lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,843 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

8843 Commits

Author SHA1 Message Date
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
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
fickleheart 0eb65d0fa7 Fix tailsbot behavior that broke with Simple mode 2019-12-30 23:58:58 -06: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
James R 4bf3597116 Fix NOOPENMPT compiling 2019-12-30 19:19:17 -08:00
James R 5e94ca07bc Use gametypecount in G_GetGametypeByName 2019-12-30 17:57:38 -08:00
fickleheart 85e2e92ee0 Fix spying on simple mode players having dumb camera angles 2019-12-30 15:44:52 -06: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
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
fickleheart 085c39128f Save separate camera settings for standard/simple modes 2019-12-30 12:10:38 -06:00
fickleheart b46cbe76d6 Somehow miss committing the ACTUAL stickyhold part 2019-12-30 11:36:59 -06:00
fickleheart d980d526c8 Change defaults to match my personal settings 2019-12-30 11:36:40 -06:00
fickleheart 7fa9eed573 Fix camera reset snap in simple controls 2019-12-30 11:22:54 -06:00
fickleheart ebbe5938a8 Fix tailsbot flying weird with P1=standard P2=simple controls 2019-12-30 11:07:29 -06:00
fickleheart f4e7227e11 Fix compilation errors 2019-12-30 11:01:56 -06:00
fickleheart a9b80bf1f0 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
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
James R 7886a4bbee Don't warn if we start in OpenGL 2019-12-29 18:37:44 -08:00
James R 569453ee93 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
James R 98313a8216 Merge branch 'bruh' into 'next' 
Fix fuckup

See merge request STJr/SRB2!598
 2019-12-29 19:56:20 -05:00
James R 97c5e63dc3 Initialize 'supported' array 2019-12-29 16:52:39 -08:00
James R a4db30b0cc Merge branch 'newnodeformats' into 'next' 
New node formats

See merge request STJr/SRB2!595
 2019-12-29 19:11:07 -05:00
MascaraSnake 136c656cc0 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 81422c4e6d Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly" 
This reverts commit cfc6428569.
 2019-12-29 21:57:47 +01:00
MascaraSnake cfc6428569 Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly 2019-12-29 21:42:16 +01:00
MascaraSnake e88556efe1 P_GetNodetype: The virtnodes pointer is supposed to be the output parameter, so we have to pass a pointer to that pointer 2019-12-29 21:00:20 +01:00
MascaraSnake dd02fe0d78 P_GetNodetype: Set virtnodes for traditional Doom format 2019-12-29 20:43:41 +01:00
MascaraSnake 882e8ef7b8 Separate shared parts of seg initialization into P_InitializeSeg 2019-12-29 20:24:14 +01:00
MascaraSnake 36f86077da Move loading of extended subsectors and segs into its own function 2019-12-29 19:54:04 +01:00
MascaraSnake c287b86fab Get rid of duplicated code in the extended seg parsing 2019-12-29 19:04:50 +01:00
MascaraSnake 3839e95d63 Move reading of extra vertices into separate function 2019-12-29 18:07:44 +01:00
MascaraSnake 45ca959f97 -Move reading of actual extended nodes into separate function, cutting down on code duplication in the process 
-Fix a typo in the segs reading
 2019-12-29 17:52:49 +01:00
MascaraSnake e5cb7a7833 Merge branch 'next' into newnodeformats 2019-12-29 16:05:55 +01:00
MascaraSnake bf25128986 Merge branch 'mapload-refactor' into 'next' 
Refactor map loading functions

See merge request STJr/SRB2!594
 2019-12-29 10:04:27 -05:00
MascaraSnake 9d009edfc8 Move copying of the nodes signature out of the else case 2019-12-29 15:59:15 +01:00