Steel Titanium
10d08fc8bb
Merge branch 'master' into next
2020-03-02 15:26:01 -05:00
SteelT
7d14796954
Merge branch 'fix-ogllib' into 'master'
...
Fix -OGLlib
See merge request STJr/SRB2!794
2020-03-02 15:21:50 -05:00
Jaime Passos
67b8a7eb67
Merge remote-tracking branch 'origin/next' into tolflag-fix
2020-03-02 13:14:12 -03:00
Louis-Antoine
04a1f479be
Increase the length of the player input buffer
2020-03-02 15:36:28 +01:00
LJ Sonic
75e12f9d9d
Merge branch 'fix-io-warning' into 'next'
...
Fix compiler warning
See merge request STJr/SRB2!833
2020-03-02 07:46:46 -05:00
Louis-Antoine
7ba93c184f
Fix warning and formatting
2020-03-02 13:33:12 +01:00
sphere
c671097c04
Actually use the "SCREENSHOT OPTIONS" header for its menu.
2020-03-02 13:23:54 +01:00
Jaime Passos
70a103b9af
Fix G_TOLFlag returning the wrong type
2020-03-02 00:20:53 -03:00
Jaime Passos
76bda716cd
Merge branch 'tol-moment' into 'next'
...
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
See merge request STJr/SRB2!825
2020-03-01 11:14:29 -05:00
LJ Sonic
2cace6e147
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
SwitchKaze
fd4666b481
Bruh.
2020-02-29 23:44:56 -05:00
SwitchKaze
21b28b6295
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
SwitchKaze
3106a92e8b
Prohibit modification of built-in colors
...
In addition, fixes a bug where loading a custom color using command line params exhibits strange behavior.
2020-02-29 23:14:49 -05:00
Jaime Passos
94107a5320
Set pixel RGBA to nothing instead of the alpha only
2020-02-29 19:36:50 -03:00
Monster Iestyn
cf95837a76
Merge branch 'follow-is-mobj' into 'next'
...
Turn FollowMobj into a mobj hook
See merge request STJr/SRB2!803
2020-02-29 12:48:39 -05:00
Jaime Passos
7d77600e71
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
Jaime Passos
4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
6fb5a6efb6
Consider hide-and-seek as GTR_HIDEFROZEN
2020-02-28 23:52:33 -03:00
Jaime Passos
d3ed5ad44f
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
Jaime Passos
fd062308fe
Score adding and stealing should check the gametype's rules.
2020-02-28 23:41:10 -03:00
Jaime Passos
3ce4ddf854
Fix incorrect team gametype rule being used in A_OldRingExplode
2020-02-28 23:25:25 -03:00
Jaime Passos
51c593e633
Fix homing ring using the wrong team gametype rule
2020-02-28 23:21:27 -03:00
Jaime Passos
4a489c4d95
Fix NOTEXTURE_NUM
2020-02-28 18:57:34 -03:00
Jaime Passos
9b88edc458
Same deal for screen textures
2020-02-28 18:57:15 -03:00
Jaime Passos
48b352049f
Stop using NextTexAvail
2020-02-28 18:56:41 -03:00
Jaime Passos
4446b0d563
Fix ACZ fence texture
2020-02-28 17:33:58 -03:00
Jaime Passos
7f32a53233
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
2020-02-28 17:31:41 -03:00
Jaime Passos
4abe112af8
Merge remote-tracking branch 'origin/master' into next
2020-02-25 22:43:15 -03:00
Jaime Passos
8350a8c58a
Merge branch 'new-color-chat-fix' into 'master'
...
Fix new skin colors using default chat color
See merge request STJr/SRB2!822
2020-02-25 20:38:36 -05:00
Jaime Passos
b9fb6182ac
Merge branch 'amycrash' into 'master'
...
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
See merge request STJr/SRB2!823
2020-02-25 20:38:15 -05:00
Jaime Passos
25cf369f22
Fix (technically functional) string comparison counting an extra character in the comparison length
2020-02-25 22:34:19 -03:00
Jaime Passos
3d7cd29eda
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
2020-02-25 22:30:34 -03:00
LJ Sonic
8dd4e47a35
Merge branch 'realmo' into 'next'
...
Let Lua access spectator mobjs
See merge request STJr/SRB2!756
2020-02-25 15:06:29 -05:00
fickleheart
de789add8a
Fix menu enterwipes being overridden?
2020-02-24 18:00:52 -06:00
fickleheart
141df606c2
Use a named macro for menu hierarchy
...
This _really_ needs to be a UINT8 array instead of
all this bit-shifting nonsense that saves no space,
but at least this way reading the menu structs doesn't
make me want to die.
2020-02-24 18:00:17 -06:00
fickleheart
da122ca2fd
Fix missing menuname entries
2020-02-24 17:56:00 -06:00
Jaime Passos
fe93155578
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
2020-02-24 20:03:08 -03:00
Steel Titanium
ce801e1076
Fix new skin colors using default chat color
2020-02-24 16:58:19 -05:00
fickleheart
b66be478d9
Increase COM_BUF_SIZE
...
The config file is starting to get close to the old max,
so this should be enough headroom for a while...
2020-02-24 11:45:22 -06:00
fickleheart
f8408f3c99
Fix ExecCfg not working on files added via command line
2020-02-24 11:44:45 -06:00
fickleheart
1f8dbd1b8c
Allow using lump names in ExecCfg
2020-02-24 11:44:27 -06:00
sphere
0df094021e
Allow emblem hints (and radar) in record attack.
2020-02-24 17:31:30 +01:00
fickleheart
1848ce4b97
Skip empty gametypes in level select menu
2020-02-24 10:02:48 -06:00
Jaime Passos
ebafd4b2c6
Merge branch 'spectator-is-it' into 'next'
...
Don't get chosen as the tagger if you're a spectator
See merge request STJr/SRB2!815
2020-02-23 20:37:27 -05:00
Jaime Passos
952bce362e
Remove unused SOC menu types
2020-02-23 22:31:17 -03:00
fickleheart
d1dcdf88c7
Fix MD2 rollangle in reverse gravity
2020-02-23 18:44:22 -06:00
fickleheart
352029fd76
Add music position functions to Lua
2020-02-23 17:58:32 -06:00
fickleheart
f2c968dea8
Add JingleStatus hook for carrying custom jingle tunes
...
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
2020-02-23 17:20:44 -06:00
fickleheart
c5f3868819
Expose P_PlayJingle/Music() to Lua
2020-02-23 17:19:18 -06:00
James R
711c8ed6b4
Merge branch 'console-in-menus-mk-ii' into 'master'
...
Console in menus again!
See merge request STJr/SRB2!797
2020-02-23 18:15:43 -05:00
