fickleheart
|
77ba835f4f
|
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
|
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 |
|
fickleheart
|
0ffb1e11f9
|
Fix tailsbot behavior that broke with Simple mode
|
2019-12-30 23:58:58 -06: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 |
|
James R
|
cdadd86780
|
Fix NOOPENMPT compiling
|
2019-12-30 19:19:17 -08:00 |
|
James R
|
2e8f83b79c
|
Use gametypecount in G_GetGametypeByName
|
2019-12-30 17:57:38 -08:00 |
|
fickleheart
|
5f50f7e8ae
|
Fix spying on simple mode players having dumb camera angles
|
2019-12-30 15:44:52 -06:00 |
|
fickleheart
|
4a2492e8e1
|
Fix camera reset button
|
2019-12-30 15:34:43 -06:00 |
|
James R
|
67ca512120
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08:00 |
|
fickleheart
|
758bb8f3ae
|
Update playstyle menu handling to use analog/directionchar combo
|
2019-12-30 15:15:37 -06:00 |
|
fickleheart
|
e0d09a457e
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
MascaraSnake
|
24acac6fe2
|
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
|
3a123654b4
|
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
|
9ccd74e99a
|
P_GetNodetype: Set virtnodes for traditional Doom format
|
2019-12-29 20:43:41 +01:00 |
|
MascaraSnake
|
039219d478
|
Separate shared parts of seg initialization into P_InitializeSeg
|
2019-12-29 20:24:14 +01:00 |
|
MascaraSnake
|
a73dc9a4d0
|
Move loading of extended subsectors and segs into its own function
|
2019-12-29 19:54:04 +01:00 |
|
MascaraSnake
|
2925030f8f
|
Get rid of duplicated code in the extended seg parsing
|
2019-12-29 19:04:50 +01:00 |
|
MascaraSnake
|
3a02aa1c4e
|
Move reading of extra vertices into separate function
|
2019-12-29 18:07:44 +01:00 |
|
MascaraSnake
|
39f3a1e88d
|
-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
|
f9a1d4a36d
|
Merge branch 'next' into newnodeformats
|
2019-12-29 16:05:55 +01:00 |
|
MascaraSnake
|
6b53b883c5
|
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
|
ac6c61e419
|
Move copying of the nodes signature out of the else case
|
2019-12-29 15:59:15 +01:00 |
|