edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11349 commits 1 branch 428 tags 413 MiB
Commit graph

238 commits

Author SHA1 Message Date
heinrich5991 c6016b77c5 Add other/bundle/ directory with Info.plist and PkgInfo 2017-11-10 08:32:21 +01:00
heinrich5991 8b1559ae14 Drop CMake 3.4 support for MSVS 
Windows users don't have old versions of CMake from their repositories,
Visual Studio installs CMake 3.9.
 2017-10-23 13:58:44 +02:00
Dennis Felsing acb052e97d Newline 2017-10-23 09:43:20 +02:00
Jupeyy 205b054026 move manifest to other directory and add MinGW support 2017-10-22 18:06:20 +02:00
Dennis Felsing 88c0778b21 Bundle glew instead 2017-10-20 11:12:27 +02:00
Dennis Felsing d7eabb0ea9 Further macosx fixes 2017-10-20 09:31:42 +02:00
Dennis Felsing db46d18e71 No GLEW on OSX necessary (untested) 2017-10-20 09:08:49 +02:00
Dennis Felsing d6999bb726 Merge "Pull Request using OpenGL 3.3" 2017-10-18 12:49:27 +02:00
Dennis Felsing f60eb5658f Merge pull request #836 from heinrich5991/pr_ddnet_unify_icons 
Unify icons for gcc and MSVC, fix server icon
 2017-09-16 11:18:40 +02:00
