stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
6690 commits 60 branches 11 tags 94 MiB
Commit graph

5694 commits

Author SHA1 Message Date
James R
ee6de3800e Don't try to update right after registering 2020-04-13 22:54:58 -07:00
James R
2c5566b013 Add a hack so the 'All' room isn't display for hosting 2020-04-13 22:31:11 -07:00
James R
1201e89132 Kill the old mserv, long live HMS! 2020-04-13 22:23:01 -07:00
James R
7255d360e1 Clean up header text 2020-04-13 21:20:29 -07:00
Steel Titanium
be94fa3200 Fix compile errors 2020-04-13 23:07:38 -04:00
James R
8c9e5fc644 Whoops I fucked that up 2020-04-13 17:45:02 -07:00
James R
abd15288b4 Don't send httpsource in SERVERINFO if join password is set 2020-04-13 17:40:48 -07:00
James R
b25acfa782 Reorder join process so password is authenticated before attempting to download 2020-04-13 17:30:42 -07:00
Sally Cochenour
1fac0505a4 No more modulo bullshit in VERSION 
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision

# Conflicts:
#	src/doomdef.h
 2020-04-12 23:32:15 -05:00
Wolfy
0a50317e49 oops 2020-04-12 22:47:22 -05:00
James R
032adadd86 HTTP update alert 2020-04-12 20:37:46 -07:00
Wolfy
c68e1c53f3 Fix off by one error in http downloader 2020-04-12 21:14:33 -05:00
Wolfy
bceeaf78bc Prep stuff 
pending asset hash changes
 2020-04-12 20:48:11 -05:00
wolfs
dcfaba2cc6 Merge branch 'http-downloads' into 'awful-mix' 
Support for http downloads

See merge request SinnamonLat/Kart-Public!1
 2020-04-12 21:38:33 -04:00
James R
48b2112af7 Fix some goofs 2020-04-12 18:33:53 -07:00
James R
03caf27d92 Bruh 2020-04-12 18:27:01 -07:00
James R
269746fe01 Clean up a bunch of stuff and follow the Master Server API more closely 2020-04-12 18:25:59 -07:00
James R
3f4224ed37 Windows certs do work, thanks Steel! 2020-04-12 17:51:30 -07:00
James R
969fe0b28e Handle more errors 2020-04-12 17:51:05 -07:00
James R
ef71bef6f3 Kill masterserver_token 2020-04-12 17:15:39 -07:00
Steel Titanium
9293c6cb32 Fix cmake using wrong libs if internal libs is turned on 
Use '\0' instead, just in case
 2020-04-12 17:56:12 -04:00
Steel Titanium
2dd7854a9b Remove some of these superfluous ifdef checks. 
Allows compatibility with non-curl enabled builds.
 2020-04-12 15:07:39 -04:00
Wolfy
9c727992a4 Fix self-comparison in hw_main.c 2020-04-12 06:47:12 -05:00
Hannu Hanhi
f3bdcb4ec3 Backport from SRB2: Replace NextTexAvail with glGenTextures 2020-04-12 06:39:00 -05:00
James R
60a38cbec3 Even the warning can die, give the programmer some credit 
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
 2020-04-11 22:10:05 -07:00
James R
6d3f5ef163 Also allocate mipmap for MD2 
(cherry picked from commit 99cd5161becec131099c64dddd2be6beafb538cc)
 2020-04-11 22:10:05 -07:00
James R
4ad360155f Fix nonpacked to packed cast for OpenGL 
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
 2020-04-11 22:10:05 -07:00
James R
437f7aa16d Fix misaligned pointers 
(cherry picked from commit ceb8d298c2ae9a6000fa4d22e381085c6bf77cd6)
 2020-04-11 22:03:29 -07:00
Wolfy
da2a640c6c Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
 2020-04-11 23:47:25 -05:00
