84 commits

Author	SHA1	Message	Date
mazmazz	46993268ae	* Added FORCERESETMUSIC level header ... * cv_resetmusicbyheader toggle to disable said override * Never reset music during time attack * Change cv_resetmusic default back to off	2019-08-04 20:02:38 -04:00
toaster	384dc0674e	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" ... This reverts commit 603d5805f7.	2019-08-04 12:03:57 +01:00
toaster	603d5805f7	Revert "Merge branch 'musicplus-aug2019-b' into 'master'" ... This reverts commit 56bfdb7113, reversing changes made to c29cfbef9b.	2019-08-04 11:32:55 +01:00
mazmazz	cdb7250da4	Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b	2019-08-04 03:22:36 -04:00
toaster	7bff305672	* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. ... * Move it into lua_script.h, so it's available to everything that needs it.	2019-07-30 17:57:57 +01:00
toaster	69e573517f	Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168).	2019-07-30 17:48:13 +01:00
MascaraSnake	e9978b2955	Merge branch 'master' into thinkerlists ... # Conflicts: # src/f_finale.c # src/p_enemy.c	2019-07-02 23:08:37 +02:00
Steel Titanium	a801efa946	Forgot to do this.	2019-06-23 18:51:42 -04:00
Nev3r	5401e9560f	Dynamic slopes now use thinkers. ... * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-19 14:14:43 +02:00
mazmazz	f163633591	Merge branch 'public_next'	2019-03-15 01:43:03 -04:00
mazmazz	6cf05a4613	Implement MUSICINTERFADEOUT level header	2019-03-15 01:05:52 -04:00
mazmazz	4377386153	Merge branch 'public_next'	2019-03-15 00:33:06 -04:00
mazmazz	9ec98c588f	Merge branch 'public_next'	2019-03-14 22:15:34 -04:00
Monster Iestyn	f3796dc7f6	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	1e702443e3	Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss	2019-01-07 01:10:54 -05:00
Steel Titanium	827461cc36	Support for per-map intermission music	2019-01-02 05:15:23 -05:00
mazmazz	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
mazmazz	b7bb570f97	Merge remote-tracking branch 'public-gl/master' into public-musicplus-core	2019-01-01 10:41:40 -05:00
Monster Iestyn	76fe78571e	fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic	2018-12-20 16:47:17 +00:00
Digiku	bea76aa4bf	Merge branch 'save-override' into 'next' ... Feature: Save override for level header See merge request STJr/SRB2!392	2018-12-19 13:04:41 -05:00
TehRealSalt	bef3bb23f8	Undo dc92bb49	2018-12-16 21:36:54 -05:00
TehRealSalt	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
Alam Ed Arias	14e98df69b	Revert "Merge branch 'kart-luatextures-backport' into 'next'" ... This reverts merge request !387	2018-12-16 22:57:39 +00:00
TehRealSalt	4ba23e1028	Expose R_TextureNumForName ... Backport from SRB2Kart	2018-12-16 15:58:47 -05:00
Monster Iestyn	1b2aea81dc	Merge branch 'master' into next	2018-11-25 20:39:17 +00:00
mazmazz	ea7162a76a	Update source copyrights to 2018	2018-11-25 07:35:38 -05:00
mazmazz	8f87bf82cd	Merge branch 'master' into musicplus-core	2018-11-13 13:46:30 -05:00
Monster Iestyn	a8291c122a	adding lua_maplib.c comments for new slope-related userdata types	2018-11-10 15:47:04 +00:00
Monster Iestyn	268bde3fdf	Merge branch 'public_next' ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h # src/dehacked.c # src/g_game.h # src/hardware/hw_draw.c # src/hardware/hw_main.c # src/lua_baselib.c # src/lua_hook.h # src/lua_hooklib.c # src/lua_hudlib.c # src/lua_libs.h # src/lua_maplib.c # src/lua_script.c # src/m_misc.h # src/p_mobj.c # src/s_sound.c # src/sdl12/mixer_sound.c # src/w_wad.c	2018-11-10 15:41:57 +00:00
Monster Iestyn	98fd9f8e42	WHY DID I FORGET THIS	2018-11-08 21:22:45 +00:00
Monster Iestyn	82c738ea4b	Remove hasslope, per colette's warning about it potentially causing desyncs	2018-11-08 21:13:58 +00:00
Monster Iestyn	e95b54e64f	missed this ESLOPE-needed area from a few commits ago apparently :V	2018-10-21 20:35:14 +01:00
Monster Iestyn	772004d3fd	Fix editing slope xydirection with Lua	2018-10-21 18:25:13 +01:00
Monster Iestyn	3ec8743c1b	Fix up the ability to edit slope zdelta and zangle with Lua (zangle is untested as of writing)	2018-10-21 17:32:53 +01:00
Monster Iestyn	e15ed742c1	add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved	2018-10-21 16:27:54 +01:00
Monster Iestyn	9296aaa28c	zangle should be shifted down by ANGLETOFINESHIFT if we're to use FINETANGENT on it	2018-10-20 23:36:06 +01:00
Monster Iestyn	61fa7026a1	add vector2 and vector3 userdata types to simplify getting a slope's o/d/normal	2018-10-20 19:00:37 +01:00
Monster Iestyn	7d4e27937d	Merge branch 'next' into lua-slopes ... # Conflicts: # src/lua_maplib.c	2018-10-20 18:31:06 +01:00
mazmazz	c5ea6b5efe	MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport	2018-09-18 10:22:17 -04:00
mazmazz	c5d4ff5712	Merge branch 'musicplus-core' into musicplus-feature-postboss	2018-09-16 23:32:18 -04:00
mazmazz	8e4569381f	Merge branch 'master' into musicplus-core	2018-09-13 13:24:46 -04:00
mazmazz	dabd7f99e6	Add MUSICPOSTBOSSFADEIN	2018-09-01 13:10:50 -04:00
Digiku	4882b7c3f8	Merge branch 'intermission-bonuslivesmax' into 'master' ... Intermission: MaxBonusLives level header option for # of lives in score tally See merge request STJr/SRB2Internal!162	2018-08-29 04:25:03 -04:00
mazmazz	4dd6b733d6	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	493bc86b08	MUSICPOSITION -> MUSICPOS ... * Added muspos level header var to lua	2018-08-25 16:21:34 -04:00
mazmazz	ed8288a028	MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS	2018-08-25 16:18:09 -04:00
mazmazz	610a83f60e	Added MUSICPOSTBOSSTRACK and MUSICPOSTBOSSPOSITION level header/variables	2018-08-25 16:10:46 -04:00
mazmazz	a3ed60d7bd	Added MUSICPOSTBOSS level header for boss post-defeat music	2018-08-25 16:02:12 -04:00
Monster Iestyn	87e37e21df	Merge branch 'public_next' ... # Conflicts: # src/sdl12/i_cdmus.c # src/win32ce/win_cd.c	2018-08-21 15:40:54 +01:00
mazmazz	d8c565407c	MaxBonusLives level header option for # of lives in score tally	2018-08-13 14:17:38 -04:00