mazmazz
0abb038938
Fix titlemap music bug
2019-08-03 22:49:12 -04:00
mazmazz
eee3eaee57
Fix titlemap music bug
2019-08-03 22:48:40 -04:00
mazmazz
5fa27c57e0
Merge branch 'master' into musicplus-feature-dying-fp
2019-08-03 22:22:39 -04:00
Steel Titanium
c314c4b208
Some few changes.
...
The amount of rings you start with also applies when you respawn from a starpost.
Startrings counts the ring total requirement for a perfect bonus.
2019-06-24 16:21:03 -04:00
Steel Titanium
c2a8c82b6a
Forgot to do this.
2019-06-23 18:51:42 -04:00
Nev3r
ae1e3630f8
Add visplane portal creation functionality and use it to replace the skybox rendering.
...
The skybox rendering process has been replaced with portals instead. Those are generated after the first BSP tree pass by looking for existing sky visplanes at the time, and their windows are used to define new portals.
The skybox portals are still incomplete and cause visual glitches when masked elements are involved.
2019-06-02 00:07:55 +02:00
mazmazz
d944156744
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
mazmazz
378106ad73
Fix MIDI crash bug when changing music between levels
...
This happened when the old music was ERZ2 native midi, then warping to any other level.
2019-03-15 10:02:50 -04:00
mazmazz
5c308c5597
Fade out music upon dying or level change: 2.1 frontport
2019-03-15 04:21:17 -04:00
mazmazz
822b4d12bf
Merge branch 'public_next'
2019-03-15 01:43:03 -04:00
mazmazz
1381343a2e
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
mazmazz
83e89ba62c
Merge branch 'public_next'
2019-03-15 00:33:06 -04:00
mazmazz
2eb04ab17d
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
MascaraSnake
3c0cb14a29
In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC
2019-02-03 14:32:07 +01:00
MascaraSnake
3ea09d4ffe
Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD
2019-02-03 11:05:22 +01:00
Monster Iestyn
74cb384be2
revert to LF_SAVEGAME system code, removing all traces of saveoverride
...
(I believe Sal wanted us to do this anyway, so...)
2019-01-08 17:14:21 +00:00
mazmazz
4f40d2abdb
Merge errors for compile
2019-01-07 17:05:20 -05:00
Nev3r
6acdc428f7
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
mazmazz
c4fcdbf687
Resolve p_setup and d_netcmd conflicts (20190101 public merge)
2019-01-07 03:07:24 -05:00
Steel Titanium
2ba11a6d69
Support for per-map intermission music
2019-01-02 05:15:23 -05:00
mazmazz
6086a9f238
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
mazmazz
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
Steel Titanium
73dc40a0b1
Fix saving progress on vanilia
2018-12-26 15:47:12 -05:00
Digiku
15c9404f91
Merge branch 'addons-backport' into '2122-version'
...
Addons Menu backport to vanilla
See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
Jimita
2b28d30109
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:58:16 -02:00
Digiku
b6ff4b8930
Merge branch 'camera-backport' into 'next'
...
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
2018-12-20 16:57:23 -05:00
MPC
b584e95cdb
bland
2018-12-20 18:52:51 -03:00
Jimita
b8b2fbb816
Merge branch 'next' into sw_largeroomfix
2018-12-20 16:56:05 -02:00
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
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
