stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
6278 commits 172 branches 41 tags 285 MiB
Commit graph

6278 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marco Z
882355d24b Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC 2019-01-04 21:18:55 -05:00
mazmazz
2f16cf3c42 Enable libopenmpt for buildbots 2019-01-04 20:53:33 -05:00
Marco Z
09ed8bd046 Add LibGME to DD vc10 project 2019-01-04 20:43:45 -05:00
Marco Z
88c4a54cea Add GME to VC10 SRB2SDL project 2019-01-04 20:43:42 -05:00
Digiku
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
Digiku
c97dc5d3c4 Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
mazmazz
16ae83ba9c FindOPENMPT cmake 2019-01-04 19:22:48 -05:00
mazmazz
2ff946bebc Notes for Ubuntu backporting libopenmpt 2019-01-04 18:43:48 -05:00
mazmazz
87c015e340 MUS_MODPLUG fix 2019-01-04 18:39:09 -05:00
mazmazz
14a361cb6d Disable OpenMPT for buildbots, for now 2019-01-04 01:48:20 -05:00
mazmazz
69965b8d98 Flip HAVE_OPENMPT on by default for non-Windows makefile 2019-01-04 01:48:04 -05:00
mazmazz
c0266e2201 DLL-README update for libopenmpt 2019-01-03 21:19:00 -05:00
mazmazz
1bfc4c02e4 CMake fixes for OpenMPT 2019-01-03 21:17:18 -05:00
mazmazz
4a17e9ed9b Remove dynamic openmpt loading 2019-01-03 20:52:09 -05:00
Marco Z
caab60e9f0 Fix MSVC compile errors 2019-01-03 20:34:10 -05:00
Marco Z
6d2ef74b21 Add libopenmpt to VC10 project 2019-01-03 20:28:00 -05:00
mazmazz
d1534257dd Add mingw-compiled libopenmpt 0.4.0 DLLs 2019-01-03 16:07:32 -05:00
mazmazz
ac7b29eb2d Add __DPL_ACTIVE condition to optional asset download 2019-01-02 20:48:46 -05:00
mazmazz
9b3174c4f4 Correct asset directory for travis 2019-01-02 18:38:02 -05:00
mazmazz
2e4c139551 DD Compile fixes 2019-01-02 06:48:06 -05:00
mazmazz
2bd794c006 Remove S_MusicExists lua 2019-01-02 06:26:18 -05:00
Steel Titanium
827461cc36 Support for per-map intermission music 2019-01-02 05:15:23 -05:00
mazmazz
dd856a8c89 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 05:06:09 -05:00
mazmazz
e2e345988a Add safe lua music functions 
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
 2019-01-02 04:58:03 -05:00
mazmazz
c8d338ca35 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 04:02:13 -05:00
mazmazz
1aacfee80c Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core 2019-01-02 03:47:51 -05:00
mazmazz
a851c5d7da Add libopenmpt to cmake 2019-01-02 03:45:40 -05:00
mazmazz
08812b1501 Revised MinGW Makefile logic for OpenMPT 2019-01-02 02:37:48 -05:00
mazmazz
7f18433059 Update libopenmpt dev library to 0.4.0 (winold.vs2017) 2019-01-02 02:21:04 -05:00
mazmazz
953f5b6297 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:15:29 -05:00
mazmazz
109dd70a53 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-02 02:15:16 -05:00
mazmazz
6166fad045 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:14:49 -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
Jimita the Cat
c3d69a8a04 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
892e650712 dumb 2019-01-02 01:01:57 -03:00
Alam Ed Arias
819e4ef2ae Merge branch 'master' into next 2019-01-01 23:00:39 -05:00
Jimita
8fdff96733
Merge branch 'next' into flashpals-on-screenshots 2019-01-02 01:55:59 -02:00
Jimita the Cat
e765b9400c Add support for flashpals in screenshots 2019-01-02 00:41:52 -03:00
Digiku
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
Digiku
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
Digiku
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
mazmazz
528c6f771a Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer) 2019-01-01 11:51:17 -05:00
Digiku
bbd878e520 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
7916e020d2 Fix loop_point and song_length floating point comparisons 2019-01-01 10:47:16 -05:00
mazmazz
b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
Digiku
ce7875b133 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
bd81c3190e 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
4d4b048ead Don't download individual asset files; support only archives 2018-12-31 19:11:01 -05:00
mazmazz
f00cfb7b3f Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
mazmazz
d61eb7edee Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00