stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 02:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
10424 commits 172 branches 41 tags 280 MiB
Commit graph

10424 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
3802ec33de Fixed how dying players who were standing on slopes just jump off to the side 2016-02-23 22:53:24 +00:00
Inuyasha
6dda71bef7 I guess this is becoming the "try to make SDL_mixer work" branch 
Move InitSubSystem calls into proper places,
don't use AUDIO_S16LSB (bad according to SDL_mixer docs)
Add error checking
 2016-02-22 23:08:35 -08:00
Inuyasha
b258b9b503 remove cpuaffinity code from SDL 
still exists in DD (while it exists) but no longer saves.
No reason whatsoever for affinity to be settable by the game itself.
 2016-02-22 23:08:34 -08:00
Alam Ed Arias
0369f39ef4 Merge branch 'master' into gl-slopes 2016-02-22 00:15:26 -05:00
RedEnchilada
bcd05b1c63 Also fixed it for MD2s 2016-02-21 23:04:14 -06:00
RedEnchilada
ce793dfe28 Fix vissprite-related crashing in OGL 2016-02-21 22:50:29 -06:00
Monster Iestyn
f87f1b7b1a Fixed compiler errors as well as a ton of tab spaces (apparently it's a common problem in this file anyway but whatever) 2016-02-21 11:37:59 -06:00
Monster Iestyn
3058648fdc Fix elemental flame trails not spawning when going up slopes 2016-02-16 17:58:08 +00:00
Monster Iestyn
03470118cd Added missing ESLOPE ifdef from when I first did these fixes for slope compiling 2016-02-15 20:57:35 +00:00
Monster Iestyn
fa1bc5a09b Whoops forgot this for last commit 2016-02-15 20:55:57 +00:00
Monster Iestyn
b5673ed101 Fix player spawning on slopes 2016-02-15 20:46:56 +00:00
Monster Iestyn
ef6430c23e Fix respawning rings on slopes 2016-02-15 20:34:53 +00:00
Monster Iestyn
8f30d67ce2 Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git 2016-02-15 19:34:10 +00:00
wolfy852
000ec9ac67 Call LUAh_PlayerSpawn instead of checking for it 2016-02-14 15:22:13 -06:00
Inuyasha
7c5adacc6f Fixed chain launching 
In the process, the stasis flags work like you'd expect them to.
You can now set them in Lua or code and they'll actually do something.
 2016-02-14 12:28:03 -08:00
wolfy852
db3797fd35 Add PlayerSpawn hook 2016-02-14 06:10:20 -06:00
wolfy852
e43f21cdda Fix dead MF_PAIN objects hurting the player 
Fixes #12
 2016-02-13 17:31:38 -06:00
Monster Iestyn
dabc4415af Fix crash caused by drawing scaled, mirrored sprites semi-covered on the left side by portal edge 
I suspect this crash was possible even outside the context of portals, but whatever
 2016-02-13 18:11:50 +00:00
toasterbabe
f59c8d20e5 fix md2 blendcolors for reduced palette 2016-02-11 18:37:53 -05:00
wolfy852
01c78c16be fix md2 blendcolors for reduced palette 2016-02-11 13:46:30 -05:00
Alam Ed Arias
9470fc5567 use sizeu#() on size_t printing 2016-02-11 13:20:35 -05:00
Alam Ed Arias
4e37964336 TRUE is not a vaild boolean under non Windows system 2016-02-11 13:20:13 -05:00
Inuyasha
04d334d454 Merge branch 'backport_state-animations' into 'backport_state-animations' 
BACKPORT: State animations MD2 fix

Fixes interpolation for MD2's for states using FF_ANIMATE.

See merge request !46
 2016-02-09 19:49:46 -05:00
Monster Iestyn
62d15e54e8 Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into portal-fix 2016-02-09 20:02:33 +00:00
Monster Iestyn
7278625963 Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into Lua-video-lib-expansion 2016-02-09 20:01:32 +00:00
Monster Iestyn
17d6bafc7e Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into new-SOC-lump-names 2016-02-09 20:00:54 +00:00
Monster Iestyn
e44c96e417 Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into lua-sector-lines 2016-02-09 19:58:51 +00:00
Monster Iestyn
db18ad6b7f Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2.git into monster-misc-2 2016-02-09 19:54:49 +00:00
Alam Ed Arias
e4ad95856f Merge branch 'public_next' into master 2016-02-09 14:49:17 -05: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
d09016c808 Merge branch 'public_next' into master 2016-02-09 14:19:50 -05: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
Sean Ryder
b7ebb8186d Fix MD2 interpolation for FF_ANIMATE states 2016-02-09 16:20:18 +00:00
Inuyasha
8fc484cea9 Just a few more changes to TUNES, nothing special 
(cherry picked from commit 63a9c66317)
 2016-02-09 02:48:35 -08:00
Inuyasha
04d112276e Fixed some oddities with TUNES. 
(cherry picked from commit a4d05350f7)
 2016-02-09 02:48:35 -08:00
Inuyasha
1203b0aa73 Fix crash on game clear 
(No, game, you can't allocate a map header for the credits, why were you doing that before and how did it not break anything??)

(cherry picked from commit e1f9a01229)
 2016-02-09 02:48:34 -08:00
Inuyasha
caab150c92 Fixed LD413 
(cherry picked from commit 1e4c2f8aad)
 2016-02-09 02:48:34 -08:00
Inuyasha
8c17dac589 The concept of "music slots" doesn't exist anymore. 
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.

(cherry picked from commit 025ca413a2)

# Conflicts:
#	src/p_user.c
 2016-02-09 02:48:33 -08:00
Inuyasha
58e685353a Attempt 2 at special stage fades. 
More basic in execution.
 2016-02-09 02:43:24 -08:00
Inuyasha
1bdd4cf641 backport state-animations from internal master to public next 
most other code in the branch did not come along for the ride.
 2016-02-09 02:39:16 -08:00
Monster Iestyn
66175d87b8 removed unused macros from doomdef.h 2016-02-08 20:10:32 +00: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
Yukita Mayako
914c6c9d98 Whitespace cleanup. 2016-02-07 21:45:16 -05:00
Alam Ed Arias
dff65aa9e0 Merge branch 'public_next' into master 2016-02-07 21:25:42 -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