Commit graph

1195 commits

Author SHA1 Message Date
Alam Ed Arias
6d2d48f152 Merge branch 'skybox-sprites-fix' into 'master'
Fix for rendering sprites in skyboxes

This branch fixes the visual glitches one sees with sprites for objects within skyboxes, typically with parts of or all of some sprites disappearing from view even though they shouldn't be.

See merge request !84
2016-06-08 14:05:06 -04:00
Monster Iestyn
29ea733ae5 Fix sprites in skyboxes not having clipping arrays actually set properly 2016-06-08 17:53:34 +01:00
Nipples the Enchilada
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
Monster Iestyn
4c422f6605 OpenGL: closed door/window detection code now accounts for slopes, just like in software 2016-06-04 18:31:21 +01:00
Alam Ed Arias
a7640e4d6c travis: compress the build cache 2016-06-01 14:32:03 -04:00
Monster Iestyn
7fc1c7466d Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2.git 2016-06-01 19:24:00 +01:00
Monster Iestyn
c863e311fe OpenGL: Fix upper texture Effect 1 only skewing 2016-06-01 19:22:54 +01:00
Alam Ed Arias
dfe5246636 appveyor: only for taggeed master builds 2016-06-01 14:01:12 -04:00
Monster Iestyn
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
Alam Ed Arias
d86dc67218 travis-ci: add back xcode6.2 2016-06-01 11:23:30 -04:00
Alam Ed Arias
f21c72b889 debug: always load exchndl.dll 2016-05-31 21:30:18 -04:00
Alam Ed Arias
5401257c74 travis-ci: llvm's APT repos are offline for now 2016-05-31 17:56:05 -04:00
Alam Ed Arias
2262e4aeb9 travis-ci: allow clang-3.8 to fail 2016-05-31 11:26:29 -04:00
Alam Ed Arias
bd588ad0f4 travis-ci: note down what version of clang we are compiling with 2016-05-31 11:06:47 -04:00
Alam Ed Arias
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
Alam Ed Arias
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
Alam Ed Arias
9a703bbeda travis-ci: drop clang 3.6, 3.7 and 3.8 2016-05-30 17:41:23 -04:00
Alam Ed Arias
5e154ce3fd travis: use the correct binary name for clang 2016-05-30 17:21:24 -04:00
Alam Ed Arias
9f5ecdcd9c travis: add mssing addons: section 2016-05-30 17:19:32 -04:00
Alam Ed Arias
5c5b85f369 travis-ci: add builds for clang 3.4 to 3.8 2016-05-30 17:16:58 -04:00
Alam Ed Arias
6fb70f8d02 travis-ci: let only display, not error on autological warnings 2016-05-29 09:47:30 -04:00
Alam Ed Arias
febaabd80b travis: label up each compiler build, and remove the allow_failures 2016-05-29 09:40:56 -04:00
Alam Ed Arias
6832962489 travis-ci: env vars need to be quoted 2016-05-28 22:45:47 -04:00
Alam Ed Arias
2dfdc99cb5 travis-ci: let add pre build files, gcc-6 get disable warning flags 2016-05-28 22:30:28 -04:00
Alam Ed Arias
e866630b22 travis: disable tautological-compare warnings 2016-05-28 22:23:20 -04:00
Alam Ed Arias
b60ab05721 travis-ci: reenable gcc-6 2016-05-28 21:31:33 -04:00
Alam Ed Arias
209d76cb9d gcc-6: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation] 2016-05-28 21:24:06 -04:00
Alam Ed Arias
9e196613a0 gcc-6: error: this ‘for’ clause does not guard... [-Werror=misleading-indentation] 2016-05-28 21:23:46 -04:00
Alam Ed Arias
4956be2bd4 gcc-6: error: left shift of negative value [-Werror=shift-negative-value] 2016-05-28 21:23:09 -04:00
Alam Ed Arias
35b254feaa D_MD5PasswordPass, fixup 2016-05-28 19:51:10 -04:00
Alam Ed Arias
3aea4a7601 replace strcpy with memmove in D_MD5PasswordPass() 2016-05-28 19:48:52 -04:00
Alam Ed Arias
d9aa430817 use memmove in D_MD5PasswordPass() and drop noreturn 2016-05-28 19:42:38 -04:00
Alam Ed Arias
35f36e1bba travis-ci: set v of nulK to 0 2016-05-28 19:28:37 -04:00
Alam Ed Arias
a1d246a34e travis-cl: disable gcc-6 build 2016-05-28 19:17:21 -04:00
Alam Ed Arias
02e67a4a95 travis: add gcc 4.4, 4.6 and 4.7 2016-05-28 19:15:37 -04:00
Alam Ed Arias
ad6c2e634f travis: disable xcode6.3 2016-05-28 19:08:50 -04:00
Alam Ed Arias
f4a84c916e travis: Fixedup gcc 5 error and allow gcc 6 to fail 2016-05-28 18:41:08 -04:00
Alam Ed Arias
c76c5152c2 travis-ci: fixup CFLAGS env and disable xcode6.3, it is really broken 2016-05-28 17:59:19 -04:00
Alam Ed Arias
90ae2b2d1d cmake: compile with warnings 2016-05-28 17:44:47 -04:00
Alam Ed Arias
3cf5d1ddec travis-ci: fixup gcc-6 build and added xcode6.3 2016-05-28 17:22:50 -04:00
Alam Ed Arias
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
Alam Ed Arias
e7b15d5f95 travis-cl: fixup osx? 2016-05-28 03:22:59 -04:00
Alam Ed Arias
94485edcbb travis:-ci: install cmake on some OSX systems 2016-05-28 02:53:42 -04:00
Alam Ed Arias
9d3f2890c3 travis-ci fixup space 2016-05-28 01:12:24 -04:00
Alam Ed Arias
ffc92489bb travia-ci: compile all xcode 2016-05-28 00:53:14 -04:00
Alam Ed Arias
439883b8c9 travis-ci: spacing 2016-05-28 00:33:44 -04:00
Alam Ed Arias
64e03c0f93 travis-ci: clean up test 2016-05-28 00:23:27 -04:00
Alam Ed Arias
3278400920 travis-ci: add test for $_CC 2016-05-28 00:01:22 -04:00
Alam Ed Arias
42dffcb6f3 travis-ci: test for _CC 2016-05-27 23:40:23 -04:00
Alam Ed Arias
30d02affa4 travis-ci: let use export, not set 2016-05-27 23:18:52 -04:00