wolfy852
f61f7f4411
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
2c363c4e1e
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
f720dd3ddb
Merge v1
2019-05-06 21:23:29 -04: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
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
fickleheart
4b7d2aea84
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
wolfy852
6b743d383b
Merge branch 'next' into md3-vanilla-kart
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05: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
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04: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
Sal
5e9a11d467
Merge branch 'ping-stuff-take2' into 'next'
...
Ping improvements
See merge request KartKrew/Kart-Public!68
2019-02-22 19:13:49 -05:00
wolfy852
d9759df874
I don't think these old interfaces even compile but let's not kill them off
2019-02-22 18:13:22 -06:00
Steel Titanium
bf2f6ebc09
Save ban list right after banning.
2019-02-21 19:47:00 -05:00
wolfy852
1fb65c72ff
Reorganization + kill old interfaces
2019-02-19 18:52:57 -06:00
Steel Titanium
6915605444
Save ban list right after banning.
2019-02-18 01:03:39 -05:00
Latapostrophe
24516cbf84
Move ping display in i_video for consistency with showfps display
2019-02-16 13:38:50 +01:00
Steel Titanium
bcd5176ad1
Update project files
2019-02-14 21:32:57 -05:00
Sally Cochenour
1e61cc6152
Better cpusleep
...
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
2019-01-28 14:12:08 -05:00
mazmazz
4d5f7e78cd
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
Marco Z
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
Arthur
1249f37fc5
Removed all glBegin/glEnd references
...
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2019-01-07 04:30:47 -05:00
Arthur
295ca25171
Common model format, with MD2/MD3 loading
2019-01-07 04:21:43 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
5f632d9b3c
Updated Kart icons to higher res
2019-01-03 12:26:25 -05:00
mazmazz
2e4c139551
DD Compile fixes
2019-01-02 06:48:06 -05:00
mazmazz
109dd70a53
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -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
TehRealSalt
aa16edec1d
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05:00
Monster Iestyn
11cb163435
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
TehRealSalt
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05: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
toaster
aa607ecf4c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00: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
Steel Titanium
c5a97dcfe6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
Alam Ed Arias
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
Monster Iestyn
f3b59c1731
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
Marco Z
0b97b2a76c
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
Steel Titanium
4836e711d3
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
mazmazz
2db2b6e6af
Win32 boolean fixes
2018-11-13 17:24:19 -05:00
TehRealSalt
499faec555
Merge remote-tracking branch 'srb2public/next'
...
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
