Inuyasha
75270f878c
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-29 00:07:10 -08:00
Inuyasha
372002d2ad
Merge branch 'backport_state-animations' into 'next'
...
BACKPORT: FF_ANIMATE simplistic state animations
this is a lot more complex due to the need to remove the dispoffset related code as well as a lot of the redefinitions; combined with the code changes due to the sprite2 system in internal master.
~~BEFORE ACCEPTING THIS: get sryder to look at and fix any possible brokenness with OpenGL MD2s~~
See merge request !45
2016-02-29 03:04:00 -05:00
Inuyasha
be642b41e2
Merge branch 'backport_special-stage-fade' into 'next'
...
BACKPORT: special stage fade
literally a straight cherry-pick of the old repository, this is a very simple change after all.
See merge request !44
2016-02-29 03:02:30 -05:00
Inuyasha
4bb7143967
Merge branch 'fof-flag-change-hotfix' into 'next'
...
Fof flag change hotfix
This fixes rendering issues caused by changing FOF flags mid-level via Lua or linedef type 445. Everything else that toggles FF_EXISTS already had this fix it turns out.
Not sure if this is safe for master too, could someone check that for me?
See merge request !53
2016-02-29 02:57:47 -05:00
Inuyasha
e2b3adc04f
Randy Heit -> Randi Heit
2016-02-28 18:21:37 -08:00
Monster Iestyn
4b447b3d0d
Don't add polyobjects to a mobj's sector nodes list. This causes the player to teeter whenever they are above the polyobject's bottom, whether or not it is solid
...
Also, a minor tweak for the teetering code itself, though it looks a right mess and probably should be redone in the future
2016-02-28 18:30:29 +00:00
wolfy852
c3166e40b0
Update names in credits
...
Same as the commit in internal, minus toaster's name (by request, of course.)
2016-02-27 14:27:14 -06:00
Monster Iestyn
c7ba1d1532
Make sure target sector's lightlist is reset whenever FOF flags are changed.
...
This fixes how removing certain flags (such as FF_EXISTS) from FOFs can cause HOMs on walls bordering their target sectors. Also fixes how the force-FOF-to-vanish linedef special can leave behind the FOF's shadow
2016-02-26 18:11:12 +00:00
Inuyasha
f5ba192f0b
remove extraneous va() calls
2016-02-25 23:31:48 -08:00
Alam Ed Arias
2b12e5ff20
Merge branch 'next' into backport_unslot-music
2016-02-26 02:11:29 -05:00
Alam Ed Arias
77dc27d070
Merge branch 'next' into backport_state-animations
2016-02-26 02:06:57 -05:00
Alam Ed Arias
0a2078d0c0
Merge branch 'next' into playerspawn-hook
2016-02-26 02:05:24 -05:00
Alam Ed Arias
49877262e3
Merge branch 'next' into backport_special-stage-fade
2016-02-26 02:00:38 -05:00
Alam Ed Arias
9d3f7d760b
Merge branch 'next' into portal-fix
2016-02-26 01:58:55 -05:00
Alam Ed Arias
8d2b4102d1
Merge branch 'next' into Lua-video-lib-expansion
2016-02-26 01:58:19 -05:00
Alam Ed Arias
18688f476f
Merge branch 'next' into new-SOC-lump-names
2016-02-26 01:58:07 -05:00
Alam Ed Arias
09d2bbc448
Merge branch 'next' into lua-sector-lines
2016-02-26 01:57:15 -05:00
Alam Ed Arias
6655e92410
Merge branch 'master' into next
2016-02-26 01:56:27 -05:00
Alam Ed Arias
41f8b25c36
travis: add verbose and server-response to wget
2016-02-26 01:48:11 -05:00
Alam Ed Arias
9b55244dc3
travis: use SRB2-v2114-assets.7z
2016-02-26 01:39:08 -05:00
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
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
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
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
