f8fd28118b
Merge branch 'master' of https://github.com/rheit/zdoom
2015-05-04 08:56:04 +02:00
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
9c43260ecb
Merge pull request #327 from MajorCooke/ripminmaxfix
...
- Fixed A_SetRipMin/Max not working properly.
2015-05-04 08:26:28 +02:00
6639f871c6
- Fixed A_SetRipMin/Max not working properly.
2015-05-03 17:55:01 -05:00
16d87f4a8c
Merge pull request #325 from edward-san/lookuplevelname_fix
...
LookupLevelName fix
2015-05-02 17:00:16 +02:00
353ace8be7
- Improve the code readability in LookupLevelName.
2015-05-02 14:18:52 +02:00
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
c75a762e7e
Merge branch 'master' of https://github.com/rheit/zdoom
2015-05-01 20:27:42 +02:00
247fd5b008
- added missing 'id' property to udmf_zdoom.txt.
2015-05-01 20:27:04 +02:00
fd2bff45e6
Merge pull request #324 from MajorCooke/teleoverride
...
- Added TF_OVERRIDE to A_Teleport.
2015-05-01 16:42:35 +02:00
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
9b128638ea
Merge pull request #323 from MajorCooke/jumpifhigherorlower
...
- Added A_JumpIfHigherOrLower.
2015-04-30 15:54:45 +02:00
1ecc048441
- Change the pointer to be at the end instead of the start.
2015-04-30 08:28:41 -05:00
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
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
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
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
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
24a096fb27
- Plug some lemon leaks during xlat generation.
...
Found with Address Sanitizer.
2015-04-30 12:52:04 +02:00
cda4fece1b
- Fixed compiler errors and warnings from TFlags.
2015-04-30 12:35:29 +02:00
50a3f8a3d2
- fixed copy/paste error.
2015-04-30 12:31:47 +02:00
84351419a3
Merge branch 'master' of https://github.com/crimsondusk/zdoom
...
Conflicts:
src/actor.h
2015-04-30 10:03:50 +02:00
9880af1b0c
- this line got lost during conflict resolution.
2015-04-30 09:18:13 +02:00
405fc31e81
Merge branch 'master' of https://github.com/DaZombieKiller/zdoom
...
Conflicts:
src/actor.h
2015-04-30 09:14:31 +02:00
691855e19b
Merge pull request #304 from MajorCooke/morphundoalways
...
- Added MORPH_UNDOALWAYS for morph powerups.
2015-04-30 09:05:41 +02:00
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
7d90c65427
- mask out Strife mapthing flags when starting an original Hexen map.
2015-04-29 08:42:54 +02:00
3c1fa3bed9
- fixed some GCC warnings.
2015-04-29 00:19:21 +02:00
a2100410f2
- fix in GL nodes loader.
2015-04-28 22:13:50 +02:00
f087903fca
- remove some redundancy from TeleportFog code.
2015-04-28 22:11:43 +02:00
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
ce4adc48a7
Merge pull request #319 from edward-san/inventory
...
Little TakeInventory refactoring.
2015-04-28 22:06:31 +02:00
319671b54a
- let cheats only give weapons in weapon slots.
...
This avoids problems which replace the entire arsenal and don't want the original weapons in there.
2015-04-28 22:05:43 +02:00
92fe265abe
- Clang 3.5.1+ fixed the compiler bug in ACS code.
...
Referring to commit 1c96039d7a
2015-04-28 19:25:06 +02:00
b51fac344d
Little TakeInventory refactoring.
...
Introduce AActor::TakeInventory, which unifies DoTakeInv from ACS and DoTakeInventory from Decorate, and AInventory::DepleteOrDestroy, which is extracted from the DoTakeInv core function, and use both where they're needed.
I don't know if the differences between DoTakeInv and DoTakeInventory were intentional, so I kept both behaviors.
2015-04-28 15:45:11 +02:00
a93c30238b
Merge branch 'master' of https://github.com/rheit/zdoom
2015-04-27 20:38:09 +02:00
c6fe0835d3
- fixed: The check for unblocking overlapping actors was a bit too lax.
...
The code never checked the starting position of the move and could be erroneously triggered in rare situations where the distance increased between actors but the hit boxes started overlapping because x or y distance got below the radius.
Changed it so that the code only gets executed when there's already an overlap before the move.
2015-04-27 20:37:01 +02:00
9ba5e30bed
- Moved autoload initialization to a separate function so that the rest of the ini can be loaded as before. Some platforms do indeed place zdoom.pk3 elsewhere.
2015-04-27 14:15:03 -04:00
98029a12ec
Merge branch 'master' of https://github.com/rheit/zdoom into zmaster
2015-04-27 18:19:44 +02:00
ae16e5d195
- Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition.
2015-04-27 18:18:46 +02:00
f3105797f4
Merge pull request #318 from edward-san/c++11_fixes
...
- Fixed C++11 warnings from recent commits.
2015-04-27 17:38:50 +02:00
346fcf584c
- Fixed C++11 warnings from recent commits.
2015-04-27 15:22:09 +02:00
47e7a30cab
- reshuffled some stuff to satisfy Linux compilers (hopefully)
2015-04-27 13:19:34 +02:00
d46ba7bfb7
- added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.)
2015-04-27 10:24:49 +02:00
aedd8f89cb
Merge branch 'master' of https://github.com/rheit/zdoom
2015-04-27 08:58:06 +02:00
020808ff40
- updated pistol pickup sprite with one from original beta graphics.
2015-04-27 08:57:36 +02:00
68e43fe65d
You never want to blindly switch between widechar and ANSI functions
2015-04-26 20:53:16 -05:00
0380ba642b
Blur de hur
2015-04-26 20:43:01 -05:00
13fb76db21
- changed lump reader setup for music so that for uncompressed data it opens a new FILE instead of caching the lump.
...
This reinstates behavior of pre-OpenAL versions but still uses the FileReader interface to keep the simplified code of the OpenAL branch.
2015-04-26 23:28:05 +02:00
4294b94728
- since Wads.ReopenLumpNum already performs caching on the lump data it is not really necessary anymore to maintain a separate musiccache, so this code can be removed.
2015-04-26 22:09:19 +02:00
Christoph Oelckers
coelckers
MajorCooke
Edoardo Prezioso
Braden Obrzut
Christoph Oelckers
Randy Heit