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
3025 commits 1 branch 12 tags 205 MiB
Commit graph

3025 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
59ac969594 Define EPSILONs only if not already defined 
Fixes OSX buildbot
 2018-12-24 20:36:28 -05:00
mazmazz
52b6810ee1 Remove log message 2018-12-24 20:33:59 -05:00
mazmazz
7c3dcd2bf9 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Alam Ed Arias
fa5ff9c0cf Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
mazmazz
732b9a66ca Fix float comparison for colormap maskamt 2018-12-24 19:58:05 -05:00
Alam Ed Arias
008fecbba7 TravisCI: GCC 8.x needs to pass 2018-12-24 19:10:29 -05:00
mazmazz
34964a07a8 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -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
mazmazz
e40deb5443 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-24 17:31:03 -05:00
mazmazz
59cc9dbecf Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-24 17:30:59 -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
mazmazz
8877d888cb Do not increment mainwads for music.dta 2018-12-23 23:54:26 -05:00
mazmazz
96dadf64a7 Play flag-returned SFX for the opposing team 2018-12-23 22:57:14 -05: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
mazmazz
c82cd78bb7 Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-23 18:09:54 -05:00
mazmazz
915c90d9f3 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-23 18:09:17 -05:00
mazmazz
9c8487e8eb Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-23 18:09:14 -05:00
Digiku
be931de113 Merge branch '2122-patch-dta-update' into '2122-version' 
Changes related to 2.1.22 patch.dta update

See merge request STJr/SRB2!417
 2018-12-23 18:08:38 -05:00
Digiku
15c9404f91 Merge branch 'addons-backport' into '2122-version' 
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
 2018-12-23 18:08:06 -05:00
Digiku
2fbb5995d8 Merge branch 'menu-mpjoy-fix' into '2122-version' 
Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version]

See merge request STJr/SRB2!420
 2018-12-23 18:06:27 -05:00
mazmazz
39b0a16727 Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'"" 
This reverts commit ee63ed22d5.
 2018-12-23 18:04:01 -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
77182e9278 Merge branch 'SRB2-CHAT' into '2122-version' 
Chat and other multiplayer quality of life improvements.

See merge request STJr/SRB2!398
 2018-12-23 17:53:54 -05:00
Digiku
95e5c76fc7 Merge branch 'execversion-filtercontrols' into '2122-version' 
Add SETCONTROL handling to config updater

See merge request STJr/SRB2!410
 2018-12-23 17:15:44 -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
Latapostrophe
47a329807a Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01: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
4e07436276 Credits update 2018-12-23 14:41:41 -05:00
mazmazz
98b59f3f9d Merge branch '2122-version' into execversion-filtercontrols 2018-12-23 14:30:24 -05:00
mazmazz
d05896415e Add JOY10 default to gc_centerview 2018-12-23 14:29:54 -05:00
mazmazz
7a1094f56e Fix joy button default override when filling keynum2 with default 2018-12-23 14:29:10 -05:00
Latapostrophe
c282d546d7 Fix the chat being displayed in singleplayer if there are stillmessages 2018-12-23 10:50:36 +01:00
Latapostrophe
9129fbad3b Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-23 10:30:37 +01:00
Latapostrophe
3ac3057931 Merge branch 'SRB2-CHAT' into 'SRB2-CHAT' 
Final code fixes and minor cleanup

See merge request SinnamonLat/SRB2!5
 2018-12-23 04:30:20 -05:00