mazmazz
e24ea0cb4d
Block song position changes on GME because unstable
2018-09-13 13:27:42 -04:00
mazmazz
9c56f953a5
Merge branch 'master' into musicplus-core
2018-09-13 13:24:46 -04:00
mazmazz
b849693c96
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:19:28 -04:00
mazmazz
2e75be2d42
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:19:10 -04:00
mazmazz
3dc4a1d7da
Missed fog boolean -> integer
2018-09-13 12:18:53 -04:00
mazmazz
065638d029
455: Fog flag fix for fading
2018-09-13 12:18:10 -04:00
mazmazz
2bef671a5f
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:10:14 -04:00
mazmazz
375f48be27
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:08:56 -04:00
mazmazz
031bc8f4d7
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
2018-09-13 12:08:46 -04:00
Digiku
8f59606199
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
mazmazz
a7ec620ea4
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
mazmazz
b58f765254
455: Set timing by either Back Y or Front Y, but not line length
2018-09-13 10:53:03 -04:00
mazmazz
8464a5ec8a
455: Don't override fadergba on default/no colormap init (~BOUNCY)
2018-09-13 10:43:41 -04:00
mazmazz
99c67decc1
455: Add speed increment timing (~EFFECT4) to FadeColormap
2018-09-13 10:43:32 -04:00
toaster
63f990e6f2
Bugfix sad chao jumping in their sad state
2018-09-13 14:40:50 +01:00
toaster
00438f4c41
Dark SPB background
2018-09-13 14:36:48 +01:00
toaster
18c0e607fa
Make the chao quieter (if it's still too loud, I can tone it down further, but not by much)
2018-09-13 14:35:20 +01:00
toaster
0dc963ffd2
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-13 14:23:36 +01:00
TehRealSalt
7532e58a8c
Tweak these blues
...
Try to make all the blues using this range look a little different, you know?
- Cyan is brighter, and has more contrast.
- Teal has 1 more shade of blue for slightly better anti-aliasing.
2018-09-13 03:04:01 -04:00
TehRealSalt
5708e49c95
Instead of doing productive things, I changed around skincolors again
...
- Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey.
- Improved Pink & Ruby.
- Added Ketchup, replaced Canary with Mustard.
- Removed Army.
2018-09-13 02:07:00 -04:00
mazmazz
c9f6c362ff
491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight
2018-09-13 00:26:49 -04:00
mazmazz
509965d2c0
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes
...
* 490: Set proper render flags according to spawnflags
* 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* 492:
* Tic-based (EFFECT4) and speed timing
* Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* Set proper render flags according to spawnflags
* Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 00:06:11 -04:00
mazmazz
33c1109993
PolyObjFade: Apply RENDER, SOLID, and NOSPECIALS flags according to spawnflags
2018-09-13 00:06:08 -04:00
mazmazz
d0b2728ce1
490 PolyVisible: Set proper spawn render flags instead of RENDERALL
2018-09-13 00:06:06 -04:00
mazmazz
35e58d3c8c
420: A parenthesis
2018-09-12 21:49:03 -04:00
mazmazz
3b7f7cf305
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00
mazmazz
ef7de5f543
420: Allow Back Y Offset for timing parameter
2018-09-12 21:32:12 -04:00
mazmazz
bf954892a7
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 21:06:32 -04:00
mazmazz
5dd6ea6c01
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-12 21:06:27 -04:00
mazmazz
fc1d5ca2ca
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 21:06:07 -04:00
mazmazz
70f3f7c80d
Init side->colormap_data pointer to NULL (for paranoia)
2018-09-12 21:05:50 -04:00
mazmazz
3e94448632
455: Change to side->colormap_data
2018-09-12 20:52:05 -04:00
mazmazz
5783302f08
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 20:47:00 -04:00
mazmazz
9060ad0e66
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 20:46:02 -04:00
mazmazz
18bd48843f
Add colormap_data to side_t and store colormaps there on setup
2018-09-12 20:43:48 -04:00
mazmazz
c19927883f
Merge branch 'master' into le-fadefof
2018-09-12 18:01:42 -04:00
mazmazz
209fda288f
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 17:40:24 -04:00
mazmazz
10e0d795a7
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 17:39:59 -04:00
mazmazz
854caf2383
Merge errors
2018-09-12 17:39:30 -04:00
mazmazz
16279631f1
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 17:30:09 -04:00
mazmazz
691ee31681
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
mazmazz
3d03964bb9
Fade FOF colormap support
2018-09-12 16:59:35 -04:00
mazmazz
675c9646a0
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 16:30:10 -04:00
mazmazz
f64703b2b1
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 16:29:02 -04:00
mazmazz
d53201d45d
Use lightlist.extra_colormap double pointers in OpenGL
2018-09-12 16:28:55 -04:00
mazmazz
8e3c609510
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 16:07:07 -04:00
mazmazz
f06e0a6569
Make lightlists react to control sector colormap changes (double pointer)
2018-09-12 16:06:56 -04:00
toaster
fd679bd2aa
* Chao audience!
...
* Replaces the CZ64-era hopping Mario guys.
* ~50% randomised colours!
* 1/9 are FANS!
* On mapload, some Chao select a random player in the server (even spectators) as their idol.
* The fans cheer for their idol when they cross the finish line in a winning position!
* They also sob when their idol loses.
* The remaining percentage are the canon Aqua.
* Minor on-field spikeball/fake radius alterations requested by Oni.
2018-09-12 19:03:45 +01:00
mazmazz
59b7a64eaf
P_ResetFakeFloorFader: Argument order error with dolighting
2018-09-12 12:40:56 -04:00
mazmazz
72e0702be6
T_FadeColormap: Fade subtraction error
2018-09-12 11:33:44 -04:00