yoshibot
bb90c8366a
Fixed bugs in OS X alert code and simplified; added more NULL checks in OS X resource code
2016-05-18 22:13:53 -05:00
yoshibot
df89563882
Add a way to build OS X binaries (not .app) through Makefiles
2016-05-18 19:14:53 -05:00
yoshibot
928c6acf4b
Simplify OS X bundle resource discovery, fix a sigsegv
2016-05-17 22:56:49 -05:00
Alam Ed Arias
a12733f480
travis: move mkdir to before_script step
2016-05-16 16:27:41 -04:00
Inuyasha
a55f207738
Merge branch 'gl-fademask-fix' into 'master'
...
Fix OpenGL Fademasks (Screen Transitions)
Screen transitions don't work in OpenGL when scr_depth is set to 8 or 16 bits.
This fixes that.
See merge request !67
2016-04-30 11:34:04 -04:00
Sean Ryder
0eb41b4450
Flip fade mask Y coordinates
...
For some reason every texture and flat loaded into GL is vertically flipped
2016-04-30 13:40:00 +01:00
Sean Ryder
d2d73f085d
Change internal formats of screen fade texture to RGB
...
Don't think either of them need RGBA
2016-04-29 20:56:46 +01:00
Sean Ryder
55a1de899c
The fade masks textures should use an alpha format
...
So they don't get effected by the texture format set by the screen depth
GL_RGB5_A1 from 16-bit was removing all alpha from the texture
2016-04-29 18:58:20 +01:00
Monster Iestyn
69b43aee2d
Fix how FF_CUTEXTRA FOFs carry over cutting ability to FOFs below them in the same sector, even if they shouldn't do that
2016-04-20 20:26:41 +01:00
Monster Iestyn
0aba2f607b
Fix FOFs with FF_CUTSOLIDS but not FF_SOLID causing software renderer problems and even crashes
...
Always wondered why a flag meant for FOF physics was used in the rendering code, lol
2016-04-20 18:04:51 +01:00
Alam Ed Arias
de630d0c33
appveyor: let check warnings as well
2016-03-30 20:30:24 -04:00
Alam Ed Arias
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
Alam Ed Arias
d90536967d
removed/remline ununsed code
2016-03-30 14:05:07 -04:00
Alam Ed Arias
10cc421fae
travis: add all/extra warnings
2016-03-30 12:58:00 -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
Alam Ed Arias
7e07d2d77a
travis-ci: reenable -Werror
2016-03-30 00:23:28 -04:00
Alam Ed Arias
0fe6ee5339
cleanup abs warnings
2016-03-30 00:22:12 -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
Monster Iestyn
5dd0e533b3
Removed unused "supdate" variable
2016-03-15 21:18:25 +00: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
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
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
ab4179dfb0
Merge branch 'travis-ci'
2016-03-10 16:46:57 -05:00
Alam Ed Arias
509516f59f
travis: enable apt and ccache cache
2016-03-10 16:38:06 -05:00
Alam Ed Arias
fbbc028ff2
Merge branch 'master' into cmake-fix
2016-03-07 16:17:38 -05:00
Alam Ed Arias
c7b18207f5
travis: do not error on making cache folder, if it already restored from cache
2016-03-07 16:06:04 -05: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
