-
Notifications
You must be signed in to change notification settings - Fork 0
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 #11
Catchup #11
Commits on Jan 6, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 6b0b64f - Browse repository at this point
Copy the full SHA 6b0b64fView commit details -
Merge pull request #36736 from kevingranade/fix-ant-tunnels
Fixes to ant lair generation
Configuration menu - View commit details
-
Copy full SHA for b0160b4 - Browse repository at this point
Copy the full SHA b0160b4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4493717 - Browse repository at this point
Copy the full SHA 4493717View commit details -
Configuration menu - View commit details
-
Copy full SHA for 57b6f2f - Browse repository at this point
Copy the full SHA 57b6f2fView commit details -
Magiclysm: Holographic transposition spell (#36714)
* Holographic transposition spell * Add spawn for the holographic transposition scroll * Remove outdated flag * Remove unused function parameter * Changes suggested by code review. * Update data/mods/Magiclysm/items/spell_scrolls.json Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> * Fix misplaced coma in spell_scrolls.json * Apply suggestions from code review Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com> Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com> Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 8ad1db2 - Browse repository at this point
Copy the full SHA 8ad1db2View commit details -
Adding Grape Seeds to the cooking oil recipe
Grape seed oil: https://en.wikipedia.org/wiki/Grape_seed_oil
Configuration menu - View commit details
-
Copy full SHA for 2d14566 - Browse repository at this point
Copy the full SHA 2d14566View commit details -
Merge pull request #1 from Ker-Nes/Ker-Nes-grapes
Adding Grape Seeds to the cooking oil recipe
Configuration menu - View commit details
-
Copy full SHA for e4492a8 - Browse repository at this point
Copy the full SHA e4492a8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 17ceebe - Browse repository at this point
Copy the full SHA 17ceebeView commit details -
Configuration menu - View commit details
-
Copy full SHA for ff81bf2 - Browse repository at this point
Copy the full SHA ff81bf2View commit details -
Merge pull request #36750 from Qrox/fix-typo
Fix a typo in avatar.cpp
Configuration menu - View commit details
-
Copy full SHA for 72a0325 - Browse repository at this point
Copy the full SHA 72a0325View commit details -
Merge pull request #36753 from Inglonias/war-on-christmas
Take down the Christmas decorations
Configuration menu - View commit details
-
Copy full SHA for 24d0daf - Browse repository at this point
Copy the full SHA 24d0dafView commit details -
Merge pull request #36755 from anothersimulacrum/docs
Add documentation for repairs_like
Configuration menu - View commit details
-
Copy full SHA for 238ab4b - Browse repository at this point
Copy the full SHA 238ab4bView commit details -
Use libbacktrace to generate readable backtrace on Windows (#36615)
* Use libbacktrace to generate backtrace * Move dbghelp symbol initialization to debug_write_backtrace * Use libbacktrace on cross-compilation to Windows * Download prebuilt libbacktrace before building * Use square brackets instead of angle brackets * Add license text of libbacktrace
Configuration menu - View commit details
-
Copy full SHA for 764aa9f - Browse repository at this point
Copy the full SHA 764aa9fView commit details
Commits on Jan 7, 2020
-
Handle basecamp component selection cancellation
Various basecamp actions require components and tools to be consumed. When there are choices to be made amongst these, the player is presented with the choice between the various options in the usual way. However, if the player cancels, the action proceeded regardless. This allowed the player to circumvent the consumption of the requirements. Fix this by separating the selection of the components from the consumption. Now the order of events is: - Select components and tools. - Select NPC. - Send NPC on mission. - Consume components and tools. We needed to perform the split because we need to select both the requirements and the NPC before performing alterations to either. Implemented by introducing a new class basecamp_action_components to store this selection state.
Configuration menu - View commit details
-
Copy full SHA for d6dbad0 - Browse repository at this point
Copy the full SHA d6dbad0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 64dedd5 - Browse repository at this point
Copy the full SHA 64dedd5View commit details -
Configuration menu - View commit details
-
Copy full SHA for b225c73 - Browse repository at this point
Copy the full SHA b225c73View commit details -
Merge pull request #36740 from jbytheway/basecamp_consumption
Handle basecamp component selection cancellation
Configuration menu - View commit details
-
Copy full SHA for 95bbdfe - Browse repository at this point
Copy the full SHA 95bbdfeView commit details -
Merge pull request #36762 from jbytheway/resume_craft_crash
Fix inventory caching bug causing crash when resuming craft
Configuration menu - View commit details
-
Copy full SHA for 168f48f - Browse repository at this point
Copy the full SHA 168f48fView commit details -
Merge pull request #36752 from Ker-Nes/grapeseedoil
Adding Grape Seeds to the cooking oil recipe
Configuration menu - View commit details
-
Copy full SHA for 4d722cb - Browse repository at this point
Copy the full SHA 4d722cbView commit details -
Moved corpses.json from items dir to items/corpses
Also fixed weight and volume of children corpses
Configuration menu - View commit details
-
Copy full SHA for 9493b39 - Browse repository at this point
Copy the full SHA 9493b39View commit details -
Merge pull request #36771 from Night-Pryanik/corpses
Fixed weight and volume of children corpses
Configuration menu - View commit details
-
Copy full SHA for 9c6802b - Browse repository at this point
Copy the full SHA 9c6802bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 88009f4 - Browse repository at this point
Copy the full SHA 88009f4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ee7ca4 - Browse repository at this point
Copy the full SHA 0ee7ca4View commit details -
Merge pull request #36773 from kevingranade/fix-sandbag
Correct sandbag recipe for charges
Configuration menu - View commit details
-
Copy full SHA for 28f902a - Browse repository at this point
Copy the full SHA 28f902aView commit details -
Merge pull request #36767 from kevingranade/fix-anthils-again
Overhaul anthill generation to avoid conflicting with other map features
Configuration menu - View commit details
-
Copy full SHA for a68dc58 - Browse repository at this point
Copy the full SHA a68dc58View commit details -
Configuration menu - View commit details
-
Copy full SHA for bd22b04 - Browse repository at this point
Copy the full SHA bd22b04View commit details -
Configuration menu - View commit details
-
Copy full SHA for 91c47b0 - Browse repository at this point
Copy the full SHA 91c47b0View commit details -
Configuration menu - View commit details
-
Copy full SHA for b63b941 - Browse repository at this point
Copy the full SHA b63b941View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9ea9f81 - Browse repository at this point
Copy the full SHA 9ea9f81View commit details -
Martial Arts missing Learn Diffculty and Incorrect Bonuses (#36772)
* Martial Arts missing Learn Diffculty and Incorrect Bonuses Medieval Swordsmanship and Leopard Stance were missing the learn difficulty, making them potentially easier to learn than intended. Leopard stance's on move buff gave a flat bonus to damage instead of the intended multiplier. Eskrima stance was giving a 200% bonus to accuracy instead of the intended +2 accuracy. * Added missing primary_skills Fior Di Battaglia uses bashing skill, Medieval Swordsmanship uses cutting skill
Configuration menu - View commit details
-
Copy full SHA for 3734302 - Browse repository at this point
Copy the full SHA 3734302View commit details -
Set debug mutation as such in Magiclysm (#36774)
* Set debug mutation as such in Magiclysm * Apply suggestions from code review Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com> Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for c4c7b91 - Browse repository at this point
Copy the full SHA c4c7b91View commit details -
Electrochemical reactions (#36785)
* Update recipe_medsandchemicals.json abstracting using chloralkali process (hot solution, unpartitioned cell) to produce sodium chlorate, then perchlorate by anodic oxidation on platinum, then ammonia perchlorate by double decomposition from sodium perchlorate and ammonium chloride; while we can't directly use bleach here but we do end up recovering some brine * Update recipe_medsandchemicals.json * Update recipe_medsandchemicals.json * Update recipe_medsandchemicals.json * Update recipe_medsandchemicals.json * Update recipe_medsandchemicals.json Reevaluating skill requirements
Configuration menu - View commit details
-
Copy full SHA for bcff7ae - Browse repository at this point
Copy the full SHA bcff7aeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0de82ed - Browse repository at this point
Copy the full SHA 0de82edView commit details
Commits on Jan 8, 2020
-
* add box backpack and recipe * add NO_REPAIR flag * edit description and recipe * Update data/json/recipes/armor/storage.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> * Update data/json/recipes/armor/storage.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> * Update data/json/recipes/armor/storage.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> * remove stray bracket Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 29351f0 - Browse repository at this point
Copy the full SHA 29351f0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1f9a072 - Browse repository at this point
Copy the full SHA 1f9a072View commit details -
Adds military helipad location (#36732)
* Adds military helipad location * JSON fixes. * Moster placing fix. * Terrain id fix. * Replace mech lifter with a forklift. * Review changes * Set of small fixes - spawns etc. * Reduce number of perimeter turrets to 4.
Configuration menu - View commit details
-
Copy full SHA for 89ef868 - Browse repository at this point
Copy the full SHA 89ef868View commit details -
Use -Wno-unknown-warning to simplify warnings
A gcc-specific warning option had been added (-Wsuggest-override). In theory this was guarded against being used with clang, but that didn't work if a compilation database was built with gcc and then used with e.g. clang-tidy. In that situation clang would complain about the unrecognized warning. The suggested workaround in the DEVELOPER_TOOLING docs was to add -Wno-unknown-warning-option, a clang option to suppress such warnings. However, we might as well just add that option always, then we don't need to make the -Wsuggest-override conditional and the build logic is simplified. Technically, gcc has no such option, but gcc doesn't complain about unrecognized disabled warning options (unless there's another error) so we get lucky there. Hopefully that remains true back to our earliest supported gcc. This might cause problems for compiling with another compiler e.g. icc, but the way the Makefile was written, it would have had that problem anyway, since it was added for any non-clang compiler.
Configuration menu - View commit details
-
Copy full SHA for 2a8c48d - Browse repository at this point
Copy the full SHA 2a8c48dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c94bf5 - Browse repository at this point
Copy the full SHA 8c94bf5View commit details -
Merge pull request #36799 from arijust/ballistic_vest
Lower material thickness for ballistic vest.
Configuration menu - View commit details
-
Copy full SHA for d8a93e0 - Browse repository at this point
Copy the full SHA d8a93e0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 09cf3e4 - Browse repository at this point
Copy the full SHA 09cf3e4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8355299 - Browse repository at this point
Copy the full SHA 8355299View commit details -
Increase assisted effect from nurse bot (#36798)
* Increase max_intensity of assisted effect * Increase intensity of assisted effect from nurse bot
Configuration menu - View commit details
-
Copy full SHA for a74605a - Browse repository at this point
Copy the full SHA a74605aView commit details -
Merge pull request #36803 from jbytheway/no_unknown_warning
Use -Wno-unknown-warning to simplify warnings selection
Configuration menu - View commit details
-
Copy full SHA for 82fafc5 - Browse repository at this point
Copy the full SHA 82fafc5View commit details -
Merge pull request #36801 from John-Candlebury/afs-butcher-fix
[Aftershock] Fix butchery results
Configuration menu - View commit details
-
Copy full SHA for 77f4898 - Browse repository at this point
Copy the full SHA 77f4898View commit details -
Configuration menu - View commit details
-
Copy full SHA for b6c48d8 - Browse repository at this point
Copy the full SHA b6c48d8View commit details -
Merge pull request #36768 from John-Candlebury/holo-fighter
Aftershock Corporate Infiltrator
Configuration menu - View commit details
-
Copy full SHA for a9432ab - Browse repository at this point
Copy the full SHA a9432abView commit details -
remove superfluous refresh calls from list item/monster views set item list width to match default/minimal monster list width
Configuration menu - View commit details
-
Copy full SHA for 44b584e - Browse repository at this point
Copy the full SHA 44b584eView commit details -
Construction recipe for barred window with curtains (#36797)
* Construction recipe for barred window with curtains * lint * add conditional for tear down Add conditional handler for tearing down curtains from a barred window * fix missing declaration No shortcuts... download a compiler, learn c++, and finish what I started. Game compiles, load save, no error, tear down curtain and they stayed down * astyle learn what astyle is and attempt application. minor fix, remove unneeded "."'s
Configuration menu - View commit details
-
Copy full SHA for 0e87154 - Browse repository at this point
Copy the full SHA 0e87154View commit details -
Allow armor inserts in ballistic vests (#36778)
* Allow armor inserts in ballistic vests * Reduce assembly time * Update ballistic plate descriptions
Configuration menu - View commit details
-
Copy full SHA for e7fabca - Browse repository at this point
Copy the full SHA e7fabcaView commit details -
Configuration menu - View commit details
-
Copy full SHA for bb7e3c4 - Browse repository at this point
Copy the full SHA bb7e3c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4322f15 - Browse repository at this point
Copy the full SHA 4322f15View commit details