Commit graph

8859 commits

Author SHA1 Message Date
James R
b5d9cf9d06 Merge branch 'thiccnames' into 'next'
Allow 6-letter character names to be drawn with the thick font

See merge request STJr/SRB2!618
2020-01-01 21:49:13 -05:00
James R
5b6c36b2a6 Merge branch 'sstailscarry-fix' into 'next'
Fix MP Special Stages crashing if a player is being carried when it ends

See merge request STJr/SRB2!615
2020-01-01 21:49:01 -05:00
James R
ffb76286dc Merge branch 'sound-slots' into 'next'
Add slots for unused sounds and remove unused sound slots

See merge request STJr/SRB2!603
2020-01-01 21:48:46 -05:00
James R
74b7a1c241 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:53:18 -08:00
James R
8720bbe044 Hahahahahahahahahahahahaha 2020-01-01 15:52:23 -08:00
James R
b342301373 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:39:05 -08:00
James R
2edea99c31 Merge branch 'custom-gametype-serverinfo' into 'next'
Gametype name in SERVERINFO

See merge request STJr/SRB2!610
2020-01-01 17:52:46 -05:00
James R
6ea83c74c3 Merge branch 'nohw-renderswitch' into 'master'
NOHW V.S. Renderer Switching

See merge request STJr/SRB2!609
2020-01-01 17:52:35 -05:00
James R
b83dfa9e5a Merge branch 'quote-shenanigans' into 'master'
Stuff I Broke: Commands

See merge request STJr/SRB2!607
2020-01-01 17:52:21 -05:00
James R
b8f465408b Merge branch 'warp-by-name' into 'master'
Properly fix the issue that !528 tried to; let the -warp parameter work with map name

See merge request STJr/SRB2!596
2020-01-01 17:51:21 -05:00
James R
75514def83 Merge branch 'respawndelaygametyperule' into 'next'
Gametype ruleset changes

See merge request STJr/SRB2!585
2020-01-01 17:49:53 -05:00
Alam Ed Arias
be11a1d249 Merge branch 'master' into next 2020-01-01 14:29:30 -05:00
Jaime Passos
0ab6fe1fd8 Rename `seenplayer to seenfriend` 2020-01-01 15:17:29 -03:00
lachwright
5df1de42b5 Allow 6-letter character names to be drawn with the thick font 2020-01-01 23:49:29 +08:00
Jaime Passos
b756b45d16 Merge branch 'revert-938f81ba' into 'master'
Revert "Merge branch 'software-clownery' into 'master'"

See merge request STJr/SRB2!616
2019-12-31 18:42:53 -05:00
Jaime Passos
285a2ec05d Revert "Merge branch 'software-clownery' into 'master'"
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Tatsuru
dda18dd080 Or is it better like this? 2019-12-31 20:20:30 -03:00
Tatsuru
df9809f3d7 The dumbass forgot NiGHTS mode is also a carry power 2019-12-31 20:13:16 -03:00
Tatsuru
402b58ce42 Fix MP Special Stages crashing if a player is being carried when it ends 2019-12-31 19:38:11 -03:00
James R
d7fb3698fe Merge branch 'fix-flight-indicator' into 'next'
Remove flight indicator when AI Tails is taken over by second player

See merge request STJr/SRB2!611
2019-12-31 17:17:21 -05:00
James R
54bcde1376 Merge branch 'metal-fume-opacity' into 'next'
Make Metal Sonic's jet fume opaque when re-emerging from water

See merge request STJr/SRB2!612
2019-12-31 17:16:14 -05:00
James R
fa54d3359f Merge branch 'firefuck3' into 'next'
Make elemental crop circle flames obey player gravity

See merge request STJr/SRB2!613
2019-12-31 17:15:45 -05:00
James R
d2651ef092 Merge branch 'minecartspawner-fix' into 'next'
Disable minecart spawners for players already riding a minecart

