Steel Titanium
b4e7e8e62f
Merge branch 'master' into dontskipframes
2019-03-05 22:11:00 -05:00
Steel Titanium
a0b06044b1
Don't skip frames in software mode
2019-03-05 22:07:53 -05:00
Steel Titanium
3c1f0b5e3f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05: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
Alam Arias
c82fd8acd7
Exported SDL_icon.xpm as srb2icon.png
2019-03-02 13:26:17 -05:00
Monster Iestyn
8d124101f4
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
Alam Arias
65cf8c5da2
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-03-01 11:10:57 -05:00
wolfy852
cc7112eaf5
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
wolfy852
088bfd30d0
Stop Linux servers from hanging every 34 hours
...
This drastically increases the amount of time Linux servers can stay up for before hanging.
2019-02-28 18:51:57 -06: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
Monster Iestyn
974e3aa4f2
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
2019-02-27 22:36:01 +00:00
Monster Iestyn
ea0c251a92
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
wolfy852
733c472e1f
Reorganization + kill old interfaces
2019-02-19 18:52:57 -06: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
james
cb1429b59f
Support CMake for apng
2019-02-12 17:01:27 -08:00
Alam Arias
380bce88a0
remove whitespaces
2019-02-05 15:42:37 -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
james
e4a1470116
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
wolfy852
1c8c6387fc
-nohidapi parameter
...
Should fix problems where Switch Pro controllers suddenly had their mappings changed. Does not recognize controllers connected before game launch. Make sure to replug your controller after the game launches if using this param.
2019-01-10 23:12:06 -06:00
mazmazz
aae6eb945d
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
wolfy852
6faae305e3
Merge remote-tracking branch 'remotes/public/next' into disable-xinput
2019-01-10 20:35:32 -06:00
wolfy852
fd99eb4f13
-noxinput command line parameter
2019-01-09 01:38:28 -06:00
Marco Z
74c57ad447
Kart Public Next merge
2019-01-08 18:43:49 -05:00
wolfy852
5c5e6a26dd
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
Arthur
2b8f49fd5e
Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
...
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2019-01-07 04:33:22 -05:00
Arthur
9617e604bb
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
e67c1bee5d
Common model format, with MD2/MD3 loading
2019-01-07 04:21:43 -05:00
mazmazz
70f2e9a7ab
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-01-07 04:06:45 -05:00
Steel Titanium
d475bcb0b7
Some few changes
2019-01-05 23:42:25 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
cae6a842de
Merge remote-tracking branch 'public-gl/master' into travis-deployer
2019-01-05 09:08:34 -05:00
Marco Z
67d829174e
Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC
2019-01-04 21:18:55 -05:00
Marco Z
35f8ff191a
Add GME to VC10 SRB2SDL project
2019-01-04 20:43:42 -05:00
mazmazz
2c2a96b554
MUS_MODPLUG fix
2019-01-04 18:39:09 -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
f0715d7af3
Updated Kart icons to higher res
2019-01-03 12:26:25 -05:00
mazmazz
7a60a739e1
Add libopenmpt to cmake
2019-01-02 03:45:40 -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
mazmazz
1dd2899521
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -05:00
mazmazz
81352aece1
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
4560b4cb41
Merge branch 'caps-lock-consistency-fix' into 'master'
...
Update capslock state on window re-focus
See merge request STJr/SRB2!436
2019-01-01 15:05:20 -05:00
mazmazz
8dc37a850b
Fix loop_point and song_length floating point comparisons
2019-01-01 10:47:16 -05:00
mazmazz
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
mazmazz
c520447f77
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2018-12-31 18:20:04 -05:00
mazmazz
af519d3c07
Also change DEFAULTWADLOCATION to SRB2Kart in SDL2
2018-12-31 00:21:19 -05:00
