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
bab4a67516
Merge branch 'master' into change-colormap-ldef
2018-09-11 16:43:01 +01: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
mazmazz
98fefaaef7
Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order
2018-09-10 22:35:26 -04:00
mazmazz
9ab67b01e2
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-10 21:57:09 -04:00
mazmazz
a4052d96b0
Make default extracolormap on init
...
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz
c4cb0b2a9f
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-10 21:15:44 -04:00
mazmazz
7000d27175
Savegame fixes
2018-09-10 21:15:34 -04:00
mazmazz
0c74c5c017
Savegame fixes
2018-09-10 21:12:56 -04:00
mazmazz
7eed10f563
Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef
2018-09-10 21:06:28 -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
mazmazz
15aded0882
Colormap overhaul in r_data.c
...
* Split R_CreateColormap to R_CreateLightTable
* Replace extra_colormaps array with next/prev pointer chain
* Remove foundcolormaps; instead store lumpnum in extracolormap_t
* Add properties to extracolormap_t for portability
2018-09-10 15:59:31 -04:00
mazmazz
e3fd7eee79
Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup
2018-09-10 13:24:57 -04:00
Monster Iestyn
22b799a655
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
mazmazz
473d902696
Remove bottommap and topmap from savegame because unused
2018-09-10 09:03:58 -04:00
mazmazz
8a4bb895af
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 09:01:09 -04:00
Monster Iestyn
a5ba47cb3a
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
mazmazz
47cf5ebdd7
Merge branch 'master' into change-colormap-ldef
2018-09-09 08:40:38 -04:00
Monster Iestyn
ae6085ef1a
Merge branch 'netcode-nitpicking' into 'next'
...
Netcode nitpicking
See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
Digiku
8d015bd7cc
Merge branch 'flicky-things' into 'master'
...
Flicky Thing Types
See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
mazmazz
fbd6b2c826
Flicky colors indexing fix
2018-09-06 13:20:55 -04:00
mazmazz
a430d133b4
Compiler errors
2018-09-06 13:16:50 -04:00
