thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4216 commits 1 branch 12 tags 205 MiB
Commit graph

4216 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
896b253927 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 09:11:35 -04:00
mazmazz
91004ac075 Outdated comment; unused var 2018-09-12 08:07:34 -04:00
mazmazz
9cec18d960 Formatting 2018-09-12 08:06:44 -04:00
mazmazz
ef74b9e661 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 08:03:45 -04:00
mazmazz
a799917ccb 447: Allow relative calc from backside colormap (ML_TFERLINE) 2018-09-12 07:55:47 -04:00
mazmazz
cb958d5bbf 447: Allow alternate alpha without relative calc 2018-09-12 07:38:51 -04:00
mazmazz
c701341f83 447: AddColormap no longer returns chained colormap, so chain it ourselves 2018-09-12 07:31:10 -04:00
mazmazz
68d242bc4c R_AddColormap will not return an existing colormap, and new colormap is not added to chain 2018-09-12 07:24:22 -04:00
mazmazz
e275a2e9b8 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-12 07:15:26 -04:00
mazmazz
4d6cbd8878 Smarter default fadergbaA and fadeend for relative calc 2018-09-12 07:14:23 -04:00
mazmazz
c99f4319ec Add fadestart/fadeend/fog to R_AddColormaps 2018-09-12 07:07:26 -04:00
mazmazz
d26073584b 447: Extra params for R_AddColormaps 2018-09-12 07:06:58 -04:00
mazmazz
b9a33f5efd Add fadestart/fadeend/fog to R_AddColormaps 2018-09-12 07:06:45 -04:00
mazmazz
caa756acf9 Duplicate lines 2018-09-11 22:49:32 -04:00
mazmazz
832cbfe278 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 22:44:44 -04:00
mazmazz
50c5cfaba5 Split colormap netsync to Load/SaveExtraColormap methods 2018-09-11 22:44:31 -04:00
mazmazz
8e4d87a739 Add R_CheckEqualColormaps comparison method 2018-09-11 22:43:12 -04:00
mazmazz
86e619e1bf R_AddColormaps method 2018-09-11 21:03:55 -04:00
mazmazz
8a212a83ac Use R_AddColormaps method in 447 relative calc 2018-09-11 21:03:13 -04:00
mazmazz
f9316a29a8 R_AddColormaps method 2018-09-11 21:02:58 -04:00
mazmazz
bc6382a024 Add relative color change to 447 2018-09-11 19:11:50 -04:00
mazmazz
3f5ea6f3bb Use RGB/RGBA macros in 447 code 2018-09-11 17:32:43 -04:00
mazmazz
6e6513483a Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 17:31:35 -04:00
mazmazz
41735f1da8 Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA 2018-09-11 17:30:43 -04:00
mazmazz
9869e13eda Don't set sector's extra_colormap if we just made a default clone 
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
 2018-09-11 17:08:57 -04:00
mazmazz
8e477c80a7 Account for NULL colormaps in alpha-only code 447 2018-09-11 17:07:50 -04:00
mazmazz
aed2411a91 Don't set sector's extra_colormap if we just made a default clone 
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
 2018-09-11 17:06:44 -04:00
mazmazz
03ddb86707 Added alpha-only, relative calc, and offset params to 447 Change Colormap 2018-09-11 16:50:35 -04:00
mazmazz
cf271e33dd Ifdef typo 2018-09-11 15:59:56 -04:00
mazmazz
d17b0d5d15 Ifdef typo 2018-09-11 15:59:13 -04:00
mazmazz
438243345e Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:57:58 -04:00
mazmazz
186a75b7d3 Consolidate colormap matching into R_GetColormapFromList 2018-09-11 15:56:21 -04:00
mazmazz
27e4e993d1 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:50:21 -04:00
mazmazz
2a046581c0 Consolidate colormap matching into R_GetExistingColormap 2018-09-11 15:50:12 -04:00
mazmazz
db3d65651a Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:20:58 -04:00
mazmazz
14d7057bf9 Add R_CopyColormap 2018-09-11 15:20:30 -04:00
mazmazz
1482a8799d Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:03:04 -04:00
mazmazz
73db00488c Merge branch 'master' into colormap-overhaul 2018-09-11 15:02:35 -04:00
mazmazz
7da83e13f0 Smarter string digit parsing; allow alpha-only values 
* GetDefaultColormap and CheckDefaultColormapValues methods
 2018-09-11 15:01:05 -04:00
mazmazz
b254cb00df Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 13:46:47 -04:00
mazmazz
a22f660bc8 Clear colormaps properly (resolve sigsegv crash) 2018-09-11 13:46:34 -04:00
mazmazz
7aee739203 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 13:33:31 -04:00
mazmazz
2cac83d5e9 Initialize extra_colormaps to NULL on program start 2018-09-11 13:31:09 -04:00
mazmazz
029d47376b Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba 2018-09-11 13:27:04 -04:00
Monster Iestyn
78130e830e Merge branch 'public_next' 
# Conflicts:
#	src/p_setup.c
#	src/r_data.c
 2018-09-11 16:41:27 +01:00
Monster Iestyn
d8f73b0d97 Merge branch 'master' into next 2018-09-11 16:34:16 +01:00
Monster Iestyn
bf6379c3df Merge branch 'colormap-code-cleanup' into 'master' 
Colormap code cleanup

See merge request STJr/SRB2!275
 2018-09-11 11:31:56 -04:00
mazmazz
74772857cf Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 22:37:34 -04:00
mazmazz
bbab5fc735 Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:37:27 -04:00
mazmazz
7267245f74 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 22:35:45 -04:00