Christoph Oelckers 4b9647e539 Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_hexen/a_hexenspecialdecs.cpp src/g_strife/a_thingstoblowup.cpp src/thingdef/thingdef_codeptr.cpp		2016-01-20 11:45:57 +01:00
..
a_acolyte.cpp	- Converted all action functions be directly callable by the VM (though they are not yet	2010-02-12 06:04:57 +00:00
a_alienspectres.cpp	Merge branch 'master' into scripting	2016-01-19 13:43:11 +01:00
a_coin.cpp	- Strife game code refactored for coordinates.	2016-01-19 11:50:07 +01:00
a_crusader.cpp	Merge branch 'master' into scripting	2016-01-19 13:43:11 +01:00
a_entityboss.cpp	Merge branch 'master' into scripting	2016-01-19 13:43:11 +01:00
a_inquisitor.cpp	- fixed the merge.	2016-01-19 13:59:53 +01:00
a_loremaster.cpp	Merge branch 'master' into scripting	2016-01-19 13:43:11 +01:00
a_oracle.cpp	- Updated scripting branch to latest version in trunk.	2013-06-07 03:31:30 +00:00
a_programmer.cpp	- fixed the merge.	2016-01-19 13:59:53 +01:00
a_reaver.cpp	- Update scripting branch to trunk.	2012-07-14 03:04:41 +00:00
a_rebels.cpp	Merge branch 'master' into scripting	2016-01-19 13:43:11 +01:00
a_sentinel.cpp	Merge branch 'master' into scripting	2016-01-19 13:43:11 +01:00
a_spectral.cpp	- fixed some leftover unused variable warnings.	2016-01-19 16:09:44 +01:00
a_stalker.cpp	Merge branch 'master' into scripting	2016-01-19 13:43:11 +01:00
a_strifeglobal.h	- Removed the third parameter from dumpclasses when it was restricted it to Actors, because	2010-03-24 02:49:37 +00:00
a_strifeitems.cpp	- Update scripting branch to trunk.	2012-07-14 03:04:41 +00:00
a_strifestuff.cpp	- fixed the merge.	2016-01-19 13:59:53 +01:00
a_strifeweapons.cpp	Merge branch 'master' into scripting	2016-01-19 13:43:11 +01:00
a_templar.cpp	- Update scripting branch to trunk.	2012-07-14 03:04:41 +00:00
a_thingstoblowup.cpp	Merge branch 'master' into scripting	2016-01-20 11:45:57 +01:00
strife_sbar.cpp	Merge branch 'master' into scripting	2015-01-29 20:53:08 -06:00