342 commits

Author	SHA1	Message	Date
Steel Titanium	ce1c1d8c88	Forgot some references	2019-05-20 23:31:23 -04:00
Steel Titanium	bf3d5f4188	circleci: Fix compiling error	2019-05-20 23:22:23 -04:00
Steel Titanium	91767a7740	Merge branch 'master' into public-musicplus-libopenmpt	2019-05-20 21:33:10 -04:00
Steel Titanium	8a14427420	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
Steel Titanium	9542a47f7f	New -noxinput and -nohidapi command line parameters.	2019-03-03 22:57:09 -05:00
Monster Iestyn	67e721e983	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	97de2ae4f6	Stop Linux servers from hanging every 34 hours	2019-03-01 00:07:58 -06: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
Monster Iestyn	d76e946b3e	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	356249dade	Set modifiers in a non-reactive manner	2019-01-17 16:47:01 -08:00
Steel Titanium	7d1e59d4ba	Some few changes	2019-01-05 23:42:25 -05:00
mazmazz	87c015e340	MUS_MODPLUG fix	2019-01-04 18:39:09 -05:00
mazmazz	1bfc4c02e4	CMake fixes for OpenMPT	2019-01-03 21:17:18 -05:00
mazmazz	4a17e9ed9b	Remove dynamic openmpt loading	2019-01-03 20:52:09 -05:00
Marco Z	caab60e9f0	Fix MSVC compile errors	2019-01-03 20:34:10 -05:00
Marco Z	6d2ef74b21	Add libopenmpt to VC10 project	2019-01-03 20:28:00 -05:00
mazmazz	a851c5d7da	Add libopenmpt to cmake	2019-01-02 03:45:40 -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
Digiku	5278d1ca20	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	7916e020d2	Fix loop_point and song_length floating point comparisons	2019-01-01 10:47:16 -05:00
mazmazz	b7bb570f97	Merge remote-tracking branch 'public-gl/master' into public-musicplus-core	2019-01-01 10:41:40 -05:00
Steel Titanium	0ebe5b258c	Inclue PNG file	2018-12-29 23:10:45 -05:00
Steel Titanium	a7b96ab83d	Update XPM icon	2018-12-29 22:52:04 -05:00
Digiku	80e30c6aaa	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	0b857f127f	Update capslock state on window re-focus	2018-12-26 15:49:57 -08:00
mazmazz	894c139bf1	Update code versions to 2.1.23	2018-12-26 16:31:43 -05:00
mazmazz	7fc79f0b88	Merge remote-tracking branch 'public-gl/master' into 2122-version	2018-12-24 17:31:03 -05:00
mazmazz	ed410575d6	Only SetWindowGrab if !disable_mouse; toggle cursor visibility	2018-12-23 22:09:16 -05:00
Steel Titanium	46d1a866d8	Another attempt to lock the mouse	2018-12-23 18:54:15 -05:00
mazmazz	c0a0c5ac5d	Merge remote-tracking branch 'public-gl/next' into 2122-version	2018-12-23 18:09:14 -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
Steel Titanium	40a037f603	A more through out attempt to lock the mouse	2018-12-23 14:54:14 -05:00
mazmazz	b49cf11fb6	Merge remote-tracking branch 'public-gl/next' into 2122-version	2018-12-22 23:41:55 -05:00
Steel Titanium	66e13cf1cc	SDL:Auto grab input	2018-12-22 23:28:59 -05:00
Alam Ed Arias	0ed9665a79	Added static library of SDL2 and SDL2_mixer for ARM systems	2018-12-22 20:48:15 -05:00
Alam Ed Arias	102fd11cb4	More work to cleanup the ARM builds	2018-12-22 19:50:32 -05:00
mazmazz	8707b2f40a	Center window on current monitor during vidmode change	2018-12-22 01:43:58 -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
Digiku	58a2cec70f	Merge branch 'float_equal' into 'master' ... Clear Float equal warnings See merge request STJr/SRB2!383	2018-12-20 16:58:37 -05:00
Digiku	f405f1ae30	Merge branch 'cmake-dllpath-fix' into 'master' ... Update CMake paths for Windows DLLs See merge request STJr/SRB2!406	2018-12-20 16:53:06 -05:00
mazmazz	0519d8c52d	Update CMake paths for Windows DLLs	2018-12-20 16:46:40 -05:00
mazmazz	9d212b340b	Update code versions to 2.1.22	2018-12-20 02:35:27 -05:00
Alam Ed Arias	6fd66bdb49	Clear float equal warnings	2018-12-14 20:34:06 -05:00
mazmazz	47ee3525af	Indentation	2018-12-08 14:10:56 -05:00
mazmazz	01f1933f69	Force directsound to fix wrong-pitch sound effects	2018-12-08 14:05:58 -05:00
Monster Iestyn	e353e2ef70	Merge branch 'next' into 21-version	2018-12-04 17:19:36 +00:00
Monster Iestyn	f2b0db5a1c	Merge branch 'master' into next	2018-12-04 17:18:19 +00:00
Digiku	631f6ed406	Merge branch 'joystick-juggling' into 'master' ... Joystick juggling See merge request STJr/SRB2!355	2018-12-04 11:51:55 -05:00