MascaraSnake
|
8e5effa07b
|
Merge branch 'udmf-argenums' into udmf-fofs-mkii
|
2020-04-18 17:23:02 +02:00 |
|
MascaraSnake
|
09506112d7
|
Add enums to encapsulate the textmap colormap settings
|
2020-04-18 17:15:25 +02:00 |
|
MascaraSnake
|
f0c63ce76a
|
Merge branch 'udmf-next' into udmf-argenums
|
2020-04-18 16:56:21 +02:00 |
|
MascaraSnake
|
111da04b07
|
Add enums to encapsulate the textmap slope settings
|
2020-04-18 16:55:56 +02:00 |
|
Nev3r
|
2b2a18fdf1
|
Merge branch 'udmf-colormaps' into 'udmf-next'
UDMF colormaps
See merge request STJr/SRB2!855
|
2020-04-18 07:42:24 -04:00 |
|
MascaraSnake
|
2a300bcea4
|
Fix NULL pointer crash involving stringargs
|
2020-04-18 12:23:01 +02:00 |
|
MascaraSnake
|
2e9dc59ca7
|
Forgot some stuff regarding FOF type 170
|
2020-04-15 09:49:00 +02:00 |
|
MascaraSnake
|
f815597219
|
Implement FOF types 170-180
|
2020-04-15 09:44:33 +02:00 |
|
Nev3r
|
d40713d08b
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-04-14 22:20:54 +02:00 |
|
MascaraSnake
|
5389344a32
|
Implement FOF type 257
|
2020-04-14 11:56:11 +02:00 |
|
Nev3r
|
464ecc01a4
|
Merge branch 't_moveplane-refactor' into 'next'
Remove faulty code from T_MovePlane()
See merge request STJr/SRB2!876
|
2020-04-14 05:53:59 -04:00 |
|
Nev3r
|
caea71b68b
|
Merge branch 'remove-bridge' into 'next'
Remove the disabled/broken bridge thinker code
See merge request STJr/SRB2!879
|
2020-04-14 05:51:45 -04:00 |
|
MascaraSnake
|
e3b86d0c74
|
Implement FOF types 252-256
|
2020-04-14 11:45:37 +02:00 |
|
Nev3r
|
98481dc10b
|
Remove the bridge thinker entry from the ZB configuration.
|
2020-04-14 10:31:26 +02:00 |
|
Nev3r
|
778ef86fee
|
Remove the bridge thinker code.
|
2020-04-14 10:31:07 +02:00 |
|
MascaraSnake
|
15defaebeb
|
Render insides on FOF type 222
|
2020-04-14 10:14:56 +02:00 |
|
MascaraSnake
|
f8c51ccde3
|
Implement FOF types 220-222
|
2020-04-14 10:13:38 +02:00 |
|
MascaraSnake
|
9fc2b5b1b9
|
Implement FOF type 258
|
2020-04-14 09:51:48 +02:00 |
|
MascaraSnake
|
32a1131c68
|
Implement FOF type 251
|
2020-04-14 09:43:49 +02:00 |
|
MascaraSnake
|
916f831edb
|
Implement linedef type 250
|
2020-04-14 09:14:10 +02:00 |
|
MascaraSnake
|
fdb46e5d14
|
Implement FOF types 202 and 223
|
2020-04-14 09:06:02 +02:00 |
|
MascaraSnake
|
60e589e92a
|
Implement FOF types 200-201
|
2020-04-14 09:03:00 +02:00 |
|
MascaraSnake
|
7f889532ea
|
Adapt solid FOF setup in UDB config
|
2020-04-14 09:00:26 +02:00 |
|
MascaraSnake
|
61d903cb5b
|
Revise setup of solid FOFs
|
2020-04-14 01:34:11 +02:00 |
|
Nev3r
|
01c0797ba6
|
Remove now unused P_MobjReadyToMove().
|
2020-04-13 16:00:58 +02:00 |
|
Nev3r
|
74bd23c275
|
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
|
2020-04-13 15:17:53 +02:00 |
|
Nev3r
|
711c35970c
|
Refactor an unholy piece of code.
|
2020-04-13 14:31:19 +02:00 |
|
Nev3r
|
4128f826b7
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
# src/lua_hooklib.c
|
2020-04-12 09:57:19 +02:00 |
|
James R
|
d460e1e826
|
Merge branch 'pk3-xtra-comm-fix' into 'next'
PK3: Proper ignorance for file comments/extra data
See merge request STJr/SRB2!761
|
2020-04-09 21:25:11 -04:00 |
|
James R
|
aca39d6210
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-09 17:04:04 -07:00 |
|
James R
|
b029ccff0d
|
Merge branch 'hide-useless-1p-menu-options' into 'master'
Hide record & NiGHTS attack options if there are no available maps for them.
See merge request STJr/SRB2!868
|
2020-04-09 19:57:27 -04:00 |
|
James R
|
40a74a6211
|
Merge branch 'ra-emblemhints' into 'master'
Allow emblem hints (and radar) in record attack.
See merge request STJr/SRB2!820
|
2020-04-09 19:56:17 -04:00 |
|
James R
|
5f7bd9a947
|
Merge branch 'fix-256-brightness' into 'master'
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
See merge request STJr/SRB2!840
|
2020-04-09 19:53:40 -04:00 |
|
James R
|
2fda89f1c3
|
Merge branch 'bot-respawn-hook' into 'next'
BotRespawn hook
See merge request STJr/SRB2!804
|
2020-04-09 19:52:25 -04:00 |
|
James R
|
bd7d05fdf0
|
Merge branch 'gtr-replace' into 'next'
Separate PvP damage from ringslinger
See merge request STJr/SRB2!831
|
2020-04-09 19:51:52 -04:00 |
|
James R
|
2dfe276a73
|
Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
|
2020-04-09 19:51:20 -04:00 |
|
James R
|
b8d40a5783
|
Merge branch 'dye' into 'next'
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
|
2020-04-09 19:50:32 -04:00 |
|
James R
|
78613ec445
|
Merge branch 'supergoldedit' into 'next'
Change SKINCOLOR_SUPERGOLD1-5
See merge request STJr/SRB2!805
|
2020-04-09 19:50:06 -04:00 |
|
James R
|
4e7283c833
|
Merge branch 'pk3-directory-start' into 'next'
Don't skip the first directory entry of PK3 if it's a file
See merge request STJr/SRB2!764
|
2020-04-09 19:49:44 -04:00 |
|
James R
|
d4c08a8410
|
Merge branch 'lightmemedata' into 'next'
Cvars returned by CV_FindVar did not work with userdataType
See merge request STJr/SRB2!754
|
2020-04-09 19:48:39 -04:00 |
|
James R
|
e100f21dda
|
Merge branch 'loop-patch' into 'next'
Let MUSICDEF set loop point
See merge request STJr/SRB2!762
|
2020-04-09 19:47:43 -04:00 |
|
James R
|
aad225932d
|
Merge branch 'SF_NONIGHTSSUPER' into 'next'
Skin flag for disabling super colors in NiGHTS
See merge request STJr/SRB2!782
|
2020-04-09 19:47:20 -04:00 |
|
James R
|
673a842043
|
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
|
2020-04-09 16:47:52 -07:00 |
|
James R
|
1edc300d0c
|
Merge branch 'lua-hook-cleanup' into 'next'
Lua hook cleanup
See merge request STJr/SRB2!851
|
2020-04-09 19:40:09 -04:00 |
|
James R
|
a4fa4351d8
|
Merge branch 'fix-consbackpic' into 'master'
Fix console backpic
See merge request STJr/SRB2!850
|
2020-04-09 19:39:16 -04:00 |
|
James R
|
b4ab284d21
|
Merge branch 'fixed2float-funcs' into 'master'
Turn FIXED_TO_FLOAT into a function
See merge request STJr/SRB2!869
|
2020-04-09 19:37:22 -04:00 |
|
sphere
|
806884a3f4
|
Use M_GametypeHasLevels again (properly this time) to save memory.
|
2020-04-02 17:59:56 +02:00 |
|
sphere
|
3074880ac1
|
Actually check for available maps correctly. Whoops!
|
2020-04-02 16:07:38 +02:00 |
|
Steel Titanium
|
9a242818a7
|
Merge branch 'master' into next
|
2020-03-31 20:46:54 -04:00 |
|
SteelT
|
6620364158
|
Merge branch 'fix-allowjoin' into 'next'
Delete singleplayer
See merge request STJr/SRB2!870
|
2020-03-31 20:45:02 -04:00 |
|