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 |
|
MascaraSnake
|
05a97530c1
|
Add support for flat offset and rotation fields in UDMF
|
2019-12-30 17:28:10 +01:00 |
|
MascaraSnake
|
72bb673209
|
Some minor refactoring of textmap loading code
|
2019-12-30 16:28:22 +01:00 |
|
Jaime Passos
|
7676f11112
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 12:09:45 -03:00 |
|
Jaime Passos
|
a04834d1aa
|
Fix alignment in R_ThickStepping
|
2019-12-30 12:02:09 -03:00 |
|
Jaime Passos
|
590d6729e6
|
Merge remote-tracking branch 'origin/master' into software-clownery
|
2019-12-30 11:49:12 -03:00 |
|
Nev3r
|
99aace19f5
|
Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser
|
2019-12-30 14:48:10 +01:00 |
|
Nev3r
|
4a5498473c
|
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
|
f9d6e26558
|
Replace INT16_MAX with LUMPERROR in lump check.
|
2019-12-30 14:45:39 +01:00 |
|
Nev3r
|
7ae2143c91
|
Add a disclaimer when loading textmaps/UDMF.
|
2019-12-30 14:42:41 +01:00 |
|
MascaraSnake
|
ea87af0076
|
Refactor TextmapParse
|
2019-12-30 14:33:41 +01:00 |
|
Nev3r
|
c6c00aa7d5
|
Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens.
|
2019-12-30 13:46:37 +01:00 |
|
MascaraSnake
|
4aee4e3684
|
Refactor TextmapCount
|
2019-12-30 13:27:05 +01:00 |
|
Monster Iestyn
|
7c9b1ee2cb
|
Fix P_SetTarget crash by setting th->target to NULL first
|
2019-12-30 11:49:01 +00:00 |
|
Nev3r
|
e43df2993f
|
Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile.
|
2019-12-30 12:33:24 +01:00 |
|
Nev3r
|
f9aabe753e
|
Refactor TextmapFixFlatOffsets().
|
2019-12-30 12:31:55 +01:00 |
|
Nev3r
|
493c6c8ae2
|
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2019-12-30 12:23:31 +01:00 |
|
Nev3r
|
f49b8de5fd
|
Adapt P_MakeMapMD5() for textmaps.
|
2019-12-30 12:07:54 +01:00 |
|
Nev3r
|
ed114f655b
|
Fixed missing M_GetToken(NULL);
|
2019-12-30 12:07:02 +01:00 |
|
lachwright
|
0839287609
|
Add unused sounds and remove unused sound slots
|
2019-12-30 19:00:45 +08:00 |
|
Nev3r
|
aaef412823
|
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
|
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 |
|
James R
|
65921c1702
|
Improve COM_AddCommand boolean deprecated warning
|
2019-12-29 21:09:07 -08:00 |
|
James R
|
802ef0aba1
|
COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd
|
2019-12-29 21:07:28 -08:00 |
|
James R
|
6546e3c3bc
|
No.
|
2019-12-29 21:02:42 -08:00 |
|
James R
|
dc757f3086
|
Fuck magic numbers; COM_ flags for Lua commands!
|
2019-12-29 21:00:38 -08:00 |
|
James R
|
8a15e9abc4
|
Bro player 2 can't use the console
|
2019-12-29 21:00:38 -08:00 |
|
Nami
|
58dd578b09
|
Let's try this again!
|
2019-12-29 20:36:24 -08: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 |
|
Zachary McAlpin
|
458f3cb14b
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2019-12-29 20:37:11 -06:00 |
|
GoldenTails
|
bc88def225
|
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
|
9d701d722e
|
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
|
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 |
|
GoldenTails
|
ae9adce873
|
Replace magic numbers with less magic and more readable chars.
|
2019-12-29 18:26:56 -06: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 |
|
Jaime Passos
|
2f4c270a7b
|
Update r_segs.c
|
2019-12-29 19:43:38 -03:00 |
|
Zachary McAlpin
|
fdd1823ee2
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2019-12-29 16:19:53 -06: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 |
|