Latapostrophe
1556e1d027
Remove cyan pixels for now
2019-06-23 18:35:57 +02:00
Sryder
777695aa88
Merge branch 'replay-typo' into 'master'
...
Spell it "forward"
See merge request KartKrew/Kart-Public!147
2019-06-23 12:34:07 -04:00
Latapostrophe
1b60524e42
Fix framedrops with 'dual-thok-barriers'
2019-06-23 14:08:17 +02:00
James R
5f4f10fdbe
Spell it "forward"
2019-06-22 21:40:20 -07:00
Sryder
18e2e4ec8f
Merge branch 'fileneededconfig-fix' into 'master'
...
Fix fileneeded overflow
See merge request KartKrew/Kart-Public!146
2019-06-21 13:13:14 -04:00
James R
bbee4a2554
Cover edge case of WRITESTRINGN
2019-06-20 15:29:55 -07:00
James R
d5e1c1af42
Add a comment by Sryder's request
2019-06-20 15:24:50 -07:00
James R
7f99ebc692
Also count terminating byte in fileneeded filename
2019-06-20 15:16:23 -07:00
James R
ec369e8d21
Don't get stuck in room menu in a modified game
2019-06-19 14:32:11 -07:00
Sryder
db24665856
Merge branch 'print-correct-view' into 'master'
...
Print the correct player for the view command
See merge request KartKrew/Kart-Public!141
2019-06-19 16:58:11 -04:00
Sryder
257ad438ef
Merge branch 'nomoreendlessclouds' into 'master'
...
Stop OpenGL having infinite precipitation draw distance
See merge request KartKrew/Kart-Public!143
2019-06-19 16:56:26 -04:00
Sryder
1b46553d43
Integer comparison warning
2019-06-19 21:54:11 +01:00
Sryder
11c94d3312
Stop OpenGL having infinite precipitation draw distance
2019-06-19 20:05:20 +01:00
Sryder
987b20e5b6
Merge branch 'playerinfo_mscompat' into 'master'
...
Fix compatibility with the MS (Specifically Doomseeker)
See merge request KartKrew/Kart-Public!142
2019-06-19 14:57:41 -04:00
Sryder
935fec1e15
Fix compatibility with the MS (Specifically Doomseeker)
...
Send back 32 players worth of playerinfo regardless of MAXPLAYERS. Fill the extra with unconnected nodes.
2019-06-17 21:04:48 +01:00
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
James R
91c707d6fd
Index displayplayers correctly
2019-06-10 14:24:11 -07: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
James R
3ffc520a2c
Merge remote-tracking branch 'james/ms-connectionfail-fix' into HEAD
2019-06-09 14:22:32 -07:00
James R
8589a1ec07
Revert "Unfuck MS connecting and error reporting"
...
This reverts commit 4d739fe7a5
2019-06-09 14:21:04 -07:00
James R
0561a5374c
Revert "Check error on select"
...
This reverts commit aa4ce2b2d1
2019-06-09 14:20:33 -07:00
James R
33b7459c1b
Revert "Force of habit"
...
This reverts commit fc8ebe83fc
2019-06-09 14:20:32 -07: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
