Commit graph

6827 commits

Author SHA1 Message Date
Jaime Passos
21a168d410 What
(cherry picked from commit d1e8744583b9a868665b4b3a5e4803a29829f7a0)
2020-03-23 17:47:40 -07:00
Jaime Passos
6f5416954e Only write a Local Color Table if the frame's palette differs from the header's palette
(cherry picked from commit 85211dcc09c922e0d42b4eeea387dcecc8e989ae)
2020-03-23 17:47:14 -07:00
Jaime Passos
e75baf70b0 Uh
(cherry picked from commit 999e72ab325301d248837f5337eb8f90143231ef)
2020-03-23 17:47:13 -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
Jaime Passos
f106ba7ac4 Fix color LUT using the wrong palette
(cherry picked from commit 636093a59ddd95b25d79c4ebff51dc6412de1956)
2020-03-23 17:11:13 -07:00
Jaime Passos
b8f5166d8e Avoid recreating the color LUT mid-recording-frame
(cherry picked from commit c3f0e6aa4472f0754a7f392759b9f93cb3c7651b)
2020-03-23 17:10:37 -07:00
Jaime Passos
2e62f5c793 Don't use the local palette, because OpenGL mixes it into the textures themselves
(cherry picked from commit 0af71fafc57fb842a8c7a9a4853d8c7fbb2bf7fc)
2020-03-23 17:10:37 -07:00
Jaime Passos
53f78b7693 Recreate the CLUT when the palette changes
(cherry picked from commit 6e0ff4a4a40306a59c8b18d03ae86560e6a52a4a)
2020-03-23 17:10:34 -07:00
Jaime Passos
1a759a4904 GIF recording
(cherry picked from commit d467d2b2295a9660631774b9edb29555cc5c30fe)
2020-03-23 17:10:33 -07:00
James R
3c2adbb7d1 Fix whacky history 2020-03-23 17:08:44 -07:00
Jimita the Cat
9ded0d1770 dumb
(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
2020-03-23 17:03:35 -07:00
Jimita the Cat
a3732678e0 Add support for flashpals in screenshots
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
2020-03-23 17:03:34 -07:00
Jimita the Cat
d6493c9101 dumb
(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
2020-03-23 16:54:18 -07:00
Jimita the Cat
60624edc1a Add support for flashpals in screenshots
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
2020-03-23 16:54:17 -07:00
toasterbabe
d688ef2c90 Fix typo.
(cherry picked from commit 5180bff05b)
2020-03-23 16:46:00 -07:00
toasterbabe
2fb599661e Introducing pMasterPalette.
Used instead of pLocalPalette when attempting to determine objective truths, such as "the colours of this gif without color profile modification" and "what indicies should this colormap remap to".

Also, made f_wipe.c's paldiv only get calculated once.

(cherry picked from commit d669a4e84a)
2020-03-23 16:45:57 -07:00
toasterbabe
e8c37067ed Made PCX use cv_screenshot_colorprofile.
Also, optimised gif headwrite's palette writing.

(cherry picked from commit 3cce495675)
2020-03-23 16:36:21 -07:00
toasterbabe
7a14bbba82 Disable colour profile influence on screenshots and gifs if you want.
(cherry picked from commit 8b46ee76ff)

# Conflicts:
#	src/m_menu.c
2020-03-23 16:35:38 -07:00
toasterbabe
56ac088443 Screenshots now contain the palette you're actively looking at, as opposed to the palette the game/map has! This makes sense for colorblind users being able to store their precious memories, and it matches up with how gifs palettise.
(cherry picked from commit 9d46ba281f)
2020-03-23 16:34:59 -07:00
toasterbabe
cdf8c54f2d Correcting gamma to match base SRB2.
(cherry picked from commit 29d5af61c1)
2020-03-23 16:34:59 -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)

# Conflicts:
#	src/m_menu.c
#	src/v_video.c
2020-03-23 16:34:34 -07:00
toasterbabe
b1202b617c greem
(cherry picked from commit 9b13caccae)
2020-03-23 16:28:35 -07:00
toasterbabe
a82e5ee916 Figured out what was up. I didn't quite understand my original array!
(cherry picked from commit c2edd6224d)
2020-03-23 16:28:35 -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)

