LJ Sonic
0beae26e9d
Merge branch 'keep-body' into 'next'
...
Let clients rejoin the server without losing their status
See merge request STJr/SRB2!722
2020-01-24 18:50:03 -05:00
SteelT
ad00bc7000
Merge branch 'key-out-of-range' into 'master'
...
Don't set controls to keys of array bounds
See merge request STJr/SRB2!723
2020-01-24 18:45:19 -05:00
LJ Sonic
09fc88f03a
Merge branch 'point-in-subsector-or-null' into 'next'
...
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
See merge request STJr/SRB2!719
2020-01-24 17:08:30 -05:00
SteelT
13c00969dc
Merge branch 'musicdef-versioning' into 'next'
...
MUSICDEF cleanup, fixes, and VERSION directive to opt into new format
See merge request STJr/SRB2!708
2020-01-24 17:06:58 -05:00
SteelT
260de0fca4
Merge branch 'player2-turn-fix-next' into 'next'
...
Fix "cam2_turnmultiplier" being unused in "next"
See merge request STJr/SRB2!713
2020-01-24 17:04:20 -05:00
SteelT
e47a0313d7
Merge branch 'player2-turn-fix' into 'master'
...
Fix "cam2_turnmultiplier"
See merge request STJr/SRB2!711
2020-01-24 17:04:06 -05:00
SteelT
03be093a38
Merge branch 'ploadflat-bruh-bruh' into 'master'
...
Fix P_AddLevelFlatRuntime again
See merge request STJr/SRB2!717
2020-01-24 17:00:09 -05:00
SteelT
a0d8b7ec24
Merge branch 'fix-mouse-controls-setup' into 'master'
...
Fix mouse in controls setup menu
See merge request STJr/SRB2!706
2020-01-24 16:58:06 -05:00
MascaraSnake
383eccd630
Merge branch 'master' into next
2020-01-24 22:37:25 +01:00
Steel Titanium
788c8deddb
Add newlines to GL debug print.
2020-01-24 15:44:57 -05:00
Jaime Passos
36fcd35108
Redundant define?
2020-01-24 17:05:40 -03:00
Jaime Passos
e8b942a3b8
GL_DBG_Printf instead of CONS_Alert
2020-01-24 17:04:38 -03:00
Jaime Passos
5a0119ee59
I_Error is too extreme I think, just CONS_Alert instead
2020-01-24 17:03:00 -03:00
Jaime Passos
3d97a0b73d
Fix custom shader loading
2020-01-24 16:57:21 -03:00
Jaime Passos
b8862e7475
Un-HWRENDER shader lump names
2020-01-24 16:42:55 -03:00
Louis-Antoine
ba0a02d2b3
Be silent when "kicking" a disconnected player
...
This lets the host manually remove a body if they want,
without polluting the chat with redundant messages.
2020-01-24 19:56:57 +01:00
James R
596ff92e69
Name the archive like the EXE
2020-01-23 21:06:48 -08:00
James R
f3ffc2f82b
Windows is dumb so no colon
...
srb2win-jameds-appveyor-exename-0a41f77a2.exe
2020-01-23 20:35:53 -08:00
James R
98297f3de2
Check if this actually is a PR before using those variables
2020-01-23 20:34:26 -08:00
James R
56abe74c18
I promise I know what I'm doing
2020-01-23 20:13:57 -08:00
James R
745f4b6492
Use the pull request repo, branch and commit
...
srb2win-jameds:appveyor-exename-0a41f77a2.exe
2020-01-23 19:58:26 -08:00
Jaime Passos
2f5254b468
I don't know why this happened
2020-01-24 00:35:51 -03:00
James R
0a41f77a22
Well I'm an idiot
2020-01-23 18:55:25 -08:00
Jaime Passos
17f4ba7219
st_translucency went missing in here for... reasons...
2020-01-23 23:52:11 -03:00
Jaime Passos
6b709386cf
fix corona compiling lol
2020-01-23 23:41:09 -03:00
Jaime Passos
f89191c6cf
Menu organisation
2020-01-23 23:15:27 -03:00
James R
a5d62ef3bb
Put the abbreviated commit hash in the EXENAME for AppVeyor
...
srb2win-master-003f3769d.exe
2020-01-23 18:10:31 -08:00
Jaime Passos
6f2635d4c1
bye
2020-01-23 23:09:53 -03:00
James R
12da266baa
Put branch name and commit hash in EXENAME for AppVeyor builds
...
srb2win-master-003f3769dfc531eae0071c07e45803c17fd53460.exe
2020-01-23 18:01:59 -08:00
Jaime Passos
2cdd40ffdb
I LOVE MENU CODE!
2020-01-23 22:38:54 -03:00
Jaime Passos
9b927e7600
Fix warnings around load_shaders
2020-01-23 22:30:36 -03:00
Jaime Passos
40d9b7f34b
Wait.
2020-01-23 22:24:35 -03:00
James R
70bcf59bd6
Fix implicit operand because GLSL is a goof or such
2020-01-23 17:22:02 -08:00
Jaime Passos
33152ee6fa
Restore some model lighting code that went gone in the shaders code
2020-01-23 22:02:18 -03:00
Jaime Passos
5d3d031db3
Fix the gl_leveltime problem, I guess.
...
This is probably superfluous.
2020-01-23 21:25:54 -03:00
Jaime Passos
a37a028e81
Delete USE_PALETTED_TEXTURE again
2020-01-23 20:21:13 -03:00
Jaime Passos
2d4945d558
Update copyright text
2020-01-23 20:12:15 -03:00
Jaime Passos
4a8340cd4a
Fix view aiming / shearing
2020-01-23 19:44:46 -03:00
Jaime Passos
5bda98764a
towards
2020-01-23 19:17:05 -03:00
James R
128f0757b6
Semantics
2020-01-23 13:57:39 -08:00
Louis-Antoine
a04004071b
Do not spam player quit net commands
2020-01-23 19:59:41 +01:00
Louis-Antoine
bb157866b7
Ignore disconnected players in tag gametypes
...
Disconnected players do not become IT at round start.
If all non-ITs are disconnected, the round ends.
If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
2020-01-23 19:58:13 +01:00
Louis-Antoine
f98be013ea
Do not protect non-IT players in tag gametypes
2020-01-23 18:52:16 +01:00
James R
a127045d98
Don't set controls to keys out of array bounds
...
Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.
2020-01-22 22:19:00 -08:00
Bartu İnce
15ecc1358a
no message
2020-01-22 22:08:08 +01:00
Bartu İnce
5d32334164
"page x of y"
2020-01-22 21:57:28 +01:00
Bartu İnce
15f1636be5
Extra emblems display, take 2.
2020-01-22 21:52:15 +01:00
Bartu İnce
2337393211
Added support for 10+ emblem hints
2020-01-22 18:53:17 +01:00
Louis-Antoine
f07b432df4
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
...
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
2020-01-22 16:58:57 +01:00
Louis-Antoine
93ac266be1
Fix missing declaration
2020-01-22 04:01:06 +01:00