Alam Ed Arias
e5a14d859e
Merge branch 'public_next' into private
2016-05-27 11:37:09 -04:00
Alam Ed Arias
a93d07172d
Merge branch 'next' into public_next
2016-05-27 11:36:36 -04:00
Alam Ed Arias
98b1254a65
Merge branch 'master' into next
2016-05-27 11:02:44 -04:00
Monster Iestyn
0081397920
OpenGL: Fix MD2s on player 2's screen breaking when reverse gravity is involved
2016-05-27 14:53:36 +01:00
Monster Iestyn
65d9c9e167
P_NetUnArchivePlayers doesn't like having "inline" either
2016-05-27 14:49:11 +01:00
Alam Ed Arias
869d582cc4
Makefile: ignore suggest=attribute for GCC 4.6 and up
2016-05-27 01:55:52 -04:00
Alam Ed Arias
20dcf138e2
hardware: let not break MSVC support
2016-05-27 01:28:21 -04:00
Alam Ed Arias
008be7c90d
hardware: start the surf as clean
2016-05-27 01:19:16 -04:00
Alam Ed Arias
4c6a807283
buildbot: let see all the errors
2016-05-27 00:57:44 -04:00
Alam Ed Arias
3297fe11ed
P_NetArchivePlayers() is too bad for inline
2016-05-26 23:39:08 -04:00
Alam Ed Arias
0079b4df64
Make: compile Release build will all the speed
2016-05-26 20:39:15 -04:00
Monster Iestyn
8ceba95bfa
Fix slope collision detection for the camera
...
See http://mb.srb2.org/showthread.php?t=41494
2016-05-25 21:10:46 +01:00
Alam Ed Arias
b51a1148d1
Merge branch 'public_next' into master
2016-05-25 10:21:55 -04:00
Alam Ed Arias
71cd6af9d2
Merge branch 'next' into public_next
2016-05-25 10:17:22 -04:00
Alam Ed Arias
6466ed5afe
Merge branch 'master' into next
2016-05-25 06:44:15 -04:00
Alam Ed Arias
8e32d978a1
Merge remote-tracking branch 'public/master'
2016-05-25 06:42:01 -04:00
Monster Iestyn
89f1da04fd
Merge branch 'master' into next
2016-05-24 22:21:04 +01:00
Monster Iestyn
7c78b95a7d
This is probably the "correct" way to set maskedtextureheight
...
Probably doesn't make any difference in-game at all though, lol
2016-05-24 22:11:48 +01:00
Monster Iestyn
ab6d4d7aec
Remove unused planefunction_t function typedef
...
(the number of unused things hiding around in SRB2's source code is silly lol)
2016-05-24 14:41:55 +01:00
Monster Iestyn
17346e29c3
Remove unused drawfunc_t function typedef
2016-05-24 14:38:31 +01:00
Alam Ed Arias
b96b999c1e
MSVC: Move x86/x64 settings into commons props
2016-05-22 21:55:55 -04:00
Alam Ed Arias
79f3d6e072
MSVC: Tidy up project files by hand
2016-05-22 11:54:32 -04:00
Alam Ed Arias
47ae39ea62
netplay: fix off by 1
2016-05-22 11:03:04 -04:00
Alam Ed Arias
4691970012
Merge branch 'master' into next
2016-05-22 01:05:43 -04:00
Alam Ed Arias
3567555598
MSVC: cleanup and enable SDLCheck
2016-05-22 01:04:21 -04:00
Alam Ed Arias
f45feb77fc
MSVC: kill level 3 warnings
2016-05-22 00:44:12 -04:00
Alam Ed Arias
57091261d9
MSVC: fixed up MSVC project
2016-05-21 23:53:04 -04:00
Alam Ed Arias
032313260a
Merge branch 'public_next' into master
2016-05-20 17:58:57 -04:00
Alam Ed Arias
3b610ead7d
Merge branch 'master' into next
2016-05-20 17:56:51 -04:00
Alam Ed Arias
9550f9626b
r_opengl.dll: UPX and static link libgcc
2016-05-20 17:36:46 -04:00
Alam Ed Arias
80611c2384
Merge branch 'master' into next
2016-05-19 18:54:21 -04:00
Alam Ed Arias
a7938783de
Merge branch 'next'
2016-05-19 18:36:27 -04:00
Alam Ed Arias
ff5587d1d5
Merge branch 'master' into next
2016-05-19 18:03:56 -04:00
Alam Arias
6db74c3b5b
Merge pull request #82 from MonsterIestyn/sdl-compiling-tweaks
...
Some SDL-related compiling tweaks
2016-05-19 12:06:38 -04:00
Monster Iestyn
c846b0ab23
Aren't some of these things already added later in sdl/Makefiles.cfg?
...
* -lSDL2_mixer is already added to SDL_LDFLAGS by default, unless NOMIXER=1 is set
* -DSDLMAIN should also be added to OPTS by default for MINGW=1 builds, unless NOSDLMAIN=1 is set
2016-05-19 16:51:05 +01:00
Alam Ed Arias
e2a5783521
Merge branch 'master' into next
2016-05-19 01:39:45 -04:00
Alam Ed Arias
30b999c6db
appveyor: no more depend ccache builds
2016-05-19 01:32:25 -04:00
Alam Ed Arias
27578edab6
appveyor: display version of ccache and force use of ccache
2016-05-19 01:20:38 -04:00
Alam Ed Arias
d73a6c9833
appveyor: copy UPX to the Mingw's bin folder, again
2016-05-19 01:10:58 -04:00
Alam Ed Arias
6f2cc1498c
appveyor: copy EXE to the Mingw's bin folder, again
2016-05-19 01:06:47 -04:00
Alam Ed Arias
eb6d8f180b
appveyor: copy EXE to the Mingw's bin folder
2016-05-19 01:00:29 -04:00
Alam Ed Arias
dbde012c8d
appveyor: debug unzip/copy lines
2016-05-19 00:53:54 -04:00
Alam Ed Arias
d08418dcff
appveyor: fixup unzipping NASM and UPX
2016-05-19 00:44:01 -04:00
Alam Ed Arias
e8cce0af8d
appveyor: download and install nasm and upx, also debug ccache
2016-05-19 00:37:22 -04:00
Alam Ed Arias
6064da9347
appveyor: fix mistake on naming the build archives
2016-05-19 00:18:40 -04:00
Alam Ed Arias
15969887ec
aapveyor: readded drive letter...
2016-05-18 23:55:30 -04:00
Alam Ed Arias
ded9dd7940
appveyor: add correct ccache folder to cache and add CONFIG to build archive
2016-05-18 23:48:29 -04:00
Alam Ed Arias
6ee81f7b1d
appveyor: fixup cache section
2016-05-18 23:38:36 -04:00
Alam Ed Arias
86f418f312
appveyor: use ccache and try to build both SDL and DD
2016-05-18 23:37:05 -04:00
Alam Ed Arias
6aa1aeb838
build: include own copy of SDL2main
2016-05-18 22:25:06 -04:00