MascaraSnake
|
d87bb1fcad
|
Move UDB configs into a subfolder
|
2020-03-22 08:08:34 +01:00 |
|
MascaraSnake
|
1d7e830bdc
|
Add UDB config
|
2020-03-22 08:04:28 +01:00 |
|
MascaraSnake
|
8850962810
|
Merge branch 'next' into udmf-next
|
2020-03-22 07:52:09 +01:00 |
|
MascaraSnake
|
93587d393d
|
Merge branch 'master' into next
|
2020-03-22 07:51:35 +01:00 |
|
MascaraSnake
|
5edec462a3
|
Minor ZB config fix
|
2020-03-22 07:50:57 +01:00 |
|
MascaraSnake
|
4c03fd5783
|
Merge branch 'next' into udmf-next
|
2020-03-21 20:18:07 +01:00 |
|
MascaraSnake
|
19aedbb0a7
|
Merge branch 'master' into next
|
2020-03-21 20:17:48 +01:00 |
|
MascaraSnake
|
828bc47846
|
Another ZB config fix
|
2020-03-21 20:17:28 +01:00 |
|
MascaraSnake
|
9b76d3af6f
|
Merge branch 'next' into udmf-next
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
|
2020-03-21 20:04:31 +01:00 |
|
MascaraSnake
|
59899f3cce
|
Merge branch 'master' into next
|
2020-03-21 19:16:52 +01:00 |
|
MascaraSnake
|
91f6c68a8f
|
Merge branch 'config-fixes' into 'master'
Updates and fixes for the ZB config
See merge request STJr/SRB2!859
|
2020-03-21 14:16:04 -04:00 |
|
MascaraSnake
|
915e6fce23
|
Add Object Special text for Star Post
|
2020-03-21 15:16:07 +01:00 |
|
LJ Sonic
|
0942c3f39a
|
Merge branch 'delete-slopes' into 'next'
Delete slopes
See merge request STJr/SRB2!857
|
2020-03-21 09:35:27 -04:00 |
|
LJ Sonic
|
fee49140e1
|
Merge branch 'skip-empty-gametypes' into 'master'
Skip empty gametypes in level select menu
See merge request STJr/SRB2!819
|
2020-03-21 08:52:54 -04:00 |
|
MascaraSnake
|
7c8fa41b54
|
Updates and fixes for the ZB config
|
2020-03-21 12:06:52 +01:00 |
|
MascaraSnake
|
9c3544e8d7
|
Merge branch 'master' into next
|
2020-03-21 09:40:57 +01:00 |
|
MascaraSnake
|
4b71029bdd
|
Remove the multi-file ZB configs. We're stick with the single-file config for ZB and doing all the UDMF stuff in UDB
|
2020-03-21 09:40:37 +01:00 |
|
Louis-Antoine
|
4e7605f0e2
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|
LJ Sonic
|
17ffdda974
|
Merge branch 'delete-lua' into 'next'
Delete Lua
See merge request STJr/SRB2!852
|
2020-03-20 09:53:24 -04:00 |
|
fickleheart
|
077b4f14e2
|
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
|
2020-03-19 18:55:10 -05:00 |
|
Louis-Antoine
|
789ddf9a66
|
Update CircleCI config
|
2020-03-19 19:26:46 +01:00 |
|
Louis-Antoine
|
46df2b9551
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
LJ Sonic
|
d11479b493
|
Merge branch 'lua-music' into 'next'
Expose more music-related functions to Lua
See merge request STJr/SRB2!817
|
2020-03-19 06:53:57 -04:00 |
|
fickleheart
|
0208d1e837
|
Avoid infinite loops if no maps are selectable (y tho)
|
2020-03-18 22:56:20 -05:00 |
|
fickleheart
|
7bf9bc4b9e
|
Merge remote-tracking branch 'upstream/next' into lua-music
|
2020-03-18 22:43:07 -05:00 |
|
fickleheart
|
ecb8a6f4e2
|
More union types for the union type god
|
2020-03-18 22:42:31 -05:00 |
|
fickleheart
|
83b8c53afa
|
Are these casts unnecessary...??
|
2020-03-18 22:40:11 -05:00 |
|
fickleheart
|
95a01de67d
|
Clean up after myself
|
2020-03-18 22:38:51 -05:00 |
|
fickleheart
|
d7421d14c7
|
> building SRB2 without Lua in 2020
|
2020-03-18 22:38:18 -05:00 |
|
fickleheart
|
2176136480
|
Rename hook to ShouldJingleContinue
|
2020-03-18 22:35:21 -05:00 |
|
Steel Titanium
|
98be23e3c2
|
Merge branch 'master' into next
|
2020-03-18 15:42:02 -04:00 |
|
SteelT
|
d2d8fe64f5
|
Merge branch 'fix-nights-mode-menu-wrong-return' into 'master'
NiGHTS Mode menu fixes
See merge request STJr/SRB2!841
|
2020-03-18 15:41:17 -04:00 |
|
SteelT
|
f3a275930b
|
Merge branch 'deadzone-sigfpe-fix' into 'master'
Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones
See merge request STJr/SRB2!838
|
2020-03-18 15:39:04 -04:00 |
|
SteelT
|
2e25a5b56d
|
Merge branch 'viewpointswitch-fix' into 'next'
Fix incorrect newdisplayplayer in forced ViewpointSwitch
See merge request STJr/SRB2!814
|
2020-03-18 15:34:18 -04:00 |
|
LJ Sonic
|
b46b698c91
|
Merge branch 'screenshot-menu-header' into 'master'
Actually use the "SCREENSHOT OPTIONS" header for its menu.
See merge request STJr/SRB2!832
|
2020-03-18 10:56:35 -04:00 |
|
MascaraSnake
|
8b25b3db23
|
Merge branch 'udmf-formatcheck' into 'udmf-next'
Add boolean variable that indicates if current map is in UDMF format
See merge request STJr/SRB2!849
|
2020-03-18 09:56:45 -04:00 |
|
LJ Sonic
|
753cdd117f
|
Merge branch 'increase-input-buffer' into 'next'
Increase the length of the player input buffer
See merge request STJr/SRB2!835
|
2020-03-18 09:49:14 -04:00 |
|
Monster Iestyn
|
f3bfa2b1db
|
Merge branch 'master' into next
|
2020-03-15 20:32:43 +00:00 |
|
LJ Sonic
|
21cb05b1f7
|
Merge branch 'fix-playernode-crash' into 'next'
Fix buffer overrun with players with no associated node
See merge request STJr/SRB2!810
|
2020-03-15 15:36:45 -04:00 |
|
Monster Iestyn
|
c0b85396e0
|
Merge branch 'skins-refactor' into 'master'
Skins refactor
See merge request STJr/SRB2!843
|
2020-03-15 15:31:49 -04:00 |
|
MascaraSnake
|
6645030a39
|
Add boolean variable that indicates if current map is in UDMF format
|
2020-03-15 16:23:15 +01:00 |
|
MascaraSnake
|
46c50222ce
|
Merge branch 'next' into udmf-next
|
2020-03-15 09:57:42 +01:00 |
|
Steel Titanium
|
d50a0914b3
|
Merge branch 'master' into next
|
2020-03-14 22:21:12 -04:00 |
|
SteelT
|
d62229a25f
|
Merge branch 'nadraw-fix' into 'master'
Fix NiGHTS Attack crash after render mode change
See merge request STJr/SRB2!837
|
2020-03-14 22:19:35 -04:00 |
|
SteelT
|
f9912eaad5
|
Merge branch 'hwrflipcolchromakey' into 'master'
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
See merge request STJr/SRB2!826
|
2020-03-14 22:13:19 -04:00 |
|
SteelT
|
6fa5ec298c
|
Merge branch 'tex' into 'master'
Replace NextTexAvail with glGenTextures
See merge request STJr/SRB2!828
|
2020-03-14 22:12:02 -04:00 |
|
SteelT
|
84d5b72735
|
Merge branch 'acz-fence' into 'master'
Fix ASTBlendPixel blending with nothing
See merge request STJr/SRB2!827
|
2020-03-14 22:11:23 -04:00 |
|
Nev3r
|
63fb8f846b
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-03-11 09:31:31 +01:00 |
|
Monster Iestyn
|
8d7d0c4dc5
|
Merge branch 'master' into next
|
2020-03-09 19:53:08 +00:00 |
|
Monster Iestyn
|
fb2b105159
|
Merge branch 'archive-sprite2-hotfix' into 'master'
Archive sprite2 Hotfix
See merge request STJr/SRB2!845
|
2020-03-09 15:50:55 -04:00 |
|