mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-12-23 19:01:48 +00:00
b5e4153c78
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. |
||
|---|---|---|
| .. | ||
| a_chicken.cpp | ||
| a_dsparil.cpp | ||
| a_hereticartifacts.cpp | ||
| a_hereticimp.cpp | ||
| a_hereticmisc.cpp | ||
| a_hereticweaps.cpp | ||
| a_ironlich.cpp | ||
| a_knight.cpp | ||
| a_wizard.cpp | ||