wolfy852
8f0abb267e
Don't mix declarations and code
2016-02-25 22:47:52 -06:00
wolfy852
5c9aaf2fe4
Move hook into G_SpawnPlayer
2016-02-25 22:28:19 -06:00
wolfy852
000ec9ac67
Call LUAh_PlayerSpawn instead of checking for it
2016-02-14 15:22:13 -06:00
wolfy852
db3797fd35
Add PlayerSpawn hook
2016-02-14 06:10:20 -06:00
Monster Iestyn
5d1c8d2968
My cherry picking somehow lead to these functions being doubled ...whoops
2016-02-09 19:35:04 +00:00
Alam Ed Arias
6000b5c980
Merge branch 'master' into next
2016-02-09 14:13:50 -05:00
Sean Ryder
ddb5652ab6
Tabbing
2016-02-09 18:05:19 +00:00
Sryder13
6b8c438e58
Change a few colours.
2016-02-09 18:05:11 +00:00
Sryder13
31deecc51c
Colour Changing MD2s
...
I don't know how I can move my old branch over so I've just created a new one.
2016-02-09 18:04:59 +00:00
Monster Iestyn
700c9c2e70
Merge branch 'md2_colourchange' into 'master'
...
Colour Changing MD2s
What it says it is, I haven't touched it in quite a while, but I have checked and it seems to be working.
See merge request !30
2016-02-09 13:03:52 -05:00
Alam Ed Arias
985b9a11cc
Merge branch 'travis-ci' into 'master'
...
Travis-CI builds
Merge support to build SRB2 for Linux system via Travis-Ci
This will build SRB2 with GCC and Clang to make sure we do not break Linux/GNU builds
See merge request !41
2016-02-07 21:57:26 -05:00
Alam Ed Arias
2dc9a4b34a
Merge branch 'master' into next
2016-02-07 21:22:28 -05:00
Alam Ed Arias
6b626f1b27
build: cmake is messly
2016-02-07 20:53:27 -05:00
Alam Ed Arias
3ba827f33d
Merge branch 'master' into travis-ci
2016-02-07 00:39:25 -05:00
Alam Ed Arias
07fc74eaf5
clang: fixup a few clang warnings
2016-02-05 22:38:40 -05:00
Alam Ed Arias
68054a49e3
clang: cleanup
2016-02-05 22:32:14 -05:00
Alam Ed Arias
f4886657c1
clang: fixup a few clang warnings
2016-02-05 22:12:12 -05:00
Alam Ed Arias
864baeda05
cmake: fixed up to handle Clang and AppleClang
2016-02-05 21:49:24 -05:00
Inuyasha
5320424269
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-03 18:09:08 -08:00
Inuyasha
c05c43cfee
Merge branch 'monster-misc' into 'master'
...
Monster Iestyn's Miscellaneous (netplay-compatible) changes
Just cleaning up some unused or unnecessary things left in the source code, see the commits for exact changes made if you like.
May add more stuff to this branch later, there's no rush really.
See merge request !39
2016-02-03 21:06:57 -05:00
Inuyasha
84fb4d108a
Merge branch 'diagonal-spring-rings-tweak' into 'next'
...
Diagonal spring rings tweak
If you didn't know before, those special placement ring lines for diagonal springs only use multiples of 45 for their angles in-game. In other words, they only face any of the 8 basic cardinal directions (N, S, E, W, NE, NW, etc). Considering that springs themselves don't follow the above behaviour, you can probably work out that's a bad thing.
This branch changes that of course, if you couldn't guess from context. Diagonal spring rings can now be placed with any angles like most thing types already could!
See merge request !37
2016-02-03 21:05:44 -05:00
Inuyasha
f17be6641e
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-03 18:00:28 -08:00
Monster Iestyn
0455b572dc
Removed weird test for water planes in HWR_Subsector
...
It crashes when you try to test it anyway, lol
2016-02-03 17:58:44 -08:00
Monster Iestyn
2e58f6c4d9
Fixed that odd bug where PolyObjects sometimes leave a vertex or two in their control sectors
...
Turns out the seg-searching code falsely assumed it'd find frontfacing segs first, who knew?
2016-01-31 13:05:30 -06:00
Monster Iestyn
2d94b2a85f
keys.h doesn't need to be included twice here lol
2016-01-31 17:10:57 +00:00
Monster Iestyn
deb958a796
Remove unused "INVERSECOLORMAP" macro
2016-01-31 17:06:03 +00:00
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
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
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
d76e21b546
fix bind out of bounds / keystring misreading
2016-01-28 08:15:34 -08:00
Alam Ed Arias
d0ce9170da
appveyor: build for GCC 5.2
2016-01-27 01:39:12 -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
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
c33d20acff
whitespace cleanup
2016-01-21 13:50:05 -05:00
