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
4194 commits 1 branch 12 tags 205 MiB
Commit graph

4194 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
21537d529d Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-12 08:08:02 -04:00
mazmazz
91004ac075 Outdated comment; unused var 2018-09-12 08:07:34 -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
f5c3b3cbbc Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-12 07:15:56 -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
a80e129863 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 22:46:40 -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
a79e785f5d Add R_CheckEqualColormaps comparison method 2018-09-11 22:34:29 -04:00
mazmazz
994e8f8ed3 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 21:04:21 -04:00
mazmazz
86e619e1bf R_AddColormaps method 2018-09-11 21:03:55 -04:00
mazmazz
bf3b877815 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 17:31:02 -04:00
mazmazz
41735f1da8 Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA 2018-09-11 17:30:43 -04:00
mazmazz
31b92844ad Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 17:09:13 -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
83648d90d5 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 16:00:14 -04:00
mazmazz
cf271e33dd Ifdef typo 2018-09-11 15:59:56 -04:00
mazmazz
c93f06b801 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 15:57:22 -04:00
mazmazz
186a75b7d3 Consolidate colormap matching into R_GetColormapFromList 2018-09-11 15:56:21 -04:00
mazmazz
bd1e5df597 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 15:50:27 -04:00
mazmazz
2a046581c0 Consolidate colormap matching into R_GetExistingColormap 2018-09-11 15:50:12 -04:00
mazmazz
14d7057bf9 Add R_CopyColormap 2018-09-11 15:20:30 -04:00
mazmazz
8907f33f0b Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 15:03:23 -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
f20e78ce14 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 13:48:39 -04:00
mazmazz
a22f660bc8 Clear colormaps properly (resolve sigsegv crash) 2018-09-11 13:46:34 -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
mazmazz
dc9de5caf2 Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba 2018-09-11 13:11:32 -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
0dde71860f Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-10 22:37:54 -04:00
mazmazz
bbab5fc735 Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:37:27 -04:00
mazmazz
c01c23a660 Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:35:03 -04:00
mazmazz
a4052d96b0 Make default extracolormap on init 
* Calc fadedist in R_CreateLightTable
 2018-09-10 21:56:57 -04:00
mazmazz
5ebcba7f6c Make default extracolormap on init 
* Calc fadedist in R_CreateLightTable
 2018-09-10 21:56:09 -04:00
mazmazz
7000d27175 Savegame fixes 2018-09-10 21:15:34 -04:00
mazmazz
96b07962fd Fixed colormap matching code again * Added debug messages for matching code 2018-09-10 20:56:59 -04:00
mazmazz
c3fafd18be Remove MAXCOLORMAPS 2018-09-10 20:41:12 -04:00
mazmazz
c1d1f08ea6 extracolormap_t refinement and netsyncing 
* Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor)
* Crunched some UINT16/32 into UINT8
* Calculate mask values in R_CreateLightTable
* ifdef out EXTRACOLORMAPLUMPS
 2018-09-10 20:36:34 -04:00
mazmazz
78f984e362 Remove bottommap and topmap from savegame because unused 2018-09-10 16:50:35 -04:00
mazmazz
27a8309ea4 Savegame netsync for sector colormaps; add spawn_midmap and co for comparison 2018-09-10 16:50:27 -04:00
mazmazz
102467489e Fix shared colormap matching 2018-09-10 16:42:07 -04:00
mazmazz
c767436629 Type 606 renderer check allow OGL again 2018-09-10 16:32:54 -04:00
mazmazz
0344ca70ba Compiler fixes 2018-09-10 16:28:39 -04:00
mazmazz
d8056b1fea Get rid of bottommap, midmap, topmap 2018-09-10 16:16:04 -04:00
mazmazz
5f03a9b1a9 P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block) 2018-09-10 16:08:43 -04:00