toaster
|
603d5805f7
|
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
|
2019-08-04 11:32:55 +01:00 |
|
mazmazz
|
bddafbeece
|
Merge branch 'internal-musicplus-jingle' into musicplus-aug2019
|
2019-08-04 02:41:37 -04:00 |
|
mazmazz
|
b99f06c0c9
|
Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx
|
2019-08-04 01:10:21 -04:00 |
|
mazmazz
|
dd9efebab5
|
Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle
|
2019-08-03 23:38:49 -04:00 |
|
Alam Ed Arias
|
b77780e1e7
|
Fix building with MSVC
|
2019-07-29 19:02:45 -04:00 |
|
mazmazz
|
5b0f7d2850
|
Merge branch 'master' into musicplus-sdlmixerx
|
2019-06-29 19:31:01 -04:00 |
|
mazmazz
|
923dc34215
|
Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle
|
2019-06-29 18:33:45 -04:00 |
|
mazmazz
|
6244489fd0
|
Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle
|
2019-06-29 18:10:44 -04:00 |
|
Steel Titanium
|
58bb05be00
|
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
# Conflicts:
# .travis.yml
# src/m_menu.c
# src/sdl/Srb2SDL-vc10.vcxproj
# src/sdl/Srb2SDL.props
|
2019-06-11 17:48:00 -04:00 |
|
Monster Iestyn
|
e7e3b0ef38
|
Merge branch 'public_next'
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
|
2019-06-09 20:04:08 +01:00 |
|
Alam Ed Arias
|
ea08ba3fba
|
Merge branch 'master' into next
|
2019-06-07 18:07:32 -04:00 |
|
Alam Ed Arias
|
83b8a98df4
|
Merge branch 'gme-msvc' into 'master'
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
|
2019-06-07 18:06:51 -04:00 |
|
Steel Titanium
|
81dec89aeb
|
Merge branch 'next' into public-musicplus-libopenmpt
|
2019-06-03 15:36:50 -04:00 |
|
Steel Titanium
|
91767a7740
|
Merge branch 'master' into public-musicplus-libopenmpt
|
2019-05-20 21:33:10 -04:00 |
|
Monster Iestyn
|
66bc287688
|
Merge branch 'public_next'
|
2019-05-16 15:58:17 +01:00 |
|
Nev3r
|
aab2f55aec
|
Merge branch 'banip-command' into 'next'
Ban IP command
See merge request STJr/SRB2!460
|
2019-05-06 13:09:14 -04:00 |
|
Monster Iestyn
|
1b2afea091
|
Merge branch 'public_next'
|
2019-05-03 16:42:42 +01:00 |
|
Monster Iestyn
|
d4ab2837bb
|
Merge branch 'master' into next
|
2019-05-03 16:00:45 +01:00 |
|
Steel Titanium
|
26fdee8217
|
Don't enable UPnP support if NONET is defined.
|
2019-04-16 15:05:09 -04:00 |
|
mazmazz
|
8317155c40
|
Merge branch 'public-gl-next' into public-musicplus-jingle
|
2019-03-15 18:42:19 -04:00 |
|
Steel Titanium
|
67a80ba311
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
|
2019-03-15 16:13:31 -04:00 |
|
mazmazz
|
9ec98c588f
|
Merge branch 'public_next'
|
2019-03-14 22:15:34 -04:00 |
|
mazmazz
|
93626c2293
|
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
|
2019-03-13 19:45:07 -04:00 |
|
Monster Iestyn
|
a93e96c75b
|
Merge branch 'public_next'
# Conflicts:
# src/sdl12/Srb2SDL-vc10.vcxproj
# src/sdl12/Srb2SDL-vc9.vcproj
# src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
|
2019-03-02 20:51:15 +00:00 |
|
wolfs
|
5620d0188e
|
Merge branch 'apng' into 'master'
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
|
2019-02-28 12:00:58 -08:00 |
|
Steel Titanium
|
bf2f6ebc09
|
Save ban list right after banning.
|
2019-02-21 19:47:00 -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 |
|
mazmazz
|
d1534257dd
|
Add mingw-compiled libopenmpt 0.4.0 DLLs
|
2019-01-03 16:07:32 -05:00 |
|
mazmazz
|
2e4c139551
|
DD Compile fixes
|
2019-01-02 06:48:06 -05:00 |
|
mazmazz
|
08812b1501
|
Revised MinGW Makefile logic for OpenMPT
|
2019-01-02 02:37:48 -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 |
|
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
|
b7bb570f97
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-01 10:41:40 -05:00 |
|
mazmazz
|
4cfacf5cde
|
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
|
2018-12-29 21:14:50 -05:00 |
|
Monster Iestyn
|
2d675750cf
|
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
|
2018-12-23 21:52:49 +00:00 |
|
Alam Ed Arias
|
102fd11cb4
|
More work to cleanup the ARM builds
|
2018-12-22 19:50:32 -05:00 |
|
Alam Arias
|
b6a917cda1
|
Added ARM/ARM64 to whole vc10 sln
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
|
2018-12-21 16:47:10 -05:00 |
|
Alam Ed Arias
|
6e79722437
|
Fix float-equal warning in Win32 interface
|
2018-12-16 14:01:28 -05:00 |
|
Monster Iestyn
|
11cb163435
|
Backport the Blockmap library I made two years ago
|
2018-11-30 17:11:11 +00:00 |
|
mazmazz
|
ea7162a76a
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Monster Iestyn
|
08af33c51f
|
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
|
2018-11-23 19:12:48 +00:00 |
|
Steel Titanium
|
fe43deacec
|
Merge branch 'master' into responsefile-fix
|
2018-11-22 23:02:20 -05:00 |
|
Monster Iestyn
|
224c0fccdb
|
Merge branch 'public_next'
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
|
2018-11-20 14:33:10 +00:00 |
|
mazmazz
|
6cc6edc137
|
Changed Mixer X sources to 2.2.0; added x64 gcc support
|
2018-11-19 20:51:54 -05:00 |
|
Steel Titanium
|
02c08a3e10
|
Some small changes
|
2018-11-14 21:01:54 -05:00 |
|
Steel Titanium
|
f02105732e
|
Fix up compiling on DD version
|
2018-11-14 18:00:10 -05:00 |
|