Alam Ed Arias
0fe6ee5339
cleanup abs warnings
2016-03-30 00:22:12 -04:00
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
Monster Iestyn
1108a52959
Check change in ceilinglightsec for markceiling code, not floorlightsec
2016-03-29 22:44:16 +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
21b13acd4b
Merge branch 'next' into polyobj-teeter-fix
2016-03-25 22:39:41 -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
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
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
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
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