stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-29 23:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
7668 commits 173 branches 41 tags 186 MiB
Commit graph

7668 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
9e8733be42 Make player flash colorized when dashmode if not SF_MACHINE, per Sonic Advance 2. 2019-10-27 13:07:06 +00:00
toaster
fa187a66e2 * Disable dashmode if pw_carry is set or the player is exiting, in addition to getting the flag. 
* Add a dashmode downpower sound.
 2019-10-27 13:02:07 +00:00
toaster
0c52de7a29 Fix bot showing up in NiGHTS stages with a two-pronged approach. 
* Sometimes, D_MapChange is passed a mapnum of -1, to complete an existing mapchange. Don't handle botingame checks when that happens.
* Disable charsel on secret level platter when selected map is a NiGHTS stage, since gameplay will be identical across characters (consistent with NiGHTS Attack).

Also:

* Replace IT_DYBIGSPACE hack in M_SetupChoosePlayer, and replace with a more direct workaround system for not being able to select characters before warping.
 2019-10-27 12:20:17 +00:00
toaster
c221a89c67 Fix unsigned/signed comparisons. 2019-10-27 11:18:37 +00:00
Nev3r
a58c794691 Missing ; 2019-10-27 12:03:52 +01:00
MascaraSnake
336c5cc61d Fixed a typo in the ZB config 2019-10-26 22:56:01 +02:00
James R
b6e145f0c5 Render title map on connecting to server screen too 2019-10-26 12:50:49 -07:00
MascaraSnake
801e83aef6 Merge branch 'use-zones-pk3' into 'master' 
Use zones.pk3 instead of zones.dta.

See merge request STJr/SRB2Internal!352
 2019-10-26 15:33:13 -04:00
mazmazz
91eb380412 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00
MascaraSnake
9e9e6a8f8f Merge branch 'metalstuff' into 'master' 
Metal Sonic's jet fume

See merge request STJr/SRB2Internal!413
 2019-10-26 14:52:04 -04:00
MascaraSnake
b6905f2733 Merge branch 'midi-toggle-fix' into 'master' 
Fix MIDI not being disabled when non-native

See merge request STJr/SRB2Internal!414
 2019-10-26 14:46:25 -04:00
mazmazz
26cb75e961 Fix MIDI not being disabled when non-native 2019-10-26 12:09:27 -04:00
lachwright
e89948ce71 Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
MascaraSnake
be5da92a8d Merge branch 'knuxstuff' into 'master' 
Knuckles gameplay changes and/or improvements

See merge request STJr/SRB2Internal!354
 2019-10-26 02:41:40 -04:00
MascaraSnake
92be187731 Merge branch 'master' into knuxstuff 2019-10-26 08:09:13 +02:00
James R
634292a5fc Differing signedness comparison 2019-10-25 21:44:34 -07:00
James R
64e7708832 I say damn you massive initializer! 2019-10-25 21:36:10 -07:00
mazmazz
c7c72a4892 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
mazmazz
8a8e91914b Merge remote-tracking branch 'origin/new-title' into new-title 2019-10-25 22:28:31 -04:00
lachwright
6c9ad67c84 Fix pointer typo (whoops) 2019-10-26 08:34:38 +08:00
lachwright
aa34f74f75 Remove imtermediary state transitions 2019-10-26 08:32:36 +08:00
lachwright
ca768b044d Merge branch 'master' into metalstuff 2019-10-26 08:30:37 +08:00
lachwright
63d24d529a Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00
MascaraSnake
03c5b70fc5 Merge branch 'newmenus' into 'master' 
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252)

Closes #245, #244, and #252

See merge request STJr/SRB2Internal!389
 2019-10-25 17:46:16 -04:00
MascaraSnake
4d022046fa Merge branch 'object_tweaks' into 'master' 
Object tweaks (object_tweaks division 3)

See merge request STJr/SRB2Internal!394
 2019-10-25 17:45:48 -04:00
MascaraSnake
1c1fefe25f Merge branch 'linedef-153' into 'master' 
Dynamic Sinking Platform (for Red Volcano Zone)

See merge request STJr/SRB2Internal!401
 2019-10-25 16:56:19 -04:00
MascaraSnake
46d105dd53 Some basic code hygiene: Remove references to the air bob code being "old" or "outdated" 2019-10-25 22:55:10 +02:00
MascaraSnake
2118b0e613 Merge branch 'hammer-landing' into 'master' 
Twinspin landing option

See merge request STJr/SRB2Internal!402
 2019-10-25 16:39:02 -04:00
MascaraSnake
faf61912a6 Merge branch 'lua-allow-player' into 'master' 
Allow access to players userdata outside levels.