Hannu Hanhi
8001bb4154 Batching! 2020-04-12 03:09:07 +03:00
Hannu Hanhi
1efa95bb33 Don't destroy my config file 2020-04-12 02:18:12 +03:00
Hannu Hanhi
3a654bb7d9 Fix comment 2020-04-11 13:27:18 -05:00
Hannu Hanhi
7bac42f9b2 Don't repeatedly look for texture files that don't exist. This fixes performance issues with models. 2020-04-11 13:27:17 -05:00
wolfs
516a4994f5 Merge branch 'fix-chat-draw-leak' into 'awful-mix' 
Chat drawing memory leak fix from SRB2 repo

See merge request SinnamonLat/Kart-Public!4
 2020-04-10 09:28:08 -04:00
Hannu Hanhi
b9e008c8bf Chat drawing memory leak fix from SRB2 repo 2020-04-08 17:33:23 -04:00
James R
4b68b41a31 Fix lol xd compiler errors 2020-04-07 17:06:20 -07:00
Steel Titanium
061e483df1 Fix error with travis 2020-04-07 19:48:39 -04:00
Steel Titanium
f28c53ea82 Fix this mistake 2020-04-07 19:27:20 -04:00
Steel Titanium
f4002f076e Fix even more build errors 2020-04-07 19:14:27 -04:00
Steel Titanium
cb9004e4cf Fix some build errors 2020-04-07 19:07:39 -04:00
Steel Titanium
6fcc06bf72 Support for http downloads 2020-04-07 18:22:29 -04:00
Wolfy
8a1f40b90f Add PT_CLIENTCMD back to allowed packet types 
Fixes unexpected CLIENTCMD prints
 2020-04-07 07:09:51 -05:00
Wolfy
bbce134afa Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-07 06:41:54 -05:00
Wolfy
95e7e59179 Remove stupid dumbfuck #ifdefs 
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
 2020-04-07 05:24:38 -05:00
Wolfy
d4c69f137a Fix unterminated #ifdef 2020-04-07 04:25:11 -05:00
Wolfy
bcfffefe43 Merge remote-tracking branch 'remotes/digiku/public-musicplus-lua' into awful-mix 
Reimplements removed MusicPlus functions.

# Conflicts:
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_script.h
 2020-04-07 03:41:26 -05:00
Wolfy
59df0c1187 Revert the removal of S_MusicExists 2020-04-07 02:56:45 -05:00
Wolfy
2406302911 Potentially fix join passwords 2020-04-05 18:57:47 -05:00
Wolfy
49a1037f6b Revert "PT_CLIENTCMD test" 
This reverts commit 78bc80fd49.
 2020-04-05 17:18:22 -05:00
Wolfy
78bc80fd49 PT_CLIENTCMD test 2020-04-05 17:01:40 -05:00
Wolfy
40f7d1b721 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-05 16:12:04 -05:00
Wolfy
cedc79fd4b Fix packet type desync 2020-04-05 16:11:30 -05:00
Wolfy
4d477d1aed Reimplement the MusicChange hook 
why the fuck was this removed
 2020-04-05 12:09:44 -05:00
