Monster Iestyn
c22df14771
Merge branch 'master' into next
2018-12-20 16:41:21 +00:00
mazmazz
8fb1453633
Comment out stray PK3 blockmap message
2018-12-20 01:11:07 -05:00
TehRealSalt
079c0ec709
Save override for level header
...
Kind of like 2.2's, but with backwards-compatability with 2.1
2018-12-16 20:09:59 -05:00
TehRealSalt
fad18c421e
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05:00
mazmazz
b6d1cca4da
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
mazmazz
ede6b183b1
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
MPC
dd78224528
Large room fix
2018-12-09 19:34:17 -03:00
mazmazz
363541d16a
Redundant type 1800 check for MT_COIN
2018-11-27 14:10:55 -05:00
MonsterIestyn
d158d7e011
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
mazmazz
9659767e43
FORCEWIPEOFF define in place of wipegamestate = -2
2018-11-25 19:40:18 -05:00
mazmazz
0d9749f418
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-25 19:03:22 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Nev3r
623c7097f1
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
Digiku
aed64a7c73
Merge branch 'nights-dronebox' into 'master'
...
NiGHTS: Drone hitbox improvements and player position correction on Nightserize
See merge request STJr/SRB2Internal!158
2018-11-21 20:19:39 -05:00
mazmazz
3bb75690c4
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
mazmazz
b37a2016c7
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
Monster Iestyn
eb4eef6104
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
mazmazz
3334df7ac4
More title screen features; menu meta state implementation (active and previous menu types)
...
* Draw background over titlemap
* HIDEBACKGROUND to show titlemap
* Specify NOMUSIC or IGNOREMUSIC (to not change music)
* Linedef execs implemented for tree hierarchy, including bubbling (NOENTERBUBBLE/NOEXITBUBBLE)
* Specify ENTERWIPE and EXITWIPE
* Menuid hierarchy fixes (Control mapping, joystick setup)
* Time attack handling fixes
* Specify custom wipes on runtime for D_Display and P_SetupLevel (for titlemap)
* Allow for forcing and skipping a wipe
* Wipe utility functions F_GetWipeLength and F_WipeExists
2018-11-17 19:08:30 -05:00
mazmazz
df7d23f00d
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -05:00
Monster Iestyn
ad8f789935
Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!
2018-11-12 20:07:45 +00:00
mazmazz
3174969755
Added page tags and find page by tag
...
* Added tutorial mode defines to this branch
2018-11-10 09:32:53 -05:00
mazmazz
3d86cbc729
Close text prompt upon level load
2018-11-04 22:32:47 -05:00
Monster Iestyn
ef2b789bfe
Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore
...
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
2018-10-27 19:29:31 +01:00
mazmazz
7102ccbcd8
Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel
2018-09-19 18:55:01 -04:00
mazmazz
b5e1856377
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 18:55:00 -04:00
mazmazz
73925fe590
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-19 18:53:46 -04:00
mazmazz
cf7131bfd4
Merge remote-tracking branch 'origin/master' into musicplus-core
2018-09-19 18:53:18 -04:00
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
