mazmazz
|
f0c11eb135
|
R_AddColormaps method
|
2018-09-11 21:03:55 -04:00 |
|
mazmazz
|
54669a6cc8
|
Use R_AddColormaps method in 447 relative calc
|
2018-09-11 21:03:13 -04:00 |
|
mazmazz
|
0fb594ad58
|
R_AddColormaps method
|
2018-09-11 21:02:58 -04:00 |
|
mazmazz
|
a1a05c9972
|
Add relative color change to 447
|
2018-09-11 19:11:50 -04:00 |
|
mazmazz
|
b9e4cd40ca
|
Use RGB/RGBA macros in 447 code
|
2018-09-11 17:32:43 -04:00 |
|
mazmazz
|
3e49cc68d2
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-11 17:31:35 -04:00 |
|
mazmazz
|
c2e662b2c0
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-11 17:31:02 -04:00 |
|
mazmazz
|
548f02eea1
|
Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA
|
2018-09-11 17:30:43 -04:00 |
|
Monster Iestyn
|
55418f9750
|
Merge branch 'change-colormap-ldef' into 'master'
New linedef executor special: change tagged sector's colormap
See merge request STJr/SRB2Internal!149
|
2018-09-11 17:21:31 -04:00 |
|
mazmazz
|
67b595f43c
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-11 17:09:13 -04:00 |
|
mazmazz
|
5975f26177
|
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
|
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
|
5f87f4a47a
|
Don't decrement fade timer if song is paused
|
2018-09-11 11:20:46 -04:00 |
|
mazmazz
|
5ea8dc3dfa
|
Change to percentage calc from interval decrement for volume fade
|
2018-09-11 11:17:30 -04:00 |
|
mazmazz
|
36923ae7b0
|
Use percentage calc instead of interval decrement for tic-based timing
|
2018-09-11 10:05:25 -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 |
|