Alam Ed Arias
2ba90082c3
Merge branch 'next' into gl-slopes
2016-02-26 02:14:00 -05:00
Alam Ed Arias
2b12e5ff20
Merge branch 'next' into backport_unslot-music
2016-02-26 02:11:29 -05:00
Alam Ed Arias
07d331676b
Merge branch 'next' into slope-fixes
2016-02-26 02:09:03 -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
Inuyasha
83278c2893
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
...
# Conflicts:
# src/p_map.c
2016-02-25 15:46:08 -08: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
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
