Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catchup #12

Merged
merged 586 commits into from
Jan 28, 2020
Merged
Changes from 1 commit
Commits
Show all changes
586 commits
Select commit Hold shift + click to select a range
cc04ecf
Remove Brian-Cataclysm-DDA - Shortcut.lnk
molkero Jan 17, 2020
2809e4f
Merge pull request #37150 from molkero/remove_lnk
ZhilkinSerg Jan 17, 2020
66807fe
Allow zombies to smash (#37154)
Jan 17, 2020
684eb06
Update misc.json
Jerimee Jan 17, 2020
d62480f
update final houses
curstwist Jan 18, 2020
ce6a800
Fix external options messing with world options (#37155)
ZhilkinSerg Jan 18, 2020
4326ad8
Merge pull request #37146 from Xanmyral/Battery-Volume-Reduction
Rivet-the-Zombie Jan 18, 2020
d54d577
Update background traits to new name format (#37165)
snipercup Jan 18, 2020
311d00e
Merge pull request #37164 from curstwist/house-update-20
ZhilkinSerg Jan 18, 2020
a6d22a6
Merge pull request #37163 from Jerimee/patch-13
ZhilkinSerg Jan 18, 2020
82a2eb2
Document mutation json (#37152)
snipercup Jan 18, 2020
4a169ad
Allow snippets in harvest messages
Jan 18, 2020
a7a97e9
Add basic archery accuracy tests.
kevingranade Jan 18, 2020
bfc715d
Ratchet down bow effective range.
kevingranade Jan 18, 2020
4f56c3f
change gravel display on curses
Jan 18, 2020
4a530aa
Fix time not advancing in death cam mode
Qrox Jan 18, 2020
011254a
Remove non-existing NO_BOOM ammo effect from mods
ZhilkinSerg Jan 17, 2020
337e94d
Clarify safe mode proximity option description and copy option value …
Qrox Jan 18, 2020
80cd821
Fix washing machine detergent manipulation (#37040)
triper-sk Jan 18, 2020
31d04eb
PRED trait hardcoded effects into flags
John-Candlebury Jan 18, 2020
122d501
Update JSON_FLAGS.md
Jerimee Jan 18, 2020
ecc2225
adjust food spawns in houses
curstwist Jan 18, 2020
db52bad
making mutants mutants
azraneth Jan 18, 2020
697563d
Cooked buckwheat buff.
SirPendrak Jan 19, 2020
158c380
Add crossbow effective range tests and tweak them to pass.
kevingranade Jan 19, 2020
9ee0415
Add varying ammo types to effective ranged test and tweak values to p…
kevingranade Jan 19, 2020
fb9dabb
Merge pull request #37047 from Trioct/drug_fix
Rivet-the-Zombie Jan 19, 2020
693950b
Fix harvest message translations
Jan 19, 2020
6ae4828
Fix json format in house_vacant mapgen (#37205)
ZhilkinSerg Jan 19, 2020
9aa5aa0
Disable tests for generic_guns mod (#37206)
ZhilkinSerg Jan 19, 2020
549cb86
Tools.json sorting pt. 1 (#37212)
RarkGrames Jan 19, 2020
0840952
Merge pull request #37176 from Qrox/fix-death-cam
ZhilkinSerg Jan 19, 2020
9fa3947
Merge pull request #37180 from Qrox/safemode-proximity
ZhilkinSerg Jan 19, 2020
aa7805f
Merge pull request #37198 from SirPendrak/buckwheat_buff
ZhilkinSerg Jan 19, 2020
29a3ab8
Merge pull request #37185 from triper-sk/fix_washing_machine_detergent
ZhilkinSerg Jan 19, 2020
f540196
Merge pull request #37177 from 1n17/1n17-gravel
ZhilkinSerg Jan 19, 2020
e268b0d
Merge pull request #37189 from Jerimee/patch-15
ZhilkinSerg Jan 19, 2020
f39eef2
Merge pull request #37183 from John-Candlebury/json-pred
ZhilkinSerg Jan 19, 2020
764b9fa
Merge pull request #37175 from Qrox/fix-maximize-resize
ZhilkinSerg Jan 19, 2020
8c365a3
Merge pull request #37196 from curstwist/adjust-domestic-food-loot-sp…
ZhilkinSerg Jan 19, 2020
da23951
Reins controls for horse-powered vehicles (#37148)
Jan 19, 2020
fd8c0cb
Fix game crash when alt tabbing (#37159)
8street Jan 19, 2020
b4ca61e
Minor tweaks to the intercom's speech
John-Candlebury Jan 19, 2020
d4900fe
add still back in (#37227)
Kilvoctu Jan 19, 2020
a7c1716
Drop firing times on ranged weapons, this is mostly handled by aiming…
kevingranade Jan 19, 2020
0c2013f
Make the unique monsters found in Hub 01 missions more resilient (#37…
John-Candlebury Jan 19, 2020
8681b75
Merge pull request #37230 from kevingranade/drop-ranged-firing-times
ZhilkinSerg Jan 19, 2020
b4b677b
Merge pull request #37222 from John-Candlebury/intercom-dialogue
ZhilkinSerg Jan 19, 2020
82d31e9
Tools.json sorting pt. 2 (#37213)
RarkGrames Jan 19, 2020
3c7ffe5
Add radio tower to Hub 01 (#37202)
John-Candlebury Jan 19, 2020
20f3473
Merge pull request #37197 from azraneth/mutant_fish
ZhilkinSerg Jan 19, 2020
dcdef1e
Spelling (#37201)
klorpa Jan 19, 2020
c28823d
Correct harvest lists for leech plants
John-Candlebury Jan 19, 2020
af20242
Fix tests
John-Candlebury Jan 20, 2020
b2b3ce6
Trigger traps after ranged_pull mattack
anothersimulacrum Jan 20, 2020
dab4220
Merge pull request #37235 from John-Candlebury/dialouge-fix
ZhilkinSerg Jan 20, 2020
52120a3
Merge pull request #37233 from John-Candlebury/leech-plant-harvest
ZhilkinSerg Jan 20, 2020
eca1d26
Merge pull request #37236 from anothersimulacrum/falling!
ZhilkinSerg Jan 20, 2020
ac64085
Tools.json sorting pt. 3 (#37214)
RarkGrames Jan 20, 2020
7185c16
Added new dairy farm location (#37221)
Night-Pryanik Jan 20, 2020
64d2a62
Three new map extras (#37160)
RarkGrames Jan 20, 2020
6e4eacd
Merge pull request #37178 from ZhilkinSerg/mods-json-ammo-effects-no-…
Rivet-the-Zombie Jan 20, 2020
9c24dec
Provide ability to execute an action from the keybindings menu (#36859)
scrotty Jan 20, 2020
90bd793
[MOD] INT Based Learning (#37075)
Jan 20, 2020
0a81a8b
Removed everything with CUT quality of 2. (#36650)
Kelenius Jan 20, 2020
1f7628d
Magazine Item Group Revamp (#37141)
LilShiningMan Jan 20, 2020
00fbf22
[CR] Update Modular Turrets and Salvaged Robots to match Mainline sty…
CSHague Jan 20, 2020
cd23350
Removes trailing 0x85 character in explosives.json (#37243)
BrettDong Jan 20, 2020
1bd1d43
increase plastic tub volume to match its contents'
l29ah Jan 20, 2020
2a9b7a7
Fixed "Aware of your presence!" text overlapping monster/npc effects
Night-Pryanik Jan 20, 2020
4384d96
Move computer window to a separate class
Qrox Jan 20, 2020
e88a8ba
Adjust tallow health modifier.
CountAlex Jan 20, 2020
70d06c7
Merge pull request #37246 from Night-Pryanik/monster-examine-ui-fix
ZhilkinSerg Jan 20, 2020
1d4b2fd
Merge pull request #37244 from l29ah/plastic-tub-volume
ZhilkinSerg Jan 20, 2020
95de03c
Merge pull request #37247 from Qrox/computer-session
ZhilkinSerg Jan 20, 2020
312b705
Tools.json sorting pt. 4 (#37215)
RarkGrames Jan 20, 2020
fe7e3c4
Update tests Makefile (#37245)
ZhilkinSerg Jan 20, 2020
080e5a7
Preserve translation data in harvest message
Jan 20, 2020
d7f5827
Tools.json sorting pt. 5 (#37216)
RarkGrames Jan 20, 2020
537b146
Tools.json sorting pt. 6 (#37217)
RarkGrames Jan 20, 2020
c26d2e8
check for max number of tile items when moving in sorting
Jan 20, 2020
c55f8f9
change curses refresh rate in main menu to stop flickering
Jan 20, 2020
b8e26b2
Tools.json sorting pt. 7 (#37218)
RarkGrames Jan 20, 2020
f8e2ed0
Merge pull request #37259 from davidpwbrown/flicker_fix
ZhilkinSerg Jan 20, 2020
038f70f
Merge pull request #37258 from davidpwbrown/overflow_sort_fix
ZhilkinSerg Jan 20, 2020
ee900d7
Appease clang
ZhilkinSerg Jan 20, 2020
4e9ea8c
NPC mission chain fix (#37255)
Jan 20, 2020
ba6d848
Merge pull request #37260 from CleverRaven/clang-2020-01-21
ZhilkinSerg Jan 20, 2020
674b2b3
Merge pull request #37250 from CountAlex/tallow-health
ZhilkinSerg Jan 20, 2020
2855e2e
Create string_consts.h and pull string consts from player.cpp and cha…
Ramza13 Jan 20, 2020
211d2aa
Migrate/cleanup consumption.cpp from player to character (#36991)
Ramza13 Jan 20, 2020
71ee31c
Remove redundant curly braces
ZhilkinSerg Jan 21, 2020
c9c7043
use om_local pos to check dnager across overmap boundaries
Jan 21, 2020
366ad78
Input event filter clean-up
Qrox Jan 21, 2020
106fa1a
House fix (#37261)
curstwist Jan 21, 2020
9b4b483
Novels Item Group Revamp - kid books and literature groups added
LilShiningMan Jan 21, 2020
a592895
rammed earth faction expansions (#37184)
curstwist Jan 21, 2020
41b3ae2
add migo resin walls for faction camps (#37188)
curstwist Jan 21, 2020
22b15d9
Removed redundant arrays for colors (#37187)
ZhilkinSerg Jan 21, 2020
b616888
Merge pull request #37262 from davidpwbrown/danger_note_fix
Rivet-the-Zombie Jan 21, 2020
2f465f3
Merge pull request #37266 from LilShiningMan/LSM---Novels
ZhilkinSerg Jan 21, 2020
fe8d699
Merge pull request #37264 from Qrox/input-filter-cleanup
ZhilkinSerg Jan 21, 2020
d3014d3
Tools.json sorting pt. 8 (#37219)
RarkGrames Jan 21, 2020
0696252
Fix NPC dropping equipment (#37240)
Ramza13 Jan 21, 2020
68b27a7
Fix item duplication
Trioct Jan 21, 2020
79b8cfc
Saner oars stats and recipe
l29ah Jan 21, 2020
395f2c4
Remove redundant translation
Jan 21, 2020
cab55e4
Fix filthy wearable weapon drops
saurocyte Jan 21, 2020
4a47f35
Apply suggestions from code review
saurocyte Jan 21, 2020
12beec0
Military Base location (#37024)
RarkGrames Jan 21, 2020
06ab5f7
Update mammal.json
RarkGrames Jan 21, 2020
7ea3189
Offal holiday cooking by evelyn turncoat (#37171)
Maleclypse Jan 21, 2020
ff0f233
Fix map revealing items (#37195)
ZhilkinSerg Jan 21, 2020
3538a65
Changed occurrences
RarkGrames Jan 21, 2020
36a0c9b
Cable charger don't draw power when you're full
Jan 21, 2020
ff78dd1
Calories for offal dishes (#37287)
I-am-Erk Jan 22, 2020
6e7dd64
Attacking shocker with worn non-conductive gloves won't zapback you (…
Night-Pryanik Jan 22, 2020
f27d795
Comestible modern json (#37273)
snipercup Jan 22, 2020
5215255
create orichalcum frame vehicle part
KorGgenT Jan 22, 2020
486010b
Added oral rehydration therapy drink and recipes to craft it. (#37286)
Inglonias Jan 22, 2020
041c666
Add MAINLINE_MODS.md to document mod inclusion criteria and procedure…
esotericist Jan 22, 2020
3e11834
Merge pull request #37274 from saurocyte/filthy_strap_fix
Rivet-the-Zombie Jan 22, 2020
b3d0c21
Added flag to the 5 variants
RarkGrames Jan 22, 2020
f258ad6
Linting
RarkGrames Jan 22, 2020
4ceedf6
shfit the ambulance
curstwist Jan 22, 2020
eeb469b
Add age_grow attribute documentation.
arijust Jan 23, 2020
1c38996
Comestible-modern-json 2
snipercup Jan 23, 2020
e497763
Merge pull request #37312 from arijust/age_grow
Rivet-the-Zombie Jan 23, 2020
566b804
typo: change 'past' to 'passed' (verb)
jkraybill Jan 23, 2020
0ee787a
Ammo modern json
snipercup Jan 23, 2020
dff7afe
Merge pull request #37270 from l29ah/oars-fix
ZhilkinSerg Jan 23, 2020
aeb3a51
Paperback novel tpl (#37166)
Jerimee Jan 23, 2020
7476d27
Merge pull request #37313 from snipercup/Comestible-modern-json2
ZhilkinSerg Jan 23, 2020
5b2f6fb
Merge pull request #37319 from jkraybill/jk1
ZhilkinSerg Jan 23, 2020
cf26630
Merge pull request #37283 from RarkGrames/Animal-reproduction-fixes
ZhilkinSerg Jan 23, 2020
ff26158
Merge pull request #37173 from ymber/harvest_snippets
ZhilkinSerg Jan 23, 2020
5486c84
Merge pull request #37320 from snipercup/Ammo-modern-json
ZhilkinSerg Jan 23, 2020
a51904b
Merge pull request #37308 from curstwist/fix-#36916-tacoma-ranch-crash
ZhilkinSerg Jan 23, 2020
beacad7
Merge pull request #37289 from RarkGrames/Overrun-scenario-fix
ZhilkinSerg Jan 23, 2020
5e2728e
Move more string consts into file for them (#37302)
Ramza13 Jan 23, 2020
31768ac
Refactor computer window (#37269)
Qrox Jan 23, 2020
fe570fa
Add new safemode rule category for ignoring sounds (#36786)
Ramza13 Jan 23, 2020
5b2bd4c
Update mre.json
Dziugaske Jan 23, 2020
f50a4dc
Update mre.json
Dziugaske Jan 23, 2020
6310134
Fixed duplicate "the"
Night-Pryanik Jan 24, 2020
8dc2115
Merge pull request #37328 from Dziugaske/MRE-fun-value-changes
Rivet-the-Zombie Jan 24, 2020
b650898
Merge pull request #37340 from Night-Pryanik/the-the-fix
ZhilkinSerg Jan 24, 2020
e792bb8
Computer refactor part 2 (#37299)
Qrox Jan 24, 2020
50ab9da
Merge pull request #37290 from Fris0uman/charger_no_waste
ZhilkinSerg Jan 24, 2020
b0e77ba
Reduce the scaling damage dealt by the evolve kill strike special att…
John-Candlebury Jan 24, 2020
40af61c
Merge pull request #37267 from Trioct/holster_fix
ZhilkinSerg Jan 24, 2020
7e961e9
Prevent auto attacking allies (#37257)
Ramza13 Jan 24, 2020
35a949b
Move update_body and skill rust related functions from player to Char…
Fris0uman Jan 24, 2020
6d9a296
Jsonize and simplify starving warnings (#36989)
Fris0uman Jan 24, 2020
b7de918
Add a "rural" biome in mod form (#37265)
I-am-Erk Jan 24, 2020
115abba
Fix mag unloading (#37338)
Trioct Jan 24, 2020
7c0cdb6
NPC can consume battery charges from batteries
Jan 24, 2020
6369e0b
Generic Guns rework (#36839)
tenmillimaster Jan 24, 2020
7ae9ac6
Reverted flag change and added coverage
RarkGrames Jan 24, 2020
070588e
Fix spelling errors (#37349)
reinerh Jan 24, 2020
e258c46
Generic modern json (#37342)
snipercup Jan 24, 2020
a7dd190
Update Makefile so LTO works on OSX
sayke Jan 24, 2020
8fd783c
Fix a few typos pre 0.E (#37359)
Cyrano7 Jan 24, 2020
2ce8aa2
Add a vibrator crafting recipe (#36860)
wapcaplet Jan 24, 2020
ed7e3b7
Added the item to item groups (#37360)
RarkGrames Jan 24, 2020
3fae12a
Sorted hats, arm and leg guards (#37358)
RarkGrames Jan 24, 2020
bb45b9a
Add item_category documentation (#37346)
snipercup Jan 24, 2020
3da00f4
Magiclysm - New Spells 1 (#37254)
foulman Jan 25, 2020
8f55ca2
regenerate values for vehicle drag test (#37369)
Jan 25, 2020
fa4ed2d
Cleaning can use clean water (#37366)
Fris0uman Jan 25, 2020
b5561ea
Fix handmade magnum carbine using wrong ammo (#37364)
Jan 25, 2020
31d04ac
Adds repair like jeans to army pants. (#37353)
Brian-Otten Jan 25, 2020
075afa3
Remove non-scifi professions from Aftershock (#37292)
John-Candlebury Jan 25, 2020
2b4d10a
json style
KorGgenT Jan 25, 2020
dbfa7f1
Add -fno-sanitize-recover=all
jbytheway Jan 17, 2020
a1ee2fe
Avoid member function call with this == null
jbytheway Jan 25, 2020
df15d25
Avoid crafting_success_roll returning NaN
jbytheway Jan 25, 2020
31e9af9
Avoid uninitialized bool member variables
jbytheway Jan 25, 2020
698fde7
Avoid overflow in get_overmaps_near
jbytheway Jan 25, 2020
97b0c13
Avoid some floating point division by zero
jbytheway Jan 25, 2020
f572d0a
Avoid overflow when computing vehicle power
jbytheway Jan 25, 2020
cb1a791
Initialize weather in tests
jbytheway Jan 25, 2020
696b4ba
Add -fno-sanitize-recover=all with sanitizers
jbytheway Jan 25, 2020
175cf62
Fixed pluralization of acorn meal/bologna/bone meal/cornmeal/detergen…
jkraybill Jan 25, 2020
30a5718
Merge pull request #37350 from Fris0uman/batt_npc
Rivet-the-Zombie Jan 25, 2020
36012ab
Triage two clang-tidy checks
jbytheway Jan 25, 2020
98dbaaf
Enable UBSan in Travis CI
jbytheway Jan 25, 2020
5e96b74
fix screen wall (#37380)
curstwist Jan 25, 2020
34f4c52
Armor.json sorting pt. 2 (#37381)
RarkGrames Jan 25, 2020
12076fe
make reins autolearn (#37379)
Jan 25, 2020
1f2840c
Routine i18n updates on 25 Jan 2020 (#37382)
BrettDong Jan 25, 2020
a59d1de
Some more typo cleanup for 0.E
Cyrano7 Jan 25, 2020
55d12ca
Use std::abs on int64_t argument
jbytheway Jan 25, 2020
fa3ab6e
Update JSON_INFO.md (bashing cannot be negative) (#37186)
Jerimee Jan 25, 2020
aa2da16
Appease clang-tidy (#37390)
jbytheway Jan 25, 2020
210f075
Merge pull request #37383 from jbytheway/triage-clang-tidy
ZhilkinSerg Jan 25, 2020
81caf54
Merge pull request #37384 from jbytheway/ubsan
ZhilkinSerg Jan 25, 2020
d790b68
Merge pull request #37389 from Cyrano7/Cleanup0.E
ZhilkinSerg Jan 25, 2020
0756e42
Armor.json sorting pt. 3 (#37393)
RarkGrames Jan 25, 2020
bb2b11c
Merge pull request #37356 from sayke/fix-LTO-on-OSX
ZhilkinSerg Jan 25, 2020
9a01fd5
Various generic guns quickfixes (#37386)
tenmillimaster Jan 25, 2020
0ef18c7
Mainline sleep deprivation (#37317)
anothersimulacrum Jan 26, 2020
17af2e6
Update inventory.cpp
SeventhSandwich Jan 26, 2020
94515f5
Increased recycle center mundane loot tenfold (#37388)
RarkGrames Jan 26, 2020
8c1d65e
Obsoleted Special 700 (#37385)
RarkGrames Jan 26, 2020
88cbf39
Standardize JSON times to strings (#37396)
wapcaplet Jan 26, 2020
3fb2a3f
Item Group Sorting #5
LilShiningMan Jan 26, 2020
a935a80
Refresh whole screen after selecting "What to do with your X"
Night-Pryanik Jan 26, 2020
0b2785f
Merge pull request #37307 from RarkGrames/Underbrush-nocollide
Rivet-the-Zombie Jan 26, 2020
9000542
Merge pull request #37401 from Night-Pryanik/query-fix
ZhilkinSerg Jan 26, 2020
95d54b2
Merge pull request #37400 from LilShiningMan/lsm---item-group-sort-5
ZhilkinSerg Jan 26, 2020
9e48800
Pull out more string consts into cata_string_consts.h (#37394)
Ramza13 Jan 26, 2020
1f2d6be
Revoked RECHARGE flag from Aftershock's UPS items/tools (#37331)
gwyter Jan 26, 2020
5c8dd53
Merge pull request #37395 from SeventhSandwich/chemlab-hotplate-rework
ZhilkinSerg Jan 26, 2020
1670fd3
Aftershock Bloodhound Drones (#37131)
Maleclypse Jan 26, 2020
c7b0c39
Refactor and update Graphical Overmap mod (#37305)
Kilvoctu Jan 26, 2020
16ef318
Add suffixes and base recipes to Modular Turrets-based mods to allow …
CSHague Jan 26, 2020
b5c9a87
Armor.json sorting pt. 4
RarkGrames Jan 26, 2020
de33e1d
security van uses orichalcum
KorGgenT Jan 26, 2020
0e2b486
Fix magazine unloading (again)
Inglonias Jan 26, 2020
7dfb8a1
Replace Food and Drink labels with Hunger and Thirst
Jan 26, 2020
7040e0b
Update bunker.json (#37411)
RarkGrames Jan 26, 2020
63458a7
Merge pull request #37412 from Inglonias/fix-mags-again
ZhilkinSerg Jan 26, 2020
9a1798d
Avoid uninitialized resistance values
jbytheway Jan 26, 2020
e845125
Adds extra whitespace to fix tests fail
CountAlex Jan 26, 2020
c65d44b
Merge pull request #37418 from CountAlex/spacefix
ZhilkinSerg Jan 26, 2020
88c370c
Merge pull request #37417 from jbytheway/uninitialized-resistances
ZhilkinSerg Jan 26, 2020
306adb1
Merge pull request #37410 from RarkGrames/Armor.json-sorting-pt.-4
ZhilkinSerg Jan 26, 2020
064338a
Merge pull request #37413 from Fris0uman/panhunger
ZhilkinSerg Jan 26, 2020
14a33b4
Update documentation on gun valid mod locations
snipercup Jan 26, 2020
7f30447
fix house spawns
curstwist Jan 27, 2020
6f0eab5
pluralization and grammar fixes: spam, canned salmon, charcoal, Brigi…
jkraybill Jan 27, 2020
ff90f51
Merge pull request #37428 from curstwist/fix-house_crack-spawns
Rivet-the-Zombie Jan 27, 2020
c778285
Merge pull request #37432 from jkraybill/jk3
ZhilkinSerg Jan 27, 2020
9f5c117
Merge pull request #37421 from snipercup/Update-documentation-on-gun-…
ZhilkinSerg Jan 27, 2020
24477c5
Mutations modern json names and doubles (#37426)
snipercup Jan 27, 2020
c4b028f
item group sorting 6 (#37408)
LilShiningMan Jan 27, 2020
8fcf7b8
Move item desription into basic_info (#37422)
wapcaplet Jan 27, 2020
6d882a2
update ITEM_CATEGORY documentation - property priority_zones (#37407)
snipercup Jan 27, 2020
6a39a45
Mutation modern names format (#37434)
snipercup Jan 27, 2020
4ae9ab6
update with crack houses
Kilvoctu Jan 27, 2020
7254bb0
Merge pull request #37438 from Kilvoctu/go-crack-house
ZhilkinSerg Jan 27, 2020
42a0692
Merge pull request #37295 from KorGgenT/orichalcum-frame
ZhilkinSerg Jan 27, 2020
4040b58
Split sausage_wasteland recipe into two recipes. (#37316)
arijust Jan 27, 2020
98a689e
Item category modern json name (#37435)
snipercup Jan 27, 2020
4eee8c7
Armor.json sorting pt. 5 (#37441)
RarkGrames Jan 27, 2020
ca1e290
Fix footsteps translation (#37402)
8street Jan 27, 2020
00ce335
Make edamame and soybeans smokable (#37335)
CSHague Jan 27, 2020
6c29cba
Build roofs over dirt, and dig stairs in roofed dirt tiles (#37427)
ashGlaw Jan 27, 2020
bfee67a
Add missing [ ] to fix game load (#37449)
Hirmuolio Jan 27, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix external options messing with world options (CleverRaven#37155)
ZhilkinSerg authored and kevingranade committed Jan 18, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit ce6a80062a4490a97d3a0e47e6a5d7384786cfba
2 changes: 1 addition & 1 deletion src/worldfactory.cpp
Original file line number Diff line number Diff line change
@@ -1426,7 +1426,7 @@ void load_external_option( const JsonObject &jo )
options_manager &opts = get_options();
if( !opts.has_option( name ) ) {
auto sinfo = jo.get_string( "info" );
opts.add_external( name, "world_default", stype, sinfo, sinfo );
opts.add_external( name, "external_options", stype, sinfo, sinfo );
}
options_manager::cOpt &opt = opts.get_option( name );
if( stype == "float" ) {