Tree: 2fe649e7b6
-
Merge pull request #13747 from VlasovVitaly/type-fastfix2
Rivet-the-Zombie committedOct 12, 2015 Fastfix of wrong type.
-
VlasovVitaly committed
Oct 12, 2015 -
Merge pull request #13746 from VlasovVitaly/pot-update
Rivet-the-Zombie committedOct 12, 2015 Translations template update
-
Fix plural from of jump message
VlasovVitaly committedOct 12, 2015 -
VlasovVitaly committed
Oct 12, 2015 -
Merge pull request #13745 from chaosvolt/mapgen-floor-fixes
Rivet-the-Zombie committedOct 12, 2015 Mapgen floor fixes
-
chaosvolt committed
Oct 12, 2015 Loading status checks…* Bandit camp: Fixed dirt floor spawning under various indoor furniture, fixed dirt spawning under indoor crates. * Duplex house: Fixed wooden floor spawning under outdoor trashcan. * Quiverfull house: Fixed dirt spawn under indoor trashcans.
-
Merge pull request #13736 from chaosvolt/arcana-fixing
Rivet-the-Zombie committedOct 11, 2015 Arcana mod monsterdrop fix and hammer tweak
-
Arcana mod monsterdrop fix and hammer tweak
chaosvolt committedOct 10, 2015 Loading status checks…* Fixed survivor zombies and The Thriller to not drop redundant amounts of their normal loot. Item groups, duh. * Updated the hammer of the hunter to be consistent with recent mainline weapon tweaks.
-
Merge pull request #13718 from Nymall/rock_salt_mine
Rivet-the-Zombie committedOct 10, 2015 Salt craftable via mined Rock Salt
-
Merge pull request #13733 from OzoneH3/v-menu-stacks
Rivet-the-Zombie committedOct 10, 2015 Display total/per stack item charges in V menu.
-
Merge pull request #13735 from chaosvolt/mshock-modded-tileset-series-15
Rivet-the-Zombie committedOct 10, 2015 MShock Modded Tileset Series 15
-
MShock Modded Tileset Series 15
Chaosvolt committedOct 10, 2015 Loading status checks…Changes: * Gave pet carriers a clearer sprite border Sprite asignments: * 40mm gas rounds Sprite additions: * Vehicle plow * Vehicle planters (normal and advanced) * Vehicle reaper * Makeshift gas canister * Giant cockroaches (nymph, adult, pregnant) * Normal little wasp * Shaving kits (normal and survivor) * Hair trimmer (electric and survivor) * Firefighter helmet
-
Revert "add camera controls to driver seats in APCs"
kevingranade committedOct 9, 2015 This reverts commit e211853.
-
Merge remote-tracking branch 'dda/pr/13727'
kevingranade committedOct 9, 2015 * dda/pr/13727: Remove unused variable Remove check for sealed flag in fd_acid Add corrosion immunity to ACIDPROOF Remove item damage from acid
-
Balanced rock salt, mining output and salt recipe.
Balanced Rock salt to work as stone, does not stack in charges but now works out to 1 rock salt per 8 salt. Volume has been fixed(now 14 volume) and weight balanced to be as mush as 8 salt rounded up. Changed distribution to between 2 and 5 pieces per mining operation at 60% chance of dropping.
-
Merge pull request #13716 from illi-kun/APCs_cameras
Rivet-the-Zombie committedOct 9, 2015 Add camera controls to driver seats in APCs
-
Merge pull request #13732 from OzoneH3/vend_fix
Rivet-the-Zombie committedOct 9, 2015 Strip Vending machines color tags.
-
Merge pull request #13617 from Coolthulhu/remove-sushi
Rivet-the-Zombie committedOct 9, 2015 Rebalance dedicated melee weapons
-
Merge pull request #13734 from chaosvolt/wasp-tweaks
Rivet-the-Zombie committedOct 9, 2015 Wasp tweaks
-
chaosvolt committed
Oct 8, 2015 Loading status checks…* Changed default faction to vermin. * Removed armor values. It looks like dragonflies are the only vermin to have any armor, so wasps lacking armor might be more consistent. Not sure yet whether to re-add a token amount or leave it at 0.
-
-
-
Merge pull request #13730 from chaosvolt/wasp-addition
Rivet-the-Zombie committedOct 8, 2015 Adds normal wasps
-
Chaosvolt committed
Oct 8, 2015 Loading status checks…* Adds a vermin version of wasps. Not sure if the small_bites flag really fits, we lack a sting flag. ID is "mon_wasp_small" because giant wasps already use the normal ID. Changing the giant wasps to use "mon_wasp_wasp" would entail changes to source, tilesets, etc. Will go through with said changes if others insist. * Added normal wasps to monstergroups (mainline and dinomod) in the same locations as giant wasps, using similar logic as non-giant insect spawns. Now if I knew a good way to have them sometimes be household pests...
-
Add checks for window pointer being null in cursesport.cpp
For compatibility with ncurses.
-
Fix crash when displaying the ATM menu:
BevapDin committedOct 7, 2015 `uimenu::redraw` fails as the menu window does not exist (is still null), it would have been create in `choose_option`, but that function is not called when the menu is entered from a activity. Now it will create and display the window from within `choose_option`. `uimenu::query` will create the window (if not already done).
-
-
Add corrosion immunity to ACIDPROOF
Coolthulhu committedOct 7, 2015 -
Coolthulhu committed
Oct 7, 2015 -
Merge pull request #13724 from BevapDin/fio
Coolthulhu committedOct 7, 2015 Fix last target not being automatically re-selected
-
Merge pull request #13719 from Night-Pryanik/patch-3
Coolthulhu committedOct 7, 2015 Radio-modded explosives on RC car update - take two
-
Merge pull request #13725 from Coolthulhu/mondeath-fix
Coolthulhu committedOct 7, 2015 Fix compilation bug in preg_roach