Commit graph

5346 commits

Author SHA1 Message Date
Latapostrophe
427127b8ec Remove cyan pixels for now 2019-06-23 18:35:57 +02:00
Latapostrophe
c8e4b5cc49 Fix framedrops with 'dual-thok-barriers' 2019-06-23 14:08:17 +02:00
Latapostrophe
335be454f3 change default fog settings, put sprite billboarding in menus and attempt to make colormaps look nicer still 2019-06-17 21:27:31 +02:00
Latapostrophe
968bd310dd Merge branch 'jimita-shaders' of git.magicalgirl.moe:Jimita/Kart-Public into jimita-shaders 2019-06-14 12:19:17 +02:00
Latapostrophe
9b25b08026 Don't remap boosters and springpads in encore + no horizon line in GL 2019-06-14 12:18:44 +02:00
Jaime Passos
dccb4192c3 Update r_opengl.c 2019-06-13 21:27:19 -03:00
Jaime Passos
a37d742561 software is better 2019-06-13 21:10:01 -03:00
Latapostrophe
599cf4fc9d encore colormaps, fixups + flat align 2019-06-13 10:14:07 +02:00
Jaime Passos
fdff52b5fe Update hw_main.c 2019-06-12 23:31:55 -03:00
Jaime Passos
c85d181df9 Open Graphics Library (OpenGL) is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics. The API is
typically used to interact with a graphics processing unit (GPU), to achieve hardware-accelerated rendering.
2019-06-12 23:01:18 -03:00
Latapostrophe
fc33255db4 Fix stuff and reimplement the kart features that went poof 2019-06-12 21:36:47 +02:00
Latapostrophe
a35cea9243 chaos conflict 2019-06-11 17:02:47 +02:00
Jaime Passos
2048dbf753 Update r_opengl.c 2019-06-10 16:53:03 -03:00
Jaime Passos
157b510f2b Merge remote-tracking branch 'upstream/master' into gl_shaders 2019-06-10 16:21:46 -03:00
Monster Iestyn
c21b9e632a Merge branch 'next' into 2.1.24-prep
# Conflicts:
#	debian-template/control
#	debian/changelog
2019-06-07 23:18:31 +01:00
Alam Ed Arias
cd1c87ea71 Merge branch 'master' into next 2019-06-07 18:07:32 -04:00
Alam Ed Arias
d5c1fe6467 Merge branch 'gme-msvc' into 'master'
Add GME to MSVC 10 solution

See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
Steel Titanium
593fcae69a Merge branch 'next' into 2.1.24-prep 2019-06-07 18:02:09 -04:00
Steel Titanium
8d5207975d Merge branch 'master' into travis-deployer
# Conflicts:
#	.travis.yml
2019-06-07 16:56:19 -04:00
Steel Titanium
9a6330ca4d Merge branch 'more-limits' into 2.1.24-prep 2019-06-07 11:28:43 -04:00
Monster Iestyn
474b70aa69 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
Steel Titanium
8f19878781 Upped freeslots limit 2019-06-03 15:23:48 -04:00
James R
2b79547512 Fix XCode compiler errors
I'm faily certain this also fixes broken logic (g_game.c).
2019-05-28 19:04:27 -07:00
James R
d8967112c6 Fix compiler errors
The truncation handling in this one spot is okay, but the compiler isn't smart
enough for it. I'm leaving it as a warning because I'd like to make a dedicated
function for handling snprintf truncation in the future.
2019-05-28 15:11:37 -07:00
James R
9ec9c639dd Revert "Revert "Fix Post Processing in 64-bit Software 3P/4P""
This reverts commit 392f357b1a.
2019-05-28 15:09:29 -07:00
James R
c0e7c17cce Merge remote-tracking branch 'origin/v1' into v1 2019-05-28 14:24:52 -07:00
wolfs
6b568e4f43 Merge branch 'v1-lua-stuff' into 'v1'
V1 lua stuff

See merge request KartKrew/Kart!155
2019-05-28 07:59:45 -04:00
wolfy852
1a038ad463 Don't guard the return 2019-05-28 06:56:35 -05:00
wolfy852
96b5a1df43 Update patch.kart hash
THIS SHOULD BE THE LAST TIME I SWEAR
2019-05-28 06:33:38 -05:00
Sryder
01a0fb1c8f Fix Heatwave Post-processing Effect in 3P/4P 2019-05-27 22:59:58 +01:00
James R
392f357b1a Revert "Fix Post Processing in 64-bit Software 3P/4P"
This reverts commit 1a9b21c195.
2019-05-27 14:20:12 -07:00
James R
88d5e9b7d2 wip 2019-05-27 14:20:07 -07:00
Sryder
1a9b21c195 Fix Post Processing in 64-bit Software 3P/4P
Vid_BlitLinearScreen didn't make sure that it was actually meant to be copying the entire screen rows before doing it properly.
2019-05-27 22:03:17 +01:00
wolfs
93a91e222d Merge branch 'spinout-angle' into 'v1'
Spinout angle change when boosting

See merge request KartKrew/Kart!153
2019-05-26 20:10:56 -04:00
Latapostrophe
1bcebaadfd Lua fixes + new drawOnMinimap function 2019-05-26 15:05:10 +02:00
Latapostrophe
ba3e682e0e fix banana's SpinPlayer using the wrong inflictor 2019-05-26 11:19:26 +02:00
Latapostrophe
142c6aacac Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff 2019-05-26 11:18:00 +02:00
Steel Titanium
2e8aae5d6a Merge branch 'next' into jimita-flashpals-on-screenshots 2019-05-25 19:37:17 -04:00
Latapostrophe
d97a0ce2b4 Move the friction change out of the offroad check 2019-05-25 14:13:35 +02:00
Latapostrophe
cb8af8eb95 add k_booostangle to dehacked 2019-05-25 14:11:26 +02:00
Latapostrophe
8628a543a5 give friction to brakes 2019-05-25 13:51:19 +02:00
Latapostrophe
ccd0ec96a4 let angle be changed while spun out and boosting 2019-05-25 13:08:38 +02:00
James R
38360f29ec Move FOV option out of OGL options 2019-05-22 23:16:20 -07:00
James R
e1451b7a98 Acknowledge fallback models as an OGL option indeed
(You may also be able to actually read that code too.)
2019-05-22 23:15:46 -07:00
Jaime Passos
47ae715962 Hardware mode y-shearing matches software mode mouselook 2019-05-17 17:49:04 -03:00
Jaime Passos
33285f7007 dude how do I co-author in Git? 2019-05-17 13:18:33 -03:00
wolfy852
519a289373 Fix the permanent instashield bug 2019-05-17 08:06:18 -05:00
wolfy852
1c52319d08 More credits updates 2019-05-17 03:55:51 -05:00
Latapostrophe
cd4b9abb78 SPB intangibility 2019-05-17 03:55:23 -05:00
wolfy852
f3b6b732f8 Update bonuschars credits 2019-05-13 12:49:44 -05:00