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
|
9064a0b33a
|
Merge remote-tracking branch 'origin/master'
|
2019-03-15 00:33:12 -04:00 |
|
mazmazz
|
4377386153
|
Merge branch 'public_next'
|
2019-03-15 00:33:06 -04:00 |
|
mazmazz
|
bd9e42ce6e
|
Merge branch 'public-gl-next' into public-musicplus-inter
|
2019-03-14 23:42:16 -04:00 |
|
mazmazz
|
469ed9cbe3
|
Implement MIXNIGHTSCOUNTDOWN
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
|
2019-03-14 23:10:14 -04:00 |
|
mazmazz
|
9ec98c588f
|
Merge branch 'public_next'
|
2019-03-14 22:15:34 -04:00 |
|
mazmazz
|
93626c2293
|
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
|
2019-03-13 19:45:07 -04:00 |
|
Monster Iestyn
|
7a0d8b408e
|
Merge branch 'public_next'
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
|
2019-02-27 22:36:01 +00:00 |
|
MascaraSnake
|
5eb089cc14
|
Forgot the continue statements
|
2019-02-03 17:07:13 +01:00 |
|
MascaraSnake
|
00cad05550
|
Emblem number in emblem definition is optional. If none is supplied, place in first free slot.
|
2019-02-03 17:03:33 +01:00 |
|
MascaraSnake
|
bc30bd06df
|
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
|
8c345b87ca
|
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 |
|
Steel Titanium
|
0aa965c59f
|
How did I forget about this
|
2019-01-26 23:22:30 -05:00 |
|
TehRealSalt
|
0d1c501664
|
Update the SP menu stuff to use MAXSKINS
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
|
2019-01-26 00:22:05 -05: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 |
|
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 |
|
mazmazz
|
c2dc5788bf
|
Merge remote-tracking branch 'public-gl/next' into 2122-version
|
2018-12-24 17:30:59 -05:00 |
|
Monster Iestyn
|
31c6b6ef77
|
remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway
|
2018-12-24 19:37:52 +00:00 |
|
Monster Iestyn
|
936b9ecebc
|
Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean
|
2018-12-24 19:29:54 +00:00 |
|
Latapostrophe
|
b7d7472a88
|
Merge branch 'next' into SRB2-CHAT
|
2018-12-23 22:53:24 +01:00 |
|
Latapostrophe
|
1b61e15b1b
|
Merge branch 'master' into SRB2-CHAT
|
2018-12-23 10:26:08 +01: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
|
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 |
|
TehRealSalt
|
cc22ef3f05
|
Add deprecation warning to admin
|
2018-12-16 16:05:18 -05:00 |
|
Latapostrophe
|
25e6d5388c
|
merge conflict
|
2018-12-16 16:48:15 +01:00 |
|
mazmazz
|
b84470ec51
|
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
|
2018-12-13 12:01:07 -05:00 |
|
Monster Iestyn
|
33c1ac33f5
|
Merge branch 'next' into 21-version
# Conflicts:
# src/d_netcmd.c
|
2018-12-02 15:45:07 +00:00 |
|
TehRealSalt
|
c70cf5908d
|
IsPlayerAdmin support, since admin was removed
# Conflicts:
# src/lua_baselib.c
|
2018-11-29 07:12:15 -06:00 |
|
Wolfy
|
b8ce51bff2
|
Multiple admins
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
|
2018-11-29 06:46:59 -06: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 |
|
Digiku
|
9e75774fd2
|
Merge branch 'nights-ideyaspawn-dronebox' into 'master'
NiGHTS: Ideya Anchor Points
See merge request STJr/SRB2Internal!160
|
2018-11-21 21:03:29 -05:00 |
|
Digiku
|
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 |
|
Monster Iestyn
|
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 |
|
Monster Iestyn
|
66900c70ee
|
Merge branch 'master' into next
|
2018-11-20 13:55:36 +00:00 |
|
Alam Ed Arias
|
4e9fc881a2
|
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
|
2018-11-14 16:26:46 -05:00 |
|
Alam Ed Arias
|
d14f87b8c6
|
Cleanup whitespace
|
2018-11-14 10:54:33 -05:00 |
|
mazmazz
|
6c69dd1f78
|
Merge branch 'master' into text-prompts
|
2018-11-13 11:12:44 -05:00 |
|
Digiku
|
b6a0b2f1d9
|
Merge branch 'tutorial-time' into 'master'
Tutorial mode handling
See merge request STJr/SRB2Internal!201
|
2018-11-13 10:49:02 -05:00 |
|
Digiku
|
3ccfd57fba
|
Merge branch 'tracerangle' into 'master'
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away
See merge request STJr/SRB2Internal!198
|
2018-11-13 10:48:01 -05:00 |
|
mazmazz
|
c1c815ce6e
|
Compile errors
|
2018-11-13 10:31:06 -05:00 |
|
mazmazz
|
75c4a96e69
|
NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
|
2018-11-13 00:13:36 -05:00 |
|
mazmazz
|
eb7718bfeb
|
PicToStart implementation; fix NumPrompts limitation error
|
2018-11-12 23:16:24 -05:00 |
|
mazmazz
|
a362407886
|
Merge branch 'control-selector' into text-prompts
|
2018-11-12 21:11:53 -05:00 |
|
mazmazz
|
ce7f168568
|
Fix PICSMETAPAGE
|
2018-11-11 14:50:10 -05:00 |
|
mazmazz
|
424bc557c2
|
Dehacked typos
|
2018-11-11 14:44:57 -05:00 |
|
mazmazz
|
c883b13b5d
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:21:10 -05:00 |
|