Digiku
|
6f1a44432b
|
Merge branch 'colormap-overhaul' into 'master'
Colormap code overhaul
See merge request STJr/SRB2Internal!189
|
2018-09-17 11:24:14 -04:00 |
|
|
mazmazz
|
69a4906911
|
Colormap netsync: Count ffloors for colormap loading upper limit
|
2018-09-17 10:38:17 -04:00 |
|
|
mazmazz
|
d417f733e5
|
Colormap netsync: Handle unaccounted dummy colormaps properly
|
2018-09-17 10:30:21 -04:00 |
|
|
mazmazz
|
752a963037
|
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
|
2018-09-17 08:05:51 -04:00 |
|
|
mazmazz
|
f3e1d280d0
|
Colormap netsync: Mixed D+C fixes
|
2018-09-17 00:26:58 -04:00 |
|
|
mazmazz
|
4b55415add
|
New colormap netsync fixes
|
2018-09-16 22:42:36 -04:00 |
|
|
mazmazz
|
4cdbc7249f
|
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
|
2018-09-16 20:25:46 -04:00 |
|
|
Digiku
|
7aedb8d035
|
Merge branch 'lightfade-ticbased' into 'master'
Linedef Exec 420: Fade Lighting add duration timing
See merge request STJr/SRB2Internal!186
|
2018-09-16 08:24:09 -04:00 |
|
|
mazmazz
|
d49f0be4ee
|
420: Strip test comments
|
2018-09-16 08:20:14 -04:00 |
|
|
Nev3r
|
350cd1435b
|
The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now.
|
2018-09-15 12:21:25 +02:00 |
|
|
mazmazz
|
d939e597a5
|
420: Unncessary include
|
2018-09-15 20:03:43 -04:00 |
|
|
mazmazz
|
ab4a825385
|
420: Combine speed and duration logic for fade lighting
|
2018-09-15 19:01:21 -04:00 |
|
|
mazmazz
|
efe0af960d
|
Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS
|
2018-09-15 02:10:55 -04:00 |
|
|
mazmazz
|
6844ed37c5
|
Colormap overhaul: %d format size_t -> UINT32 fix
|
2018-09-15 01:50:33 -04:00 |
|
|
mazmazz
|
57959522e2
|
Colormap overhaul r_data: Mixed D+C fix
|
2018-09-15 00:49:03 -04:00 |
|
|
mazmazz
|
2f995f4cbe
|
Remove possibly wrong comment about extracolormap_t->fog
|
2018-09-14 22:35:30 -04:00 |
|
|
Monster Iestyn
|
b82ddd4f08
|
Merge branch 'public_next'
|
2018-09-14 19:51:20 +01:00 |
|
|
mazmazz
|
714464993e
|
420: Removed unnecessary include (gametic no longer needed)
|
2018-09-14 08:26:52 -04:00 |
|
|
Monster Iestyn
|
6fbc014ea3
|
Merge branch 'thwomp-fixes' into 'next'
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS
See merge request STJr/SRB2!277
|
2018-09-13 14:47:40 -04:00 |
|
|
mazmazz
|
07af82aa84
|
Missed fog boolean -> integer
|
2018-09-13 12:18:53 -04:00 |
|
|
mazmazz
|
6824e6a359
|
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
|
2018-09-13 12:08:46 -04:00 |
|
|
Digiku
|
89a6694d67
|
Don't trigger thwomp on spectators
|
2018-09-13 11:32:40 -04:00 |
|
|
mazmazz
|
c32c72c401
|
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
|
2018-09-13 11:32:38 -04:00 |
|
|
mazmazz
|
63a3125df2
|
420: A parenthesis
|
2018-09-12 21:49:03 -04:00 |
|
|
mazmazz
|
46067f0579
|
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
|
2018-09-12 21:35:46 -04:00 |
|
|
mazmazz
|
41fe080a68
|
420: Allow Back Y Offset for timing parameter
|
2018-09-12 21:32:12 -04:00 |
|
|
mazmazz
|
0b2caa948f
|
Init side->colormap_data pointer to NULL (for paranoia)
|
2018-09-12 21:05:50 -04:00 |
|
|
mazmazz
|
f7ff440250
|
Add colormap_data to side_t and store colormaps there on setup
|
2018-09-12 20:43:48 -04:00 |
|
|
mazmazz
|
ad9ef5d593
|
Merge errors
|
2018-09-12 17:39:30 -04:00 |
|
|
mazmazz
|
c58e9b0bae
|
Merge remote-tracking branch 'origin/master' into colormap-overhaul
|
2018-09-12 17:28:22 -04:00 |
|
|
mazmazz
|
62b6950e33
|
Use lightlist.extra_colormap double pointers in OpenGL
|
2018-09-12 16:28:55 -04:00 |
|
|
mazmazz
|
7d36aae7c4
|
Make lightlists react to control sector colormap changes (double pointer)
|
2018-09-12 16:06:56 -04:00 |
|
|
mazmazz
|
92c5cb8233
|
Colormap savegame failsafe - Handle NULL (default colormap)
|
2018-09-12 11:13:49 -04:00 |
|
|
mazmazz
|
9a6a8b0b82
|
Outdated comment; unused var
|
2018-09-12 08:07:34 -04:00 |
|
|
mazmazz
|
55c43a2161
|
R_AddColormap will not return an existing colormap, and new colormap is not added to chain
|
2018-09-12 07:24:22 -04:00 |
|
|
mazmazz
|
87ad2a87f7
|
Smarter default fadergbaA and fadeend for relative calc
|
2018-09-12 07:14:23 -04:00 |
|
|
mazmazz
|
133c3598a7
|
Add fadestart/fadeend/fog to R_AddColormaps
|
2018-09-12 07:07:26 -04:00 |
|
|
mazmazz
|
92a97fb1a6
|
Split colormap netsync to Load/SaveExtraColormap methods
|
2018-09-11 22:44:31 -04:00 |
|
|
mazmazz
|
90aeac5058
|
Add R_CheckEqualColormaps comparison method
|
2018-09-11 22:43:12 -04:00 |
|
|
mazmazz
|
f0c11eb135
|
R_AddColormaps method
|
2018-09-11 21:03:55 -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
|
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
|
71ade23739
|
Ifdef typo
|
2018-09-11 15:59:56 -04:00 |
|
|
mazmazz
|
c920827032
|
Consolidate colormap matching into R_GetColormapFromList
|
2018-09-11 15:56:21 -04:00 |
|
|
mazmazz
|
85d89287de
|
Add R_CopyColormap
|
2018-09-11 15:20:30 -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
|
4ef016e40f
|
Clear colormaps properly (resolve sigsegv crash)
|
2018-09-11 13:46:34 -04:00 |
|
|
mazmazz
|
506ce43627
|
Initialize extra_colormaps to NULL on program start
|
2018-09-11 13:31:09 -04:00 |
|