Commit Graph

6294 Commits

Author SHA1 Message Date
Latapostrophe b9b76e739c 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 b58478a685 Merge branch 'jimita-shaders' of git.magicalgirl.moe:Jimita/Kart-Public into jimita-shaders 2019-06-14 12:19:17 +02:00
Latapostrophe a49c4349a4 Don't remap boosters and springpads in encore + no horizon line in GL 2019-06-14 12:18:44 +02:00
Jaime Passos 0b3a02bfcc Update r_opengl.c 2019-06-13 21:27:19 -03:00
Jaime Passos 5e14fd4ae4 software is better 2019-06-13 21:10:01 -03:00
Latapostrophe bf13726c1e encore colormaps, fixups + flat align 2019-06-13 10:14:07 +02:00
Jaime Passos a0ff5c6b25 Update hw_main.c 2019-06-12 23:31:55 -03:00
Jaime Passos df789e1d67 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 53df420546 Fix stuff and reimplement the kart features that went poof 2019-06-12 21:36:47 +02:00
Latapostrophe ff04e0c103 chaos conflict 2019-06-11 17:02:47 +02:00
Jaime Passos e251f9c230 Update r_opengl.c 2019-06-10 16:53:03 -03:00
Jaime Passos de5e44cfbc Merge remote-tracking branch 'upstream/master' into gl_shaders 2019-06-10 16:21:46 -03:00
Steel Titanium bfa7325295 Merge branch '2.1.24-prep' into 'next'
Update version to 2.1.24

See merge request STJr/SRB2!495
2019-06-08 17:08:34 -04:00
Monster Iestyn f5d883bd12 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 ea08ba3fba Merge branch 'master' into next 2019-06-07 18:07:32 -04:00
Alam Ed Arias 83b8a98df4 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 c0c1e5416f Merge branch 'next' into 2.1.24-prep 2019-06-07 18:02:09 -04:00
Alam Ed Arias 3edf73f181 Merge branch 'travis-deployer' into 'master'
Deploy OS X and Debian packages from Travis-CI

See merge request STJr/SRB2!449
2019-06-07 17:57:29 -04:00
Steel Titanium 3c08ee1313 Merge branch 'master' into travis-deployer
# Conflicts:
#	.travis.yml
2019-06-07 16:56:19 -04:00
Steel Titanium e1d025cd2b Merge branch 'jimita-flashpals-on-screenshots' into 'next'
Flashpals on screenshots

See merge request STJr/SRB2!492
2019-06-07 16:37:59 -04:00
Steel Titanium eb99ad0437 Merge branch 'more-limits' into 2.1.24-prep 2019-06-07 11:28:43 -04:00
Monster Iestyn 6f6d912fa6 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
Steel Titanium d4dac52766 Upped freeslots limit 2019-06-03 15:23:48 -04:00
wolfs c96f5dba0c Merge branch 'v1-errors' into 'master'
V1 errors

See merge request KartKrew/Kart-Public!140
2019-05-28 22:13:19 -04:00
James R b15cea53e6 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 f070bd2d4d Fix GCC 8 Travis error 2019-05-28 19:00:24 -07:00
James R 6d4cdfaab7 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 71e3ec55bf Revert "Revert "Fix Post Processing in 64-bit Software 3P/4P""
This reverts commit 995edfb1e8.
2019-05-28 15:09:29 -07:00
James R cf36490ca6 Merge remote-tracking branch 'origin/v1' into v1 2019-05-28 14:24:52 -07:00
wolfs 4743e4bac8 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 c28e1702eb Don't guard the return 2019-05-28 06:56:35 -05:00
wolfy852 e266f72a1c Update patch.kart hash
THIS SHOULD BE THE LAST TIME I SWEAR
2019-05-28 06:33:38 -05:00
wolfs a562673d3f Merge branch 'fix-postprocessing' into 'v1'
Fix Post Processing in 64-bit Software 3P/4P

See merge request KartKrew/Kart!156
2019-05-28 06:35:33 -04:00
Sryder ab7246d1f7 Fix Heatwave Post-processing Effect in 3P/4P 2019-05-27 22:59:58 +01:00
James R 995edfb1e8 Revert "Fix Post Processing in 64-bit Software 3P/4P"
This reverts commit a2a63c5e7f.
2019-05-27 14:20:12 -07:00
James R 06ddf55709 wip 2019-05-27 14:20:07 -07:00
Sryder a2a63c5e7f 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 65763b8745 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
wolfs fd9f5b8f58 Merge branch 'fix-brakes' into 'v1'
Make brakes stronger

See merge request KartKrew/Kart!154
2019-05-26 20:10:46 -04:00
Latapostrophe a7917cb4b9 Lua fixes + new drawOnMinimap function 2019-05-26 15:05:10 +02:00
Latapostrophe cb74228469 fix banana's SpinPlayer using the wrong inflictor 2019-05-26 11:19:26 +02:00
Latapostrophe 55815eb829 Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff 2019-05-26 11:18:00 +02:00
Steel Titanium dc273d3f23 Merge branch 'next' into jimita-flashpals-on-screenshots 2019-05-25 19:37:17 -04:00
Latapostrophe e42e567489 Move the friction change out of the offroad check 2019-05-25 14:13:35 +02:00
Latapostrophe 93740dc854 add k_booostangle to dehacked 2019-05-25 14:11:26 +02:00
Latapostrophe d4d794ceac give friction to brakes 2019-05-25 13:51:19 +02:00
Latapostrophe 78c2c54a87 let angle be changed while spun out and boosting 2019-05-25 13:08:38 +02:00
James R 2fb4dd73fc Move FOV option out of OGL options 2019-05-22 23:16:20 -07:00
James R 05dde43423 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 d3dfd77ae7 Hardware mode y-shearing matches software mode mouselook 2019-05-17 17:49:04 -03:00