zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-22 18:31:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
9655 commits 6 branches 6 tags 107 MiB
Commit graph

9655 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Oelckers
96fa3b124e - fixed: Trying to remove sector tags for line-less sectors crashed when there were no sector tags at all in a map. 2015-05-06 23:24:27 +02:00
Christoph Oelckers
bfc10f4c5e Merge branch 'master' into scripting 2015-05-05 11:24:43 +02:00
Christoph Oelckers
535102ae6e - fixed: NULLing the flash state in P_BringUpWeapon should be done before setting the main weapon state so that it doesn't cancel any flash state effects that get initiated there. 2015-05-05 11:23:41 +02:00
Christoph Oelckers
9b331b1713 Merge branch 'master' of https://github.com/rheit/zdoom 2015-05-04 10:54:07 +02:00
Christoph Oelckers
8c5cc45dbe Merge branch 'master' into scripting 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
 2015-05-04 09:29:46 +02:00
Christoph Oelckers
f8fd28118b Merge branch 'master' of https://github.com/rheit/zdoom 2015-05-04 08:56:04 +02:00
Christoph Oelckers
6f0caee4ba - fixed: Searching for tag 0 was no longer possible. 
The new tag manager considers tag 0 'untagged' and won't create entries in its tag list for it, so the normal search algorithm can not find any such sector.
It now uses a linear search over all sectors instead, if tag 0 is looked for.
 2015-05-04 08:55:31 +02:00
coelckers
9c43260ecb Merge pull request #327 from MajorCooke/ripminmaxfix 
- Fixed A_SetRipMin/Max not working properly.
 2015-05-04 08:26:28 +02:00
MajorCooke
6639f871c6 - Fixed A_SetRipMin/Max not working properly. 2015-05-03 17:55:01 -05:00
Christoph Oelckers
6996a15235 - fixed some overlooked merging problem. 2015-05-02 23:44:54 +02:00
Christoph Oelckers
99fc685a01 - allow linefeed before braces starting a compound state action definition. 2015-05-02 22:57:29 +02:00
Christoph Oelckers
48ae605b7d Merge branch 'master' into scripting 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
 2015-05-02 22:44:31 +02:00
Christoph Oelckers
db8cd859a6 Merge branch 'master' of https://github.com/rheit/zdoom 2015-05-02 21:29:29 +02:00
coelckers
16d87f4a8c Merge pull request #325 from edward-san/lookuplevelname_fix 
LookupLevelName fix
 2015-05-02 17:00:16 +02:00
Edoardo Prezioso
353ace8be7 - Improve the code readability in LookupLevelName. 2015-05-02 14:18:52 +02:00
Edoardo Prezioso
4217c2ccd6 - Fixed a very old bug in LookupLevelName code. 
If the map name neither matched 'ExMy', 'MAPxy' or 'LEVELxy', 'checkstring' was left uninitialized before using as argument to 'strstr', leading to undefined results.

Spotted with Valgrind.
 2015-05-02 13:46:34 +02:00
Christoph Oelckers
c75a762e7e Merge branch 'master' of https://github.com/rheit/zdoom 2015-05-01 20:27:42 +02:00
Christoph Oelckers
247fd5b008 - added missing 'id' property to udmf_zdoom.txt. 2015-05-01 20:27:04 +02:00
coelckers
fd2bff45e6 Merge pull request #324 from MajorCooke/teleoverride 
- Added TF_OVERRIDE to A_Teleport.
 2015-05-01 16:42:35 +02:00
MajorCooke
dc00d61f4d - Added TF_OVERRIDE to A_Teleport. 
- Overrides the NOTELEPORT flag so actors with velocity don't need to disable it in order to perform A_Teleport, which could be screwed up by a teleporting line or sudden ACS interference.
- Ensure that the result is set to false if it fails prematurely. Wasn't sure if this was needed, but with the upcoming if/else statements, better safe than sorry.
 2015-05-01 08:32:07 -05:00
Christoph Oelckers
bb85625d52 Merge branch 'master' of https://github.com/rheit/zdoom 2015-05-01 00:08:42 +02:00
Christoph Oelckers
1b29c3b6cf Merge branch 'master' into scripting 
Conflicts:
	src/p_interaction.cpp
	tools/lemon/lemon.c
 2015-04-30 16:13:32 +02:00
coelckers
9b128638ea Merge pull request #323 from MajorCooke/jumpifhigherorlower 
- Added A_JumpIfHigherOrLower.
 2015-04-30 15:54:45 +02:00
