Monster Iestyn
60ec0ff294
Merge branch 'next' into demo-replay-fixes
2016-04-20 18:15:36 +01:00
Monster Iestyn
d31fd95d75
Armageddon & Sparkles confusion is no more, DMG_NUKE exists to sort that out now
2016-04-07 22:02:52 +01:00
Monster Iestyn
249d25a316
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into damage-control
2016-04-07 20:47:12 +01:00
Inuyasha
3b4b7a05fd
Better CTF in splitscreen, no death message for spectators
2016-04-06 19:55:58 -07:00
Inuyasha
3117a6a16e
Splitscreen fixes
...
initialize flipcam2
player 2 gets game over music now.
restore the other player's music when the dead player is done sulking about their game over
2016-04-06 18:28:43 -07:00
Monster Iestyn
29f0301540
Whoops
2016-04-05 21:21:45 +01:00
Monster Iestyn
e8a4d7b7b8
Fix replay camera not being turnable when climbing, sliding ...and several other things.
...
If in analog mode, this does not apply (also analog mode replay camera no longer borks)
2016-04-05 20:56:48 +01:00
Inuyasha
50d3fe15b8
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
...
# Conflicts:
# src/d_main.c
# src/doomdef.h
2016-03-31 21:17:29 -07:00
Alam Ed Arias
1c16943be8
Merge branch 'next' into bp_random2
2016-03-31 21:44:03 -04:00
Alam Ed Arias
b45b9801d6
Merge branch 'next' into slope-fixes
2016-03-31 21:43:51 -04:00
Inuyasha
816990a3ed
Merge branch 'polyobj-teeter-fix' into 'next'
...
Fix for teetering on PolyObjects
So... somebody goofed and didn't realise PolyObject sectors could be added to the sector node list for each object (which is referenced by mobj->touching_sectorlist), via their linedefs if they are nearby the player (yes, PolyObject linedefs are special and get to move about the level). As it turns out, this allows even INTANGIBLE PolyObjects to make you teeter in a seemingly inexplicable way.
What is happening is that PolyObject sectors, when they are added to the mentioned lists, are then checked under normal sector teetering conditions - if the player is above the floorheight by 24 FUs, you're officially teetering unless stated otherwise. The actual PolyObject teetering code can't help you here if the conditions are right, especially if they're taller than 24 FU in height.
There are a number of things wrong with the teetering code in general that I'd like to sort eventually, but at least now teetering on PolyObjects is fixed at last ...right? Please check the branch out if you can to check this, obviously.
See merge request !54
2016-03-31 20:55:28 -04:00
Alam Ed Arias
6b9fd60f06
Merge branch 'next' into camera-fix
2016-03-31 12:28:31 -04:00
Alam Ed Arias
47bb95f5f5
Merge branch 'next' into polyobj-teeter-fix
2016-03-31 12:26:52 -04:00
Alam Ed Arias
32a950893e
Merge branch 'next' into slope-fixes
2016-03-31 12:17:40 -04:00
Alam Ed Arias
d77e541f29
Merge branch 'next' into bp_random2
2016-03-31 12:15:09 -04:00
Inuyasha
3812b6bc20
the abs() is necessary; force unsigned shift and signed result
2016-03-31 06:48:08 -07:00
Alam Ed Arias
283c64ee20
Merge branch 'next' into camera-fix
2016-03-30 20:49:44 -04:00
Alam Ed Arias
d26c486c6d
Merge branch 'next' into polyobj-teeter-fix
2016-03-30 20:42:33 -04:00
Alam Ed Arias
4370459166
Merge branch 'next' into slope-fixes
2016-03-30 20:41:33 -04:00
Alam Ed Arias
a935ac21e8
Merge branch 'next' into bp_random2
2016-03-30 20:40:48 -04:00
Alam Ed Arias
75f65c4d44
using abs() on unsigned have no effect
2016-03-30 20:17:09 -04:00
Alam Ed Arias
51aa7692d8
Merge branch 'master' into next
2016-03-30 20:15:08 -04:00
Alam Ed Arias
b169529dfd
switich to do the angle math in signed, then run it thur abs()
2016-03-30 11:47:27 -04:00
Alam Ed Arias
0fe6ee5339
cleanup abs warnings
2016-03-30 00:22:12 -04:00
Inuyasha
ac03ce39c8
*_Random is now *_RandomByte.
...
P_RandomChance is now a macro for something that should happen a
certain percentage of time.
P_SignedRandom was moved to a macro. Nobody cared.
# Conflicts:
# src/p_inter.c
2016-03-29 16:27:55 -07:00
Alam Ed Arias
42aa41c552
Merge branch 'next' into polyobj-teeter-fix
2016-03-25 18:44:30 -04:00
Monster Iestyn
f9c4b877ca
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into damage-control
2016-03-13 20:37:43 +00:00
Monster Iestyn
13f4ef2f34
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into slope-fixes
2016-03-12 23:06:37 +00:00
Monster Iestyn
5b89164cf7
Fix camera going nuts around intangible polyobjects
2016-03-10 20:50:54 +00:00
Inuyasha
317161221d
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-03-09 01:23:48 -08:00
Inuyasha
6aa708b5af
I don't think we need the BLUE_SPHERES define anymore...
2016-03-09 00:49:35 -08:00
Alam Ed Arias
407bf4f39d
Merge branch 'next' into polyobj-teeter-fix
2016-03-07 16:46:32 -05:00
Alam Ed Arias
55a6355e15
Merge branch 'next' into slope-fixes
2016-03-07 16:45:51 -05:00
Inuyasha
e0f5312d13
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into unslot-music
...
# Conflicts:
# src/dehacked.c
# src/f_finale.c
# src/lua_baselib.c
# src/lua_maplib.c
# src/m_menu.c
# src/p_enemy.c
# src/p_inter.c
# src/p_setup.c
# src/p_user.c
# src/s_sound.c
# src/y_inter.c
2016-03-03 22:09:24 -08:00
Inuyasha
c956b498c8
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
...
# Conflicts:
# src/p_user.c
2016-03-03 21:48:32 -08:00
Inuyasha
a8bca89dbd
Merge branch 'backport_unslot-music' into 'next'
...
BACKPORT: removal of music slots
Relevant commits cherry-picked. Basically everything except the internal music track name switches.
See merge request !43
2016-03-03 22:31:21 -05:00
Inuyasha
fc35c8557e
Super color code cleaning, speed 50%, nothing special
2016-02-29 01:18:33 -08:00
Inuyasha
fdb4ac5c2e
Super color code cleaning, speed 50%, nothing special
2016-02-28 18:19:46 -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
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
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
Monster Iestyn
3058648fdc
Fix elemental flame trails not spawning when going up slopes
2016-02-16 17:58:08 +00: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
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
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
2016-02-09 02:48:33 -08: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
Inuyasha
42fb7ed5aa
clearly I don't care about Super forms much :v
2016-02-04 02:37:40 -08:00
