thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2873 commits 1 branch 12 tags 205 MiB
Commit graph

2873 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias
fa5ff9c0cf Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
Alam Ed Arias
008fecbba7 TravisCI: GCC 8.x needs to pass 2018-12-24 19:10:29 -05:00
Digiku
f81144d7b1 Merge branch 'side-discolor-fix' into 'master' 
Fix colormap bleeding onto sides [by Jimita]

See merge request STJr/SRB2!427
 2018-12-24 17:33:34 -05:00
Jimita
23b27f5566 cleanup 2018-12-24 17:21:33 -05:00
Digiku
c24d860eea Merge branch 'sdl-autograb' into 'master' 
SDL:Auto grab input

Closes #46

See merge request STJr/SRB2!416
 2018-12-24 17:04:27 -05:00
Digiku
7067d47c41 Merge branch 'polyobject-crush-fix-waypoint' into 'next' 
Polyobject crush fix by waypoints [by TehRealSalt]

See merge request STJr/SRB2!426
 2018-12-24 17:01:06 -05:00
Alam Ed Arias
3942736e11 Merge branch 'master' into next 2018-12-24 16:56:29 -05:00
Digiku
e12ca787c4 Merge branch 'disablespeedadjust-fix' into 'next' 
Disablespeedadjust fix

See merge request STJr/SRB2!425
 2018-12-24 16:31:19 -05:00
Digiku
27d7bc7cc3 Merge branch 'bot-respawn-fix' into 'next' 
Bot respawn fix

See merge request STJr/SRB2!423
 2018-12-24 15:53:47 -05:00
TehRealSalt
55d300c4e2 Fix move by waypoints not checking for sector changes 
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.

If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
 2018-12-24 14:39:07 -05:00
Monster Iestyn
06e2da214e remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway 2018-12-24 19:37:52 +00:00
Monster Iestyn
e96a345fce Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean 2018-12-24 19:29:54 +00:00
Monster Iestyn
94f0eedb60 Fix bot players using the respawning code meant only for real players to use 2018-12-24 17:59:12 +00:00
Steel Titanium
29308db913 Merge branch 'master' into sdl-autograb 2018-12-23 22:35:44 -05:00
Steel Titanium
7bf9636d45 Merge branch 'sdl-autograb-revise' into 'sdl-autograb' 
AutoGrab changes

See merge request SteelTitanium/SRB2!3
 2018-12-23 22:32:51 -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
Digiku
1e6ff01426 Merge branch '2122-next' into 'next' 
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"

See merge request STJr/SRB2!419
 2018-12-23 18:00:18 -05:00
mazmazz
ee63ed22d5 Revert "Merge branch 'menu-mpjoy-fix' into 'next'" 
This reverts commit eaab2da100, reversing
changes made to 50710c3f10.
 2018-12-23 17:57:50 -05:00
Digiku
eaab2da100 Merge branch 'menu-mpjoy-fix' into 'next' 
Menu: Fix joystick events causing the player to move during multiplayer system menu

See merge request STJr/SRB2!414
 2018-12-23 17:55:02 -05:00
Digiku
8d05795f65 Merge branch 'loadconfig-defaultcontrols' into 'master' 
Reset default controls for LOADCONFIG command

See merge request STJr/SRB2!403
 2018-12-23 17:14:34 -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
mazmazz
ff2ec801bc Clear all control keys before loading defaults in LoadConfig 2018-12-23 14:59:26 -05:00
Steel Titanium
c98024aaf0 A more through out attempt to lock the mouse 2018-12-23 14:54:14 -05:00
mazmazz
88a503aa76 Add chat_on to non-key move event checks 2018-12-23 03:21:32 -05:00
Steel Titanium
350a6b1027 SDL:Auto grab input 2018-12-22 23:28:59 -05:00
Alam Arias
a81fa9755e Merge pull request #391 from monster-psychic-cat/sw_largeroomfix 
Large room fix
 2018-12-22 19:48:08 -05:00
Alam Ed Arias
59a97a01b9 Merge branch 'master' into next 2018-12-22 19:36:32 -05:00
Alam Arias
6aa648214d Merge branch 'next' into sw_largeroomfix 2018-12-22 19:34:22 -05:00
Digiku
b9e37d1ed0 Merge branch 'sdl-vidmode-display-fix' into 'master' 
SDL: Center window on current monitor during vidmode change

Closes #47

See merge request STJr/SRB2!415
 2018-12-22 09:06:55 -05:00
mazmazz
5ed5d09950 Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
mazmazz
5a18d89414 Don't create movement events from joy or mouse when menu is active 2018-12-22 01:20:24 -05:00
Digiku
7136112f9c Merge branch 'menu-screenshot-fix' into 'master' 
Menu screenshot fix

Closes #45

See merge request STJr/SRB2!413
 2018-12-22 00:40:18 -05:00
TehRealSalt
e5c308c1d7 Don't allow non-keyboard keys to screenshot/gif in menus 2018-12-22 00:39:32 -05:00
Monster Iestyn
d46e2ef51b Merge branch 'master' into next 2018-12-21 17:41:19 +00:00
Digiku
932daaee22 Merge branch '2122-credits-update-2' into 'next' 
Re-order Special Thanks -- groups first, then names in ABC order

See merge request STJr/SRB2!411
 2018-12-21 11:41:41 -05:00
mazmazz
8e40bdb59d Re-order Special Thanks -- groups first, then names in ABC order 2018-12-21 11:40:35 -05:00
Digiku
cb81503f8e Merge branch '2122-credits-update' into 'next' 
Add sirjuddington and CodeImp to Special Thanks credits

See merge request STJr/SRB2!409
 2018-12-20 18:06:08 -05:00
mazmazz
a4ddad6824 Add sirjuddington and CodeImp to Special Thanks credits 2018-12-20 17:27:25 -05:00
Digiku
7920dbe4a8 Merge branch 'float_equal' into 'master' 
Clear Float equal warnings

See merge request STJr/SRB2!383
 2018-12-20 16:58:37 -05:00
Jimita
2b28d30109 Merge branch 'next' into sw_largeroomfix 2018-12-20 19:58:16 -02:00
Jimita
97e57203d6 Merge branch 'next' into sw_largeroomfix 2018-12-20 19:57:38 -02:00
Digiku
b6ff4b8930 Merge branch 'camera-backport' into 'next' 
Suggestion: 2.2 camera changes backport

See merge request STJr/SRB2!393
 2018-12-20 16:57:23 -05:00
Digiku
2b365bd7ce Merge branch 'jump-spin-axes' into 'next' 
Feature: Jump/Spin axes

See merge request STJr/SRB2!389
 2018-12-20 16:57:05 -05:00
Digiku
2cff6dc078 Merge branch 'joy-jump-defaults' into 'next' 
Assign joy button defaults for 1 and 2 player

See merge request STJr/SRB2!400
 2018-12-20 16:56:09 -05:00
Digiku
6a62edcae4 Merge branch 'menu-2pcontrols-fix' into 'master' 
Fix 2p control menu graying out

See merge request STJr/SRB2!407
 2018-12-20 16:54:52 -05:00
Jimita
32ff0dcd71 Merge branch 'next' into sw_largeroomfix 2018-12-20 19:53:24 -02:00
Digiku
f674a77a8e 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
MPC
b584e95cdb bland 2018-12-20 18:52:51 -03:00
mazmazz
fb3fbf64bd Update CMake paths for Windows DLLs 2018-12-20 16:46:40 -05:00