fickleheart
7025a23f25
Merge remote-tracking branch '[remote name redacted]/jimita-shaders'
...
# Conflicts:
# src/hardware/hw_main.c
2019-12-01 11:58:24 -06:00
Sryder
9beaac2e53
Merge branch 'fix-port-connect' into 'master'
...
Don't use client port as default peer port
See merge request KartKrew/Kart-Public!152
2019-07-05 11:54:28 -04:00
Sryder
8ac774a9d6
Merge branch 'add-floats-command' into 'master'
...
Fix the Add command when floats
See merge request KartKrew/Kart-Public!153
2019-07-05 11:49:46 -04:00
James R
460105cb8a
Support adding to CV_FLOAT cvars with the Add command
2019-07-04 17:48:17 -07:00
James R
d4e950f17b
Don't use client port as default peer port
2019-07-04 16:38:00 -07:00
Sryder
e14da85868
Merge branch 'opengl_match_software_wallclip' into 'master'
...
OpenGL: Try and Match Software Wallclipping Better
See merge request KartKrew/Kart-Public!150
2019-07-02 14:08:10 -04:00
Sryder
658e852a0c
Merge branch 'revert-mserv' into 'master'
...
Revert mserv
See merge request KartKrew/Kart-Public!144
2019-06-30 15:56:17 -04:00
Sryder
d579a40221
Merge branch 'replay-code-sucks' into 'master'
...
Fix SIGSEGV when saving replays and invalid extrainfo offset
See merge request KartKrew/Kart-Public!149
2019-06-30 05:51:21 -04:00
Sryder
269050ecc7
Merge branch 'lemme-outa-room-menu' into 'master'
...
Don't get stuck in room menu in a modified game
See merge request KartKrew/Kart-Public!145
2019-06-27 14:16:37 -04:00
Sryder
6a53837d2c
Update Skywall handling
...
I've tried to make this so it almost never under-compensates, and over-compensates very little where possible.
I don't think it's 1:1 to software's current behaviour, and probably never will be due to software being very strange.
2019-06-26 23:17:45 +01:00
James R
78bd39acd5
Someone doesn't know how pointers or WRITE macros work...
...
Fixes SIGSEGV when saving a replay.
2019-06-25 00:44:12 -07:00
Sryder
913225dd2a
checkforemptylines can be static
2019-06-24 20:50:37 +01:00
Sryder
06592383a0
Match CheckClip to software's clipping check in R_AddLine
...
Has the added benefit of fixing noclip camera for opengl
Unfortunately SkyWalls are kinda broken with this. I'll be looking into them shortly.
2019-06-24 20:21:30 +01:00
Latapostrophe
927b464b5a
handle clipping like literally every hw renderer ever
2019-06-24 12:51:18 +02:00
Latapostrophe
53e6c360fd
fix splitscreen, fix thok barriers, better fog settings
2019-06-24 10:39:16 +02:00
Latapostrophe
427127b8ec
Remove cyan pixels for now
2019-06-23 18:35:57 +02:00
Sryder
d63c05a5aa
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
c8e4b5cc49
Fix framedrops with 'dual-thok-barriers'
2019-06-23 14:08:17 +02:00
James R
76c5e3d6fe
Spell it "forward"
2019-06-22 21:40:20 -07:00
Sryder
1e000d27ed
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
aa5857211c
Cover edge case of WRITESTRINGN
2019-06-20 15:29:55 -07:00
James R
fa8999c0df
Add a comment by Sryder's request
2019-06-20 15:24:50 -07:00
James R
b5aff9f6e7
Also count terminating byte in fileneeded filename
2019-06-20 15:16:23 -07:00
James R
a6b7c0a996
Don't get stuck in room menu in a modified game
2019-06-19 14:32:11 -07:00
Sryder
a80bfe4f41
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
b595cd4c22
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
3ee34f7518
Integer comparison warning
2019-06-19 21:54:11 +01:00
Sryder
636724aeb6
Stop OpenGL having infinite precipitation draw distance
2019-06-19 20:05:20 +01:00
Sryder
3c64cdc6ed
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
3d6161c7ca
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
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
James R
8faff03f31
Index displayplayers correctly
2019-06-10 14:24:11 -07: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
James R
6bee5435d2
Merge remote-tracking branch 'james/ms-connectionfail-fix' into HEAD
2019-06-09 14:22:32 -07:00
James R
62b957d348
Revert "Unfuck MS connecting and error reporting"
...
This reverts commit 50ae248b84 .
2019-06-09 14:21:04 -07:00
James R
a8d1ddd1c2
Revert "Check error on select"
...
This reverts commit 1d77716d7e .
2019-06-09 14:20:33 -07:00
James R
154ce80a9b
Revert "Force of habit"
...
This reverts commit 9f0887fafc .
2019-06-09 14:20:32 -07:00
Steel Titanium
605e32004a
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
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