Steel Titanium
221ec15af0
How did I forget about this
2019-01-26 23:22:30 -05:00
Steel Titanium
34920c2951
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
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
Alam Ed Arias
94748c3921
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
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
james
e4a1470116
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
Jimita
683bc8fb34
Merge branch 'next' into flashpals-on-screenshots
2019-01-16 05:59:05 -02: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
Digiku
8e862b3c98
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
Digiku
e45c54dc60
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
mazmazz
5db9b3082f
Remove unnecessary version info call
2019-01-05 19:56:27 -05:00
mazmazz
4ba352e590
Remove zlib from release brew packages
...
(it was never in the original travis script)
2019-01-05 19:49:25 -05:00
mazmazz
51ad724513
Use standard OSX brew bottles to speed up test buildbots
2019-01-05 19:43:37 -05:00
mazmazz
43fa1f0ee1
OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs
2019-01-05 19:34:39 -05:00
mazmazz
342e7768f5
* Add homebrew tap mazmazz/srb2
...
* Use sdl2_mixer from mazmazz/srb2 due to removed options from homebrew-core
* Use `brew install --build-bottle` to build compatible libraries for old Macs
2019-01-05 19:20:58 -05:00
mazmazz
d9d2f6e23f
Don't terminate in after_success because it halts the log abruptly
2019-01-05 10:17:33 -05:00
mazmazz
4ee642e2ab
Revised comments
2019-01-05 09:54:45 -05:00
mazmazz
cae6a842de
Merge remote-tracking branch 'public-gl/master' into travis-deployer
2019-01-05 09:08:34 -05:00
Marco Z
67d829174e
Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC
2019-01-04 21:18:55 -05:00
Marco Z
d284b877f6
Add LibGME to DD vc10 project
2019-01-04 20:43:45 -05:00
Marco Z
35f8ff191a
Add GME to VC10 SRB2SDL project
2019-01-04 20:43:42 -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
3e5cfc4d65
Add __DPL_ACTIVE condition to optional asset download
2019-01-02 20:48:46 -05:00
mazmazz
a873b8517c
Correct asset directory for travis
2019-01-02 18:38:02 -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
Jimita the Cat
6a29184b5c
Merge branch 'flashpals-on-screenshots' of https://github.com/monster-psychic-cat/SRB2 into flashpals-on-screenshots
2019-01-02 01:02:14 -03:00
Jimita the Cat
6f72f69575
dumb
2019-01-02 01:01:57 -03:00
Alam Ed Arias
13e3a975d8
Merge branch 'master' into next
2019-01-01 23:00:39 -05:00
Jimita
55e65def2c
Merge branch 'next' into flashpals-on-screenshots
2019-01-02 01:55:59 -02:00
Jimita the Cat
2cc6a22d12
Add support for flashpals in screenshots
2019-01-02 00:41:52 -03: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
5149fb7d66
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
mazmazz
7d66f912d0
Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer)
2019-01-01 11:51:17 -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
Digiku
2374750d3c
Merge branch 'appveyor-64' into 'mingw-64bit-cpu-target-revise'
...
Add 64-bit job to Appveyor
See merge request STJr/SRB2!442
2019-01-01 10:14:37 -05:00
Digiku
f2aa86cab2
Merge branch 'appveyor-deployer' into 'appveyor-64'
...
Add Windows installer building to AppVeyor
See merge request STJr/SRB2!443
2019-01-01 10:14:25 -05:00
mazmazz
f25bdead73
Don't download individual asset files; support only archives
2018-12-31 19:11:01 -05:00
mazmazz
77eea3c41d
Use optional asset archive instead of file
2018-12-31 17:31:25 -05:00