fc8e7728cd
I meant to extend this to 4 seconds but forgot
2016-03-31 06:57:11 -07:00
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
3812b6bc20
the abs() is necessary; force unsigned shift and signed result
2016-03-31 06:48:08 -07:00
9286e30366
Merge branch 'master' into next
2016-03-30 20:39:12 -04:00
de630d0c33
appveyor: let check warnings as well
2016-03-30 20:30:24 -04:00
75f65c4d44
using abs() on unsigned have no effect
2016-03-30 20:17:09 -04:00
51aa7692d8
Merge branch 'master' into next
2016-03-30 20:15:08 -04:00
f9411982ed
Merge branch 'travis-ci' into 'master'
...
Clang cleanup
"taking the absolute value of unsigned type 'unsigned int' has no effect"
using abs() on an unsigned should be nop, replace them with (angle_t)()
Need someone to verify this does not break any game logic
See merge request !63
2016-03-30 20:13:00 -04:00
d90536967d
removed/remline ununsed code
2016-03-30 14:05:07 -04:00
10cc421fae
travis: add all/extra warnings
2016-03-30 12:58:00 -04:00
b169529dfd
switich to do the angle math in signed, then run it thur abs()
2016-03-30 11:47:27 -04:00
7e07d2d77a
travis-ci: reenable -Werror
2016-03-30 00:23:28 -04:00
0fe6ee5339
cleanup abs warnings
2016-03-30 00:22:12 -04:00
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
1108a52959
Check change in ceilinglightsec for markceiling code, not floorlightsec
2016-03-29 22:44:16 +01: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
a567ce8e8e
Merge branch 'master' into next
2016-03-25 16:40:13 -04: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
f5b56f2a07
fixup
2016-03-14 12:28:22 -04:00
f9949a3026
dropping NOVERSION, you will not build SRB2 without a SCM
2016-03-14 12:24:51 -04:00
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
81fc9df8d3
Merge branch 'master' into next
2016-03-10 18:02:23 -05:00
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
65c94218b9
Merge branch 'next' into changeangle-hotfix
2016-03-10 17:39:35 -05:00
Inuyasha