69f556d40a
Split AA trees code from m_misc.c/.h into m_aatree.c/.h
...
Also updated any relevant project files that I can think of to include the new files, as well as the makefile of course. Some of the other project files haven't been touched in years so I'll leave those alone ...unless someone objects
2016-06-05 21:29:40 +01:00
2e9607938d
Merge branch 'master' into next
2016-06-04 20:23:46 +01:00
6bf40b8f40
Merge branch 'gl-slope-doors' into 'master'
...
OpenGL slope fixes again
This branch just adds the relevant code for OpenGL to properly check slopes regarding "closed door" segs (those between two sectors that cannot be crossed normally) and "window" segs (those between two sectors of differing plane heights that you CAN cross, which would probably display top or bottom textures), so you don't get HOMs when the the slopes create a closed door even though the normal sector heights wouldn't or something.
(if you couldn't understand that, my slopes test map shows what I mean to the right of the player start: https://dl.dropboxusercontent.com/u/25409000/2.1/mi-slopetest.wad )
See merge request !81
2016-06-04 14:28:07 -04:00
4c422f6605
OpenGL: closed door/window detection code now accounts for slopes, just like in software
2016-06-04 18:31:21 +01:00
83c4dba4ce
Fix crash reported by FuriousFox at http://mb.srb2.org/showthread.php?t=41536
...
Basically this makes sure numwadfiles is updated before loading the SOC/Lua scripts, so if a Lua script calls COM_BufInsertText with the contents "addfile scr_mysticrealm.wad" it can't overwrite the last written wadfile slot! Not that COM_BufInsertText really should be used like that to begin with
2016-06-02 20:16:25 +01:00
919e3ed0e2
Make token available to Lua as a global variable
...
Reviewed by @RedEnchilada
2016-06-01 21:06:24 -05:00
5c24efac21
Merge branch 'master' into next
2016-06-01 15:35:03 -04:00
a7640e4d6c
travis: compress the build cache
2016-06-01 14:32:03 -04:00
43b6b2a53f
Merge branch 'master' into next
2016-06-01 19:31:57 +01:00
7fc1c7466d
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2.git
2016-06-01 19:24:00 +01:00
c863e311fe
OpenGL: Fix upper texture Effect 1 only skewing
2016-06-01 19:22:54 +01:00
dfe5246636
appveyor: only for taggeed master builds
2016-06-01 14:01:12 -04:00
bf85cc25bd
OpenGL: Fix lower unpegged texture offset, fix lower unpegged + effect 1 so the texture actually skews
2016-06-01 18:51:38 +01:00
0444e8a14c
Merge branch 'master' into next
2016-06-01 11:45:57 -04:00
d86dc67218
travis-ci: add back xcode6.2
2016-06-01 11:23:30 -04:00
f21c72b889
debug: always load exchndl.dll
2016-05-31 21:30:18 -04:00
ef290723c2
Merge branch 'master' into next
2016-05-31 17:57:12 -04:00
5401257c74
travis-ci: llvm's APT repos are offline for now
2016-05-31 17:56:05 -04:00
d24cc49443
Fix FOF height checks all over p_spec.c to account for slopes
...
This fixes certain sector specials and linedef executor specials etc not accounting for players/mobjs touching sloped FOFs
2016-05-31 21:31:29 +01:00
7dd3a4ba7b
Merge branch 'master' into next
2016-05-31 11:26:51 -04:00
2262e4aeb9
travis-ci: allow clang-3.8 to fail
2016-05-31 11:26:29 -04:00
bd588ad0f4
travis-ci: note down what version of clang we are compiling with
2016-05-31 11:06:47 -04:00
9122c3e5ea
Merge branch 'travis-ci' into 'master'
...
Travis ci
Ok, now SRB2 on travis-ci is tested to be compiled against 17 buildsets
Now, what am I doing wrong?
See merge request !74
2016-05-31 11:02:51 -04:00
61faee12bc
travis-ci: add back clang 3.6 to 3.8, but also have toolchain test repos into the mix
2016-05-30 17:52:30 -04:00
9a703bbeda
travis-ci: drop clang 3.6, 3.7 and 3.8
2016-05-30 17:41:23 -04:00
5e154ce3fd
travis: use the correct binary name for clang
2016-05-30 17:21:24 -04:00
9f5ecdcd9c
travis: add mssing addons: section
2016-05-30 17:19:32 -04:00
5c5b85f369
travis-ci: add builds for clang 3.4 to 3.8
2016-05-30 17:16:58 -04:00
2c73e2a2cd
Fix flung emeralds not disappearing in death pits
...
(assuming it wasn't an intentional behaviour thing of course)
2016-05-29 16:47:38 +01:00
6fb70f8d02
travis-ci: let only display, not error on autological warnings
2016-05-29 09:47:30 -04:00
febaabd80b
travis: label up each compiler build, and remove the allow_failures
2016-05-29 09:40:56 -04:00
6832962489
travis-ci: env vars need to be quoted
2016-05-28 22:45:47 -04:00
2dfdc99cb5
travis-ci: let add pre build files, gcc-6 get disable warning flags
2016-05-28 22:30:28 -04:00
e866630b22
travis: disable tautological-compare warnings
2016-05-28 22:23:20 -04:00
b60ab05721
travis-ci: reenable gcc-6
2016-05-28 21:31:33 -04:00
209d76cb9d
gcc-6: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
2016-05-28 21:24:06 -04:00
9e196613a0
gcc-6: error: this ‘for’ clause does not guard... [-Werror=misleading-indentation]
2016-05-28 21:23:46 -04:00
4956be2bd4
gcc-6: error: left shift of negative value [-Werror=shift-negative-value]
2016-05-28 21:23:09 -04:00
35b254feaa
D_MD5PasswordPass, fixup
2016-05-28 19:51:10 -04:00
3aea4a7601
replace strcpy with memmove in D_MD5PasswordPass()
2016-05-28 19:48:52 -04:00
d9aa430817
use memmove in D_MD5PasswordPass() and drop noreturn
2016-05-28 19:42:38 -04:00
35f36e1bba
travis-ci: set v of nulK to 0
2016-05-28 19:28:37 -04:00
a1d246a34e
travis-cl: disable gcc-6 build
2016-05-28 19:17:21 -04:00
02e67a4a95
travis: add gcc 4.4, 4.6 and 4.7
2016-05-28 19:15:37 -04:00
ad6c2e634f
travis: disable xcode6.3
2016-05-28 19:08:50 -04:00
f4a84c916e
travis: Fixedup gcc 5 error and allow gcc 6 to fail
2016-05-28 18:41:08 -04:00
c76c5152c2
travis-ci: fixup CFLAGS env and disable xcode6.3, it is really broken
2016-05-28 17:59:19 -04:00
90ae2b2d1d
cmake: compile with warnings
2016-05-28 17:44:47 -04:00
3cf5d1ddec
travis-ci: fixup gcc-6 build and added xcode6.3
2016-05-28 17:22:50 -04:00
0b1fc30d0e
travis-ci: clang and gcc are the same on osx and xcode6.3 does not works
2016-05-28 17:16:29 -04:00
Monster Iestyn