See merge request STJr/SRB2Internal!386
 2019-10-25 15:40:31 -04:00
MascaraSnake
7d69409cf7 Merge branch 'set-name-on-join' into 'master' 
Set the player's name as soon as they enter the game

See merge request STJr/SRB2Internal!397
 2019-10-25 15:38:21 -04:00
MascaraSnake
4a9eb387f7 Merge branch 'window-focus-music' into 'master' 
Window focus options for playing sounds/music

See merge request STJr/SRB2Internal!407
 2019-10-25 15:37:06 -04:00
MascaraSnake
2a8e5b7bff Merge branch 'james-kart' into 'master' 
My changes to Kart

See merge request STJr/SRB2Internal!406
 2019-10-25 15:36:40 -04:00
MascaraSnake
f1a7a3b4de Merge branch 'kartport_misc-changes' into 'master' 
Kart ports: misc changes

See merge request STJr/SRB2Internal!380
 2019-10-25 15:33:30 -04:00
MascaraSnake
ff061fb813 Merge branch 'kartport_namedvalues' into 'master' 
Kart-port - Named cvar values + Improved "HELP" command (round 3)

See merge request STJr/SRB2Internal!388
 2019-10-25 15:32:56 -04:00
toaster
f2596ab0bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks 
# Conflicts:
#	extras/conf/SRB2-22.cfg
 2019-10-25 20:32:15 +01:00
MascaraSnake
403d698724 Merge branch 'mi-tinkers-with-lua-again' into 'master' 
MI tinkers with lua again

See merge request STJr/SRB2Internal!392
 2019-10-25 15:27:55 -04:00
MascaraSnake
d7480f20fa Merge branch 'intangible-flats-tangible-sides' into 'master' 
Collide with walls of FOF if both planes are intangible

See merge request STJr/SRB2Internal!385
 2019-10-25 15:26:54 -04:00
MascaraSnake
080ff854b8 Merge branch 'be-more-nice-with-levelselect-mp' into 'master' 
Remove level select restrictions in DEVELOP Multiplayer

Closes #238

See merge request STJr/SRB2Internal!399
 2019-10-25 15:26:09 -04:00
MascaraSnake
829706a090 Merge branch 'walltransfermove' into 'master' 
Let players move after spinning off a wall transfer

See merge request STJr/SRB2Internal!412
 2019-10-25 15:20:20 -04:00
MascaraSnake
5a28c03a26 Merge branch 'superminecarts' into 'master' 
Super and Minecarts fixes (resolves #259)

Closes #259

See merge request STJr/SRB2Internal!408
 2019-10-25 15:19:47 -04:00
MascaraSnake
2ee42c498b Merge branch 'nonightsbot' into 'master' 
Disable tailsbot in NiGHTS maps (resolves #261)

Closes #261

See merge request STJr/SRB2Internal!409
 2019-10-25 15:19:05 -04:00
MascaraSnake
7a09a8bd3a Merge branch 'cezfangcheat' into 'master' 
CEZ3 Fang cheat fix (resolves #262)

Closes #262

See merge request STJr/SRB2Internal!410
 2019-10-25 15:18:16 -04:00
MascaraSnake
6c60a67a4f Merge branch 'waterlighting' into 'master' 
Water lighting reversion (resolves #188 for now)

Closes #188

See merge request STJr/SRB2Internal!411
 2019-10-25 15:17:35 -04:00
MascaraSnake
53ac815334 ...and also rename the palm tree leaves accordingly 2019-10-25 20:48:51 +02:00
MascaraSnake
863101824a Removed palm tree trunks from the ZB config. They no longer exist as mapthings. 2019-10-25 20:17:50 +02:00
lachwright
2d458059c8 Don't fuck nojumpspin characters who are capable of rolling 2019-10-25 18:51:41 +08:00
lachwright
d5b1467e79 Put player in jump state after spinning during a wall transfer 2019-10-25 18:48:40 +08:00
toaster
630bdaa876 Move INLEVEL macros for mobj_get and mobj_set to prevent mixed code/declaration errors. 2019-10-24 21:14:51 +01:00
toaster
d89d8acc59 I can't figure out how to make this consistent at all, so in order to have the water look good in levels designed for it, I think it's necessary to effectively revert everything with SHITPLANESPARENCY to a roughly 2.1-equivalent behaviour. 2019-10-24 20:40:03 +01:00
toaster
4ff46d14dd Added an experiment with an alternate CEZ3 pinch behaviour (but keep it disabled because it was kind of boring). 2019-10-24 19:55:02 +01:00