Inuyasha
191a4bc7d2
Merge branch 'reverseplatform_clipping' into 'next'
...
FF_REVERSEPLATFORM clipping
Ran into an issue whilst testing out one last feature (there's always one more...) for flat_alignment_revamp. This is a backported fix.
The bug was such that if you're falling through a platform with FF_REVERSEPLATFORM and not FF_PLATFORM, you'll be pushed downwards such that your head is against the bottom of the FOF. This just checks momz is greater than zero if it has FF_REVERSEPLATFORM to make sure it's okay to set ceilingz. (OR the alternative in reverse gravity.)
No test map because this was originally done for internal. Instead, test it on the other branch's test map.
See merge request !83
2016-06-17 08:01:03 -04:00
Monster Iestyn
9ae2a4036a
Merge branch 'master' into next
2016-06-13 21:10:53 +01:00
Monster Iestyn
b4798538e2
Merge branch 'software-fixes' into 'master'
...
Software crashes fix
This branch SHOULD fix the many crashes people have reported lately that all point to the software renderer. Simply put, the software renderer allowed stuff to be drawn out of the screen even though that wasn't safe, and even the existing checks to prevent that didn't work.
If you saw me worrying about the sky HOMs I discovered in AGZ earlier in the commits for this branch, don't worry - it turns out that issue already existed in 2.1.15's srb2win.exe (and probably srb2dd.exe too) anyway, the changes in this branch didn't cause them. Hopefully nothing else broke then.
See merge request !75
2016-06-12 14:33:27 -04:00
Alam Ed Arias
742353d0ab
Merge branch 'master' into next
2016-06-08 15:06:17 -04:00
Monster Iestyn
29ea733ae5
Fix sprites in skyboxes not having clipping arrays actually set properly
2016-06-08 17:53:34 +01:00
toasterbabe
26744c2a6b
woops #1
2016-06-06 21:02:47 +01:00
toasterbabe
7c0eee6ff1
The fix now takes reverse gravity platform step-up into account properly.
2016-06-06 20:53:29 +01:00
toasterbabe
60dd8dab3c
Backported clipping fix for FF_REVERSEPLATFORM collision.
2016-06-06 18:11:23 +01:00
Monster Iestyn
2e9607938d
Merge branch 'master' into next
2016-06-04 20:23:46 +01:00
Monster Iestyn
4c422f6605
OpenGL: closed door/window detection code now accounts for slopes, just like in software
2016-06-04 18:31:21 +01:00
Monster Iestyn
83c4dba4ce
Fix crash reported by FuriousFox at http://mb.srb2.org/showthread.php?t=41536
...
Basically this makes sure numwadfiles is updated before loading the SOC/Lua scripts, so if a Lua script calls COM_BufInsertText with the contents "addfile scr_mysticrealm.wad" it can't overwrite the last written wadfile slot! Not that COM_BufInsertText really should be used like that to begin with
2016-06-02 20:16:25 +01:00
wolfy852
919e3ed0e2
Make token available to Lua as a global variable
...
Reviewed by @RedEnchilada
2016-06-01 21:06:24 -05:00
Alam Ed Arias
208fb75a17
Merge branch 'master' into software-fixes
2016-06-01 15:35:55 -04:00
Monster Iestyn
43b6b2a53f
Merge branch 'master' into next
2016-06-01 19:31:57 +01:00
Monster Iestyn
c863e311fe
OpenGL: Fix upper texture Effect 1 only skewing
2016-06-01 19:22:54 +01:00
Monster Iestyn
bf85cc25bd
OpenGL: Fix lower unpegged texture offset, fix lower unpegged + effect 1 so the texture actually skews
2016-06-01 18:51:38 +01:00
Alam Ed Arias
0444e8a14c
Merge branch 'master' into next
2016-06-01 11:45:57 -04:00
Alam Ed Arias
87cf02e21b
Merge branch 'master' into software-fixes
2016-06-01 11:17:57 -04:00
Alam Ed Arias
f21c72b889
debug: always load exchndl.dll
2016-05-31 21:30:18 -04:00
Monster Iestyn
d24cc49443
Fix FOF height checks all over p_spec.c to account for slopes
...
This fixes certain sector specials and linedef executor specials etc not accounting for players/mobjs touching sloped FOFs
2016-05-31 21:31:29 +01:00
Monster Iestyn
d5184847d6
Merge branch 'master' into software-fixes
2016-05-31 16:29:02 +01:00
Alam Ed Arias
7dd3a4ba7b
Merge branch 'master' into next
2016-05-31 11:26:51 -04:00
Monster Iestyn
8b2b49fb04
Just some final cleanup of the code I changed
2016-05-31 16:08:29 +01:00
Monster Iestyn
eb90f4f50d
welp no success in fixing the sky HOMs yet, committing progress anyway
2016-05-30 22:53:22 +01:00
Monster Iestyn
a2aeece419
Significant rework of main seg-rendering code, to eliminate the possibility of drawing off-screen and crashing the game as result
...
NOTE: HOMs sometimes appear in the sky in maps like AGZ (map40), so this isn't completely fine yet. I'll fix that later
2016-05-30 21:53:29 +01:00
Monster Iestyn
2c73e2a2cd
Fix flung emeralds not disappearing in death pits
...
(assuming it wasn't an intentional behaviour thing of course)
2016-05-29 16:47:38 +01:00
Alam Ed Arias
209d76cb9d
gcc-6: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
2016-05-28 21:24:06 -04:00
Alam Ed Arias
9e196613a0
gcc-6: error: this ‘for’ clause does not guard... [-Werror=misleading-indentation]
2016-05-28 21:23:46 -04:00
Alam Ed Arias
4956be2bd4
gcc-6: error: left shift of negative value [-Werror=shift-negative-value]
2016-05-28 21:23:09 -04:00
Alam Ed Arias
35b254feaa
D_MD5PasswordPass, fixup
2016-05-28 19:51:10 -04:00
Alam Ed Arias
3aea4a7601
replace strcpy with memmove in D_MD5PasswordPass()
2016-05-28 19:48:52 -04:00
Alam Ed Arias
d9aa430817
use memmove in D_MD5PasswordPass() and drop noreturn
2016-05-28 19:42:38 -04:00
Alam Ed Arias
35f36e1bba
travis-ci: set v of nulK to 0
2016-05-28 19:28:37 -04:00
Alam Ed Arias
02e67a4a95
travis: add gcc 4.4, 4.6 and 4.7
2016-05-28 19:15:37 -04:00
Alam Ed Arias
ad6c2e634f
travis: disable xcode6.3
2016-05-28 19:08:50 -04:00
Alam Ed Arias
f4a84c916e
travis: Fixedup gcc 5 error and allow gcc 6 to fail
2016-05-28 18:41:08 -04:00
Alam Ed Arias
9731a8daa1
Merge branch 'master' into next
2016-05-27 14:39:23 -04:00
Alam Ed Arias
d1aab2e418
gcc: clear uninitialized warnings in am_map.c
2016-05-27 14:22:02 -04:00
Alam Ed Arias
390927cc32
Makefile: compile debug build with -Og on GCC 4.8 and higher
2016-05-27 14:14:04 -04:00
Alam Ed Arias
98b1254a65
Merge branch 'master' into next
2016-05-27 11:02:44 -04:00
Monster Iestyn
0081397920
OpenGL: Fix MD2s on player 2's screen breaking when reverse gravity is involved
2016-05-27 14:53:36 +01:00
Monster Iestyn
65d9c9e167
P_NetUnArchivePlayers doesn't like having "inline" either
2016-05-27 14:49:11 +01:00
Alam Ed Arias
869d582cc4
Makefile: ignore suggest=attribute for GCC 4.6 and up
2016-05-27 01:55:52 -04:00
Alam Ed Arias
20dcf138e2
hardware: let not break MSVC support
2016-05-27 01:28:21 -04:00
Alam Ed Arias
008be7c90d
hardware: start the surf as clean
2016-05-27 01:19:16 -04:00
Alam Ed Arias
3297fe11ed
P_NetArchivePlayers() is too bad for inline
2016-05-26 23:39:08 -04:00
Alam Ed Arias
0079b4df64
Make: compile Release build will all the speed
2016-05-26 20:39:15 -04:00
Monster Iestyn
8ceba95bfa
Fix slope collision detection for the camera
...
See http://mb.srb2.org/showthread.php?t=41494
2016-05-25 21:10:46 +01:00
Alam Ed Arias
8e32d978a1
Merge remote-tracking branch 'public/master'
2016-05-25 06:42:01 -04:00
Monster Iestyn
7c78b95a7d
This is probably the "correct" way to set maskedtextureheight
...
Probably doesn't make any difference in-game at all though, lol
2016-05-24 22:11:48 +01:00