Jupeyy 74cccdeed0 output use_maxosxframework 2017-09-13 17:42:09 +02:00
Jupeyy 629bf2c5f9 Merge branch 'master' of https://github.com/ddnet/ddnet 2017-09-12 20:24:58 +02:00
def 0302393512 builds now 2017-09-08 21:01:38 +02:00
def 874c8381f2 macosx freetype try 2017-09-08 20:48:53 +02:00
Jupeyy 1053bc735d initial port to opengl3.3 (without any optimazations) 2017-09-02 15:24:07 +02:00
def 80b04370d5 bam 2017-08-31 21:39:33 +02:00
def c66cdf9b0d macosx freetype lib32 bam 2017-08-31 21:17:01 +02:00
def 1860113f46 Fix freetype on mac 2017-08-31 20:18:27 +02:00
heinrich5991 05f136fdfb Unify icons for gcc and MSVC, fix server icon 2017-08-01 21:43:56 +02:00
def 275adcba54 No manifest for MSVC 2017-07-22 11:50:58 +02:00
def 0db98b218b Fix icons 2017-07-21 23:54:58 +02:00
def c53f39c434 Let's try the nicer dll names on windows 2017-07-21 23:43:01 +02:00
def a72910bb4e Move external libraries to ddnet/ddnet-libs repo 2017-07-19 21:51:47 +02:00
def fed747b9a0 curl-4.lib needs to reference libcurl-4.dll 2017-07-19 17:40:51 +02:00
def d57ffaf2f5 Correct name 2017-07-19 17:37:54 +02:00
def b89295cdcb Let's try to create libcurl-4.lib files for MSVC linking 2017-07-19 17:32:29 +02:00
def 718aa5bdfc Fix curl build on Mac 2017-07-17 19:42:57 +02:00
def ed3b3f94c4 Further build fixes 2017-07-17 00:34:11 +02:00
def b1b4aa78ea Windows build fixes 2017-07-17 00:17:22 +02:00
def b2d86d197f Add missing mysql include files 2017-07-16 23:53:10 +02:00
def f94f567acf New curl and openssl versions 2017-07-16 23:52:55 +02:00
def f76f0cce2b Actually use Windows manifest 2017-07-15 19:18:29 +02:00
def 9779e5adde Fix linux opusfile linking 2017-07-15 19:11:11 +02:00
def 49eb0128f2 Windows cleanup 2017-07-15 16:38:40 +02:00
def 1144490ff7 Only use opusfile+opus+ogg from one source at the same time to prevent linking problems (fixes #793) 2017-07-15 16:26:05 +02:00
def 1e3476e8bd Opposite manifest setting 2017-07-15 16:18:18 +02:00
def 78dc5aa959 Another Windows DPI try 2017-07-15 15:31:53 +02:00
Dennis Felsing 7c53a32d9c Let's try to fix stuff by updating SDL2 on Windows 2017-07-11 14:21:07 +02:00
def afe8b4dfbe Or we just disable stupid highdpi... 2017-07-09 14:50:10 +02:00
def 66f6f16e81 Windows DPI fixes #2 2017-07-09 09:44:07 +02:00
def 3e885cb587 Bundled mysql linux libs are totally broken on lots of systems, new builds are not better, so let's just force the system ones 2017-06-16 23:20:25 +02:00
heinrich5991 51b4a793b8 CMakeLists.txt: Add icon to DDNet executable on Windows 2017-03-07 15:32:11 +01:00
heinrich5991 a6983d329c CMakeLists.txt: Copy over data files and DLLs 2017-03-07 15:24:08 +01:00
heinrich5991 33aa719d63 CMakeLists.txt: Move libraries into more canonical locations 2017-03-03 13:29:06 +01:00
Learath2 09552a6d9f Get rid of trailing whitespaces 2017-02-21 19:11:43 +03:00
Giorgos Retsinas a0b2abff28 Fix macOS server icon 2016-10-29 15:09:14 +03:00
def 03f662dd6f Add new SDL2 2.0.4 libs 2016-04-30 00:52:54 +02:00
def 0e609cd92c Windows SDL2 linking fix 2016-04-29 21:56:38 +02:00
def 41f0365de1 Fix SDL_platform.h for Windows (from SDL2 HG, will be fixed in next version) 2016-04-29 21:56:38 +02:00
def 2d70c3e292 Try to get SDL2 on Windows working 2016-04-29 21:55:48 +02:00
def db8a126315 Merge swick's SDL2 branch 2016-04-29 21:55:48 +02:00
H-M-H 8f8053de3d fixed mysql compiling on mac 2015-11-22 15:23:10 +01:00
def 975fbf3702 libwinpthread for new mingw 2015-09-03 11:50:40 +02:00
def d4fe267c58 Make cross-compilation for windows possible using mingw 2015-09-03 07:44:56 +02:00
def fca4c112d4 Better support for cross-compiling by using pkg-config (instead of sdl-config and freetype-config) and trying both static linux libs 2015-09-03 06:28:11 +02:00
def 60d035cf78 Fix mysql arch x86 2015-07-10 17:42:16 +02:00
def e163f9f8ea Add support for compiling mysql with dynlibs thanks to mysql_config 2015-07-10 16:55:53 +02:00
def 5c1ce6c601 Fix linux x86 2015-07-10 15:48:42 +02:00
def 0df6866036 Enable support to use pkg-config for curl, opusfile, opus and ogg 
instead of the bundled libs. This should enable support for building on
more platforms again.

To disable pkg-config detection and use the bundled libraries instead,
you can manually set it like this:
  bam config curl.use_pkgconfig=false opus.use_pkgconfig=false opusfile.use_pkgconfig=false ogg.use_pkgconfig=false

Fixes #172
 2015-07-10 15:31:09 +02:00
def e332a43dc5 Add libwinpthread-1.dll for Win64 2015-07-01 14:59:44 +02:00
def 486e0d43c9 Remove incompatible win64 curl.lib 2015-07-01 14:19:27 +02:00
def e503b7def5 First try for Win64 2015-07-01 13:41:15 +02:00
def ed3c3bbf1f Update Linux libcurl and openssl 2015-03-20 12:54:42 +01:00
def 55c3738a32 Add libssl.a and libcrypto.a for linux 2015-03-14 15:36:14 +01:00
def f893ed6ec4 Fix and clean up autoupdater 2015-03-13 15:14:00 +01:00
def 201e67d513 Update libcurl includes 2015-02-05 20:21:37 +01:00
def 98dab85a53 Finally building on mac 2015-02-05 20:02:58 +01:00
def 4deffb523b Update curl on win32 2015-02-05 19:42:14 +01:00
def 3b085d0cf9 Try to fix mac libcurl again 2015-02-05 19:36:58 +01:00
def 6a440cc9d8 Add macosx libcurl 2015-02-05 18:16:12 +01:00
def 05ae3f41bb Let's try to make curl build 2015-02-05 17:54:42 +01:00
Learath 340e79904d Added fetcher interface. 
Make fetcher client only and move Task class from interface.

Fix queue logic, add destructor.
LEAN_AND_MEAN moved up to prevent curl including the whole winapi

Remove JobNo, Fix callback, Cleanup debug messages.

Fix include guard

Copy the Url and Destination. Delete pTask.

Fix typo

Add Completion callback

Let the user pass context

Add virtual to inherited funcs

Use 0 instead of NULL

Give fetcher the ability to create folders. Fix couple of small bugs.

Added .lib files for MSVC.

Leave user the allocation of CFetchTask. Get rid of unnecessary cb
arguments.

Get the HTTP return code from libcurl.

Incorperate the storage system.

Fail on HTTP error >= 400.

Add more info to the task.

Add blocking way of getting HTTP resp code.
Remove resp code from normal tasks as we fail >= 400 anyways.

Sleep instead of killing the thread

Forgot one instance of respcode.

Provide HTTP download for maps.

Dont check 404 first.
 2015-01-19 22:14:52 +01:00
fisted 095d172903 Link against libcurl. 
Conflicts:
	scripts/make_release.py
 2015-01-05 22:43:09 +02:00
def d34fa2fe9c Add VERSIONS for opus 2014-10-28 22:12:22 +01:00
def bb484c0f58 Opus working with Mac 2014-10-28 17:49:42 +01:00
def 5604629468 Add Mac libraries 2014-10-28 16:59:53 +01:00
def 636f407645 Working compilation on Linux 2014-10-28 16:03:11 +01:00
def 45fff36957 Add missing DLLs for Windows 2014-10-28 15:29:58 +01:00
BeaR 5562fac602 Add opus as external library (windows only) 2014-10-28 14:38:50 +01:00
def 177ea323a1 New Mac logo 2014-04-28 00:27:24 +02:00
def 54fdb7ff1b New client logo 2014-04-24 00:32:08 +02:00
def f2163f2338 New client logo 2014-04-23 23:07:35 +02:00
def d22bc98b70 oops 2014-03-29 00:25:13 +01:00
def 6774a92029 Cleanup 2014-03-29 00:24:34 +01:00
def c7d97bb81c New SDL version (fixes some vsync problems on Windows) 2014-02-06 18:18:05 +01:00
def cde8a18901 ddnet icons 2014-02-03 16:05:09 +01:00
def a03cc19a4f Actually add new icon 2013-12-31 14:49:27 +01:00
def 72ca64501f New SQL, automatic reconnect 2013-08-12 20:13:12 +02:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
oy 7d109a2c58 forgot some files 2011-12-04 22:36:11 +01:00
oy f12095fb51 fixed win64 building 2011-12-04 22:28:58 +01:00
oy 2df6e0d04d updated freetype to 2.4.8 on windows 2011-12-04 20:10:30 +01:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
oy f5fff81abb linked the runtime library statically within sdl. Closes #797 2011-07-23 19:54:49 +02:00
oy 4869d0ed35 added a SDL dll built with the latest 1.2 source which can handle accented character input. Closes #745 2011-07-05 18:04:09 +02:00
GreYFoX 989d69a5b2 Mac make_release changes 2011-04-13 01:35:13 +02:00
GreYFoX dd70b687ed Better ICons + Mac Icons 
Disabled Emotional tees until reworked
 2011-04-13 01:34:39 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts 
Added Icon by landil
alot more...
 2011-04-09 22:32:17 +02:00
oy e717754b8d added new icons by Crises that support a higher size 2011-04-05 19:13:01 +02:00
oy a4ce187613 added new icons by crises 2011-04-01 22:52:25 +02:00
GreYFoX 8cd7dec179 Added High Definition Client Icon 2011-03-31 23:12:26 +02:00