Monster Iestyn
9e29b69a29
Remove unused "firstnewseg" variable
2016-01-31 16:49:04 +00:00
Monster Iestyn
8b56cd76c7
doomtype.h tweaks
...
some of the mess in here really bothers me
(cherry-picking this commit of mine from next since it only fixes a small oversight with compiling and adds a comment)
2016-01-31 15:08:16 +00:00
Monster Iestyn
cd198d6809
merge SOC_****, MAINCFG and OBJCTCFG searches into one big search for any of them
...
This makes it so that it doesn't matter what order you place SOC lumps within a WAD... relative to other SOC lumps at least, anyway
2016-01-30 17:19:05 +00:00
Monster Iestyn
5cae87430f
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into new-SOC-lump-names
2016-01-30 16:39:55 +00:00
Inuyasha
cd4442d971
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-29 18:30:58 -08:00
Inuyasha
e49f531ba1
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-01-29 18:27:33 -08:00
Alam Ed Arias
82bfce7683
Merge remote-tracking branch 'magicgirl/master'
2016-01-29 20:29:28 -05:00
Inuyasha
93d1f9920e
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-29 16:03:52 -08:00
Inuyasha
e6f0a4be18
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-01-29 16:01:57 -08:00
Inuyasha
f500986692
use RGB for screen texture, not RGBA
...
the screen texture does not need an alpha channel.
the fact that it had one made OGL copy the topmost pixel of the screen texture's alpha channel.
which, naturally results in the screen becoming partially transparent and letting you see the working texture in the background.
2016-01-29 16:01:05 -08:00
Monster Iestyn
7d603c320b
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into diagonal-spring-rings-tweak
2016-01-29 19:40:04 +00:00
Alam Ed Arias
e8cf4cdaac
SDL2: compile SDL with SDL_main for Win32
2016-01-29 00:33:11 -05:00
Alam Ed Arias
c47ff7b3c6
let make the main() entry point noreturns
2016-01-28 21:37:41 -05:00
Alam Ed Arias
050ce857c4
let not care for main() being noreturn
2016-01-28 21:31:18 -05:00
Alam Ed Arias
0d327c7c16
kill logical-not-parentheses warning in g_game.c
...
g_game.c: In function 'G_CheckDemoStatus':
g_game.c:5588:22: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
if (!modeattacking == ATTACKING_RECORD)
^
2016-01-28 21:15:51 -05:00
Alam Ed Arias
10e1aaaf85
appveyor: no need for DEPFLAGS
2016-01-28 12:08:08 -05:00
Alam Ed Arias
7fdb5cfcfb
move disabled warning out of mingw
2016-01-28 12:06:00 -05:00
Alam Ed Arias
2176b21e62
ignore noreturns
2016-01-28 11:49:23 -05:00
Alam Ed Arias
7a09a82489
new flags: DEPFLAGS, to tell the depend step where are the headers
2016-01-28 11:41:02 -05:00
Alam Ed Arias
f0842d2200
appveyor: add debug and sdl mixer
2016-01-28 11:33:36 -05:00
Inuyasha
549d3aeb3f
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-28 08:20:50 -08:00
Inuyasha
d76e21b546
fix bind out of bounds / keystring misreading
2016-01-28 08:15:34 -08: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
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
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
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
Inuyasha
7d6dc3a5bb
fix bad lstring usage in map header lua
...
This is not how you use pushlstring! This is actually sending uninitialized memory to Lua, which is making scripts have inconsistent results (duh?)
c/o JTE: "Tell Red they're a doofus."
2016-01-20 09:25:28 -08:00
Monster Iestyn
5abdb08a25
#sector.lines now returns the number of linedefs in the sector
2016-01-20 16:03:17 +00:00
Sean Ryder
7d914913dd
Tabbing
2016-01-20 15:55:32 +00:00
Monster Iestyn
79e3e2351d
Finally bothered to add in a method to obtain sector.lines' size internally to prevent going out of bounds.
...
Admittedly I knew of this particular method from the start but wanted to avoid it in favour of a less-hacky looking method of getting sector.lines' size ...but there was none to be found at all.
2016-01-20 14:56:52 +00:00
Monster Iestyn
3dc0f2b4ff
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into lua-sector-lines
2016-01-20 14:22:11 +00:00
Inuyasha
d15aee9d44
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-01-20 04:41:56 -08:00
