Wolfy
a7a7de6183
Merge branch 'ceilinglighting-fix' into 'next'
...
Ceiling lighting fix
The ceiling lighting linedef special (and anything else that changes ceiling lighting directly for sectors) works in software mode now.
See merge request !62
2016-03-29 21:00:25 -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
a3c01ea6c2
Merge branch 'travis-ci'
2016-03-25 22:37:27 -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
9bc6ce3d85
travis: steal SDL2 dmg for Mac build
2016-03-25 21:43:17 -04:00
Alam Ed Arias
7122908560
travis: matrix is not correct
2016-03-25 20:57:57 -04:00
Alam Ed Arias
fc1d71454b
travis: fixup xml
2016-03-25 20:56:04 -04:00
Alam Ed Arias
18f51b343b
build: more mac fixes
2016-03-25 20:37:14 -04:00
Alam Ed Arias
2165c68066
travis: add -Wno-unknown-warning-option
2016-03-25 20:25:52 -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
23c9892fea
travis-ci: fixup os list
2016-03-25 20:02:57 -04:00
Alam Ed Arias
9162e7da9d
travis-ci: move dist setting to top
2016-03-25 19:56:51 -04:00
Alam Ed Arias
dfa41ed878
travis-ci: drop libpng for osx
2016-03-25 19:56:05 -04:00
Alam Ed Arias
8d36a77e42
travis-ci: libpng, not libsdl
2016-03-25 19:53:13 -04:00
Alam Ed Arias
73dd5cd803
travis-ci: add brew packages
2016-03-25 19:48:39 -04:00
Alam Ed Arias
0953c9430b
travis-ci: try osx building
2016-03-25 19:16:35 -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
