stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 10:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
4119 commits 172 branches 41 tags 280 MiB
Commit graph

4119 commits

This branch
This branch
All branches
Author SHA1 Message Date
LJSonik
bd6373bc86
Merge branch 'master' into minor-net-command-fixes 2018-07-05 20:00:38 +02:00
LJSonik
8e3c3a6f65
Merge branch 'master' into password-security-fix 2018-07-05 19:46:36 +02:00
Steel Titanium
c8d0eb04f4 Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation 2018-07-05 01:23:56 -04:00
Steel Titanium
44144e379e Merge remote-tracking branch 'upstream/master' into defaultsoundvol 2018-07-05 01:22:39 -04:00
Steel Titanium
c61035571b Merge remote-tracking branch 'upstream/master' into md2-fopen-error 2018-07-05 01:21:09 -04:00
Steel Titanium
46aa4c3503 Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix 2018-07-05 01:20:32 -04:00
Steel Titanium
8aee862ff8 Merge remote-tracking branch 'upstream/master' into gme-pause 2018-07-05 01:16:43 -04:00
Monster Iestyn
82d953bbc2 Fixed the Lua crash exploit. 2018-07-04 20:15:36 +01:00
Monster Iestyn
dfb5f06d7e 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
bcffe61277 remove MF_RUNSPAWNFUNC from MT_CACOLANTERN 2018-07-02 20:35:39 +01:00
Monster Iestyn
c045e8cf8d 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
daa87947a4 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
76c8d30ed2 Fix special stage map end var defaults to use the correct map numbers 2018-06-30 18:14:04 +01:00
Monster Iestyn
80d6253eec 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
25cd61c094 Merge branch 'master' into next 2018-06-27 15:06:12 +01:00
Monster Iestyn
03e2a2b445 Merge branch 'mp-menu-playername-fix' into 'master' 
Multiplayer menu playername fix

See merge request STJr/SRB2!256
 2018-06-27 10:01:39 -04:00
Monster Iestyn
d8a86a8d74 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
415c095274 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
aed30519d4 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
Monster Iestyn
b74c01b38f Merge branch 'precipmobj-fix' into 'master' 
Add sprite2 to precipmobj_t

See merge request STJr/SRB2Internal!150
 2018-06-20 08:25:40 -04:00
MascaraSnake
a601cacfff Added sprite2 to precipmobj_t 2018-06-20 14:04:49 +02:00
toaster
1ffa45f875 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
2ab1d91ec9 * 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
fe6b47dc00 Merge branch 'master' into leveltitle-tinkering 
# Conflicts:
#	src/hu_stuff.h
#	src/st_stuff.c
 2018-06-14 21:26:44 +01:00
toaster
37e1fae07d Fixing dehacked.c consistency. 2018-06-13 18:10:32 +01:00
toaster
7f86e147f3 Fix the starposts not being cleared properly. 2018-06-12 02:26:42 +01:00
toaster
a56811cb0d Fix all the Floral Fieldsing pv2 discovered. 2018-06-12 01:08:03 +01:00
toaster
1bd963db7a 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
75d2073307 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
e39bbab532 Merge branch 'public_flatsprite' 
# Conflicts:
#	src/hardware/hw_main.c
#	src/r_things.c
 2018-06-11 19:53:16 +01:00
Monster Iestyn
5f09f60856 Merge branch 'public_flatsprite' into 'public_flatsprite' 
OpenGL: Paper Sprites: The Thousands of Bugs

See merge request STJr/SRB2!253
 2018-06-11 14:46:51 -04:00
Sryder
672ca12550 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
54e92a96b3 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
934c178941 Remove unpopular exitlevel limitation. 2018-06-10 20:02:34 +01:00
Sryder
ea915e5778 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
c5ab2ffa11 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
94b2ad2836 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
82b69b7de5 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
eb948cf78a Restore music upon successful completion of old-style special stage 2018-06-09 21:12:56 +01:00
toaster
1242180667 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
14d49b8bf1 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
Monster Iestyn
d3a60d9921 Merge branch 'public_flatsprite' into 'public_flatsprite' 
OpenGL: Public flatsprite: The Fixening

See merge request STJr/SRB2!252
 2018-06-09 14:25:52 -04:00
toaster
3bc8987586 Disable bumper score icon in NiGHTS to match enemies. 2018-06-09 19:22:28 +01:00
Sryder
0f4e8c1eda 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
9a309b29c6 * 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
16c8d17a4c * (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
adc0e3d6c3 Kart Krew discovered a crash, and I was already fiddling around with this, so... 2018-06-08 22:30:38 +01:00
toaster
30843fecb6 My little experiments with super transformation animation! (Requires new player.dta.) 2018-06-08 21:11:59 +01:00
toaster
a7c6977b6e * 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
35a5f7447e * 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