Alam Ed Arias
4230225a0c
appveor: SDL, not SSDL
2016-01-28 11:36:51 -05:00
Alam Ed Arias
50846880a6
appveyor: not = for envs
2016-01-28 11:34:19 -05:00
Alam Ed Arias
f0842d2200
appveyor: add debug and sdl mixer
2016-01-28 11:33:36 -05:00
Alam Ed Arias
89786ff7fd
appveyor: include the SDL header in depend step:
2016-01-28 11:22:46 -05:00
Inuyasha
549d3aeb3f
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-28 08:20:50 -08:00
Alam Ed Arias
5ace352e71
appveyor: manually set SDL flags
2016-01-28 11:16:24 -05:00
Inuyasha
d76e21b546
fix bind out of bounds / keystring misreading
2016-01-28 08:15:34 -08:00
Alam Ed Arias
e0f3733819
appveyor: hehe, OR
2016-01-28 11:05:09 -05:00
Alam Ed Arias
53aa932207
appveyor: ingore robocopy errorcode
2016-01-28 11:03:08 -05:00
Alam Ed Arias
ffe193ca3e
appveyor: mistakes are easy to make
2016-01-28 10:55:38 -05:00
Alam Ed Arias
46f9e4a961
appveyor: we need to run 7zip twice
2016-01-28 10:52:40 -05:00
Alam Ed Arias
9e1ba2e972
appvenyor: self note only
2016-01-28 10:44:52 -05:00
Alam Ed Arias
e5dbd3cb9d
appveyor: copy and paste mistake on extracting archive comannd
2016-01-28 10:40:28 -05:00
Alam Ed Arias
9422b994e4
appveyor: fixup env block
2016-01-28 10:30:35 -05:00
Alam Ed Arias
5bf43171ae
appveyor: let try SDL2 builds
2016-01-28 10:29:02 -05:00
yellowtd
b3fbc37c94
Midtextures, lights, and culling fixes for ogl slopes
...
There's a weird issue with lights that's hard to diagnose but otherwise
this is ready to go I think
2016-01-27 20:10:02 -06:00
yellowtd
e6235d4d6b
Fix FOF slope rendering in ogl
...
should work as well as software if not better now
2016-01-27 20:09:52 -06:00
yellowtd
52ae3f2875
GL slope walls and fixed plane culling
2016-01-27 20:09:34 -06:00
yellowtd
24da82f026
Begin work on OGL slope support
...
unfinished
2016-01-27 20:09:04 -06:00
Alam Ed Arias
d0ce9170da
appveyor: build for GCC 5.2
2016-01-27 01:39:12 -05:00
Alam Ed Arias
1a72f2f1db
appveyor: wrong path...
2016-01-27 01:32:53 -05:00
Alam Ed Arias
443562c3c0
appveyor: why is this failing
2016-01-27 01:26:36 -05:00
Alam Ed Arias
6e1b9549fc
appveyor: fullpath to binaries
2016-01-27 01:24:32 -05:00
Alam Ed Arias
85de668d1a
appveyor: move set to before_build, and drop gcc and make version
2016-01-27 01:21:29 -05:00
Alam Ed Arias
113a3cd6fc
appveyor: try again
2016-01-27 01:16:42 -05:00
Alam Ed Arias
8ad8533880
appveyor: found mingw64 32-bit target, do not build with UPX
2016-01-27 01:09:51 -05:00
Alam Ed Arias
cbd85e6baf
appveyor: spacing
2016-01-27 00:27:32 -05:00
Alam Ed Arias
289b5506bf
appveyor: whitespace?
2016-01-27 00:15:09 -05:00
Alam Ed Arias
21c30a396c
appveyor: allow one to RDP to system to debug build system
2016-01-27 00:11:54 -05:00
Alam Ed Arias
b8cafea40a
appveyor: full path to make binary and no asm or png support
2016-01-26 23:56:22 -05:00
Alam Ed Arias
3db1a1fe9f
add/test appveyor build
2016-01-26 23:30:53 -05:00
wolfy852
bd1231764e
Merge remote-tracking branch 'remotes/origin/master' into dashmode
2016-01-25 21:41:41 -06:00
wolfy852
e314b442b2
Remove dashmode limit since tic_t is UINT32
...
This might be overpowered as hell. Needs testing for sure.
2016-01-25 20:26:31 -06:00
Monster Iestyn
67b92d7273
Went and fixed the dashmode variable hack nonsense once and for all myself
...
would have gone for "dashtime", but then I was reminded that was already a name for something to do with spindash. Oh well
2016-01-25 11:47:33 +00:00
wolfy852
95d6cba184
[HACK] Make dashmode work again
...
Fixed one of Red's mistakes, and used a different struct variable for dashmode. This needs to be changed though, because everything will break if someone loads a circuit map.
2016-01-25 01:49:37 -06:00
Inuyasha
c4b022b202
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-24 03:36:05 -08:00
Inuyasha
732c1a87f1
Merge branch 'texture-anims-fix' into 'next'
...
Texture anims fix
See issue #20
See merge request !34
2016-01-24 06:32:52 -05:00
Monster Iestyn
80fb282334
Fixed math for calculating current texture in texture animations
2016-01-23 18:59:17 +00:00
Alam Ed Arias
181c875016
SDL: config.h.in is pre source tree, config.h for each cmake build
2016-01-22 17:25:19 -05:00
Inuyasha
6784419d38
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-21 14:56:25 -08:00
Inuyasha
4df951224b
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2 into public_next
2016-01-21 14:51:33 -08:00
Inuyasha
6af27212c5
Merge branch 'mapinfo-hotfix' into 'next'
...
Mapinfo hotfix
Fixes Inu's fix to map headers for Lua from the other day, one small compiling warning got missed somehow. =V
See merge request !33
2016-01-21 17:45:06 -05:00
Monster Iestyn
674ff51153
Fix shadowing in mapheaderinfo_get
2016-01-21 20:27:35 +00:00
Monster Iestyn
ccb0abb853
Diagonal ring springs should now be able to face any angle
2016-01-21 20:19:43 +00:00
Alam Ed Arias
3bfc402241
whitespace cleanup
2016-01-21 13:53:21 -05:00
Alam Ed Arias
6189d1a2ca
whitespace cleanup
2016-01-21 13:53:21 -05:00
Alam Ed Arias
c33d20acff
whitespace cleanup
2016-01-21 13:50:05 -05:00
Inuyasha
d6d662b2dc
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-20 09:43:53 -08:00
Inuyasha
9d5718760d
interscreen is a lump name and thus needs lstring
...
... not just lstring though, but the behavior with i that is used elsewhere.
2016-01-20 09:42:35 -08:00
Inuyasha
d36e9a425f
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-20 09:27:50 -08:00