mazmazz
ae05d8c0dd
Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle
2019-08-03 23:38:49 -04:00
Steel Titanium
538928031c
use VERSIONSTRING
2019-07-30 20:56:03 -04:00
Alam Ed Arias
827bd7e123
Merge remote-tracking branch 'private/master' into newicon
2019-07-29 19:04:19 -04:00
Alam Ed Arias
5286938853
Fix building with MSVC
2019-07-29 19:02:45 -04:00
Steel Titanium
2cccab7655
More icon stuff
2019-07-27 01:13:54 -04:00
Steel Titanium
93acb98aa7
New icons
...
Also update IMG_xpm.c
2019-07-16 19:20:00 -04:00
mazmazz
f7936876be
Merge branch 'master' into musicplus-sdlmixerx
2019-06-29 19:31:01 -04:00
mazmazz
7bbd05e85d
Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle
2019-06-29 18:33:45 -04:00
mazmazz
53fe455a8f
Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle
2019-06-29 18:10:44 -04:00
mazmazz
14df513db6
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
mazmazz
11955ba838
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
James R
9579f6ea9e
Add font system to Makefile and Visual Studio project files
2019-06-26 16:33:59 -07:00
Steel Titanium
8e5593c207
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
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
Monster Iestyn
67392baae0
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
cd1c87ea71
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
Alam Ed Arias
d5c1fe6467
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
813ccf71e5
Merge branch 'next' into public-musicplus-libopenmpt
2019-06-03 15:36:50 -04:00
Steel Titanium
2ede6dd29f
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
Monster Iestyn
04a8c9a283
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
wolfy852
9ac41cca73
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
mazmazz
dc14318f02
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-08 17:56:05 -04:00
wolfy852
2222738e1c
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
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
Nev3r
7a66fabf4f
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
055aeddb6f
Merge branch 'public_next'
2019-05-03 16:42:42 +01:00
Monster Iestyn
57edf46531
Merge branch 'master' into next
2019-05-03 16:00:45 +01:00
mazmazz
f9354289ba
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -04:00
Steel Titanium
877e149908
Don't enable UPnP support if NONET is defined.
2019-04-16 15:05:09 -04:00
fickleheart
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
Jaime Passos
08efec4cf3
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 18:23:40 -03:00
wolfy852
963cbf4671
Merge branch 'next' into md3-vanilla-kart
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
Jaime Passos
35459caea7
md3-vanilla
2019-03-18 18:34:20 -03:00
Jaime Passos
c8bec127ec
I don't care about DirectDraw
...
Neither SDL 1.2
2019-03-18 15:54:29 -03:00
mazmazz
7f0b923107
Merge branch 'public-gl-next' into public-musicplus-jingle
2019-03-15 18:42:19 -04:00
Steel Titanium
adcc8fe0d8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
mazmazz
2eb04ab17d
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
mazmazz
937a423664
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
Monster Iestyn
70d1006800
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
8a6f4b6405
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
ea0da92c22
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
277216af2b
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
deb58b0e68
Save ban list right after banning.
2019-02-21 19:47:00 -05:00
wolfy852
733c472e1f
Reorganization + kill old interfaces
2019-02-19 18:52:57 -06:00
Steel Titanium
5e2cea3980
Save ban list right after banning.
2019-02-18 01:03:39 -05:00
Latapostrophe
4129dae3af
Move ping display in i_video for consistency with showfps display
2019-02-16 13:38:50 +01:00
Steel Titanium
264adb7c7e
Update project files
2019-02-14 21:32:57 -05:00
Sally Cochenour
1928721218
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
aae6eb945d
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
