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

2815 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mazmazz
e54086038f Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu 2018-12-20 16:40:59 -05:00
Monster Iestyn
ef90aa7920 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
Monster Iestyn
f7698de3ea fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic 2018-12-20 16:47:17 +00:00
Monster Iestyn
c22df14771 Merge branch 'master' into next 2018-12-20 16:41:21 +00:00
Digiku
f75d572075 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
e6954eae30 Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua 2018-12-20 10:56:36 -05:00
Digiku
12fc077e01 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
Digiku
f70a023bce 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
861805ca0f Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
mazmazz
119b7cb469 Assign joy button defaults for 1 and 2 player 2018-12-20 01:47:35 -05:00
Digiku
bf5a27477e 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
8fb1453633 Comment out stray PK3 blockmap message 2018-12-20 01:11:07 -05:00
Digiku
6e196b3ed7 Merge branch 'using-offsetof' into 'next' 
Use the `offsetof` function

See merge request STJr/SRB2!394
 2018-12-19 21:53:37 -05:00
Alam Ed Arias
718f16426e Merge branch 'master' into next 2018-12-19 13:20:54 -05:00
Digiku
91bed58e6a 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
2ede537861 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
4c69dac654 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
mazmazz
7c5e508f40 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus
ae590779f9 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
TehRealSalt
b5d86d7263 Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication. 2018-12-18 15:03:54 -05:00
Alam Arias
34354185e0 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
3cecf00c83 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
Alam Arias
8c8e72cb72 Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 14:11:43 -05:00
Alam Ed Arias
c56645d193 Merge branch 'master' into next 2018-12-18 14:05:07 -05:00
Alam Arias
69398d8910 Merge pull request #373 from monster-psychic-cat/sw_planefixes 
Software plane fixes
 2018-12-18 14:02:21 -05:00
Alam Arias
09f41f0e68 Merge pull request #368 from monster-psychic-cat/automap_fix 
Automap fix
 2018-12-18 14:02:05 -05:00
Alam Arias
632982ef68 Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 13:57:48 -05:00
TehRealSalt
4ad9801b21 Revert default changes 
Digiku said they'd handle the new button defaults so \m/
 2018-12-18 12:55:05 -05:00
Monster Iestyn
1478374723 Merge branch 'frame-backslash-fix' into 'next' 
Accept '+' as substitute for '\' for sprite frames (PK3)

See merge request STJr/SRB2!380
 2018-12-17 17:34:41 -05:00
Jimita
97cc111f3e Merge branch 'master' into automap_fix 2018-12-17 17:46:29 -02:00
Jimita
f08e73bc82 Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 17:46:17 -02:00
Jimita
91037eae12 Merge branch 'master' into sw_planefixes 2018-12-17 17:45:36 -02:00
Jimita
180de2fbb2 Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 15:40:20 -02:00
Monster Iestyn
a1bc5852a2 Merge branch 'master' into next 2018-12-17 17:34:41 +00:00
TehRealSalt
4d8fe70aa7 Undo 53dfb4c8 2018-12-16 21:36:54 -05:00
TehRealSalt
f5a0d52749 Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport 2018-12-16 21:22:06 -05:00
TehRealSalt
079c0ec709 Save override for level header 
Kind of like 2.2's, but with backwards-compatability with 2.1
 2018-12-16 20:09:59 -05:00
TehRealSalt
672b948b92 Foolish 2018-12-16 18:19:53 -05:00
TehRealSalt
fad18c421e 2.2 camera changes backport 
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.

These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
 2018-12-16 18:18:59 -05:00
Alam Ed Arias
53dfb4c8bc Merge branch 'revert-d92cec1c' into 'next' 
Revert "Merge branch 'kart-luatextures-backport' into 'next'"

See merge request STJr/SRB2!390
 2018-12-16 17:57:53 -05:00
Alam Ed Arias
8a47cf93f6 Revert "Merge branch 'kart-luatextures-backport' into 'next'" 
This reverts merge request !387
 2018-12-16 22:57:39 +00:00
TehRealSalt
edd3259cf4 2.2 backport of jump/spin axes 
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
 2018-12-16 17:45:49 -05:00
Monster Iestyn
94b00b6b67 Merge branch 'sdl-sound-fix' into 'master' 
SDL: Force use DirectSound driver to fix wrong-pitch sound effects

See merge request STJr/SRB2!375
 2018-12-16 17:16:49 -05:00
Monster Iestyn
d92cec1c78 Merge branch 'kart-luatextures-backport' into 'next' 
Lua: Expose R_TextureNumForName

See merge request STJr/SRB2!387
 2018-12-16 17:15:31 -05:00
Monster Iestyn
ca4cbd9c30 Merge branch 'deprecate-admin' into 'master' 
Lua: Add deprecation warning to admin

See merge request STJr/SRB2!386
 2018-12-16 17:14:32 -05:00
TehRealSalt
6b1746b67b Add deprecation warning to admin 2018-12-16 16:05:18 -05:00
TehRealSalt
dde29e47c5 Expose R_TextureNumForName 
Backport from SRB2Kart
 2018-12-16 15:58:47 -05:00