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
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04: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
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
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
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
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
James R
70d46ebb0a
Merge branch 'parties-only' into parties
2020-03-03 20:05:30 -08:00
James R
dd29a44ecc
cancelinvite command to rescind a party invitation
2020-03-03 19:17:27 -08:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
James R
f9b5f71171
Merge branch 'gentlemen' into parties
2020-02-23 23:22:37 -08:00
James R
7fe61a99df
More plurals
2020-02-23 23:21:20 -08:00
James R
dfe6d62d76
bruh
2020-02-23 23:21:20 -08:00
James R
fc1e4b5cc5
Just say "joined" so to not worry about plurals
2020-02-23 23:21:20 -08:00
James R
4f40edaf01
Maybe localdisplayplayers is a bad idea
2020-02-23 23:21:20 -08:00
James R
e235267f1d
Improve feedback on party invitations
2020-02-23 23:20:20 -08:00
James R
110871c3b6
Void the party invitation once its accepted
2020-02-23 23:20:20 -08:00
James R
02757eac82
Fix and fully implement leaving parties
2020-02-23 23:20:20 -08:00
James R
46ac563eaf
Implement big bad parties (splitscreen with network players)
...
Use the 'invite' command to invite another player to your party.
If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.
Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
2020-02-23 23:20:20 -08:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
James R
352d576979
Don't turn off lagless at map start; draw LAGLESS in intermission
2020-02-23 23:07:57 -08:00
James R
56f6b058d0
Make host lag optional with "lagless", lag by default (lagless off)
2020-02-23 23:07:57 -08:00
James
94a00bb497
Option to hide/show viewpoint text
2019-11-16 16:28:48 -05:00
TehRealSalt
90b4ce8e58
Merge branch 'master' into sal-waypoints
2019-10-25 23:36:02 -04:00
TehRealSalt
addb0d0a66
Fix time limit
2019-10-25 23:35:31 -04:00
TehRealSalt
b69d105af3
Add respawn animation
...
This commit also fixes MF_NOCLIP not working properly on players. Sink now spawns an SPB explosion on successful hit, since dying is no longer a harsh punishment.
2019-10-24 16:35:39 -04:00
TehRealSalt
674c0aec17
Merge branch 'master' into new-items
2019-10-24 10:08:37 -04:00
TehRealSalt
4feed0decc
Merge branch 'master' into sal-waypoints
2019-10-22 17:06:38 -04:00
TehRealSalt
c963a49542
Try fixing Auto causing desyncs
...
- Move K_SetPowerLevelScrambles to G_DoCompleted
- Fix wrong gamespeed being displayed in strings
- Add defines for kartspeed values
- Disable Easy scrambles again
- Corrupt gamedata if pwrlv is in invalid range (gets corrected in-game, and doesn't really matter to anyone who knows what you're doing, but it'll stop at least the most basic script kiddie)
Replay menu will still display wrong speed name, but it's fine in the replay itself.
2019-10-17 23:43:06 -04:00
TehRealSalt
e7d0fde5fd
Merge branch 'master' into sal-waypoints
2019-10-15 21:34:41 -04:00
TehRealSalt
d1c20c2a5a
Don't allow finish lines to be hit multiple times per tic
2019-10-15 21:30:23 -04:00
TehRealSalt
d10e4aebac
Fix a few messups due to the merged cvars
2019-10-03 11:22:58 -04:00
TehRealSalt
3d5676d4d6
atoi
2019-10-03 10:16:10 -04:00
TehRealSalt
a5ea6a9799
Merge speed/encore scrambles into the normal cvars as an "auto" option
2019-10-03 01:48:16 -04:00
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
TehRealSalt
9072f233eb
Remove a few more magic numbers
2019-09-23 08:31:36 -04:00
