mazmazz
5066e340f4
Update SRB2-CHAT nickname colors to 2.2 skincolors
2019-01-07 22:26:39 -05:00
mazmazz
e403d1bacc
Correct addons menu back color
2019-01-07 21:58:42 -05:00
mazmazz
dfc427e81a
Dummy out SRB2-CHAT console colors
...
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
mazmazz
411b1b4f54
Addons menu merge fixes
2019-01-07 21:45:41 -05:00
mazmazz
a775a63dfd
WIP hu_stuff merge fixes
2019-01-07 17:56:55 -05:00
mazmazz
875aee60a0
Menu merge fixes
2019-01-07 17:56:43 -05:00
mazmazz
b3f7b169b2
Merge errors for compile
2019-01-07 17:05:20 -05:00
Digiku
4f0be1b064
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
mazmazz
7aa55f24f5
Resolve r_data.c colormap conflict
2019-01-07 15:29:37 -05:00
Nev3r
7d09149b04
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
Monster Iestyn
9effa134d2
resolve the conflict in p_spec.c
2019-01-07 17:02:05 +00:00
Monster Iestyn
96ad8dd81a
resolve conflict in r_main.c
2019-01-07 16:52:46 +00:00
Digiku
1c1331199d
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
mazmazz
015e7b9862
Resolve p_setup and d_netcmd conflicts (20190101 public merge)
2019-01-07 03:07:24 -05:00
mazmazz
e18eb69a0b
Resolved filesrch.c conflicts (20190101 public merge)
2019-01-07 02:54:26 -05:00
mazmazz
e9150b6645
Resolve m_menu.c conflicts (20190101 public merge)
2019-01-07 02:31:45 -05:00
Steel Titanium
7d1e59d4ba
Some few changes
2019-01-05 23:42: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
mazmazz
db71ba71c9
Add libopenmpt to osx buildbot
2019-01-04 23:34:08 -05:00
mazmazz
6d985d3d4d
Enable libopenmpt for circleCI
2019-01-04 21:34:07 -05:00
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
