Alam Ed Arias
121f144e3c
Merge branch 'next' into patch-scaling-flip-fix
2016-03-31 12:27:43 -04:00
Alam Ed Arias
47bb95f5f5
Merge branch 'next' into polyobj-teeter-fix
2016-03-31 12:26:52 -04:00
Alam Ed Arias
e16129a8c5
Merge branch 'next' into closestpointonline
2016-03-31 12:17:52 -04:00
Alam Ed Arias
32a950893e
Merge branch 'next' into slope-fixes
2016-03-31 12:17:40 -04:00
Alam Ed Arias
d77e541f29
Merge branch 'next' into bp_random2
2016-03-31 12:15:09 -04:00
Monster Iestyn
e34da95c4c
DEVMODE's automap now supports slopes
2016-03-31 16:32:25 +01:00
Inuyasha
fc8e7728cd
I meant to extend this to 4 seconds but forgot
2016-03-31 06:57:11 -07:00
Inuyasha
690b65b47f
"Sonic can now become Super Sonic" exists again
...
Fixed an off-by-one array error in the process
2016-03-31 06:51:04 -07:00
Inuyasha
3812b6bc20
the abs() is necessary; force unsigned shift and signed result
2016-03-31 06:48:08 -07:00
Alam Ed Arias
283c64ee20
Merge branch 'next' into camera-fix
2016-03-30 20:49:44 -04:00
Alam Ed Arias
9fcd06f152
Merge branch 'next' into skybox-hotfix
2016-03-30 20:49:20 -04:00
Alam Ed Arias
f84d76c683
Merge branch 'next' into portal-fix
2016-03-30 20:43:25 -04:00
Alam Ed Arias
44afedd85f
Merge branch 'next' into patch-scaling-flip-fix
2016-03-30 20:42:59 -04:00
Alam Ed Arias
d26c486c6d
Merge branch 'next' into polyobj-teeter-fix
2016-03-30 20:42:33 -04:00
Alam Ed Arias
bdcdf8ddab
Merge branch 'next' into closestpointonline
2016-03-30 20:42:07 -04:00
Alam Ed Arias
4370459166
Merge branch 'next' into slope-fixes
2016-03-30 20:41:33 -04:00
Alam Ed Arias
a935ac21e8
Merge branch 'next' into bp_random2
2016-03-30 20:40:48 -04:00
Alam Ed Arias
75f65c4d44
using abs() on unsigned have no effect
2016-03-30 20:17:09 -04:00
Alam Ed Arias
51aa7692d8
Merge branch 'master' into next
2016-03-30 20:15:08 -04:00
Alam Ed Arias
d90536967d
removed/remline ununsed code
2016-03-30 14:05:07 -04:00
Alam Ed Arias
b169529dfd
switich to do the angle math in signed, then run it thur abs()
2016-03-30 11:47:27 -04:00
Inuyasha
9cec9093bb
denom of A_CheckRandom can't be zero, that would be bad
2016-03-30 06:20:57 -07:00
Alam Ed Arias
0fe6ee5339
cleanup abs warnings
2016-03-30 00:22:12 -04:00
Inuyasha
caf081b6f5
Merge branch 'bp_random2' of http://git.magicalgirl.moe/STJr/SRB2 into bp_random2
2016-03-29 16:35:21 -07:00
Inuyasha
480f9be51f
gotta start compensating for xorshift's needs
2016-03-29 16:27:57 -07:00
Inuyasha
3dc4cfc229
Simplicity is a virute... don't overcomplicate things.
2016-03-29 16:27:56 -07:00
Inuyasha
a3e940fe65
Compensate for insufficient RAND_MAX values.
2016-03-29 16:27:56 -07:00
Inuyasha
ac03ce39c8
*_Random is now *_RandomByte.
...
P_RandomChance is now a macro for something that should happen a
certain percentage of time.
P_SignedRandom was moved to a macro. Nobody cared.
# Conflicts:
# src/p_inter.c
2016-03-29 16:27:55 -07:00
Inuyasha
ce2c2de58a
P_Random now using a variant of xorshift
...
This actually passes most diehard tests, as opposed to the old RNG.
It's also similarly fast.
Internally the PRNG generates a fixed point number from [0,1) now,
which makes P_RandomKey and P_RandomRange much easier to
calculate. P_Random is just a simple shift, as well.
Also, the lack of floating point math in P_RandomKey and
P_RandomRange now is probably for the best.
2016-03-29 16:27:25 -07:00
Monster Iestyn
1108a52959
Check change in ceilinglightsec for markceiling code, not floorlightsec
2016-03-29 22:44:16 +01:00
Monster Iestyn
ee00da6a74
Another thing that probably needed to check for slopes
2016-03-29 22:32:09 +01:00
Monster Iestyn
ef832dd8b8
Fixed how two adjacent FOFs can prevent each others' walls from displaying if they're at least partially covered
...
Also some miscellaneous tweaks and changes to account for slopes properly
2016-03-29 18:59:56 +01:00
Monster Iestyn
6bda1a57a5
Fix FOF plane light underside checks
2016-03-29 15:40:01 +01:00
Monster Iestyn
bc8ea700ed
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into closestpointonline
2016-03-26 18:32:51 +00:00
Alam Ed Arias
583ffd2537
Merge branch 'next' into patch-scaling-flip-fix
2016-03-25 22:40:17 -04:00
Alam Ed Arias
f50a46a0cd
Merge branch 'next' into camera-fix
2016-03-25 22:40:04 -04:00
Alam Ed Arias
b11236a591
Merge branch 'next' into skybox-hotfix
2016-03-25 22:39:51 -04:00
Alam Ed Arias
21b13acd4b
Merge branch 'next' into polyobj-teeter-fix
2016-03-25 22:39:41 -04:00
Alam Ed Arias
b29a176275
Merge branch 'next' into slope-fixes
2016-03-25 22:39:11 -04:00
Alam Ed Arias
8d3ded4020
Merge branch 'next' into portal-fix
2016-03-25 22:38:56 -04:00
Alam Ed Arias
c23d971bcb
Merge branch 'master' into next
2016-03-25 22:37:48 -04:00
Alam Ed Arias
0f853640e2
macosx: We need CoreFoudation for SDLMain
2016-03-25 22:23:47 -04:00
Alam Ed Arias
077781cc56
macosx: drop CoreFoundation linking
2016-03-25 22:11:39 -04:00
Alam Ed Arias
2c4a27c7c6
macosx: let fix linking to SDL frameworks
2016-03-25 22:07:34 -04:00
Alam Ed Arias
18f51b343b
build: more mac fixes
2016-03-25 20:37:14 -04:00
Alam Ed Arias
dadf8e1260
cmake: remove fixed HWRENDER define
2016-03-25 20:21:56 -04:00
Alam Ed Arias
0c9081f762
cmake: try to fixup mac build
2016-03-25 20:10:14 -04:00
Alam Ed Arias
de2d327da7
Merge branch 'next' into patch-scaling-flip-fix
2016-03-25 18:47:21 -04:00
Alam Ed Arias
169210138d
Merge branch 'next' into camera-fix
2016-03-25 18:45:57 -04:00
Alam Ed Arias
5945b8f16c
Merge branch 'next' into skybox-hotfix
2016-03-25 18:45:00 -04:00
Alam Ed Arias
42aa41c552
Merge branch 'next' into polyobj-teeter-fix
2016-03-25 18:44:30 -04:00
Alam Ed Arias
49b1c277af
Merge branch 'next' into portal-fix
2016-03-25 18:43:07 -04:00
Alam Ed Arias
62d93a349f
Merge branch 'next' into slope-fixes
2016-03-25 18:42:01 -04:00
Alam Ed Arias
a567ce8e8e
Merge branch 'master' into next
2016-03-25 16:40:13 -04:00
Monster Iestyn
3698c2583d
wrap prevention code now takes flipped patches into account
2016-03-25 20:04:49 +00:00
Monster Iestyn
76d71bda92
destend now scales the added-on patch width properly if needed
2016-03-25 19:43:17 +00:00
Monster Iestyn
ec5b272fa6
Unless I'm mistaken, scalesteps/heightsteps should be divided by stop-start, not stop-start+1. Revert this commit if that was intentional.
2016-03-19 23:19:05 +00:00
Monster Iestyn
28631c30b7
Fix maskedtextureheight being set outside of ESLOPE code
2016-03-19 22:25:49 +00:00
Monster Iestyn
a82c19adb1
Fix sprites displaying behind "closed doors" when slopes are present.
...
For the record, thok barriers count as "closed doors" in SRB2 level contexts
2016-03-19 16:19:58 +00:00
Monster Iestyn
6623a9148e
Fix HOMs by actually bothering to check if either side of a seg has slopes for height-checking code
2016-03-18 23:58:58 +00:00
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
6301deb2a5
Merge branch 'master' into next
2016-03-14 13:25:37 -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
65c94218b9
Merge branch 'next' into changeangle-hotfix
2016-03-10 17:39:35 -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
.
# Conflicts:
# src/dehacked.c
# src/p_mobj.c
# src/p_mobj.h
2016-03-08 21:30:12 -08: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
178d904bb9
Merge branch 'master' into portal-fix
2016-03-07 16:22:41 -05:00
Alam Ed Arias
3ab3de20d7
Merge branch 'master' into polyobj-teeter-fix
2016-03-07 16:21:32 -05:00
Alam Ed Arias
6ab6cc959c
Merge branch 'master' into slope-fixes
2016-03-07 16:16:40 -05:00
Monster Iestyn
eab51414f3
Fix typo in A_ChangeAngleAbsolute
2016-03-07 21:16:02 +00:00
Monster Iestyn
60ea2ecb77
Whoops, forgot these
2016-03-07 21:02:35 +00:00
Monster Iestyn
2f539a4df9
R_RenderThickSideRange now checks for slopes in the front sector's lightlist
...
This appears to fix a few holes that have been known to appear with FOF slopes sometimes, dunno how they actually came about exactly but this apparently sorts them out
2016-03-07 20:42:25 +00:00
Monster Iestyn
4ab2c336e7
Possibly fixed the issues with LibGME mentioned in issue #14 .
...
Not even the HAVE_LIBGME macro was defined apparently, huh.
2016-03-06 19:32:07 +00:00
Monster Iestyn
099e25824f
First person view now should correctly take the skybox centerpoint's angle into account
2016-03-05 16:29:25 +00:00
Wolfy
e769b7882c
Merge branch 'lua-sector-lines' into 'next'
...
Lua sector lines
Adds support for "sector.lines" in Lua, an array containing all the linedefs in a particular sector variable:
#sector.lines returns the number of lines in the sector.
sector.lines\[ _i_ \] (e.g. sector.lines[0], sector.lines[1], sector.lines[2], etc ....) gives you individual linedefs in the sector. If the number you supply is equal to or greater than #sector.lines, this returns nil.
Test script for your benefit: (see comments)
Type "luatest" in console in any level and you'll get a few print messages that tests these features for sectors[0]
See merge request !32
2016-03-04 10:23:42 -05:00