Steel Titanium
31a884e542
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
TehRealSalt
bcdfe2eb14
Update the SP menu stuff to use MAXSKINS
...
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05:00
Alam Ed Arias
2f65d2860a
Merge branch 'master' into next
2019-01-20 17:01:01 -05:00
Sryder
517a32e96d
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
Steel Titanium
123b97c5ed
Fix skins overflow
2019-01-15 14:29:43 -05:00
fickleheart
81c73032e4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05: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
3753e1be28
Fixed Addons Menu icons for search bar
2019-01-08 01:31:44 -05:00
mazmazz
6ae27013f2
Misssed alwaysfreelook defaults (first person)
2019-01-08 01:29:12 -05:00
mazmazz
58b3b6d236
Fix player.dta SIGNA0 overwriting regular end sign frame
2019-01-08 00:19:42 -05:00
mazmazz
8d930c7f47
GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)
2019-01-07 23:06:47 -05:00
mazmazz
e5125d0746
Chat arrow offsets
2019-01-07 22:34:48 -05:00
mazmazz
1821edeee7
Update SRB2-CHAT nickname colors to 2.2 skincolors
2019-01-07 22:26:39 -05:00
mazmazz
275070b608
Correct addons menu back color
2019-01-07 21:58:42 -05:00
mazmazz
7a97ebe985
Dummy out SRB2-CHAT console colors
...
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
mazmazz
95c2f34278
Addons menu merge fixes
2019-01-07 21:45:41 -05:00
mazmazz
38ad1ec027
WIP hu_stuff merge fixes
2019-01-07 17:56:55 -05:00
mazmazz
a436313987
Menu merge fixes
2019-01-07 17:56:43 -05:00
mazmazz
4f40d2abdb
Merge errors for compile
2019-01-07 17:05:20 -05:00
Digiku
8e862b3c98
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
mazmazz
1de7fcad8d
Resolve r_data.c colormap conflict
2019-01-07 15:29:37 -05:00
Nev3r
6acdc428f7
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
Monster Iestyn
69d7927ee8
resolve the conflict in p_spec.c
2019-01-07 17:02:05 +00:00
Monster Iestyn
d4d30e9e9c
resolve conflict in r_main.c
2019-01-07 16:52:46 +00:00
Digiku
e45c54dc60
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
mazmazz
c4fcdbf687
Resolve p_setup and d_netcmd conflicts (20190101 public merge)
2019-01-07 03:07:24 -05:00
mazmazz
78d631f5da
Resolved filesrch.c conflicts (20190101 public merge)
2019-01-07 02:54:26 -05:00
mazmazz
1dd464b17d
Resolve m_menu.c conflicts (20190101 public merge)
2019-01-07 02:31:45 -05:00
Digiku
031e234d86
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
Digiku
e42e1178ed
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
mazmazz
c5e9d6c97f
DD Compile fixes
2019-01-02 06:48:06 -05:00
mazmazz
5807384dbd
Remove S_MusicExists lua
2019-01-02 06:26:18 -05:00
Steel Titanium
2ba11a6d69
Support for per-map intermission music
2019-01-02 05:15:23 -05:00
mazmazz
0724d042bc
Add safe lua music functions
...
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
2019-01-02 04:58:03 -05:00
mazmazz
6086a9f238
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
mazmazz
e244b34093
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -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
Alam Ed Arias
13e3a975d8
Merge branch 'master' into next
2019-01-01 23:00:39 -05:00
Digiku
764e6e7659
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
Digiku
4560b4cb41
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
Digiku
80dc98624b
Merge branch 'mingw-64bit-cpu-target-revise' into 'master'
...
MinGW64:Target nocona for 64-bit builds [revision]
See merge request STJr/SRB2!440
2019-01-01 11:15:34 -05:00
mazmazz
8dc37a850b
Fix loop_point and song_length floating point comparisons
2019-01-01 10:47:16 -05:00
mazmazz
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
mazmazz
61e8685713
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -05:00
Steel Titanium
07f1d495a4
Inclue PNG file
2018-12-29 23:10:45 -05:00
Steel Titanium
b6538c966e
Update XPM icon
2018-12-29 22:52:04 -05:00
mazmazz
deec4550d3
Rename M5 to ARCHOPTS; allow override by command line
2018-12-29 21:55:35 -05:00
mazmazz
44d2340a5b
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
2018-12-29 21:14:50 -05:00
Digiku
1517c16c4d
Merge branch 'MSVC-ARM' into 'master'
...
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
2018-12-28 01:05:40 -05:00
Steel Titanium
f61c8fa279
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
