Zachary McAlpin
|
dc51ba6b64
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2020-01-01 17:11:19 -06:00 |
|
James R
|
85fbf4f571
|
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
|
48c83be89e
|
Merge branch 'respawndelaygametyperule' into 'next'
Gametype ruleset changes
See merge request STJr/SRB2!585
|
2020-01-01 17:49:53 -05:00 |
|
Zachary McAlpin
|
7123abd493
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2020-01-01 13:31:07 -06:00 |
|
Alam Ed Arias
|
af57468e68
|
Merge branch 'master' into next
|
2020-01-01 14:29:30 -05:00 |
|
Jaime Passos
|
35ff383a4a
|
Rename `seenplayer to seenfriend`
|
2020-01-01 15:17:29 -03:00 |
|
Jaime Passos
|
2728536589
|
Merge branch 'revert-09798876' 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
|
b41cd59e51
|
Revert "Merge branch 'software-clownery' into 'master'"
This reverts merge request !578
|
2019-12-31 23:40:17 +00:00 |
|
James R
|
2a9a3b9760
|
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
|
f77188ef0f
|
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
|
0cb76f63b7
|
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
|
bd0deea11c
|
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
|
c460775cd7
|
Merge branch 'fixcoronalist' into 'master'
Fix broken corona list
See merge request STJr/SRB2!605
|
2019-12-31 14:25:49 -05:00 |
|
Nev3r
|
0979887600
|
Merge branch 'software-clownery' into 'master'
Software clownery
See merge request STJr/SRB2!578
|
2019-12-31 12:49:44 -05:00 |
|
Jaime Passos
|
1c048275da
|
**NEW!** hook_SeenPlayer
|
2019-12-31 14:37:45 -03:00 |
|
Jaime Passos
|
cd1cc9a222
|
Fix desynch
|
2019-12-31 14:00:25 -03:00 |
|
Tatsuru
|
79f18a3c19
|
Got rid of the uhh
|
2019-12-31 11:19:54 -03:00 |
|
lachwright
|
e5e96cb271
|
Make elemental crop circle flames obey player gravity
|
2019-12-31 18:06:40 +08:00 |
|
lachwright
|
10b71d40b8
|
Make Metal Sonic's jet fume opaque when re-emerging from water
|
2019-12-31 17:26:35 +08:00 |
|
lachwright
|
342d80198c
|
Add missed semicolon, oops
|
2019-12-31 16:55:36 +08:00 |
|
lachwright
|
1a78b3548c
|
Remove flight indicator on death as well
|
2019-12-31 16:54:52 +08:00 |
|
lachwright
|
d3c56cd807
|
Remove flight indicator when AI Tails is taken over by second player
|
2019-12-31 16:48:29 +08:00 |
|
James R
|
939814d479
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 22:37:24 -08:00 |
|
James R
|
3112dff345
|
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
|
34687e85d7
|
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
|
b5df2d5c3f
|
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
|
4b91e49bf4
|
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
|
077c453e33
|
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
|
8e61b1003a
|
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
|
b4ebb01e2d
|
Truncate gametype name in server list if it's too long
|
2019-12-30 22:23:19 -08:00 |
|
James R
|
281f30c4fd
|
Replace gametype with gametypename in SERVERINFO
PACKETVERSION 1
|
2019-12-30 22:18:55 -08:00 |
|
Tatsuru
|
b68a629a71
|
Small
|
2019-12-31 01:48:50 -03:00 |
|
Tatsuru
|
2d0cdbe34f
|
Appease the C90 entity
|
2019-12-31 01:20:11 -03:00 |
|
James R
|
36c5bb7b0d
|
Fix NOHW compiling
|
2019-12-30 20:18:08 -08:00 |
|
James R
|
782bf8d31e
|
Fix NOMIXER compiling
|
2019-12-30 20:08:29 -08:00 |
|
Tatsuru
|
47b096a357
|
Disable Minecart Spawners for players already riding a minecart
|
2019-12-31 00:38:09 -03:00 |
|
James R
|
4bf3597116
|
Fix NOOPENMPT compiling
|
2019-12-30 19:19:17 -08:00 |
|
Jaime Passos
|
7b54846a02
|
Merge remote-tracking branch 'origin/master' into software-clownery
|
2019-12-30 23:21:42 -03:00 |
|
James R
|
5e94ca07bc
|
Use gametypecount in G_GetGametypeByName
|
2019-12-30 17:57:38 -08:00 |
|
Zachary McAlpin
|
ed5bf1ad9d
|
Merge branch 'next' into playerthink-hook
|
2019-12-30 16:35:50 -06:00 |
|
Jaime Passos
|
181a366d4a
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 18:39:31 -03:00 |
|
James R
|
fc8c0f8a9a
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08:00 |
|
James R
|
80bb6fe7a0
|
Merge branch 'modid' into 'next'
Put a mod name in SERVERINFO
See merge request STJr/SRB2!577
|
2019-12-30 15:41:08 -05:00 |
|
James R
|
5e5f3c4fa7
|
Merge branch 'renderswitch' into 'master'
Renderer switching
See merge request STJr/SRB2!550
|
2019-12-30 15:36:17 -05:00 |
|
Jaime Passos
|
7676f11112
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 12:09:45 -03:00 |
|
Jaime Passos
|
a04834d1aa
|
Fix alignment in R_ThickStepping
|
2019-12-30 12:02:09 -03:00 |
|
Jaime Passos
|
590d6729e6
|
Merge remote-tracking branch 'origin/master' into software-clownery
|
2019-12-30 11:49:12 -03:00 |
|
Monster Iestyn
|
7c9b1ee2cb
|
Fix P_SetTarget crash by setting th->target to NULL first
|
2019-12-30 11:49:01 +00:00 |
|
James R
|
c46bfa2be9
|
Merge branch 'saloondoor-fix' into 'next'
Fix saloon doors not letting players through when marked with the Ambush flag
See merge request STJr/SRB2!600
|
2019-12-30 00:25:37 -05:00 |
|
Tatsuru
|
3d724f302d
|
Fix saloon doors not letting players through when marked with the Ambush flag
|
2019-12-30 01:16:50 -03:00 |
|