James R
|
71f4433b98
|
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
|
ae3bf2498a
|
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
|
f68a361f6e
|
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
|
7ff3e7f18b
|
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
|
dc37cdf2a6
|
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
|
34318fbc98
|
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
|
2c539300d3
|
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
|
2020-04-09 16:47:52 -07:00 |
|
James R
|
483243353b
|
Merge branch 'lua-hook-cleanup' into 'next'
Lua hook cleanup
See merge request STJr/SRB2!851
|
2020-04-09 19:40:09 -04:00 |
|
Steel Titanium
|
c1aac7c06e
|
Merge branch 'master' into next
|
2020-03-31 20:46:54 -04:00 |
|
Louis-Antoine
|
dece2adbe6
|
Fix allowjoin off affecting single player
|
2020-03-30 22:11:48 +02:00 |
|
Louis-Antoine
|
b0b21aada6
|
Fix disconnected players being kicked for high ping
|
2020-03-28 15:23:15 +01:00 |
|
MascaraSnake
|
58e8ec6500
|
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
|
2020-03-25 08:34:52 +01:00 |
|
Monster Iestyn
|
1677aff989
|
Merge branch 'demos-refactor' into 'next'
Demos refactor
See merge request STJr/SRB2!853
|
2020-03-22 17:52:45 -04:00 |
|
Monster Iestyn
|
0a288260fc
|
Merge branch 'buggle-trouble' into 'next'
P_HomingAttack related fixes
See merge request STJr/SRB2!836
|
2020-03-22 16:57:22 -04:00 |
|
Monster Iestyn
|
0a360e1d90
|
Merge branch 'fix-setspriteinfo' into 'next'
Fix lib_setSpriteInfo indexes being off-by-one
See merge request STJr/SRB2!854
|
2020-03-22 16:40:34 -04:00 |
|
MascaraSnake
|
59899f3cce
|
Merge branch 'master' into next
|
2020-03-21 19:16:52 +01: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 |
|
Louis-Antoine
|
4e7605f0e2
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|
Monster Iestyn
|
ffb2674a6e
|
Merge branch 'next' into demos-refactor
# Conflicts:
# src/g_game.c
(also update g_demo.c)
|
2020-03-20 17:48:31 +00:00 |
|
fickleheart
|
077b4f14e2
|
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
|
2020-03-19 18:55:10 -05:00 |
|
Jaime Passos
|
4579c6f631
|
Fix lib_setSpriteInfo indexes being off-by-one
|
2020-03-19 19:09:34 -03:00 |
|
Monster Iestyn
|
45092d854f
|
We don't need m_cheat.h either in g_demo.c
|
2020-03-19 21:10:23 +00:00 |
|
Monster Iestyn
|
bcfbaec629
|
We definitely don't need these files to compile!
|
2020-03-19 20:43:56 +00:00 |
|
Monster Iestyn
|
690ccb49d8
|
Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all)
|
2020-03-19 20:42:51 +00:00 |
|
Monster Iestyn
|
8ae098a1e3
|
update Makefile, CMakeLists.txt and MSVC project files
|
2020-03-19 20:13:39 +00:00 |
|
Monster Iestyn
|
ac7a71f85b
|
Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c
|
2020-03-19 20:09:55 +00:00 |
|
Louis-Antoine
|
46df2b9551
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
Louis-Antoine
|
1a21da7e2b
|
Fix compiler warning
|
2020-03-19 14:40:35 +01:00 |
|
Louis-Antoine
|
5318e41f26
|
Fix misleading naming
|
2020-03-19 14:40:12 +01:00 |
|
Louis-Antoine
|
85d0a92eb4
|
Simplify hook code
|
2020-03-19 14:38:42 +01: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 |
|
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 |
|
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 |
|