Wolfy
49842c37cd Record attack only linedef exec 2020-04-05 14:12:12 +02:00
Latapostrophe
12bca93591 Merge branch 'v1-backwards-thrown-spikeballs' into awful-mix 2020-04-05 14:10:00 +02:00
Sally Cochenour
88a6b6b2f4 Slow down backwards spikeballs (again) 2020-04-05 14:09:04 +02:00
Wolfy
9395a0f5fc Record attack only linedef exec 2020-04-05 07:03:49 -05:00
Latapostrophe
b483e42d94 Merge branch 'v1-ignore-posthumous-ackret' into awful-mix 2020-04-05 11:23:49 +02:00
Latapostrophe
86986adf6e Merge branch 'ignore-posthumous-ackret' of git.magicalgirl.moe:KartKrew/Kart-Public into v1-ignore-posthumous-ackret 2020-04-05 11:23:29 +02:00
Latapostrophe
732eb4cafa Merge branch 'fix-double-bombs' into awful-mix 2020-03-22 13:09:06 +01:00
Latapostrophe
549eabe9e4 I'm dumb, don't check for flashtics here... 2020-03-22 13:08:46 +01:00
James R
f0cc851b29 This will be the Master Server in 2020 2020-03-20 20:37:26 -07:00
Latapostrophe
4f24f1ae5b Merge branch 'spb-blockmap-fix' of git.magicalgirl.moe:KartKrew/Kart-Public into awful-mix 2020-03-13 22:38:20 +01:00
Latapostrophe
67eeb819cb Merge branch 'fix-double-bombs' into awful-mix 2020-03-13 13:52:37 +01:00
Latapostrophe
245ac55654 This flag shouldn't have been applied there 2020-03-13 13:50:22 +01:00
Latapostrophe
44f45d6d28 Fix Lua crashes when loading without addons 2020-03-12 16:03:12 +01:00
Latapostrophe
cbc7fe7b67 Fix Demo lua archive crash for real this time 2020-03-12 15:31:58 +01:00
Latapostrophe
b905f20cd4 Fix tiny conflict because I forgot to merge 2020-03-11 19:55:56 +01:00
Latapostrophe
0ee6426830 Remove debug prints 2020-03-11 19:53:52 +01:00
Latapostrophe
dabed0cd50 Attempt to fix replay loading crash 2020-03-11 19:33:22 +01:00
Latapostrophe
a3389b43a0 Merge branch 'too-many-files' into awful-mix 2020-03-11 12:34:54 +01:00
Latapostrophe
513c3d1c3f don't set MAX_WADFILES to 256, worst mistake of my life 2020-03-11 12:34:35 +01:00
Latapostrophe
43e5718851 Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
37c733b8c2 More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Latapostrophe
ee2fdeaf21 Merge branch 'too-many-files' into awful-mix 2020-03-11 07:21:41 +01:00
Latapostrophe
168b8ac052 Bump MAX_WADFILES to 256 2020-03-11 07:20:11 +01:00
Latapostrophe
6da057167d Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix 2020-03-10 21:46:12 +01:00
Latapostrophe
99905a443e Merge branch 'damned-springpads' into v1.2-frankeinstein 2020-03-10 20:39:35 +01:00
Latapostrophe
b85a588e01 Merge branch 'push-more-lua' into v1.2-frankeinstein 2020-03-10 20:35:29 +01:00
Latapostrophe
7cd3221be8 Merge branch 'fix-orbit-shield' into v1.2-frankeinstein 2020-03-10 20:35:19 +01:00
Latapostrophe
d993bce8b6 Merge branch 'fix-double-bombs' into v1.2-frankeinstein 2020-03-10 20:34:47 +01:00
Latapostrophe
1a0d148a7c Merge branch 'no-cheese' into v1.2-frankeinstein 2020-03-10 20:34:38 +01:00
Latapostrophe
d43ed7f74c Merge branch 'gl-qol' into v1.2-frankeinstein 2020-03-10 20:34:20 +01:00
Latapostrophe
3b2907865f Merge branch 'stack-draw-flags' into v1.2-frankeinstein 2020-03-10 20:27:52 +01:00
Latapostrophe
81ad772a8b Merge branch 'record-attack-changes' into v1.2-frankeinstein 2020-03-10 20:27:00 +01:00
Latapostrophe
5202a4f0fd VoteThinker Hook for Lua 2020-03-10 18:58:44 +01:00
Latapostrophe
63eadaf83c Expose CV_FindVar to Lua 2020-03-10 18:12:20 +01:00
Latapostrophe
2e5608d33b Push race countdowns and functions to set them 2020-03-10 12:57:30 +01:00
Latapostrophe
8c00331c2b Push consoleplayer and displayplayers to Lua 2020-03-10 11:53:28 +01:00
Latapostrophe
428dc42e2d Remove debug print 2020-03-10 10:21:47 +01:00
fickleheart
11cba9bd6a I'M GONNA PISS MYSELF OF LAUGHER anyway fixed syncbombs 2020-03-07 12:40:45 -06:00
fickleheart
b8e4af3f8d SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06:00
Latapostrophe
bb1c320236 Merge branch 'fickle-replay-v1' into replay-freecam-rewind 2020-03-05 21:08:20 +01:00
TehRealSalt
190b0d4660 Replay playback changes: 
- Store level state periodically
- Load the closest usable level state when done rewinding for
  quicker resumes
