Zachary McAlpin
|
7402797a2e
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2020-01-01 13:31:07 -06:00 |
|
Alam Ed Arias
|
be11a1d249
|
Merge branch 'master' into next
|
2020-01-01 14:29:30 -05: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 |
|
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 |
|
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 |
|
Tatsuru
|
50ffcba552
|
Small
|
2019-12-31 01:48:50 -03: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 |
|
James R
|
cdadd86780
|
Fix NOOPENMPT compiling
|
2019-12-30 19:19:17 -08:00 |
|
Jaime Passos
|
2bdd411736
|
Merge remote-tracking branch 'origin/master' into software-clownery
|
2019-12-30 23:21:42 -03:00 |
|
James R
|
2e8f83b79c
|
Use gametypecount in G_GetGametypeByName
|
2019-12-30 17:57:38 -08:00 |
|
Zachary McAlpin
|
850299fb32
|
Merge branch 'next' into playerthink-hook
|
2019-12-30 16:35:50 -06:00 |
|
James R
|
67ca512120
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08:00 |
|
James R
|
0408572380
|
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
|
14fb5dccc8
|
Merge branch 'renderswitch' into 'master'
Renderer switching
See merge request STJr/SRB2!550
|
2019-12-30 15:36:17 -05:00 |
|
Jaime Passos
|
8d1ad4dc2e
|
Fix alignment in R_ThickStepping
|
2019-12-30 12:02:09 -03:00 |
|
Jaime Passos
|
2c247d8210
|
Merge remote-tracking branch 'origin/master' into software-clownery
|
2019-12-30 11:49:12 -03:00 |
|
Monster Iestyn
|
014d2f6358
|
Fix P_SetTarget crash by setting th->target to NULL first
|
2019-12-30 11:49:01 +00:00 |
|
James R
|
529ccf9271
|
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
|
d01fb277dc
|
Fix saloon doors not letting players through when marked with the Ambush flag
|
2019-12-30 01:16:50 -03:00 |
|
James R
|
a330a7ee40
|
Don't warn if we start in OpenGL
|
2019-12-29 18:37:44 -08:00 |
|
James R
|
3883d44bb5
|
Warn when going to OpenGL from the menu
|
2019-12-29 18:37:22 -08:00 |
|
Zachary McAlpin
|
29ca001ea3
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2019-12-29 20:37:11 -06:00 |
|
James R
|
ca5a1b8a18
|
Merge branch 'bruh' into 'next'
Fix fuckup
See merge request STJr/SRB2!598
|
2019-12-29 19:56:20 -05:00 |
|
James R
|
2f6ec18562
|
Initialize 'supported' array
|
2019-12-29 16:52:39 -08:00 |
|
James R
|
a33131d227
|
Merge branch 'newnodeformats' into 'next'
New node formats
See merge request STJr/SRB2!595
|
2019-12-29 19:11:07 -05:00 |
|
Jaime Passos
|
ee94af04d5
|
Update r_segs.c
|
2019-12-29 19:43:38 -03:00 |
|
Zachary McAlpin
|
cbebe934b7
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2019-12-29 16:19:53 -06:00 |
|
MascaraSnake
|
108af9935e
|
Properly pass nodes data along to functions that need it without breaking the original data pointer
|
2019-12-29 22:11:15 +01:00 |
|
MascaraSnake
|
f74798f020
|
Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly"
This reverts commit 24acac6fe2.
|
2019-12-29 21:57:47 +01:00 |
|