thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-03 22:52:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9879 commits 2 branches 14 tags 206 MiB
Commit graph

9879 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
James R
4a4fd1051b Revert revert revert 
This reverts commit 41a8bed879.
This reverts commit e37e9b0f99.
 2019-12-30 12:31:53 -08:00
MascaraSnake
1654119ae9 -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
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
fickleheart
0f62ada954 Disable lock-on in Ringslinger 2019-12-30 12:13:41 -06:00
fickleheart
f8599ffcb9 Save separate camera settings for standard/simple modes 2019-12-30 12:10:38 -06:00
fickleheart
774412bbfd Somehow miss committing the ACTUAL stickyhold part 2019-12-30 11:36:59 -06:00
fickleheart
aadc91e4e8 Change defaults to match my personal settings 2019-12-30 11:36:40 -06:00
fickleheart
b4924fdfed Fix camera reset snap in simple controls 2019-12-30 11:22:54 -06:00
fickleheart
0577c151ce Fix tailsbot flying weird with P1=standard P2=simple controls 2019-12-30 11:07:29 -06:00
fickleheart
205b1cc4cd Fix compilation errors 2019-12-30 11:01:56 -06:00
fickleheart
be9384ddd9 Merge branch 'master' into newcontrols 
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/g_game.h
#	src/m_menu.c
 2019-12-30 10:47:09 -06:00
MascaraSnake
dff1e92ba8 Add support for flat offset and rotation fields in UDMF 2019-12-30 17:28:10 +01:00
MascaraSnake
b22460bd32 Some minor refactoring of textmap loading code 2019-12-30 16:28:22 +01:00
Jaime Passos
12068930b2 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03: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
Nev3r
e0b4921855 Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser 2019-12-30 14:48:10 +01:00
Nev3r
839718499d Make P_LoadMapData() a return a boolean as well as P_LoadMapFromFile(); if they fail to load, they return false, and thus P_SetupLevel() will also return false. 
TextmapCount() also now returns false if brackets are left open inside a textmap.
 2019-12-30 14:47:48 +01:00
Nev3r
73698c70aa Replace INT16_MAX with LUMPERROR in lump check. 2019-12-30 14:45:39 +01:00
Nev3r
0edb23eaf7 Add a disclaimer when loading textmaps/UDMF. 2019-12-30 14:42:41 +01:00
MascaraSnake
8756b81fa0 Refactor TextmapParse 2019-12-30 14:33:41 +01:00
Nev3r
dd56500ed0 Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens. 2019-12-30 13:46:37 +01:00
MascaraSnake
9c07bde69c Refactor TextmapCount 2019-12-30 13:27:05 +01:00
Monster Iestyn
014d2f6358 Fix P_SetTarget crash by setting th->target to NULL first 2019-12-30 11:49:01 +00:00
Nev3r
6fe6cfad1a Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile. 2019-12-30 12:33:24 +01:00
Nev3r
fadebabc78 Refactor TextmapFixFlatOffsets(). 2019-12-30 12:31:55 +01:00
Nev3r
ac81463031 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2019-12-30 12:23:31 +01:00
Nev3r
71d13d1a67 Adapt P_MakeMapMD5() for textmaps. 2019-12-30 12:07:54 +01:00
Nev3r
dd66aa9a14 Fixed missing M_GetToken(NULL); 2019-12-30 12:07:02 +01:00
lachwright
69663fe872 Add unused sounds and remove unused sound slots 2019-12-30 19:00:45 +08:00
Nev3r
6e8a023fdd Add basic textmap support; currently crashes when trying to free the virtres, at vres_free(). 2019-12-30 11:33:22 +01: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
James R
b13b3f197f Improve COM_AddCommand boolean deprecated warning 2019-12-29 21:09:07 -08:00
Jaime Passos
e266073014 Some cleanup in general. 2019-12-30 02:07:39 -03:00
James R
c7821da6b6 COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd 2019-12-29 21:07:28 -08:00
James R
41a8bed879 No. 2019-12-29 21:02:42 -08:00
James R
2ab129b7bc Fuck magic numbers; COM_ flags for Lua commands! 2019-12-29 21:00:38 -08:00
James R
e37e9b0f99 Bro player 2 can't use the console 2019-12-29 21:00:38 -08:00
Jaime Passos
48950bbc16 Use strspn here. 2019-12-30 01:39:34 -03:00
Nami
e4d1b9491c Let's try this again! 2019-12-29 20:36:24 -08:00
Tatsuru
d01fb277dc Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00
Jaime Passos
30696bf981 MUSICDEF parser changes. 2019-12-30 00:22:27 -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
GoldenTails
0fc81794ea Slap in some Ctrl+Insert (copy) support too while I'm at it. 
Also added a comment but you didn't see that.
 2019-12-29 20:22:58 -06:00
GoldenTails
92b4044f01 Reverted to better, less complex system, and added support for Shift+Insert and Shift+Delete. 
Major thanks to James for helping me.
Turns out that strncpy thwarts the memory leaks for me. Silly, me!
 2019-12-29 20:15:18 -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