Randy Heit b5e4153c78 Merge branch 'master' into gonesolong ... Conflicts: src/CMakeLists.txt src/b_think.cpp src/g_doom/a_doomweaps.cpp src/g_hexen/a_clericstaff.cpp src/g_hexen/a_fighterplayer.cpp src/namedef.h src/p_enemy.cpp src/p_local.h src/p_mobj.cpp src/p_teleport.cpp src/sc_man_tokens.h src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_function.cpp src/thingdef/thingdef_parse.cpp wadsrc/static/actors/actor.txt wadsrc/static/actors/constants.txt wadsrc/static/actors/shared/inventory.txt - Added register reuse to VMFunctionBuilder for FxPick's code emitter. - Note to self: Need to reimplement IsPointerEqual and CheckClass, which were added to thingdef_function.cpp over the past year, as this file no longer exists in this branch.		2014-12-21 21:15:11 -06:00
..
fixrtext	- Add support for cross compiling so that OS X PowerPC builds can still be made on systems without rosetta (10.7+). (Compiling x86 binaries on ppc should also be possible.)	2014-01-02 01:59:04 -05:00
lemon	Merge branch 'master' into gonesolong	2014-12-20 19:13:14 -06:00
re2c	- Add support for cross compiling so that OS X PowerPC builds can still be made on systems without rosetta (10.7+). (Compiling x86 binaries on ppc should also be possible.)	2014-01-02 01:59:04 -05:00
updaterevision	- Simplify CMake GCC and Clang checking.	2014-06-26 01:23:41 +02:00
zipdir	fixed compilation with latest LZMA SDK on Windows.	2014-06-26 09:43:51 +02:00
CMakeLists.txt	- Fixed: fixrtext isn't needed with Win64 builds.	2014-11-17 21:56:16 -05:00