lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4301 commits 1 branch 29 tags 122 MiB
Commit graph

4301 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz 5523fc3a8d Account for NULL colormaps in alpha-only code 447 2018-09-11 17:07:50 -04:00
mazmazz f703c19502 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 bb6cf6a807 Added alpha-only, relative calc, and offset params to 447 Change Colormap 2018-09-11 16:50:35 -04:00
mazmazz 837dcb662e Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 16:00:14 -04:00
mazmazz 71ade23739 Ifdef typo 2018-09-11 15:59:56 -04:00
mazmazz fb7ac4ccae Ifdef typo 2018-09-11 15:59:13 -04:00
mazmazz c6dbf2e560 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:57:58 -04:00
mazmazz e2d3c77a45 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 15:57:22 -04:00
mazmazz c920827032 Consolidate colormap matching into R_GetColormapFromList 2018-09-11 15:56:21 -04:00
mazmazz 7695f42962 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 15:50:27 -04:00
mazmazz 3290104922 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:50:21 -04:00
mazmazz 78aefc05cf Consolidate colormap matching into R_GetExistingColormap 2018-09-11 15:50:12 -04:00
mazmazz 87cf18b60b Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:20:58 -04:00
mazmazz 85d89287de Add R_CopyColormap 2018-09-11 15:20:30 -04:00
mazmazz a9c656160e Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 15:03:23 -04:00
mazmazz 5dad8d15b0 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 15:03:04 -04:00
mazmazz 3da58f436c Merge branch 'master' into colormap-overhaul 2018-09-11 15:02:35 -04:00
mazmazz ba88f8ebb6 Smarter string digit parsing; allow alpha-only values 
* GetDefaultColormap and CheckDefaultColormapValues methods
 2018-09-11 15:01:05 -04:00
mazmazz e20d5e90a7 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-11 13:48:39 -04:00
mazmazz 8695a5f5df Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 13:46:47 -04:00
mazmazz 4ef016e40f Clear colormaps properly (resolve sigsegv crash) 2018-09-11 13:46:34 -04:00
mazmazz 19fbb177ec Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-11 13:33:31 -04:00
mazmazz 506ce43627 Initialize extra_colormaps to NULL on program start 2018-09-11 13:31:09 -04:00
mazmazz a818b9a1dc 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 56b947ae95 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 82a26580de Merge branch 'master' into change-colormap-ldef 2018-09-11 16:43:01 +01:00
Monster Iestyn fd783f09ea Merge branch 'public_next' 
# Conflicts:
#	src/p_setup.c
#	src/r_data.c
 2018-09-11 16:41:27 +01:00
Monster Iestyn 3218ab17e0 Merge branch 'master' into next 2018-09-11 16:34:16 +01:00
Monster Iestyn 1199a5f9b4 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 5907e075e6 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-10 22:37:54 -04:00
mazmazz df4ea79ab7 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 22:37:34 -04:00
mazmazz b7a216c78b Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:37:27 -04:00
mazmazz 36522665c3 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 22:35:45 -04:00
mazmazz 17e101a24b Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:35:26 -04:00
mazmazz 9038ba4d9c Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:35:03 -04:00
mazmazz f29acffb19 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 21:57:09 -04:00
mazmazz 43ae25c4fd Make default extracolormap on init 
* Calc fadedist in R_CreateLightTable
 2018-09-10 21:56:57 -04:00
mazmazz 53b92a1601 Make default extracolormap on init 
* Calc fadedist in R_CreateLightTable
 2018-09-10 21:56:09 -04:00
mazmazz 0c4f3cbeca Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-10 21:15:44 -04:00
mazmazz 22746c1d91 Savegame fixes 2018-09-10 21:15:34 -04:00
mazmazz c007dfacec Savegame fixes 2018-09-10 21:12:56 -04:00
mazmazz 75267dfa2c Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef 2018-09-10 21:06:28 -04:00
mazmazz 3da38f2a9b Fixed colormap matching code again * Added debug messages for matching code 2018-09-10 20:56:59 -04:00
mazmazz 1e4f5e8d45 Remove MAXCOLORMAPS 2018-09-10 20:41:12 -04:00
mazmazz 8d78c22194 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 c92226890e Remove bottommap and topmap from savegame because unused 2018-09-10 16:50:35 -04:00
mazmazz 7e9297d06e Savegame netsync for sector colormaps; add spawn_midmap and co for comparison 2018-09-10 16:50:27 -04:00
mazmazz 7608583c6f Fix shared colormap matching 2018-09-10 16:42:07 -04:00
mazmazz 53733ddf76 Type 606 renderer check allow OGL again 2018-09-10 16:32:54 -04:00
mazmazz 2701976ba3 Compiler fixes 2018-09-10 16:28:39 -04:00