Monster Iestyn
e941687d4c
R_RenderMaskedSegRange now checks for slopes in the sector lightlist
...
in other words, midtexture rendering should now correctly account for slopes from FOFs that could affect lighting/colormap
2016-03-18 20:33:16 +00:00
Monster Iestyn
5dd0e533b3
Removed unused "supdate" variable
2016-03-15 21:18:25 +00:00
Alam Ed Arias
c63b746714
Merge branch 'master' into next
2016-03-14 21:58:12 -04:00
Alam Ed Arias
19e82bc866
Merge remote-tracking branch 'origin/master'
2016-03-14 21:57:49 -04:00
Alam Ed Arias
c4e54d52e7
comptime.bat: restore echo off
2016-03-14 21:54:53 -04:00
wolfy852
bbe93a6d31
comptime.bat: Put @echo off back in
2016-03-14 20:36:37 -05:00
Alam Ed Arias
873fa10fe1
comptime.bat: Windows 8.1 sucks
2016-03-14 17:48:33 -04:00
Alam Ed Arias
6301deb2a5
Merge branch 'master' into next
2016-03-14 13:25:37 -04:00
Inuyasha
2f21c24d77
Makefile can run comptime.bat from src\ too
2016-03-14 12:44:40 -04:00
Inuyasha
7e174290d7
SVN needs the revision prefixed with 'r'
2016-03-14 12:44:16 -04:00
Inuyasha
2ecdd9e6f9
Branch and revision information in builds
...
Also makes comptime.bat work with git if able.
Development builds will now show the branch and the SHA1 hash of the revision. Also been tested to work with subversion, where it displays "Subversion r####". You know, just in case.
2016-03-14 12:43:08 -04:00
Alam Ed Arias
f5b56f2a07
fixup
2016-03-14 12:28:22 -04:00
Alam Ed Arias
f9949a3026
dropping NOVERSION, you will not build SRB2 without a SCM
2016-03-14 12:24:51 -04:00
Monster Iestyn
13f4ef2f34
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into slope-fixes
2016-03-12 23:06:37 +00:00
Monster Iestyn
accab7da6a
Fixed precipitation not checking for slopes
2016-03-12 23:03:56 +00:00
Monster Iestyn
c67683eb0a
Fixed slope walls displaying sprites through them if they weren't completely above you
...
Sadly this does not fix ALL sprite issues, but just some of them at the least
2016-03-12 19:59:32 +00:00
Monster Iestyn
d82c9a66db
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into skybox-hotfix
2016-03-11 17:13:31 +00:00
Wolfy
3232549971
Merge branch 'changeangle-hotfix' into 'next'
...
Changeangle hotfix
Fixes an issue with A_ChangeAngleAbsolute reported on the MB https://mb.srb2.org/showthread.php?t=41236
See merge request !59
2016-03-11 02:57:51 -05:00
Alam Ed Arias
81fc9df8d3
Merge branch 'master' into next
2016-03-10 18:02:23 -05:00
Alam Ed Arias
ee5190480d
Merge branch 'cmake-fix' into 'master'
...
Cmake fix
This branch SHOULD fix issue #14 , but I haven't been able to check for myself without any GME stuff to test in-game with.
See merge request !58
2016-03-10 18:00:51 -05:00
Alam Ed Arias
65c94218b9
Merge branch 'next' into changeangle-hotfix
2016-03-10 17:39:35 -05:00
Alam Ed Arias
9599d7f6dd
Merge branch 'master' into next
2016-03-10 16:47:55 -05:00
Alam Ed Arias
ab4179dfb0
Merge branch 'travis-ci'
2016-03-10 16:46:57 -05:00
Alam Ed Arias
509516f59f
travis: enable apt and ccache cache
2016-03-10 16:38:06 -05:00
Monster Iestyn
5b89164cf7
Fix camera going nuts around intangible polyobjects
2016-03-10 20:50:54 +00:00
Inuyasha
83e9eb6df4
patch.dta officially in use. Version number updated.
2016-03-09 18:30:11 -08:00
Alam Arias
771c1ecb8a
Merge pull request #68 from Yukitty/revert-Lua-angles
...
Revert "Change angle_t handling in Lua."
2016-03-09 11:58:51 -05:00
Inuyasha
a7cb049b65
leave a dummy string in dehacked, nothing more.
...
a courtesy fuck you to gitlab for making me have to keep
the previous screwed up bullshit in this branch.
2016-03-09 06:23:57 -08:00
Inuyasha
f40cfb0271
Revert "MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh"
...
This reverts commit 4625118ee8
2016-03-09 06:22:40 -08:00
Monster Iestyn
4625118ee8
MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh
2016-03-09 14:03:20 +00:00
Monster Iestyn
bf415b8618
Revert "Shifted down the last few mobj eflags to close gap left by MF2_PUSHED -> MFE_PUSHED undo"
...
This reverts commit 280e932f02
2016-03-09 13:59:10 +00:00
Monster Iestyn
280e932f02
Shifted down the last few mobj eflags to close gap left by MF2_PUSHED -> MFE_PUSHED undo
2016-03-09 13:38:30 +00:00
JTE
54f95eb387
Revert "Change angle_t handling in Lua."
...
This partially reverts commit ef0e61fc33
2016-03-09 08:38:10 -05:00
Inuyasha
5a38088623
Well, we don't need "experimental" slopes anymore either
...
Not when we have properly working ones!
2016-03-09 01:09:21 -08:00
Inuyasha
6aa708b5af
I don't think we need the BLUE_SPHERES define anymore...
2016-03-09 00:49:35 -08:00
Inuyasha
436bcdf19a
Objectplace handles slopes.
...
Sorry MI, I'm hijacking your branch for a bit.
2016-03-08 23:43:43 -08:00
Inuyasha
7ae87cc2c6
Revert "No more stupidity for No More Enemies special plz"
...
This reverts commit 474ad01b46
2016-03-08 22:22:30 -08:00
Inuyasha
cfcd7ce0d3
Readded EvalMath to Lua.
...
There is a caveat to this: The first time EvalMath is used, a
deprecated function warning will be shown to the user that tells
them to use _G[] instead.
This reverts commit 9d36cf37bd
2016-03-08 22:15:26 -08:00
Inuyasha
694220155e
Revert "MF2_PUSHED is now MFE_PUSHED, for the simple reason that it makes more sense as an eflags object flag than a flags2 object flag!"
...
This reverts commit c8c7878005
2016-03-08 21:30:12 -08:00
Alam Ed Arias
7cf5dd0c3c
Merge branch 'next' into skybox-hotfix
2016-03-07 16:47:10 -05:00
Alam Ed Arias
407bf4f39d
Merge branch 'next' into polyobj-teeter-fix
2016-03-07 16:46:32 -05:00
Alam Ed Arias
55a6355e15
Merge branch 'next' into slope-fixes
2016-03-07 16:45:51 -05:00
Alam Ed Arias
b173c3e31e
Merge branch 'next' into portal-fix
2016-03-07 16:44:59 -05:00
Alam Ed Arias
6b0c73f2ec
Merge branch 'master' into changeangle-hotfix
2016-03-07 16:25:13 -05:00
Alam Ed Arias
178d904bb9
Merge branch 'master' into portal-fix
2016-03-07 16:22:41 -05:00
Alam Ed Arias
c4b0c6ec56
Merge branch 'master' into gl-slopes
2016-03-07 16:22:10 -05:00
Alam Ed Arias
3ab3de20d7
Merge branch 'master' into polyobj-teeter-fix
2016-03-07 16:21:32 -05:00
Alam Ed Arias
bc81ad8dcd
Merge branch 'master' into closestpointonline
2016-03-07 16:20:53 -05:00
Alam Ed Arias
ae3b7e0623
Merge branch 'master' into next
2016-03-07 16:18:08 -05:00
Alam Ed Arias
e21776a511
Merge branch 'master' into skybox-hotfix
2016-03-07 16:18:00 -05:00
