thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6932 commits 1 branch 12 tags 205 MiB
Commit graph

6932 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mazmazz
c91ac23ecb Merge branch 'musicplus-core' into musicplus-feature-postboss 2019-01-07 01:17:07 -05:00
mazmazz
e1a566157c Merge remote-tracking branch 'origin/master' into musicplus-core 2019-01-07 01:15:08 -05:00
mazmazz
403565e92f Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss 2019-01-07 01:10:54 -05:00
Steel Titanium
d475bcb0b7 Some few changes 2019-01-05 23:42: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
mazmazz
2b96983d16 Add libopenmpt to osx buildbot 2019-01-04 23:34:08 -05:00
mazmazz
159cc28e53 Enable libopenmpt for circleCI 2019-01-04 21:34:07 -05:00
Marco Z
67d829174e Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC 2019-01-04 21:18:55 -05:00
mazmazz
9a8fa8331b Enable libopenmpt for buildbots 2019-01-04 20:53:33 -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
0f4ef53a09 FindOPENMPT cmake 2019-01-04 19:22:48 -05:00
mazmazz
281cdb5597 Notes for Ubuntu backporting libopenmpt 2019-01-04 18:43:48 -05:00
mazmazz
2c2a96b554 MUS_MODPLUG fix 2019-01-04 18:39:09 -05:00
mazmazz
98766ae50e Disable OpenMPT for buildbots, for now 2019-01-04 01:48:20 -05:00
mazmazz
0efc1b968f Flip HAVE_OPENMPT on by default for non-Windows makefile 2019-01-04 01:48:04 -05:00
mazmazz
deca1a14f6 DLL-README update for libopenmpt 2019-01-03 21:19:00 -05:00
mazmazz
c2687a4289 CMake fixes for OpenMPT 2019-01-03 21:17:18 -05:00
mazmazz
c0ca2c8980 Remove dynamic openmpt loading 2019-01-03 20:52:09 -05:00
Marco Z
51976778e2 Fix MSVC compile errors 2019-01-03 20:34:10 -05:00
Marco Z
213927b264 Add libopenmpt to VC10 project 2019-01-03 20:28:00 -05:00
mazmazz
c31abf458f Add mingw-compiled libopenmpt 0.4.0 DLLs 2019-01-03 16:07:32 -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
91d0c090d6 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 05:06:09 -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
05b27b5127 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 04:02:13 -05:00
mazmazz
6086a9f238 Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core 2019-01-02 03:47:51 -05:00
mazmazz
7a60a739e1 Add libopenmpt to cmake 2019-01-02 03:45:40 -05:00
mazmazz
04fc9a8605 Revised MinGW Makefile logic for OpenMPT 2019-01-02 02:37:48 -05:00
mazmazz
37f710619f Update libopenmpt dev library to 0.4.0 (winold.vs2017) 2019-01-02 02:21:04 -05:00
mazmazz
235db51696 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:15:29 -05:00
mazmazz
e244b34093 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-02 02:15:16 -05:00