Commit graph

3536 commits

Author SHA1 Message Date
Steel Titanium
6d1a8703c7 Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation 2018-07-05 01:23:56 -04:00
Steel Titanium
deb0d72094 Merge remote-tracking branch 'upstream/master' into defaultsoundvol 2018-07-05 01:22:39 -04:00
Steel Titanium
d47e7014bc Merge remote-tracking branch 'upstream/master' into md2-fopen-error 2018-07-05 01:21:09 -04:00
Steel Titanium
b7776da524 Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix 2018-07-05 01:20:32 -04:00
Steel Titanium
e104e01057 Merge remote-tracking branch 'upstream/master' into gme-pause 2018-07-05 01:16:43 -04:00
Monster Iestyn
56ccf5ab7c Fixed the Lua crash exploit. 2018-07-04 20:15:36 +01:00
Monster Iestyn
1c30318bd3 fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype) 2018-07-02 21:03:04 +01:00
Monster Iestyn
4fc9ec6cba remove MF_RUNSPAWNFUNC from MT_CACOLANTERN 2018-07-02 20:35:39 +01:00
Monster Iestyn
e662d6cbf1 Since there is only one type of the old spikeball that doesn't rotate, there is no point using A_RotateSpikeBall in its states anymore.
Likewise, A_RotateSpikeBall no longer has to care about the object type of the actor, for the same reason.
2018-07-01 22:01:00 +01:00
Monster Iestyn
a23d5cf101 huh, no wonder the two FHZ ice types looked the same in objectplace; they were using the same spawnstate it seems 2018-07-01 19:47:26 +01:00
Monster Iestyn
a1f742a0d4 Fix special stage map end var defaults to use the correct map numbers 2018-06-30 18:14:04 +01:00
Monster Iestyn
90b56b7386 Don't re-enable MD5 checks yet, we're not even near RC phase yet 2018-06-30 18:09:39 +01:00
Monster Iestyn
28702eeed1 Merge branch 'master' into next 2018-06-27 15:06:12 +01:00
Monster Iestyn
e3616de7de Fix OpenGL completely missing the ability to alter FOF wall pegging by lower unpegged flag. Stupid OpenGL.
Sorry in advance Lat'!
2018-06-26 21:41:05 +01:00
Monster Iestyn
4eb2ccfae9 fix the multiplayer menu not allowing the full max length for player names unlike the "name" console command 2018-06-26 17:46:04 +01:00
Monster Iestyn
609cc16b1e Fix HWR_ProjectSprite to check properly whether the displayed player's mobj or its subsector exists, to avoid a crash when checking for fake planes. (also use viewplayer since its available to use, silly hardware code)
Also tweaked a weird splitscreen check in HWR_DrawSpriteShadow; still investigating whether stplyr is ever not player 2 when it's player 2's view, but this looks better for now
2018-06-23 18:47:32 +01:00
MascaraSnake
4993add019 Added sprite2 to precipmobj_t 2018-06-20 14:04:49 +02:00
toaster
4c3be6a577 Rework software coronas a bit, apply them to the flame and flame holder too, and spawn them only if MTF_EXTRA is given. 2018-06-19 23:16:49 +01:00
toaster
af3c0bc8e4 * Fix nextstate, radius, and painchance of fire torch decoration.
* Fix waving flag object type's... flags. *womp womp*
2018-06-19 21:58:49 +01:00
Monster Iestyn
71d2280020 Added linedef 447 as the change colormap linedef exec special.
IMPORTANT NOTE: UNTESTED
2018-06-14 21:51:21 +01:00
Monster Iestyn
18aa5bda18 Merge branch 'master' into leveltitle-tinkering
# Conflicts:
#	src/hu_stuff.h
#	src/st_stuff.c
2018-06-14 21:26:44 +01:00
toaster
d655359544 Fixing dehacked.c consistency. 2018-06-13 18:10:32 +01:00
toaster
05afb28b57 Fix the starposts not being cleared properly. 2018-06-12 02:26:42 +01:00
toaster
653d6112e8 Fix all the Floral Fieldsing pv2 discovered. 2018-06-12 01:08:03 +01:00
toaster
fa82bb11db Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-12 00:57:21 +01:00
Monster Iestyn
d98a95b4b0 Do the usual hack for loading a lump from a map WAD in a pk3, but this time for P_LoadThingsOnly 2018-06-11 20:23:00 +01:00
Monster Iestyn
837ad5bcb1 Merge branch 'public_flatsprite'
# Conflicts:
#	src/hardware/hw_main.c
#	src/r_things.c
2018-06-11 19:53:16 +01:00
Sryder
34aa7df43a Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2018-06-11 19:40:35 +01:00
Monster Iestyn
358a47967b backport fix to L/R sprite loading code from internal
basically we don't want L/R sprites to always be flipped, for obvious reasons
2018-06-11 19:36:47 +01:00
toaster
db1992a429 Remove unpopular exitlevel limitation. 2018-06-10 20:02:34 +01:00
Sryder
ca4da92470 Fix papersprites more for real this time
(Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey)
2018-06-09 22:58:03 +01:00
toaster
7355c1482b At FF and Sphere's suggestion, make the ring hoops work natively in normal stages and require more replacing for special stage conversion purposes. 2018-06-09 21:42:37 +01:00
toaster
35188076ba Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 21:18:17 +01:00
Monster Iestyn
b2caed8528 Merge branch 'public_flatsprite'
# Conflicts:
#	src/dehacked.c
#	src/hardware/hw_main.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_pspr.h
#	src/p_user.c
#	src/r_defs.h
#	src/r_things.c
#	src/r_things.h
2018-06-09 21:14:41 +01:00
toaster
fe750464ae Restore music upon successful completion of old-style special stage 2018-06-09 21:12:56 +01:00
toaster
c85e97a05d Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 19:36:48 +01:00
Monster Iestyn
105eee7e0a Merge branch 'public_next'
# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c
2018-06-09 19:35:36 +01:00
toaster
6203a867f6 Disable bumper score icon in NiGHTS to match enemies. 2018-06-09 19:22:28 +01:00
Sryder
41cb51159d Merge branch 'next' into public_flatsprite
I also fix papersprites in regards to flipping on one sprite fits all rotation stuff