MajorCooke
1ecc048441 - Change the pointer to be at the end instead of the start. 2015-04-30 08:28:41 -05:00
MajorCooke
492ef1b716 - Added A_JumpIfHigherOrLower. 
- (int ptr = AAPTR_TARGET, state high, state low, float offsethigh = 0, float offsetlow = 0, bool includeHeight = true)
- Jumps if the pointer of the calling actor is higher or lower than itself, adding offsethigh or offsetlow depending on the circumstance.
- includeHeight works twofold.
- Includes the height of the calling actor if the pointer is higher to truly determine if they are completely above them or not.
- Includes the height of the pointer if the pointer is lower.
- Disable it to only check z differences without adding height.
 2015-04-30 08:15:48 -05:00
coelckers
033712d044 Merge pull request #322 from edward-san/lemon_leak 
- Plug some lemon leaks during xlat generation.
 2015-04-30 14:57:08 +02:00
coelckers
a6dcd20447 Merge pull request #321 from edward-san/tflags_fix 
- Fixed compiler errors and warnings from TFlags.
 2015-04-30 13:01:59 +02:00
Christoph Oelckers
4316740ee9 - some color coding of error messages during ACS loading. (not that I expect that the people these are meant for will read them anyway...) 2015-04-30 12:59:26 +02:00
Christoph Oelckers
97e63b1319 - split up FBehavior constructor to better be able to weed out broken ACS modules. 
Please note that this WILL break old savegames from mods which put ACS sources or unrelated data in the ACS namespace!
 2015-04-30 12:53:44 +02:00
Edoardo Prezioso
24a096fb27 - Plug some lemon leaks during xlat generation. 
Found with Address Sanitizer.
 2015-04-30 12:52:04 +02:00
Edoardo Prezioso
cda4fece1b - Fixed compiler errors and warnings from TFlags. 2015-04-30 12:35:29 +02:00
Christoph Oelckers
d96edb5c68 Merge branch 'master' into scripting 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
 2015-04-30 12:32:50 +02:00
Christoph Oelckers
50a3f8a3d2 - fixed copy/paste error. 2015-04-30 12:31:47 +02:00
Christoph Oelckers
5f1c4d157c Merge branch 'master' into scripting 
Conflicts:
	src/g_shared/a_sharedglobal.h
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_data.cpp
 2015-04-30 12:30:36 +02:00
Christoph Oelckers
84351419a3 Merge branch 'master' of https://github.com/crimsondusk/zdoom 
Conflicts:
	src/actor.h
 2015-04-30 10:03:50 +02:00
Christoph Oelckers
9880af1b0c - this line got lost during conflict resolution. 2015-04-30 09:18:13 +02:00
Christoph Oelckers
405fc31e81 Merge branch 'master' of https://github.com/DaZombieKiller/zdoom 
Conflicts:
	src/actor.h
 2015-04-30 09:14:31 +02:00
coelckers
691855e19b Merge pull request #304 from MajorCooke/morphundoalways 
- Added MORPH_UNDOALWAYS for morph powerups.
 2015-04-30 09:05:41 +02:00
coelckers
c2e91293d2 Merge pull request #310 from MajorCooke/telefogfix 
- Allow teleport fogs to set the teleporting actors as their targets, so...
 2015-04-30 09:02:10 +02:00
Christoph Oelckers
21993b3481 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-29 16:27:46 +02:00
Christoph Oelckers
7b6b473ec4 - some GCC fixed by Edward-san. 2015-04-29 11:28:04 +02:00
Christoph Oelckers
1effaa4c8e Merge branch 'master' into scripting 2015-04-29 10:53:37 +02:00
Christoph Oelckers
7d90c65427 - mask out Strife mapthing flags when starting an original Hexen map. 2015-04-29 08:42:54 +02:00
Christoph Oelckers
4c17bd65a4 - parameters for FRandomPick should not be added up. 
(I hope that this code is correct, all I can judge it by is the assert not being triggered.)
 2015-04-29 01:03:50 +02:00
Christoph Oelckers
3c1fa3bed9 - fixed some GCC warnings. 2015-04-29 00:19:21 +02:00
Christoph Oelckers
e42b688afa - finally found the reason why the garbage collector went haywire after a restart: PClass::StaticShutdown set the PClass::bShutdown variable which disables much of the garbage collector. This needs to be cleared after successful cleanup. Restart works now, except for some random CCMDs being executed right afterward. 
- fixed incorrect variable init in A_Face* functions which was missed before.
 2015-04-28 23:37:04 +02:00
Christoph Oelckers
646c135eff Merge branch 'master' into scripting 
Conflicts:
	src/m_cheat.cpp
	src/p_acs.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_properties.cpp
 2015-04-28 23:04:10 +02:00
Christoph Oelckers
a2100410f2 - fix in GL nodes loader. 2015-04-28 22:13:50 +02:00
Christoph Oelckers
f087903fca - remove some redundancy from TeleportFog code. 2015-04-28 22:11:43 +02:00
coelckers
15fbf2510a Merge pull request #320 from edward-san/clang_3_5_crash_solved 
- Clang 3.5.1+ fixed the compiler bug in ACS code.
 2015-04-28 22:06:50 +02:00