Digiku
4f0be1b064
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
mazmazz
66e6a6f940
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-01-07 04:06:45 -05:00
Digiku
1c1331199d
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
mazmazz
2592f42a17
Remove unnecessary version info call
2019-01-05 19:56:27 -05:00
mazmazz
20879f1f40
Remove zlib from release brew packages
...
(it was never in the original travis script)
2019-01-05 19:49:25 -05:00
mazmazz
17cde328c1
Use standard OSX brew bottles to speed up test buildbots
2019-01-05 19:43:37 -05:00
mazmazz
9ef7d2e6ba
OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs
2019-01-05 19:34:39 -05:00
mazmazz
0834dbc194
* 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
97f8448b72
Don't terminate in after_success because it halts the log abruptly
2019-01-05 10:17:33 -05:00
mazmazz
abaa8730a5
Revised comments
2019-01-05 09:54:45 -05:00
mazmazz
578a4fe80d
Merge remote-tracking branch 'public-gl/master' into travis-deployer
2019-01-05 09:08:34 -05:00
Marco Z
882355d24b
Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC
2019-01-04 21:18:55 -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
a3fd5e7247
Revert "Un-dummy md5 checks"
...
This reverts commit 908a6d321d
2019-01-04 11:31:20 -05:00
mazmazz
bbcc82e9b4
Fix blinking MD2 models
...
MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.
2019-01-03 00:57:14 -05:00
mazmazz
908a6d321d
Un-dummy md5 checks
2019-01-02 23:31:29 -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
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
1aacfee80c
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
mazmazz
109dd70a53
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -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
Steel Titanium
f73501fd11
Update libgme to 0.6.2
2018-12-30 22:49:11 -05:00
mazmazz
78fa72514f
Implement deployer scripts for Travis -- OSX and Linux package building
2018-12-30 15:22:50 -05:00
mazmazz
e1300d5173
Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET
2018-12-30 10:43:17 -05:00
mazmazz
941e29780c
Implement install building for appveyor (deployer)
2018-12-30 03:42:55 -05:00
mazmazz
bef0bc82e4
Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64
2018-12-29 23:46:16 -05:00
mazmazz
e7165444b4
Add 64-bit DD buildbot
2018-12-29 23:16:08 -05:00
