Sryder
16fed26707
Hopefully a few more fixes and sanity changes for map voting
2018-02-23 01:53:30 +00:00
Sryder
192d28f7e0
I don't see a reason for this to be in caps, but it stops me compiling DEVELOP on linux so fix
2018-02-23 01:11:31 +00:00
Sryder
6abc6aa4d2
It's SINT8 not INT8
2018-02-23 01:04:52 +00:00
Monster Iestyn
6c038e2918
Cache all the act number graphicss at game startup rather than at every start/end of a level
...
I also added a few helpful functions for drawing the act numbers themselves
2018-02-22 21:49:36 +00:00
TehRealSalt
585e7a2ca2
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-02-22 00:07:51 -05:00
Monster Iestyn
628f9921a8
removing stupid dumb useless code fish
2018-02-21 22:45:51 +00:00
TehRealSalt
c6ca5e6920
Battle Mode wins award (player count * 2) points now
2018-02-20 20:08:53 -05:00
TehRealSalt
7b05192695
Fixed stereoreverse, and its effects are applied to mirror mode
...
How long has this cvar been broken?!
2018-02-20 20:04:33 -05:00
TehRealSalt
c550bc3df1
Fixed fourth taunt sound not playing
...
% 4 would output 0 to 3, not 1 to 4 guys :V
2018-02-20 19:33:50 -05:00
TehRealSalt
11e2d9c6cf
Winning positions scale with number of players
...
Anyone in the top 50% gets winning music & blue position, everyone below
gets the losing music & red position. For odd numbers, it rounds up.
2p: 1st wins, 2nd loses
3p: 1-2 win, 3rd loses
4p: 1-2 win, 3-4 lose
5p: 1-3 win, 4-5 lose
6p: 1-3 win, 4-6 lose
7p: 1-4 win, 5-7 lose
8p: 1-4 win, 5-8 lose (SMK)
12p: 1-6 win, 7-12 lose (modern MK)
16p: 1-8 win, 9-16 lose (max player count)
In big netgames you won't just hear the losing music all of the time now
:V
2018-02-20 19:11:09 -05:00
TehRealSalt
d07160bcba
Quick fix
2018-02-20 18:18:10 -05:00
Monster Iestyn
bef710aa8f
Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder
2018-02-20 17:06:03 +00:00
TehRealSalt
af10a43fc7
Minor but important fixes
2018-02-17 01:53:44 -05:00
Steel Titanium
6d663fefa7
Removed some redundant checks
2018-02-17 00:37:17 -05:00
Steel Titanium
8ba644679b
Don't init the sound system on dedicated servers
2018-02-17 00:01:42 -05:00
Monster Iestyn
64eba82692
Added Z_TotalUsage as a shortcut for Z_TagsUsage(0, INT32_MAX)
2018-02-16 20:32:43 +00:00
Monster Iestyn
5c6755df7f
Total reorganisation of z_zone.c/h, added doxygen-compatible comments to all functions and additional regular comments where appropriate, changed purge tag macros to an enum list
2018-02-15 22:09:24 +00:00
Monster Iestyn
afe4178fd7
updating comment for Z_TagsUsage in the .c file
2018-02-15 16:53:58 +00:00
Monster Iestyn
c5261c1133
Z_FreeTag and Z_TagUsage are now both macros of their respective two arg variants
2018-02-15 16:31:05 +00:00
Monster Iestyn
4383d1fdd2
added a quick Z_FreeTag function as a shortcut to Z_FreeTags(tag, tag) where both tags are the same
2018-02-14 23:16:16 +00:00
Monster Iestyn
fa1173ed10
Clean up z_zone.h's function protos to look more readable like m_random.h, don't name functions with "2" if not using PARANOIA or ZDEBUG
...
also, Z_Malloc/Calloc/Realloc are now macros of the "Align" versions, regardless of ZDEBUG or not
2018-02-14 22:52:25 +00:00
LJSonik
a4af974f5e
Merge branch 'master' into minor-net-command-fixes
2018-02-14 21:07:10 +01:00
Louis-Antoine
d56c00a466
Fix SV_StopServer not calling D_Clearticcmd correctly
2018-02-14 21:00:55 +01:00
Monster Iestyn
1ab046de89
Merge branch 'master' into hardcoding-time-again
2018-02-14 16:24:05 +00:00
Alam Ed Arias
f1fa3855e5
Merge branch 'public_next' into private
2018-02-14 10:34:36 -05:00
Alam Ed Arias
8722b369a3
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
Alam Arias
d23d0e0e5b
Merge pull request #231 from LJSonik/net-command-leak-fix
...
Fix net commands not always being freed
2018-02-14 10:28:32 -05:00
Louis-Antoine
64a108e24a
Don't allocate memory for net commands already executed, as it would cause them to be never freed
2018-02-14 15:09:52 +01:00
TehRealSalt
9c5a09d770
sonicitems porting, Part 2
...
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
TehRealSalt
1a424ba756
Porting over some things from sonicitems
2018-02-13 16:48:09 -05:00
Monster Iestyn
4885c3b719
Merge branch 'master' into hardcoding-time-again
2018-02-13 21:21:30 +00:00
Monster Iestyn
c44a1dc543
Merge branch 'file-loading-cleanup' into 'master'
...
File loading cleanup
See merge request STJr/SRB2Internal!129
2018-02-13 16:18:55 -05:00
Monster Iestyn
f5035e70ea
Don't attempt to load the "Lua/" or "SOCs/" folder lumps themselves as Lua/SOC lumps
2018-02-13 21:12:42 +00:00
Louis-Antoine
851c52f3dd
Do not prevent all net commands for the current tic from being executed because of an unkown net command ID
2018-02-13 17:53:18 +01:00
toasterbabe
78bb534550
Fixed the strengths going in the wrong direction of transparency in GL!
2018-02-12 21:31:03 +00:00
toasterbabe
4d5dac0d03
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
2018-02-12 18:59:01 +00:00
toasterbabe
a1d12429e4
* Move the non-mapping drawFill out of the source code function and into the Lua interface.
...
* Add a drawFill fallback for COLORMAP too.
* Correct a few index mishaps.
2018-02-12 18:23:57 +00:00
toasterbabe
b0888c44bd
* Total overhaul of V_DrawFadeScreen(color, strength!
...
- controllable strengths between 0-31 for COLORMAP lump like before
- arbitrary colour indices in the palette via TRANSMAP lumps, with strengths 0-9
- exposed to Lua as v.fadeScreen(color, strength)!
* Remove last vestiges of V_STATICPATCH.
2018-02-12 17:47:31 +00:00
TehRealSalt
3be938d04a
Updated player arrows
2018-02-11 21:47:19 -05:00
TehRealSalt
ff1462898a
Fuck this weird tabbing
2018-02-11 12:50:42 -05:00
TehRealSalt
62b45ff4b0
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
...
# Conflicts:
# src/k_kart.c
(Also I added some extra music for voting, because I forgot I didn't
commit the merge :V)
2018-02-11 12:18:25 -05:00
TehRealSalt
c94df11be1
Merge remote-tracking branch 'refs/remotes/origin/democracy'
2018-02-10 20:00:20 -05:00
TehRealSalt
df600ba780
Remove comment
2018-02-10 19:56:05 -05:00
TehRealSalt
ed55d21682
Random picking animation
2018-02-10 19:02:15 -05:00
TehRealSalt
3db2ff37a2
One last thing: don't add whatever the game rolls for the random option
...
Makes it even more of a wild-card option, also makes sure that you
actually *see* all of the maps before it empties
2018-02-10 16:50:44 -05:00
TehRealSalt
a1be15134e
Maybe fixed
2018-02-10 16:28:45 -05:00
TehRealSalt
e4b1bd3365
Minor fixes, mostly mobjscale and spectators
2018-02-10 16:19:22 -05:00
TehRealSalt
495ee25f18
Chaotix sound effects, new music names
2018-02-10 16:01:09 -05:00
TehRealSalt
eab1120950
New invincibility effect, grow/shrink stuff
...
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
TehRealSalt
b83dd75a99
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-02-09 21:16:10 -05:00
