vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5264 commits 50 branches 7 tags 75 MiB
Commit graph

5264 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
MPC 9d93f54b67 bland 2018-12-20 18:52:51 -03:00
mazmazz 0519d8c52d Update CMake paths for Windows DLLs 2018-12-20 16:46:40 -05:00
mazmazz fe5001a38a Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu 2018-12-20 16:40:59 -05:00
mazmazz b57204fc12 Fix 2p control menu graying out 2018-12-20 16:38:58 -05:00
mazmazz 6f8b126586 Add G_FilterKeyByVersion() to setcontrol 2018-12-20 16:30:37 -05:00
Monster Iestyn c9a730340a Merge branch 'lua-fof-flat-names-fix' into 'next' 
Lua FOF flat names fix

See merge request STJr/SRB2!405
 2018-12-20 15:48:04 -05:00
MPC fcb65951b8 change implementation of square root 2018-12-20 17:37:06 -03:00
Jimita 5b285a60a2
Update r_segs.c 2018-12-20 16:15:19 -03:00
Jimita ffd5061531
Merge branch 'next' into sw_largeroomfix 2018-12-20 16:56:05 -02:00
Monster Iestyn 76fe78571e fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic 2018-12-20 16:47:17 +00:00
Monster Iestyn dfbbab35f4 Merge branch 'master' into next 2018-12-20 16:41:21 +00:00
Digiku 1e15f2365d Merge branch 'exitvars-fix' into 'next' 
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua

See merge request STJr/SRB2!404
 2018-12-20 10:58:27 -05:00
mazmazz e2b8ff26db Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua 2018-12-20 10:56:36 -05:00
Digiku dd107724de Merge branch 'lua-nextmapoverride' into 'next' 
Lua: nextmapoverride & skipstats changing outside of G_ExitLevel

See merge request STJr/SRB2!396
 2018-12-20 10:55:30 -05:00
mazmazz 71da6836c0 Reset default controls for LOADCONFIG command 2018-12-20 10:13:43 -05:00
mazmazz 04916edc07 Update EXECVERSION to MODVERSION 27 2018-12-20 04:03:35 -05:00
mazmazz 9d212b340b Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
Digiku 25f0dc7eae Merge branch 'version-string-develop' into 'master' 
Add DEVELOP build flag to version string

See merge request STJr/SRB2!401
 2018-12-20 02:28:21 -05:00
mazmazz 7f8d16d3cd Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
mazmazz 60bcf92525 Adjust execversion retrieval in CV_FilterVarByVersion 2018-12-20 02:18:59 -05:00
mazmazz 969960a1eb Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz ed7178bca4 Assign joy button defaults for 1 and 2 player 2018-12-20 01:47:35 -05:00
Digiku 722ceb5285 Merge branch 'pk3-stray-blockmap-msg' into 'master' 
Comment out stray PK3 blockmap message

See merge request STJr/SRB2!399
 2018-12-20 01:11:44 -05:00
mazmazz 78501dcd0c Comment out stray PK3 blockmap message 2018-12-20 01:11:07 -05:00
Digiku 223257e237 Merge branch 'using-offsetof' into 'next' 
Use the `offsetof` function

See merge request STJr/SRB2!394
 2018-12-19 21:53:37 -05:00
wolfy852 2a0e6937a0 Extend joystick hotplugging to players 3 and 4 2018-12-19 18:08:38 -06:00
wolfy852 fc3578c592 Revert GameController stuff 2018-12-19 13:11:30 -06:00
Alam Ed Arias e5e978f8bd Merge branch 'master' into next 2018-12-19 13:20:54 -05:00
Digiku 7982b1695a Merge branch 'ogl-zfighting-fix' into 'master' 
OpenGL z-fighting fix [by Azeonus]

Closes #43

See merge request STJr/SRB2!395
 2018-12-19 13:05:04 -05:00
Digiku bea76aa4bf Merge branch 'save-override' into 'next' 
Feature: Save override for level header

See merge request STJr/SRB2!392
 2018-12-19 13:04:41 -05:00
Digiku 4c69fe23f6 Merge branch 'kart-luatextures-backport' into 'next' 
Lua: Kart textures backport (non-foolish vers)

See merge request STJr/SRB2!391
 2018-12-19 13:04:24 -05:00
Latapostrophe 387173ea89 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-19 16:50:49 +01:00
Latapostrophe a31b85e124 Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
mazmazz 96cad09db6 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus 67cd6dcdd2 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
toaster bab444e42c woops, kicks are player-based, aren't they 2018-12-18 20:13:11 +00:00
TehRealSalt 42a9e66883 Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication. 2018-12-18 15:03:54 -05:00
Alam Arias ba00752c71
Merge pull request #367 from monster-psychic-cat/the_second_remote_view_camera_fix 
Fix remote viewpoint cameras for real this time
 2018-12-18 15:00:59 -05:00
TehRealSalt 0e34e7f32f G_SetCustomExitVars for setting nextmapoverride & skipstats 
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
 2018-12-18 14:48:04 -05:00
toaster 0aabcd2503 lj dm'd me so here's a second, more sensible crack at it 2018-12-18 19:40:38 +00:00
Alam Arias b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 14:11:43 -05:00
Alam Ed Arias d5c7ca1d23 Merge branch 'master' into next 2018-12-18 14:05:07 -05:00
Alam Arias 056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes 
Software plane fixes
 2018-12-18 14:02:21 -05:00
Alam Arias e0eb64375a
Merge pull request #368 from monster-psychic-cat/automap_fix 
Automap fix
 2018-12-18 14:02:05 -05:00
Alam Arias afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 13:57:48 -05:00
toaster 99e50250cf Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation. 
pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
 2018-12-18 18:05:11 +00:00
TehRealSalt 03a4bd8f53 Revert default changes 
Digiku said they'd handle the new button defaults so \m/
 2018-12-18 12:55:05 -05:00
Latapostrophe 9f17039e2e Merge branch 'srb2chat' into 'SRB2-CHAT' 
fix my fucking code

See merge request SinnamonLat/SRB2!1
 2018-12-18 11:51:18 -05:00
Latapostrophe 9c9fd2e2f7 Merge branch 'SRB2-CHAT-COMPILE' into 'SRB2-CHAT' 
Compile fixes for buidbots

See merge request SinnamonLat/SRB2!2
 2018-12-18 11:45:01 -05:00