# Conflicts:
#	src/hardware/hw_main.c
2018-06-09 18:47:42 +01:00
toaster
5260d3f4e1 * Made P_LevelInitStuff's stuff clearer.
* Changed a caption I'd meant to modify earlier in the branch's lifespan.
2018-06-09 18:20:59 +01:00
toaster
66c8ab422b * (probably) fix crash with followmobj not being properly invalidated on mapload
* clean up P_LevelInitStuff
* [unrelated] make the bot use directionchar if you are (i only realised it wasn't as a consequence of testing this)
2018-06-09 18:06:14 +01:00
toaster
16195d12db Kart Krew discovered a crash, and I was already fiddling around with this, so... 2018-06-08 22:30:38 +01:00
toaster
0ebff3820b My little experiments with super transformation animation! (Requires new player.dta.) 2018-06-08 21:11:59 +01:00
toaster
406ec1c6a5 * Make bomb spheres respawn with new laps
* Make the mapthing detection for stuff to be spawned by P_SpawnHoopsAndRings more consistent.
* Make NiGHTS stuff prevent perfect bonus.
2018-06-08 17:16:20 +01:00
toaster
49161952b3 * Remove flashing from spheres in bonus time through #ifdef.
* Fix inconsistency in counting nummaprings.
* Prevent perfect bonus in non-special stage NiGHTS maps.
2018-06-07 15:10:43 +01:00
toaster
9a00e2efe1 Fix hanging bug if A_ConnectToGround's supplied object's height is zero. 2018-06-06 22:36:55 +01:00
toaster
5ee1edae9f So MI tells me there's a good reason why that was not done. :V 2018-06-06 21:48:27 +01:00
toaster
830cc096b5 Fixed the fireball Sal sleepily helped me with. 2018-06-06 18:48:37 +01:00
toaster
dfdd8f48c2 CORRECTION OF MINOR ANNOYANCES
* On request of Nev3r and Sphere (combined with my own annoyances), make SOC-loading in .pk3 files use the /SOC folder rather than the /SOCS folder.
* Make the Crushstacean's claw launch sounds stop when killed.
2018-06-06 17:11:12 +01:00
toaster
daba070399 FINAL CHANGE, I PROMISE, I THINK
* MainCfg property smpstage_start - controls the special stage multiplayer games go to.
2018-06-06 16:07:14 +01:00