- Make playback menu fade out after 5 seconds of no activity
  (but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
  at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo

from fickleheart
 2020-03-05 21:04:56 +01:00
James R
3f9f07af84 Use https because my web server redirects 2020-03-01 12:31:49 -08:00
James R
56fac10b14 strtok can return NULL 2020-03-01 12:15:48 -08:00
James R
9d42a5ad5e This time I fucked up 2020-03-01 11:59:54 -08:00
James R
aca2e97c84 Windows gaysed: the sequel 2020-03-01 11:54:21 -08:00
James R
ceb332e580 Windows is weird 2020-03-01 11:46:02 -08:00
James R
32a34cc1b2 masterserver_debug to set CURLOPT_VERBOSE 2020-03-01 11:39:27 -08:00
James R
1959a9b107 Don't show "All" room when hosting 2020-03-01 11:19:59 -08:00
James R
8756ef15a2 I don't even know my own website 2020-03-01 11:17:56 -08:00
James R
47a5f9ef94 lol 2020-03-01 10:59:25 -08:00
James R
e2507f390f The big bad HTTP master server 
Cvars:

http_masterserver is the url to the master server's API.
masterserver_token may be an authentication token.
 2020-03-01 02:36:56 -08:00
Latapostrophe
ba8dff544a How can you look at yourself in the mirror? 2020-01-29 22:33:00 +01:00
James R
2a016332c4 Handle log file in parent properly 2019-12-16 19:28:42 -08:00
James R
f460e83846 Add this back for Windoodoo because I'm an idiot 2019-12-16 19:27:55 -08:00
James R
d0c41a8d55 Rename signal caught message to be more obvious 2019-12-16 19:27:55 -08:00
James R
a0d6dc30cb Fix signal handler setup error reporting 2019-12-16 19:27:55 -08:00
James R
b83f41e089 Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place 2019-12-16 19:27:54 -08:00
James R
a64dbe1016 Kill child when wait fails, so I_Error exits both 2019-12-16 19:27:54 -08:00
James R
c9830e5ab1 Fix idiot mistake 2019-12-16 19:27:54 -08:00
James R
9efe4d8445 Move everything to i_system.c 
This also simplifies things; SDL isn't initialized in the parent process.
 2019-12-16 19:27:53 -08:00
James R
2b837726eb nix: Fork before game code and wait to catch signals and coredumps 
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.

"(core dumped)" is also included in the message if core dumping could be
determined.
 2019-12-16 19:27:35 -08:00
fickleheart
92d320be72 Fix dereferencing uninitialized pointer 2019-12-01 16:16:27 -06:00
fickleheart
35a8944f88 Remove (redundant?) skywalls that seemed to drop performance 2019-12-01 15:39:30 -06:00
fickleheart
e8d2ca1f63 Fix kart HUD fadein 2019-12-01 12:38:05 -06:00
fickleheart
6131b80f03 I don't like your sprite clipping fix, so here's mine 2019-12-01 12:34:25 -06:00
fickleheart
9ecc48d0e4 Merge remote-tracking branch '[remote name redacted]/jimita-shaders' 
# Conflicts:
#	src/hardware/hw_main.c
 2019-12-01 11:58:24 -06:00
Latapostrophe
272f3fbb53 fix conflict 2019-11-12 00:41:26 +01:00
Latapostrophe
aab87012df dontencoreremap flag + colormaps 2019-11-12 00:40:25 +01:00
Latapostrophe
abcb1e9981 Merge branch 'gl-encore' into gl-qol 2019-11-12 00:23:56 +01:00
Jaime Passos
994f9492e8 Recreate the CLUT when the palette changes 2019-11-12 00:23:38 +01:00
Jaime Passos
f22e767380 fix conflict 2019-11-12 00:23:26 +01:00
Latapostrophe
3bd62175f6 fix encore for ogl 2019-11-12 00:21:37 +01:00
Latapostrophe
ff7a706976 fix orbiting items not protecting you against your own items 2019-11-11 00:24:06 +01:00
James R
fdb54d8e80 Apply BMBOUNDFIX to A_MineExplode 2019-10-15 23:29:02 -07:00
James R
1d6020883c Forgot includes 2019-10-07 18:10:33 -07:00
James R
abaefa05b1 ferror does not return errno, are you stupid? 
Use M_FileError to return the proper error description, or "end-of-file".
 2019-10-07 17:55:31 -07:00
James R
5e9082fb77 Also apply HUD translucency to FREE PLAY 2019-09-19 20:29:51 -07:00
Latapostrophe
90a272489e it's cam, not thiscam 2019-09-18 14:04:23 +02:00
Latapostrophe
9a1bfb3a92 camera checks to avoid crashes 2019-09-17 00:04:32 +02:00
James R
3801f93181 Let first person camera work in demos 2019-09-15 00:32:01 -07:00
Latapostrophe
ef279ac5fe i am a retard 2019-09-13 23:42:51 +02:00
filpAM
fe4cbd7ba1 Fix "NOMIXER" flag compiling 2019-09-13 13:20:44 -04:00
Latapostrophe
ca2f6685e4 forgot to reset variables on demo stop 2019-09-11 21:30:11 +02:00
Latapostrophe
cea0ffab60 forgot to add back 'void' after undoing experiments 2019-09-10 13:52:32 +02:00
Latapostrophe
2205246f0c get replays to save player lua vars 2019-09-10 11:59:17 +02:00
Latapostrophe
bee60709ec I'm an idiot and forgot to let you download files 2019-09-09 22:26:09 +02:00
Latapostrophe
18c8f47f9a fix rewind, fix sound local sound playing in freecam 2019-09-09 22:15:50 +02:00
Latapostrophe
e3393d6323 let mfe_drawonlyfor flags stack 2019-09-09 20:20:40 +02:00
Latapostrophe
45b62aa8a4 replay freecam + enhancements 2019-09-05 23:24:23 +02:00
Latapostrophe
eb8cef41e4 shorten RA intro & allow to restart with pause 2019-09-01 23:04:07 +02:00
James R
3838700f2c Save bans when cleared too 
(Why doesn't it work for I_Quit?)
 2019-08-22 15:18:14 -07:00
Latapostrophe
9cdd8d85c8 Fix bombs exploding twice in the same frame 2019-08-12 00:14:01 +02:00
Latapostrophe
61d7fc8b48 remove join passwords 2019-08-04 11:26:26 +02:00
Sryder
eb8cb12b8f Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2019-07-17 21:29:35 +01:00
Latapostrophe
f15adb64cb fix thrust on spring pads for shrink and the likes 2019-07-13 14:07:57 +02:00
Sryder
3cd5b3a33e 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
James R
14be24dfb6 Support adding to CV_FLOAT cvars with the Add command 2019-07-04 17:48:17 -07:00
James R
0a2eac682b Don't use client port as default peer port 2019-07-04 16:38:00 -07:00
Sryder
e276faf819 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
815f237b22 Merge branch 'revert-mserv' into 'master' 
Revert mserv

See merge request KartKrew/Kart-Public!144
 2019-06-30 15:56:17 -04:00
James R
141ffd5c94 Send the old GT_MATCH only for specific versions 
These version numbers were gathered from the Master Server's PHP code.
 2019-06-30 10:47:08 -07:00
Sryder
56ad1340a2 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
bcae3898dd 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
c3f6f263d4 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
59bbab1fff 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
414eee58ba checkforemptylines can be static 2019-06-24 20:50:37 +01:00
Sryder
d67ea859e3 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
e219645577 handle clipping like literally every hw renderer ever 2019-06-24 12:51:18 +02:00
Latapostrophe
998ee7b6b2 fix splitscreen, fix thok barriers, better fog settings 2019-06-24 10:39:16 +02:00
Latapostrophe
1556e1d027 Remove cyan pixels for now 2019-06-23 18:35:57 +02: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
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
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
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
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
Steel Titanium
3c08ee1313 Merge branch 'master' into travis-deployer 
# Conflicts:
#	.travis.yml
 2019-06-07 16:56:19 -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
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
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