See merge request STJr/SRB2!608
2019-12-31 17:15:18 -05:00
Jaime Passos
86e8f35c44 Merge branch 'fixcoronalist' into 'master'
Fix broken corona list

See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
Nev3r
938f81ba88 Merge branch 'software-clownery' into 'master'
Software clownery

See merge request STJr/SRB2!578
2019-12-31 12:49:44 -05:00
Jaime Passos
a811021112 **NEW!** hook_SeenPlayer 2019-12-31 14:37:45 -03:00
Jaime Passos
77d6601e8b Fix desynch 2019-12-31 14:00:25 -03:00
Tatsuru
24e4552d5b Got rid of the uhh 2019-12-31 11:19:54 -03:00
lachwright
b575e7ab47 Make elemental crop circle flames obey player gravity 2019-12-31 18:06:40 +08:00
lachwright
8132905436 Make Metal Sonic's jet fume opaque when re-emerging from water 2019-12-31 17:26:35 +08:00
lachwright
2f8033c426 Add missed semicolon, oops 2019-12-31 16:55:36 +08:00
lachwright
9f5283f841 Remove flight indicator on death as well 2019-12-31 16:54:52 +08:00
lachwright
aaa1875040 Remove flight indicator when AI Tails is taken over by second player 2019-12-31 16:48:29 +08:00
James R
e0c2e607f0 Merge remote-tracking branch 'origin/master' into next 2019-12-30 22:37:24 -08:00
James R
39b7cb4fef Merge branch 'oops' into 'next'
Fix unknown gametype for map command crashing the game

See merge request STJr/SRB2!606
2019-12-31 01:34:39 -05:00
James R
be66b67f63 Merge branch 'emeraldhunt-fix' into 'next'
Fix emerald hunt not working properly

See merge request STJr/SRB2!593
2019-12-31 01:34:17 -05:00
James R
0f3b77de8c Merge branch 'polyobj-waypoint-thinker-optimise' into 'next'
Polyobj waypoint thinker optimise

See merge request STJr/SRB2!586
2019-12-31 01:33:01 -05:00
James R
e70ae46a76 Merge branch 'fix-lua-scorechains' into 'next'
Fix scoreadd not doing anything in certain cases when modified by Lua

See merge request STJr/SRB2!579
2019-12-31 01:32:22 -05:00
James R
0fdf838c86 Merge branch 'dashmode-ctf-monitors' into 'next'
Don't let Metal pop the enemy team's monitors (closes #94)

See merge request STJr/SRB2!584
2019-12-31 01:31:55 -05:00
James R
3bcfe5ae99 Merge branch 'dashspeed-fix' into 'next'
Cap dashspeed between mindash and maxdash before revving.

See merge request STJr/SRB2!565
2019-12-31 01:31:43 -05:00
James R
93d5a9a174 Truncate gametype name in server list if it's too long 2019-12-30 22:23:19 -08:00
James R
6d042c4d3f Replace gametype with gametypename in SERVERINFO
PACKETVERSION 1
2019-12-30 22:18:55 -08:00
James R
ec72c69614 Make the menu option for renderer switching transparent under NOHW 2019-12-30 21:45:19 -08:00
James R
7616bf5734 IT_PAIR for when you want to define both sides of a menu item 2019-12-30 21:40:13 -08:00
Tatsuru
50ffcba552 Small 2019-12-31 01:48:50 -03:00
James R
3b30fcc5fa Don't let the user switch to OpenGL if NOHW 2019-12-30 20:29:41 -08:00
Tatsuru
15d4829e19 Appease the C90 entity 2019-12-31 01:20:11 -03:00
James R
73643dafaf Fix NOHW compiling 2019-12-30 20:18:08 -08:00
James R
4f8775d560 Fix NOMIXER compiling 2019-12-30 20:08:29 -08:00
Tatsuru
5cf362dd87 Disable Minecart Spawners for players already riding a minecart 2019-12-31 00:38:09 -03:00