stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-03-10 19:32:44 +00:00
Code Issues Projects Releases Packages Wiki Activity
6721 commits 60 branches 11 tags 94 MiB
Commit graph

82 commits

Author SHA1 Message Date
James R
1dca1a3f47 Makefile: automatically detect system to compile for, if no system was specified 
This should work for mingw and linux so far.

(cherry picked from commit f92026f98b168f4556d50d3dde403ab6bfd97ff3)
 2020-09-13 14:25:08 -07:00
James R
00ff94caa2 Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS 
(cherry picked from commit 9495e6354fed1028c6fc502cc9d946cfdd0b7896)
 2020-09-13 14:25:07 -07:00
James R
3437b0690a Kill NOHS 2020-08-24 17:58:39 -07:00
James R
e8a2397dea Rename hms123311.c to http-mserv.c 
HMS lives on in our hearts!
 2020-05-14 17:26:10 -07:00
James R
233e6627de Merge remote-tracking branch 'origin/master' into http-mserv 2020-05-12 17:50:32 -07:00
Steel Titanium
ba989dce10 Support for http downloads 
(cherry picked from commit 6fcc06bf72)

(cherry picked just the libcurl stuff)
 2020-04-26 20:01:15 -07: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
Steel Titanium
6fcc06bf72 Support for http downloads 2020-04-07 18:22:29 -04: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
ff04e0c103 chaos conflict 2019-06-11 17:02:47 +02:00
Jaime Passos
76967e46bb destroy hw_glide.h because no modern GPU supports such API 2019-03-21 18:23:40 -03:00
wolfy852
6b743d383b Merge branch 'next' into md3-vanilla-kart 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
 2019-03-20 19:50:20 -05:00
Jaime Passos
f210053735 md3-vanilla 2019-03-18 18:34:20 -03:00
wolfs
5620d0188e Merge branch 'apng' into 'master' 
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
 2019-02-28 12:00:58 -08:00
james
79736e40aa Support aPNG in new versions of libpng 
A known issue: iTXt cannot be written (yet). I may do something about that.
For now, this is likely good enough. Who cares about the extra text anyway?
 2019-02-10 23:52:02 -08:00
mazmazz
4d5f7e78cd Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart 2019-01-10 22:08:37 -05:00
TehRealSalt
b713903208 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
mazmazz
30c7ad3928 Add MD2/MD3 files to makefile 2019-01-07 04:21:46 -05:00
wolfy852
bcf687c3af Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00
SeventhSentinel
73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
3d2e58861d Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
4cfacf5cde Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-29 21:14:50 -05:00
Steel Titanium
d048e7cbec Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium
5ba0863876 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium
4a05fd5f26 More explict check 2018-12-27 18:54:10 -05:00
Steel Titanium
6dddf61265 Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
TehRealSalt
5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
6b772aab59 Add Kart files to Makefile 2018-11-15 19:17:49 -05:00
Steel Titanium
02c08a3e10 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium
f02105732e Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium
4836e711d3 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
Sryder
6af56273bf Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge 
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
 2018-11-10 21:14:53 +00:00
Monster Iestyn
a733a29f4c Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least 
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
 2018-11-10 16:08:26 +00:00
TehRealSalt
69faf1cbc7 Remove NOFOURPLAYER from Makefile 
Seems that someone already removed it from the other code anyway...?
 2018-11-03 03:21:08 -04:00
toaster
a1e1aa81b5 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
 2018-10-14 21:52:05 +01:00
Steel Titanium
79f5f4885c Split zlib and libpng 2018-10-04 19:47:19 -04:00
toaster
c52a4de933 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_md2.c
 2018-08-07 21:20:27 +01:00
Alam Ed Arias
1ee7eda0ad Fixup PROFILEMODE 2018-07-20 17:35:18 -04:00
TehRealSalt
4d207e9037 NOFOURPLAYER as a compile option 2018-01-01 13:18:38 -05:00
TehRealSalt
5fe2f4928f Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu 
# Conflicts:
#	src/doomdef.h
#	src/sdl/i_main.c
#	src/sdl/i_video.c
#	src/y_inter.c
 2017-10-17 15:53:34 -04:00
Monster Iestyn
c330907dba Added a SDL12=1 flag to all ports whose interface code still lives in the sdl12 folder (and is unsupported by SDL 2.0 officially anyway) 
This basically causes the makefile to use the sdl12 folder instead of the main sdl folder
 2017-09-14 21:03:20 +01:00
Alam Ed Arias
86a76a9766 Makefile: disable GETTEXT by default 2017-05-26 18:10:53 -04:00
Sryder
68d439a783 Merge branch 'upstream/next' into zarrotsu_vanillamerge 
# Conflicts:
#	src/Makefile
#	src/doomdef.h
#	src/hardware/hw_main.c
#	src/p_mobj.c
#	src/p_user.c
#	src/r_segs.c
#	src/sdl/i_video.c
#	src/win32/win_sys.c
 2017-02-17 20:14:55 +00:00
Sryder
2d6c7959ed Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge 
# Conflicts:
#	.gitignore
#	libs/zlib/projects/visualc10/zlib.vcxproj
#	src/Makefile
#	src/am_map.c
#	src/d_main.c
#	src/dehacked.c
#	src/doomdef.h
#	src/g_game.c
#	src/hardware/hw_main.c
#	src/hardware/hw_md2.c
#	src/info.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_bsp.c
#	src/r_plane.c
#	src/r_segs.c
#	src/r_things.c
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/win32/Srb2win-vc10.vcxproj
#	src/win32/Srb2win.ico
#	src/y_inter.c
 2017-02-17 20:03:10 +00:00
Logan-A
eb8f608fd7 Merge branch 'master' into netcode-shit 2017-01-02 15:18:28 -05:00
Louis-Antoine
b347b818e7 -Fixed broken net commands, thus fixing (or at least greatly improving) chat/commands/joins/leaves and possibly other annoying bugs 
-Updated packet name list so the debug file no longer shows garbage packet names
-Replaced byte values with actual net command names in the debug file. Only the first net command in a packet will be shown though
-Added a MOBJCONSISTANCY define that makes the game takes all revelant mobjs to be counted in the synch seed
-Added a PACKETDROP define that adds two console commands "drop" and "droprate" to simulate bad internet by dropping packets
-Added/changed comments here in there in the netcode
-Fixed a minor error that would ignore one of the urgent ack slots
-Added a space between the map name and "zone" for the messages shown in a joiner's console
 2017-01-01 23:07:34 +01:00
Alam Ed Arias
b9b5d20300 Makefile: move ZLIB flags outside of GME check 2016-11-13 17:34:53 -05:00
Alam Ed Arias
c9aebc6f81 libz pkgconfig 2016-09-09 17:41:30 -04:00
ZTsukei
4112d44529 Some Color code, Kart powers 2016-08-11 21:42:16 -04:00