thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-10 13:16:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5970 commits 2 branches 14 tags 206 MiB
Commit graph

383 commits

Author SHA1 Message Date
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
Monster Iestyn
c21b9e632a Merge branch 'next' into 2.1.24-prep 
# Conflicts:
#	debian-template/control
#	debian/changelog
 2019-06-07 23:18:31 +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
8d5207975d Merge branch 'master' into travis-deployer 
# Conflicts:
#	.travis.yml
 2019-06-07 16:56:19 -04:00
Monster Iestyn
474b70aa69 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Monster Iestyn
c8e3748a1c Merge branch 'master' into next 2019-05-13 16:07:30 +01:00
Steel Titanium
2c4555493d Merge branch 'perpetual-modifier-updates' into 'master' 
Set modifiers in a non-reactive manner

See merge request STJr/SRB2!456
 2019-05-13 00:36:06 -04:00
wolfy852
93c706bfb8 Don't skip frames when connecting or paused 2019-05-08 09:39:45 -05:00
mazmazz
d2236a32c3 Remove song_length tag search 
Because songs without this tag will skiplag when loading.
 2019-05-02 19:14:23 -04:00
mazmazz
7301140b10 Remove MP3 widechar tag searching 
1. It's slow, 2. It's incorrect
 2019-05-02 19:13:56 -04:00
Monster Iestyn
257f31c1ba Merge branch 'public_next' 
# Conflicts:
#	src/doomstat.h
#	src/g_game.c
 2019-03-28 14:19:02 +00:00
Monster Iestyn
7c36a2a99e Merge branch 'master' into next 2019-03-25 18:08:36 +00:00
mazmazz
2eb04ab17d Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
mazmazz
832a6433c2 Remove MP3 warning 2019-03-13 19:51:45 -04:00
mazmazz
937a423664 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04: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
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
wolfy852
cc7112eaf5 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -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
james
e4a1470116 Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08: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
e244b34093 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-02 02:15:16 -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
6e2d757219 Implement deployer scripts for Travis -- OSX and Linux package building 2018-12-30 15:22:50 -05:00
Steel Titanium
07f1d495a4 Inclue PNG file 2018-12-29 23:10:45 -05:00
Steel Titanium
b6538c966e Update XPM icon 2018-12-29 22:52:04 -05:00
Digiku
1517c16c4d Merge branch 'MSVC-ARM' into 'master' 
ARM and ARM64 support with MSVC toolchain

See merge request STJr/SRB2!412
 2018-12-28 01:05:40 -05:00
james
77a5a31135 Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
mazmazz
7deac7e603 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
e40deb5443 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-24 17:31:03 -05:00
mazmazz
fe836e6109 Only SetWindowGrab if !disable_mouse; toggle cursor visibility 2018-12-23 22:09:16 -05:00
Steel Titanium
f1c4f3c772 Another attempt to lock the mouse 2018-12-23 18:54:15 -05:00
mazmazz
9c8487e8eb Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-23 18:09:14 -05:00
Monster Iestyn
50710c3f10 fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c 2018-12-23 21:52:49 +00:00
Steel Titanium
c98024aaf0 A more through out attempt to lock the mouse 2018-12-23 14:54:14 -05:00
mazmazz
336c3d87c4 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-22 23:41:55 -05:00
Steel Titanium
350a6b1027 SDL:Auto grab input 2018-12-22 23:28:59 -05:00
Alam Ed Arias
7b2a7190dd Added static library of SDL2 and SDL2_mixer for ARM systems 2018-12-22 20:48:15 -05:00
Alam Ed Arias
e6cf509a84 More work to cleanup the ARM builds 2018-12-22 19:50:32 -05:00
mazmazz
5ed5d09950 Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00