mazmazz
ec61164765
MP Core: 2.1 dehacked typo
2018-09-18 23:29:18 -04:00
mazmazz
d7ba245022
EndOfLevel: 2.1 dehacked setup fix
2018-09-18 23:28:39 -04:00
mazmazz
54d02e1d9a
musicplus-feature-endoflevel 2.2 -> 2.1 backport
2018-09-18 15:50:12 -04:00
mazmazz
4d164802c1
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-18 15:35:02 -04:00
mazmazz
4fa7a4ca37
musicplus-le-changemusic 2.2 -> 2.1 backport
2018-09-18 15:28:57 -04:00
mazmazz
9457fe15bf
Merge branch 'master' into musicplus-core
2018-09-18 12:20:56 -04:00
Digiku
be6bae4ccb
Merge branch 'colormap-overhaul-fade' into 'master'
...
Linedef Exec 455 Fade Colormap, 456 Stop Fading Colormap
See merge request STJr/SRB2Internal!191
2018-09-18 11:06:09 -04:00
mazmazz
65aeea28bc
Merge branch 'colormap-overhaul-fade' into le-fadefof
2018-09-18 11:05:30 -04:00
mazmazz
83cfc7d0e4
Merge remote-tracking branch 'origin/master' into le-fadefof
2018-09-18 10:52:03 -04:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
7b94368549
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
2018-09-18 07:37:29 -04:00
mazmazz
5f5ea5eec6
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-16 23:32:18 -04:00
mazmazz
5515fba00e
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-14 08:42:02 -04:00
mazmazz
9c56f953a5
Merge branch 'master' into musicplus-core
2018-09-13 13:24:46 -04:00
mazmazz
5dd6ea6c01
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-12 21:06:27 -04:00
mazmazz
70f3f7c80d
Init side->colormap_data pointer to NULL (for paranoia)
2018-09-12 21:05:50 -04:00
mazmazz
5783302f08
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 20:47:00 -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
691ee31681
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
mazmazz
054c18b9b7
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 09:07:55 -04:00
mazmazz
df739180b0
Fade colormap special 455! And stop fade colormap 456
...
* Added T_FadeColormap thinker and netsync
* Added sector_t fadecolormapdata property
2018-09-12 09:06:38 -04:00
mazmazz
91004ac075
Outdated comment; unused var
2018-09-12 08:07:34 -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
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
1482a8799d
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 15:03:04 -04:00
mazmazz
7da83e13f0
Smarter string digit parsing; allow alpha-only values
...
* GetDefaultColormap and CheckDefaultColormapValues methods
2018-09-11 15:01:05 -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
mazmazz
7eed10f563
Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef
2018-09-10 21:06:28 -04:00
mazmazz
27a8309ea4
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 16:50:27 -04:00
mazmazz
c767436629
Type 606 renderer check allow OGL again
2018-09-10 16:32:54 -04:00
mazmazz
d8056b1fea
Get rid of bottommap, midmap, topmap
2018-09-10 16:16:04 -04:00
mazmazz
5f03a9b1a9
P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block)
2018-09-10 16:08:43 -04:00
mazmazz
e3fd7eee79
Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup
2018-09-10 13:24:57 -04:00
Monster Iestyn
22b799a655
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
mazmazz
8a4bb895af
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 09:01:09 -04:00
Monster Iestyn
a5ba47cb3a
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
mazmazz
888ea233dc
Add spawn_lightlevel to sector_t
2018-09-09 12:44:35 -04:00
mazmazz
47cf5ebdd7
Merge branch 'master' into change-colormap-ldef
2018-09-09 08:40:38 -04:00
mazmazz
56d9522a62
Merge branch 'master' into nights-dronebox
2018-09-07 09:06:32 -04:00
mazmazz
73842cec71
Add MUSICPOSTBOSSFADEIN
2018-09-01 13:10:50 -04:00
Monster Iestyn
d60ade9f95
Merge branch 'master' into hud-n-menu-tidbits
2018-08-29 21:28:11 +01:00
mazmazz
2ee3228ee4
Merge remote-tracking branch 'origin/master' into nightsplus-laplogic
2018-08-29 10:16:49 -04:00
Monster Iestyn
6c85af79f6
Merge branch 'master' into hud-n-menu-tidbits
...
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
2018-08-28 20:51:46 +01:00
mazmazz
e588460fe5
MUSICPOSITION -> MUSICPOS
...
* Added muspos level header var to lua
# Conflicts:
# src/dehacked.c
# src/lua_maplib.c
# src/p_setup.c
2018-08-25 16:23:01 -04:00
mazmazz
6bb5280fbc
MUSICPOSITION -> MUSICPOS
...
* Added muspos level header var to lua
2018-08-25 16:21:34 -04:00
mazmazz
26d309992a
MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS
2018-08-25 16:18:09 -04:00
mazmazz
bc0038ca3e
Merge branch 'musicplus-core' into musicplus-feature-postboss
...
# Conflicts:
# src/dehacked.c
# src/p_setup.c
2018-08-25 16:11:29 -04:00
mazmazz
13854fbffb
Added MUSICPOSTBOSSTRACK and MUSICPOSTBOSSPOSITION level header/variables
2018-08-25 16:10:46 -04:00
