Commit graph

7093 commits

Author SHA1 Message Date
Sally Cochenour
14fdc8a90a Savegame is a stupid term for this 2020-03-25 05:36:46 -04:00
Sal
dc9ce7bc20 Merge branch 'power-level-tweak' into 'master'
Power level tweak

See merge request KartKrew/Kart!219
2020-03-25 04:06:30 -04:00
Sally Cochenour
0051655c62 Merge branch 'master' into power-level-tweak 2020-03-25 02:04:53 -04:00
Jaime Passos
21a3067936 Fix M_PathParts instead
(cherry picked from commit 244f0b228fefb69fb59c1f7f70d4815c0388a634)
2020-03-24 15:49:29 -07:00
Jaime Passos
f74adb0ad9 Fix logfiles crashing Windoze
(cherry picked from commit 3bb7fd4cbf2bb92f5548cafad00b80cb366395a4)
2020-03-24 15:49:29 -07:00
James R
7ef8e81713 Correct usage of logdir
(cherry picked from commit b7b4945c36fb95f406a365d64f109cfc83ad4d63)
2020-03-24 15:49:09 -07:00
James R
d1de8cc2eb Overwrite an already existing symlink
(cherry picked from commit f2c2836301d4dc59242d09f08a5473341c4d692c)
2020-03-24 15:49:08 -07:00
James R
10a9a05cd8 symlink latest-log.txt on nix, copy to the real log file everywhere else
(cherry picked from commit 25525a6aae84581ac03ca3089950ad4ff25b8512)
2020-03-24 15:49:08 -07:00
James R
294dfbacc5 Create directories from -logfile too
(cherry picked from commit 98cb238d36e0f85d9d4b4d2cff59c720e1630bdd)
2020-03-24 15:49:08 -07:00
James R
b4f93fea8e Let an asbolute path work with -logfile
(cherry picked from commit 5fbe77cdda7ec52bc2ca10ab9253df8dc56d2317)
2020-03-24 15:49:08 -07:00
James R
45a2e22abc -logdir lets the user change the log directory
(cherry picked from commit 457e986b7514c0e9fa921c1961344012443ac164)
2020-03-24 15:49:07 -07:00
James R
599452af7b Change default log filename to not use a space
bleh

(cherry picked from commit c285000c5668ab82545ec9ee4989aabf65e2585e)
2020-03-24 15:49:07 -07:00
James R
ccde660cdf -logfile to let the user change the log file name
(cherry picked from commit d9d13764e6840e036c095c6d87838a4dfede80f4)
2020-03-24 15:49:07 -07:00
James R
c79ceca65e Forgot includes
(cherry picked from commit 92dd9d20663c8c601053354326fd9412694e3078)
2020-03-24 15:48:42 -07:00
James R
6274b9fde1 ferror does not return errno, are you stupid?
Use M_FileError to return the proper error description, or "end-of-file".

(cherry picked from commit 2f521f2eb18a79fd7e0a6aca2f2b7b6113042d6c)
2020-03-24 15:48:42 -07:00
toaster
f400d33947 Mark new-style log names as loaded.
(cherry picked from commit c36123aa5687c5151aad98fd1941412f7407ae52)
2020-03-24 15:46:04 -07:00
toaster
5653a72141 * Resolve compiling issues with logmessages.
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)

(cherry picked from commit 113568095a609c662e33e67f311c94e28be127d9)
2020-03-24 15:43:07 -07:00
Steel Titanium
d6c8306858 Fix this mistake
(cherry picked from commit cc80cd77c531d23f88ae5f7ee417a453172fdc09)
2020-03-24 15:38:33 -07: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
James R
0a0dede69e Revert "Correcting gamma to match base SRB2."
This reverts commit cdf8c54f2d.
2020-03-24 15:13:54 -07:00
Sally Cochenour
88709aafaa Fix eggman items having no collision 2020-03-24 12:55:48 -04:00
James R
ef028e5822 Add a comment because this is confusing 2020-03-23 17:50:51 -07:00
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
Sal
b54531c9f6 Merge branch 'gentlemen-no-spectators' into 'master'
Ignore spectators for gentlemen's ping

See merge request KartKrew/Kart!221
2020-03-23 16:10:47 -04:00
Sal
8d763afae6 Merge branch 'map-features' into 'master'
Minor but handy new mapping features

See merge request KartKrew/Kart!218
2020-03-23 00:44:18 -04:00
Sal
14bd304b06 Merge branch 'parties' into 'master'
Parties (Online Splitscreen Mk. II)

See merge request KartKrew/Kart!198
2020-03-23 00:43:33 -04:00