6bda1a57a5
Fix FOF plane light underside checks
2016-03-29 15:40:01 +01:00
bc8ea700ed
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into closestpointonline
2016-03-26 18:32:51 +00:00
583ffd2537
Merge branch 'next' into patch-scaling-flip-fix
2016-03-25 22:40:17 -04:00
f50a46a0cd
Merge branch 'next' into camera-fix
2016-03-25 22:40:04 -04:00
b11236a591
Merge branch 'next' into skybox-hotfix
2016-03-25 22:39:51 -04:00
21b13acd4b
Merge branch 'next' into polyobj-teeter-fix
2016-03-25 22:39:41 -04:00
b29a176275
Merge branch 'next' into slope-fixes
2016-03-25 22:39:11 -04:00
8d3ded4020
Merge branch 'next' into portal-fix
2016-03-25 22:38:56 -04:00
c23d971bcb
Merge branch 'master' into next
2016-03-25 22:37:48 -04:00
a3c01ea6c2
Merge branch 'travis-ci'
2016-03-25 22:37:27 -04:00
0f853640e2
macosx: We need CoreFoudation for SDLMain
2016-03-25 22:23:47 -04:00
077781cc56
macosx: drop CoreFoundation linking
2016-03-25 22:11:39 -04:00
2c4a27c7c6
macosx: let fix linking to SDL frameworks
2016-03-25 22:07:34 -04:00
9bc6ce3d85
travis: steal SDL2 dmg for Mac build
2016-03-25 21:43:17 -04:00
7122908560
travis: matrix is not correct
2016-03-25 20:57:57 -04:00
fc1d71454b
travis: fixup xml
2016-03-25 20:56:04 -04:00
18f51b343b
build: more mac fixes
2016-03-25 20:37:14 -04:00
2165c68066
travis: add -Wno-unknown-warning-option
2016-03-25 20:25:52 -04:00
dadf8e1260
cmake: remove fixed HWRENDER define
2016-03-25 20:21:56 -04:00
0c9081f762
cmake: try to fixup mac build
2016-03-25 20:10:14 -04:00
23c9892fea
travis-ci: fixup os list
2016-03-25 20:02:57 -04:00
9162e7da9d
travis-ci: move dist setting to top
2016-03-25 19:56:51 -04:00
dfa41ed878
travis-ci: drop libpng for osx
2016-03-25 19:56:05 -04:00
8d36a77e42
travis-ci: libpng, not libsdl
2016-03-25 19:53:13 -04:00
73dd5cd803
travis-ci: add brew packages
2016-03-25 19:48:39 -04:00
0953c9430b
travis-ci: try osx building
2016-03-25 19:16:35 -04:00
de2d327da7
Merge branch 'next' into patch-scaling-flip-fix
2016-03-25 18:47:21 -04:00
169210138d
Merge branch 'next' into camera-fix
2016-03-25 18:45:57 -04:00
5945b8f16c
Merge branch 'next' into skybox-hotfix
2016-03-25 18:45:00 -04:00
42aa41c552
Merge branch 'next' into polyobj-teeter-fix
2016-03-25 18:44:30 -04:00
49b1c277af
Merge branch 'next' into portal-fix
2016-03-25 18:43:07 -04:00
62d93a349f
Merge branch 'next' into slope-fixes
2016-03-25 18:42:01 -04:00
a567ce8e8e
Merge branch 'master' into next
2016-03-25 16:40:13 -04:00
3698c2583d
wrap prevention code now takes flipped patches into account
2016-03-25 20:04:49 +00:00
76d71bda92
destend now scales the added-on patch width properly if needed
2016-03-25 19:43:17 +00:00
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
28631c30b7
Fix maskedtextureheight being set outside of ESLOPE code
2016-03-19 22:25:49 +00:00
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
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
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
5dd0e533b3
Removed unused "supdate" variable
2016-03-15 21:18:25 +00:00
c63b746714
Merge branch 'master' into next
2016-03-14 21:58:12 -04:00
19e82bc866
Merge remote-tracking branch 'origin/master'
2016-03-14 21:57:49 -04:00
c4e54d52e7
comptime.bat: restore echo off
2016-03-14 21:54:53 -04:00
bbe93a6d31
comptime.bat: Put @echo off back in
2016-03-14 20:36:37 -05:00
873fa10fe1
comptime.bat: Windows 8.1 sucks
2016-03-14 17:48:33 -04:00
6301deb2a5
Merge branch 'master' into next
2016-03-14 13:25:37 -04:00
2f21c24d77
Makefile can run comptime.bat from src\ too
2016-03-14 12:44:40 -04:00
7e174290d7
SVN needs the revision prefixed with 'r'
2016-03-14 12:44:16 -04:00
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
Monster Iestyn