7d09149b04
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
015e7b9862
Resolve p_setup and d_netcmd conflicts (20190101 public merge)
2019-01-07 03:07:24 -05:00
075f28b7c8
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
4f18ec60bc
Fix saving progress on vanilia
2018-12-26 15:47:12 -05:00
8d56c2f486
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
2b59cfa63f
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:58:16 -02:00
9525de2d83
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
9d93f54b67
bland
2018-12-20 18:52:51 -03:00
ffd5061531
Merge branch 'next' into sw_largeroomfix
2018-12-20 16:56:05 -02:00
dfbbab35f4
Merge branch 'master' into next
2018-12-20 16:41:21 +00:00
78501dcd0c
Comment out stray PK3 blockmap message
2018-12-20 01:11:07 -05:00
9e596d15af
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
e763eab6cd
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
37950341ec
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
348ed1e43f
Large room fix
2018-12-09 19:34:17 -03:00
97ea4086a5
Redundant type 1800 check for MT_COIN
2018-11-27 14:10:55 -05:00
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
c548aaa347
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
c6bd1111e5
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
74da082c75
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
224c0fccdb
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
e85f73117c
Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!
2018-11-12 20:07:45 +00:00
e1e94c3af2
Added page tags and find page by tag
...
* Added tutorial mode defines to this branch
2018-11-10 09:32:53 -05:00
311cb27818
Close text prompt upon level load
2018-11-04 22:32:47 -05:00
90cfa5ef16
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
3cdd904fbc
Merge branch 'colormap-overhaul-fade' into le-fadefof
2018-09-18 11:05:30 -04:00
899e8ef2a0
Merge remote-tracking branch 'origin/master' into le-fadefof
2018-09-18 10:52:03 -04:00
e7ecd84e80
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
2018-09-18 07:37:29 -04:00
e8a5735f75
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-14 08:42:02 -04:00
dc72835679
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-12 21:06:27 -04:00
0b2caa948f
Init side->colormap_data pointer to NULL (for paranoia)
2018-09-12 21:05:50 -04:00
17a78ba674
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 20:47:00 -04:00
f7ff440250
Add colormap_data to side_t and store colormaps there on setup
2018-09-12 20:43:48 -04:00
fad12d6be3
Merge branch 'master' into le-fadefof
2018-09-12 18:01:42 -04:00
c58e9b0bae
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
c4079dfca9
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 09:07:55 -04:00
14b71bdbc5
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
9a6a8b0b82
Outdated comment; unused var
2018-09-12 08:07:34 -04:00
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
f703c19502
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
5dad8d15b0
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 15:03:04 -04:00
ba88f8ebb6
Smarter string digit parsing; allow alpha-only values
...
* GetDefaultColormap and CheckDefaultColormapValues methods
2018-09-11 15:01:05 -04:00
82a26580de
Merge branch 'master' into change-colormap-ldef
2018-09-11 16:43:01 +01:00
fd783f09ea
Merge branch 'public_next'
...
# Conflicts:
# src/p_setup.c
# src/r_data.c
2018-09-11 16:41:27 +01:00
75267dfa2c
Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef
2018-09-10 21:06:28 -04:00
7e9297d06e
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 16:50:27 -04:00
53733ddf76
Type 606 renderer check allow OGL again
2018-09-10 16:32:54 -04:00
e0d8a6eec0
Get rid of bottommap, midmap, topmap
2018-09-10 16:16:04 -04:00
Nev3r