# Conflicts:
#	src/m_menu.c
2020-03-23 16:27:14 -07:00
toasterbabe
ae3c4a0227 Removal of cv_allcaps for console stuff.
(cherry picked from commit 95d89078f5)
2020-03-23 15:05:00 -07:00
Sally Cochenour
464e3273a9 Missing include 2020-03-22 21:16:55 -04:00
Sally Cochenour
a638054332 Bad whoopsie 2020-03-22 20:37:20 -04:00
Sal
82a39f6c85 Merge branch 'kill-whitespace' into 'master'
Kill CRLF and trailing whitespace

See merge request KartKrew/Kart!216
2020-03-22 20:31:08 -04:00
Sal
d64f77cf06 Merge branch 'welcome-to-errormode' into 'master'
abs on unsigned does nothing

See merge request KartKrew/Kart!220
2020-03-22 20:30:47 -04:00
Sal
fe9927fbd8 Merge branch 'targets' into 'master'
Break the Capsules

See merge request KartKrew/Kart!172
2020-03-22 20:30:20 -04:00
Sally Cochenour
53df47b4fe toaster suggestions 2020-03-22 20:29:58 -04:00
James R
c74cea6d5d abs on unsigned does nothing 2020-03-22 14:47:12 -07:00
James R
dda610fbd4 Merge remote-tracking branch 'origin/master' into kill-whitespace 2020-03-22 14:36:21 -07:00
Sally Cochenour
7f07fa9b2d Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00
Sally Cochenour
198b9770f7 Apply to any break the capsules, instead of only time attack 2020-03-22 16:14:53 -04:00
Sally Cochenour
8d91ff1e1c No time limit in capsules 2020-03-22 16:13:41 -04:00
Sally Cochenour
b18df427dd Break the Capsules ends when you lose bumpers 2020-03-22 16:07:25 -04:00
Sally Cochenour
601ab839f0 Set bumpers to 1 in Break the Capsules 2020-03-22 14:55:47 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sal
6e02982e7d Merge branch 'air-spark-experiment' into 'master'
Air spark experiment

See merge request KartKrew/Kart!217
2020-03-22 14:26:33 -04:00
Sal
7ce109249a Merge branch 'antigrav-waypoints' into 'master'
Fix antigrav respawn, no respawn flag, and remove spinout when respawning

See merge request KartKrew/Kart!213
2020-03-22 14:23:21 -04:00
Latapostrophe
80e04a2035 Use proper respawn check, don't cancel spinout, but prevent dropdashing when respawning with spinout 2020-03-22 11:32:55 +01:00
Sal
36f9bb4381 Merge branch 'waypoints' into 'master'
Waypoints Exist

See merge request KartKrew/Kart!215
2020-03-22 01:05:02 -04:00
Sally Cochenour
c75e3a025c Braces to avoid compile error
(Not sure why I never got this until now?)
2020-03-21 23:11:19 -04:00
Sally Cochenour
521c4662bf void out heap after done asserting, to fix an unused variable compile error I get 2020-03-21 23:09:05 -04:00
Sryder
4975cce3ac Just use an I_Assert on SpawnSPBRingTrail 2020-03-22 00:47:17 +00:00
Sryder
9dae62c2c6 Fix me being hyperdumb with copypaste error 2020-03-22 00:47:02 +00:00
Sryder
2be2277f4b Fix the merge confluct I SOMEHOW missed 2020-03-22 00:44:28 +00:00
James R
d46c6dc384 Kill trailing whitespace 2020-03-21 17:37:33 -07:00
James R
12a229285b Kill CRLF 2020-03-21 17:37:16 -07:00