Rachael Alexanderson a78b713f4b Merge https://github.com/coelckers/gzdoom ... # Conflicts: # src/v_video.cpp		2016-12-06 18:19:08 -05:00
..
a_ammo.cpp	- moved ammo to its own file, including the backpack.	2016-11-30 12:24:50 +01:00
a_ammo.h	- cleanup of the virtual function definitions for inventory items. Let's better use 'virtual' and 'override' everywhere to make sure that nothing gets overlooked.	2016-11-30 15:54:01 +01:00
a_armor.cpp	- moved armor class declarations to their own file and added necessary #includes only to those files actually using them.	2016-11-30 10:55:03 +01:00
a_armor.h	- cleanup of the virtual function definitions for inventory items. Let's better use 'virtual' and 'override' everywhere to make sure that nothing gets overlooked.	2016-11-30 15:54:01 +01:00
a_artifacts.cpp	Merge https://github.com/coelckers/gzdoom	2016-12-06 18:19:08 -05:00
a_artifacts.h	- removed an assert from APowerMorph::EndEffect. With some recent changes to DestroyAllInventory it appears that the asserted condition no longer is true at this point when ending a game.	2016-12-01 00:05:23 +01:00
a_health.cpp	- split up zscript/shared/inventory.txt.	2016-11-30 13:36:13 +01:00
a_health.h	- cleanup of the virtual function definitions for inventory items. Let's better use 'virtual' and 'override' everywhere to make sure that nothing gets overlooked.	2016-11-30 15:54:01 +01:00
a_keys.cpp	- moved armor class declarations to their own file and added necessary #includes only to those files actually using them.	2016-11-30 10:55:03 +01:00
a_keys.h	- cleanup of the virtual function definitions for inventory items. Let's better use 'virtual' and 'override' everywhere to make sure that nothing gets overlooked.	2016-11-30 15:54:01 +01:00
a_pickups.cpp	- added null pointer validation to any relevant exported function. In most cases null pointers were already being treated as 'do nothing', but there's several places where this can make the code silently fail so in these cases a VM exception will be raised, once the VM's exception handling has been repaired to provide useful diagnostics. (Right now all it does is catch the exception, print a useless message and return to the caller as if nothing has happened.)	2016-12-02 12:06:49 +01:00
a_pickups.h	- removed an assert from APowerMorph::EndEffect. With some recent changes to DestroyAllInventory it appears that the asserted condition no longer is true at this point when ending a game.	2016-12-01 00:05:23 +01:00
a_puzzleitems.cpp	- split up zscript/shared/inventory.txt.	2016-11-30 13:36:13 +01:00
a_weaponpiece.cpp	- removed an assert from APowerMorph::EndEffect. With some recent changes to DestroyAllInventory it appears that the asserted condition no longer is true at this point when ending a game.	2016-12-01 00:05:23 +01:00
a_weaponpiece.h	- removed an assert from APowerMorph::EndEffect. With some recent changes to DestroyAllInventory it appears that the asserted condition no longer is true at this point when ending a game.	2016-12-01 00:05:23 +01:00
a_weapons.cpp	- fixed: The ammo and sister weapon type pointers were not properly declared as pointers to the type system.	2016-12-02 22:10:15 +01:00
a_weapons.h	- removed an assert from APowerMorph::EndEffect. With some recent changes to DestroyAllInventory it appears that the asserted condition no longer is true at this point when ending a game.	2016-12-01 00:05:23 +01:00