1580e14cbc
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
42445b39d7
Merge branch 'master' into next
2020-03-21 19:16:52 +01:00
a2729ddefc
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
d2c83e1cda
Add Object Special text for Star Post
2020-03-21 15:16:07 +01:00
006b1e8c0e
Merge branch 'delete-slopes' into 'next'
...
Delete slopes
See merge request STJr/SRB2!857
2020-03-21 09:35:27 -04:00
fa9c2f43f7
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
06f9246fd3
Updates and fixes for the ZB config
2020-03-21 12:06:52 +01:00
e2c9815606
Merge branch 'master' into next
2020-03-21 09:40:57 +01:00
2107b89586
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
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
37b70fe857
Merge branch 'delete-lua' into 'next'
...
Delete Lua
See merge request STJr/SRB2!852
2020-03-20 09:53:24 -04:00
78ec210896
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
2020-03-19 18:55:10 -05:00
a436ece941
Update CircleCI config
2020-03-19 19:26:46 +01:00
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
92016a742b
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
725826a64b
Avoid infinite loops if no maps are selectable (y tho)
2020-03-18 22:56:20 -05:00
05b2570ae7
Merge remote-tracking branch 'upstream/next' into lua-music
2020-03-18 22:43:07 -05:00
9c86cd0bc2
More union types for the union type god
2020-03-18 22:42:31 -05:00
520e3c5dc3
Are these casts unnecessary...??
2020-03-18 22:40:11 -05:00
647f73c8f2
Clean up after myself
2020-03-18 22:38:51 -05:00
dd0d86120b
> building SRB2 without Lua in 2020
2020-03-18 22:38:18 -05:00
e0badd1e5b
Rename hook to ShouldJingleContinue
2020-03-18 22:35:21 -05:00
5dac9c6875
Merge branch 'master' into next
2020-03-18 15:42:02 -04:00
04131d3268
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
e3a5164ddf
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
bd058ecc4b
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
38bcfe4997
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
a8f53b31b4
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
c43ca31dc2
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
31b1188a3e
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
0a54c40ff4
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
3f43dd22f9
Merge branch 'skins-refactor' into 'master'
...
Skins refactor
See merge request STJr/SRB2!843
2020-03-15 15:31:49 -04:00
f689bc88aa
Add boolean variable that indicates if current map is in UDMF format
2020-03-15 16:23:15 +01:00
3c294b5e3d
Merge branch 'next' into udmf-next
2020-03-15 09:57:42 +01:00
efab0f479c
Merge branch 'master' into next
2020-03-14 22:21:12 -04:00
49001b207e
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
88fff119ea
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
e80a09a651
Merge branch 'tex' into 'master'
...
Replace NextTexAvail with glGenTextures
See merge request STJr/SRB2!828
2020-03-14 22:12:02 -04:00
2d16281d86
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
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
ddc0762ecc
Merge branch 'master' into next
2020-03-09 19:53:08 +00:00
db6a3bbd1f
Merge branch 'archive-sprite2-hotfix' into 'master'
...
Archive sprite2 Hotfix
See merge request STJr/SRB2!845
2020-03-09 15:50:55 -04:00
5e705b84ae
Merge branch 'patch-1' into 'master'
...
Fix desyncs never recovering if node and player mismatch
See merge request STJr/SRB2!842
2020-03-09 12:56:41 -04:00
40e728fdb5
One line fix: don't assume 0 (aka SPR2_STND) is the default value for sprite2, but rather what the state sets for it
...
This fixes some issues with a custom character tested during netplay, which did not have SPR2_WAIT sprites and therefore fell back to SPR2_STND sprites. Unfortunately, the fact they used SPR2_STND instead meant the sprite2 was not synced at all!
2020-03-09 15:04:22 +00:00
f4cb6e1f5e
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
1dd4ed4afa
Reorganise r_things.h
2020-03-08 21:17:30 +00:00
e81ef824d6
Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway
...
This way we don't have to make it some extern in order for r_skins.c to use it
2020-03-08 19:51:18 +00:00
37ecb47436
update Makefile, CMakeLists.txt and MSVC project files
2020-03-08 19:48:23 +00:00
b2d9697e07
remove r_skins.c include in r_things.c, on second thoughts
2020-03-08 19:36:56 +00:00
a67dbfff54
Create r_skins.c/.h, to contain skins code formerly in r_things.c/h
2020-03-08 19:32:07 +00:00
MascaraSnake