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
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
TehRealSalt
50826ef634
New drift sparks
2018-09-11 19:52:00 -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
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
Monster Iestyn
7d49951cc0
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
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
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
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
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
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
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
8907f33f0b
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-11 15:03:23 -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
f20e78ce14
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-11 13:48:39 -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
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
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
1c24b9ac8e
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-11 11:26:12 -04:00
mazmazz
ccf37b96f8
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-11 11:25:21 -04:00
mazmazz
1bb41a00bc
Don't decrement fade timer if song is paused
2018-09-11 11:20:46 -04:00
mazmazz
2b4d7d1ad4
Change to percentage calc from interval decrement for volume fade
2018-09-11 11:17:30 -04:00
toaster
8df3e2ffbe
Do a bunch of major modifications to the voting system's rule change system!
...
* Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency.
* "Never" - does what it says on the tin.
* "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full
* "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps
* "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change
* There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense.
* Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps.
* Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 15:42:53 +01:00
mazmazz
31ee9df9b9
Use percentage calc instead of interval decrement for tic-based fading
2018-09-11 10:28:24 -04:00
mazmazz
17055a1345
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-11 10:08:13 -04:00
