lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
862 commits 1 branch 29 tags 122 MiB
Commit graph

862 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alam Ed Arias cb9542848b Merge remote-tracking branch 'public/next' into next 2016-02-25 18:42:28 -05:00
Inuyasha 8b7e0347fd Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 
# Conflicts:
#	src/sdl/i_system.c
 2016-02-25 15:41:13 -08:00
Alam Ed Arias b3b5521e1b Merge branch 'master' into next 2016-02-25 18:33:29 -05:00
Alam Ed Arias 8a369d969b whitespace clean 2016-02-25 18:31:40 -05:00
Inuyasha 5108bb97f4 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-25 15:16:15 -08:00
Inuyasha 1e15ed2f7b Merge branch 'i-hate-stupid-speedrun-tricks' into 'next' 
Fix chain launching

Basically you're not allowed to launch off a chain the frame you touch it anymore.

Coincidentally the changes here allow you to actually use PF_*STASIS in a Lua script now and have it work as you'd expect it to (it lasts for a tic).

See merge request !49
 2016-02-25 18:12:39 -05:00
Inuyasha aa4414d706 Merge branch 'sdlmix-master' into 'master' 
cpuaffinity/sdl_mixer changes

Hopefully this will alleviate SDL2 sound issues.

If not, hopefully this will give us info on what the hell is going on.

See merge request !51
 2016-02-25 18:12:10 -05:00
Inuyasha 8cc6261c15 Merge branch 'monster-misc-2' into 'master' 
Monster misc 2

Just some clean-up in doomdef.h, nothing important or majorly game-breaking really. It's all stuff that apparently hasn't been used by the game itself in many years by now.

...

inb4 I find something else obsolete to kill later and make monster misc branch no. 3

See merge request !52
 2016-02-25 18:10:48 -05:00
Inuyasha 8cf74f5044 Merge branch 'mf_pain-fix' into 'next' 
Fix dead MF_PAIN objects hurting the player

Makes MF_PAIN check for health before damaging the player. Fixes issue #12

See merge request !47
 2016-02-25 18:10:08 -05:00
Inuyasha f10279d61b Very minor performance improvement. 2016-02-25 14:35:05 -08: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
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
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 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
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
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 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 Arias f9d56f65a8 Merge pull request #47 from ProfessorKaos64/brewmaster 
Update pkg to be fully compatible with Debian Jesse, add desktop file/artwork
 2016-02-07 00:36:04 -05:00
mikeyd 865676d341 loose the revision, pkgs switched to native format 2016-02-06 22:46:52 -05:00
mikeyd c8ae630dfe Fix desktop file 2016-02-06 22:29:01 -05:00
mikeyd 1082ae6ba5 Missing append, <facepalm.jpg> 2016-02-06 22:17:14 -05:00
mikeyd 3ae9892064 missing install section for new desktop/png file 2016-02-06 22:08:32 -05:00
mikeyd 40dff2c123 missing space for "proper" Debian formatting 2016-02-06 22:00:59 -05:00
mikeyd d213791054 Rename srb2 to srb2.desktop 2016-02-06 18:13:14 -05:00