Steel Titanium
4bfb583e91
Remove some of these superfluous ifdef checks.
...
Allows compatibility with non-curl enabled builds.
2020-04-12 15:07:39 -04:00
Zachary McAlpin
b6a2c21db7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05:00
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
Steel Titanium
5e0eca9fe9
Support for http downloads
2020-04-07 18:22:29 -04:00
James R
2e963a46f5
For fun, let the bots vote
2020-04-02 14:16:29 -07:00
James R
9bdebe51bf
Fix a dumb warning
2020-03-31 16:54:20 -07:00
James R
6975de85b4
Call the substitution macro FOREACH
2020-03-31 16:45:36 -07:00
James R
1243d0940a
Merge remote-tracking branch 'origin/master' into more-debug
2020-03-31 16:44:04 -07:00
Sally Cochenour
9e2c119b56
Merge branch 'master' into pet-robo
2020-03-29 20:44:13 -04:00
Latapostrophe
4c1459cd4e
Chaos Conflicts
2020-03-29 12:14:27 +02:00
James R
61be09e6bf
Merge remote-tracking branch 'origin/master' into gifs-port
2020-03-28 21:00:39 -07:00
Sal
eb9144338a
Merge branch 'logs-port' into 'master'
...
2.2 directory structure and log files port
See merge request KartKrew/Kart!224
2020-03-28 22:16:50 -04:00
Sally Cochenour
ff621d3e46
Skins, rudimentary ticcmd building for bots
2020-03-28 12:39:27 -04:00
Sally Cochenour
e5ae9d1513
Merge branch 'master' into pet-robo
2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
Zachary McAlpin
61447c20be
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Steel Titanium
e9110b660c
Better directory structure
...
(cherry picked from commit 8ee0a9309b289a1a3d1a7260a44a43c776180686)
# Conflicts:
# src/m_menu.c
# src/m_menu.h
# src/m_misc.h
2020-03-24 15:36:44 -07:00
Jaime Passos
d64dc5b2a8
Local Color Table for GIF movie mode
...
(cherry picked from commit 5a330803ec5bea2ca7b6b30bf7972b11753b571d)
2020-03-23 17:47:08 -07:00
toasterbabe
7a14bbba82
Disable colour profile influence on screenshots and gifs if you want.
...
(cherry picked from commit 8b46ee76ff
2020-03-23 16:35:38 -07:00
toasterbabe
fcc80b12ad
Colour Cube Calibration Menu! (called "Advanced Color Settings" because No Fun Allowed...)
...
https://cdn.discordapp.com/attachments/237798387070664724/304343382073933824/aa.png
Also, a "Reset all" button for the Monitor toggle menu, a ton of new cvars to match up with the colour cube calibration, and a bunch of variable renames related to colour cube operations.
(cherry picked from commit c3840ba01d
2020-03-23 16:34:34 -07:00
toasterbabe
f5ecb1b9c9
Introducing the Colour Cube! https://cdn.discordapp.com/attachments/293238104096112641/304015171385294850/aa.png
...
Basically in preperation of supporting colourblindness modes I implemented the following link when loading palettes.
http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html
This basically means I can do whatever the hell I want to the colour profile of incoming paletties, and nobody can stop me. Muahahahaha etc.
Also, I added a saturation feature to show off its full potential, converted gamma from a table to a factor of the calculation, tweaked some menus and made the default value of cvars show up on sliders. Because that's how I roll.
(cherry picked from commit 83e16da83b
2020-03-23 16:27:14 -07:00
James R
572bf314e5
Merge remote-tracking branch 'origin/master' into resume
2020-03-22 19:01:05 -07:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde
Merge branch 'master' into new-items
2020-03-22 20:50:28 -04:00
James R
0ee7456708
Fix shit
2020-03-22 14:45:21 -07:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Sally Cochenour
7f1d55421a
Merge branch 'master' into new-items
2020-03-22 14:23:51 -04:00
James R
7e0aa16e70
Reset Invincibility (and Grow) music to the start if stacked
...
Toggleable via the resetspecialmusic cvar.
2020-03-21 22:28:55 -07:00
James R
7023ccc239
Death fades music
...
Cvars are respawnfademusicout and respawnfademusicback. Both measure
milliseconds.
2020-03-21 22:28:55 -07:00
James R
911dd57334
Restore level music to where it left off
...
Toggleable via the resume cvar.
2020-03-21 22:28:55 -07:00
James R
8524c3749d
Fade level music back in after Invincibility and Grow
...
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
2020-03-21 22:28:54 -07:00
Sryder
da2f1fc972
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/k_kart.c
2020-03-21 23:27:55 +00:00
James R
c3b967468a
Revert "Remove kartdebugitem"
...
This reverts commit 803884c55a
2020-03-21 15:56:40 -07:00
James R
4a973e2906
Revert "...Also remove kartdebugamount"
...
This reverts commit 22cb7451e9
2020-03-21 15:56:38 -07:00
James R
8a28d3cfe5
Replace some instances of int with fixed width types
2020-03-21 13:12:50 -07:00
James R
29ebf7ee60
Attempt to fix Sal's compiler warnings
2020-03-21 13:07:22 -07:00
James R
fd1cb69a87
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 12:45:23 -07:00
Sal
68bec970a3
Merge branch 'viewpoint-text-toggle' into 'master'
...
Option to hide/show viewpoint text
See merge request KartKrew/Kart!209
2020-03-20 22:07:30 -04:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01: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
Sally Cochenour
040865b589
Merge branch 'master' into new-items
2020-03-17 19:31:47 -04:00
Sally Cochenour
fa34e4eee4
Merge branch 'master' into sal-waypoints
2020-03-15 20:21:17 -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
Zachary McAlpin
564ecf4f0f
Check if you are playing a game then execute `LUAh_GameQuit` if you are in Command_quit_f and Command_ExitGame_f
2020-03-15 10:34:43 -05:00
Zachary McAlpin
9ca79b4d8b
Since exitgame shuts down the server if you are running a dedicated server I may as well allow the hook to run for the dedicated server as well
2020-03-15 00:54:06 -05:00
Zachary McAlpin
38d7ad3e6a
Let's just call LUAh_GameQuit in Command_ExitGame_f during its execution if you are in game and are not a dedicated server
2020-03-15 00:28:41 -05:00
Zachary McAlpin
586c05389d
Revert "Call LUAh_GameQuit in Command_ExitGame_f"
...
This reverts commit 57dc2df60a
2020-03-12 22:31:48 -05:00
