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
0dd8779b91
Hardcoded emblems of the first four special stages
2019-01-30 23:01:58 +01:00
88a6dbae9b
Spring Hill -> Christmas Chime
2019-01-29 22:26:15 +01:00
f6dd521fd0
Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ
2019-01-28 21:28:38 +01:00
0aa965c59f
How did I forget about this
2019-01-26 23:22:30 -05:00
bce093fd06
Setup the tables even eariler.
...
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
74bf3164f8
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
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
74850fea17
Merge branch 'master' into next
2019-01-20 17:01:01 -05:00
b8b605a9c7
Merge branch 'apng-conditional-disable' into 'master'
...
Disable the APNG code if the version of libpng is greater than 1.4.
See merge request STJr/SRB2!457
2019-01-20 17:00:50 -05:00
b18a8dbc8d
Disable the APNG code if the version of libpng is greater than 1.4.
...
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
fad341b0e9
Fix skins overflow
2019-01-15 14:29:43 -05:00
7e026824a4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05:00
2e066876d4
Merge branch 'master-20190101' into 'master'
...
Post-2.1.23 public next merge (20190101)
Closes #46 , #47 , #45 , #43 , and #37
See merge request STJr/SRB2Internal!209
2019-01-11 18:09:30 -05:00
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
a050ed956a
Fixed Addons Menu icons for search bar
2019-01-08 01:31:44 -05:00
47bd042a7e
Misssed alwaysfreelook defaults (first person)
2019-01-08 01:29:12 -05:00
d5de5e9f49
Fix player.dta SIGNA0 overwriting regular end sign frame
2019-01-08 00:19:42 -05:00
e02fd489a7
GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)
2019-01-07 23:06:47 -05:00
8ea8bf2587
Chat arrow offsets
2019-01-07 22:34:48 -05:00
5066e340f4
Update SRB2-CHAT nickname colors to 2.2 skincolors
2019-01-07 22:26:39 -05:00
e403d1bacc
Correct addons menu back color
2019-01-07 21:58:42 -05:00
dfc427e81a
Dummy out SRB2-CHAT console colors
...
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
411b1b4f54
Addons menu merge fixes
2019-01-07 21:45:41 -05:00
a775a63dfd
WIP hu_stuff merge fixes
2019-01-07 17:56:55 -05:00
875aee60a0
Menu merge fixes
2019-01-07 17:56:43 -05:00
b3f7b169b2
Merge errors for compile
2019-01-07 17:05:20 -05:00
4f0be1b064
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
7aa55f24f5
Resolve r_data.c colormap conflict
2019-01-07 15:29:37 -05:00
7d09149b04
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
9effa134d2
resolve the conflict in p_spec.c
2019-01-07 17:02:05 +00:00
96ad8dd81a
resolve conflict in r_main.c
2019-01-07 16:52:46 +00:00
1c1331199d
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
015e7b9862
Resolve p_setup and d_netcmd conflicts (20190101 public merge)
2019-01-07 03:07:24 -05:00
e18eb69a0b
Resolved filesrch.c conflicts (20190101 public merge)
2019-01-07 02:54:26 -05:00
e9150b6645
Resolve m_menu.c conflicts (20190101 public merge)
2019-01-07 02:31:45 -05:00
d5870e6f8a
Merge branch 'changecontrol-text-overflow-fix' into 'master'
...
Resolve buffer overflow crash when configuring System Menu and GIF controls
See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
c97dc5d3c4
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
2e4c139551
DD Compile fixes
2019-01-02 06:48:06 -05:00
2bd794c006
Remove S_MusicExists lua
2019-01-02 06:26:18 -05:00
827461cc36
Support for per-map intermission music
2019-01-02 05:15:23 -05:00
e2e345988a
Add safe lua music functions
...
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
2019-01-02 04:58:03 -05:00
1aacfee80c
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
109dd70a53
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -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
819e4ef2ae
Merge branch 'master' into next
2019-01-01 23:00:39 -05:00
393c64b8bc
Merge branch 'expanded-nmuslist' into 'next'
...
Expand NMUSList to include HUD changes
See merge request STJr/SRB2!388
2019-01-01 15:06:04 -05:00
5278d1ca20
Merge branch 'caps-lock-consistency-fix' into 'master'
...
Update capslock state on window re-focus
See merge request STJr/SRB2!436
2019-01-01 15:05:20 -05:00
900a439c11
Merge branch 'appveyor-installer-revise' into 'master'
...
Make AppVeyor installer paths consistent with Travis installer paths
See merge request STJr/SRB2!446
2019-01-01 11:52:42 -05:00
528c6f771a
Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer)
2019-01-01 11:51:17 -05:00
MascaraSnake