fickleheart
|
b22de48c03
|
Merge branch 'next' into next-newcontrols
# Conflicts:
# src/g_game.c
# src/p_setup.c
|
2019-12-31 12:58:36 -06: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 |
|
fickleheart
|
0eb65d0fa7
|
Fix tailsbot behavior that broke with Simple mode
|
2019-12-30 23:58:58 -06:00 |
|
James R
|
7af2533d23
|
Make the menu option for renderer switching transparent under NOHW
|
2019-12-30 21:45:19 -08:00 |
|
James R
|
38492073fa
|
IT_PAIR for when you want to define both sides of a menu item
|
2019-12-30 21:40:13 -08:00 |
|
Tatsuru
|
b68a629a71
|
Small
|
2019-12-31 01:48:50 -03:00 |
|
James R
|
e8db39229c
|
Don't let the user switch to OpenGL if NOHW
|
2019-12-30 20:29:41 -08: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 |
|
Nami
|
60928db0e0
|
I removed a hook I left behind and forgot to save the change before committing :upside_down:
|
2019-12-30 19:22:12 -08:00 |
|
James R
|
4bf3597116
|
Fix NOOPENMPT compiling
|
2019-12-30 19:19:17 -08:00 |
|
Nami
|
41c902b819
|
Move PreThinkFrame hook back a bit, now runs before PlayerThink
|
2019-12-30 19:11:49 -08:00 |
|
Nami
|
a36920808b
|
Revert changes to searchBlockmap because on reflection, the benefits didn't outweigh breaking every current usage of it
Readd ThinkFrame in its original position
PostThinkFrame now runs at the end of P_Ticker, only MapEnd runs after it
|
2019-12-30 19:04:27 -08:00 |
|
James R
|
ff47f911dc
|
Fix command not running if it was split by COM_BufAddText
(Looks at 4865a190578b900b48571e74e0bd97bef88ea71b...)
|
2019-12-30 18:47:21 -08:00 |
|
James R
|
ab410652ae
|
Fix unclosed quotes leaving the escape character in
|
2019-12-30 18:44:13 -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 |
|
James R
|
e3fcd860de
|
Merge remote-tracking branch 'origin/next' into local-lua-commands
|
2019-12-30 15:08:34 -08:00 |
|
Zachary McAlpin
|
ed5bf1ad9d
|
Merge branch 'next' into playerthink-hook
|
2019-12-30 16:35:50 -06:00 |
|
fickleheart
|
85e2e92ee0
|
Fix spying on simple mode players having dumb camera angles
|
2019-12-30 15:44:52 -06:00 |
|
Jaime Passos
|
181a366d4a
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 18:39:31 -03:00 |
|
fickleheart
|
2c45ecbaa5
|
Fix camera reset button
|
2019-12-30 15:34:43 -06:00 |
|
James R
|
fc8c0f8a9a
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08:00 |
|
fickleheart
|
a51f2500e0
|
Update playstyle menu handling to use analog/directionchar combo
|
2019-12-30 15:15:37 -06:00 |
|
fickleheart
|
c3d14064e2
|
Convert simple movement to directionchar+analog
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
|
2019-12-30 15:05:24 -06: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 |
|
James R
|
d670139404
|
Revert revert revert
This reverts commit 6546e3c3bc.
This reverts commit 8a15e9abc4.
|
2019-12-30 12:31:53 -08:00 |
|
MascaraSnake
|
013f1f70d9
|
-Set defaults for vertex and mapthing fields in textmap
-Fix P_InitializeSector being called too early (band-aid fix for now, will reorganize this properly later)
|
2019-12-30 21:23:00 +01:00 |
|
fickleheart
|
e0f35d207f
|
Convert analog/directionchar cvars into 2-long arrays
|
2019-12-30 14:01:14 -06:00 |
|
fickleheart
|
631b5ff883
|
Disable lock-on in Ringslinger
|
2019-12-30 12:13:41 -06:00 |
|