Christoph Oelckers 1dbbb56a1b Merge branch 'master' into new_level_refactor ... # Conflicts: # src/p_user.cpp		2019-02-02 16:58:30 +01:00
..
ammo.txt	- Since GetParentAmmo is now virtual, BackpackItem and the "give ammo" cheat should call GetParentAmmo to determine base ammo classes.	2019-01-01 22:00:35 +01:00
armor.txt	- scriptified GiveInventory and made the interface a bit more configurable by mods.	2018-12-01 17:07:09 +01:00
health.txt	fixed spelling (mostly comments)	2018-11-27 19:44:06 +01:00
inv_misc.txt	- removed the playernum parameter from CheckLocalView	2019-01-31 03:29:25 +01:00
inventory.txt	Merge branch 'master' into new_level_refactor	2019-02-02 16:58:30 +01:00
powerups.txt	- sanitized the 'frozen level' code.	2019-01-28 20:15:48 +01:00
stateprovider.txt	- fixed armor bonus giving in A_CustomPunch	2019-01-23 21:49:18 +01:00
weaponpiece.txt	fixed spelling (mostly comments)	2018-11-27 19:44:06 +01:00
weapons.txt	- fixed ammo check for weapon with 'uses both' flags	2018-12-29 13:36:10 +02:00