thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-20 20:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
16942 commits 2 branches 14 tags 206 MiB
Commit graph

119 commits

Author SHA1 Message Date
Sryder
a06e4da65b Additive and subtractive for the HUD 2021-02-01 17:53:27 +00:00
Sally Coolatta
afbbfc9b1f Fix cvars 
My wrist burns...
 2020-10-24 21:32:07 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
SteelT
6a168ac5e9 Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
Jaime Passos
15eb91be69 Use color look-up table for PNG conversion 2020-09-10 02:10:31 -03:00
Jaime Passos
bf52125494 Change method of color look-up table generation 2020-09-10 01:43:46 -03:00
Sally Coolatta
08b76dd52f Fix the HUD 2020-08-18 06:09:27 -04:00
Sally Coolatta
f5bf0371de Revert "TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig" 
This reverts commit 49e2f98beb.
 2020-08-18 03:54:31 -04:00
Sally Coolatta
49e2f98beb TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig 
Bare minimum for levels to load again, need to figure out why the 2.2 merged version isn't working
 2020-08-16 00:15:05 -04:00
Sally Coolatta
873474ac87 Make it to s_sound 2020-08-15 01:54:45 -04:00
James R
fe4f311da5 . 2020-08-14 22:38:15 -07:00
James R
e1a745db1f REMOVE THE LAST OF CV_ALLCAPS 2020-08-14 21:01:41 -07:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
1a058cb0cd Fix extra V_MAGENTAMAP definition 2020-08-10 17:07:47 -04:00
Sally Coolatta
f6ad84f572 and h 2020-08-09 16:05:06 -04:00
Sally Coolatta
3d53adaa2b Sliding HUD 
- Split HUD stuff into k_hud.c/h
- V_SPLITSCREEN replaces the old function that sets V_SPLITSCREEN/V_HORZSCREEN flags system, and instead automatically moves it based on player number
- V_SLIDEIN makes HUD items slide in after the intro animation.
 2020-07-26 05:47:53 -04:00
Sally Coolatta
a3ec4f22a1 Finished nametags 2020-06-03 23:29:43 -04:00
Sally Coolatta
120dc253af Merge remote-tracking branch 'origin/iwantmychat' into nametags 2020-06-03 20:19:26 -04:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
sphere
4d9d125a99 Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
 2020-04-11 23:47:25 -05: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
1a759a4904 GIF recording 
(cherry picked from commit d467d2b2295a9660631774b9edb29555cc5c30fe)
 2020-03-23 17:10:33 -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
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
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
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
4331b13952 Merge branch 'thin-fixed' into 'next' 
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
 2020-02-20 19:27:01 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
GoldenTails
c25e4bb1d8 Make V_DrawCenteredSmallThinString() a less precise wrapper for V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-center" option in v.drawString() 2020-02-01 11:01:39 -06:00
GoldenTails
7a00a08a52 Make V_DrawRightAlignedSmallThinString() a less precise wrapper for V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-right" option in v.drawString() 2020-02-01 11:01:22 -06:00
GoldenTails
8dbdb75abc Create V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-fixed-center" option in v.drawString() 
Thankfully "center" is just "right" but with the X offset divided by 2.
 2020-02-01 11:01:03 -06:00
GoldenTails
f526cf2b4c Create V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-fixed-right" option in v.drawString() 
You guys have no idea how long this took to code.
 2020-02-01 11:00:45 -06:00
GoldenTails
5d1b1b7e2b Create V_DrawSmallThinStringAtFixed() for new "small-thin-fixed" option in v.drawString() 
I removed the limitation present in "small-thin" by converting all relevant variables to fixed_t's and using FixedMul() and FixedDiv() when necessary. Who'da thunk it would actually work?
 2020-02-01 11:00:02 -06:00
GoldenTails
a75bc92146 Create V_DrawCenteredSmallStringAtFixed() for new "small-fixed-center" option in v.drawString() 2020-02-01 10:59:38 -06:00
GoldenTails
933088f3cb Create V_DrawRightAlignedSmallStringAtFixed() for new "small-fixed-right" option in v.drawString() 2020-02-01 10:59:21 -06:00
GoldenTails
ce744a5ebe Create V_DrawCenteredThinStringAtFixed() for new "thin-fixed-center" option in v.drawString() 2020-02-01 10:58:55 -06:00
GoldenTails
b2e33b48ef Fixed V_DrawRightAlignedThinStringAtFixed declaration to use fixed_t for positioning. 2020-02-01 10:58:19 -06:00
GoldenTails
e221e0b314 Create V_DrawRightAlignedThinStringAtFixed() for new "thin-fixed-right" option in v.drawString() 
These function names are starting to become rediculous...
 2020-02-01 10:55:54 -06:00
GoldenTails
7687d4d1ef Create V_DrawSmallThinString() for new "small-thin" option in v.drawString() 
Note this has some major limitations to prevent squished text. It defaults to using V_MONOSPACE|V_OLDSPACING and you cannot change the size of characters. V_6WIDTHSPACE seems to act exactly the same as V_OLDSPACING too.
 2020-02-01 10:53:06 -06:00
GoldenTails
3d2934350d Create V_DrawCenteredStringAtFixed() for new "fixed-center" option in v.drawString() 2020-02-01 10:51:43 -06:00
GoldenTails
b320d47d6c Fixed v_video.h declaration for V_DrawRightAlignedStringAtFixed() 2020-02-01 10:51:31 -06:00
GoldenTails
3c00c22a1d Create V_DrawRightAlignedStringAtFixed() for new "fixed-right" option in v.drawString() 2020-02-01 10:50:57 -06:00
GoldenTails
7ef82c6f08 Create V_DrawCenteredThinString() for new "thin-center" option in v.drawString() 2020-02-01 10:50:50 -06:00
GoldenTails
15e83615fa Create V_DrawCenteredSmallString() for new "small-center" option in v.drawString() 2020-02-01 10:50:46 -06:00
GoldenTails
8a44ca0a75 Create V_DrawSmallStringAtFixed() for new "small-fixed" option in v.drawString() 2020-02-01 10:43:04 -06:00