gzdoom-gles

zdoom/gzdoom-gles

Fork 0

mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 15:22:15 +00:00

Commit graph

Author	SHA1	Message	Date
Christoph Oelckers	6e223ebc21	Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript # Conflicts: # src/CMakeLists.txt # wadsrc/static/actors/doom/doomarmor.txt # wadsrc/static/decorate.txt	2016-11-15 11:36:59 +01:00
Christoph Oelckers	784f7ed671	- converted all of Doom's actors. - fixed a few problems that were encountered during conversion: * action specials as action functions were not recognized by the parser. * Player.StartItem could not be parsed. * disabled the naming hack for PowerupType. ZScript, unlike DECORATE will never prepend 'Power' to the power's name, it always needs to specified by its full name. * states and defaults were not checked for empty bodies. * the scope qualifier for goto labels was not properly converted to a string, because it is an ENamedName, not an FName.	2016-10-14 20:08:41 +02:00

Author

SHA1

Message

Date

Christoph Oelckers

6e223ebc21

Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript

# Conflicts:
#	src/CMakeLists.txt
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/decorate.txt

2016-11-15 11:36:59 +01:00

Christoph Oelckers

784f7ed671

- converted all of Doom's actors.

- fixed a few problems that were encountered during conversion:
 * action specials as action functions were not recognized by the parser.
 * Player.StartItem could not be parsed.
 * disabled the naming hack for PowerupType. ZScript, unlike DECORATE will never prepend 'Power' to the power's name, it always needs to specified by its full name.
 * states and defaults were not checked for empty bodies.
 * the scope qualifier for goto labels was not properly converted to a string, because it is an ENamedName, not an FName.

2016-10-14 20:08:41 +02:00

2 commits