Commit graph

285 commits

Author SHA1 Message Date
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
GreYFoX 312e36ff04 Added Missing Server Icon 2011-03-31 23:12:07 +02:00
Sworddragon 6a3653b850 Added version information for Freetype 2011-03-27 13:09:58 +02:00
oy 147095fc07 added update to version 2.4.4 and dynamic library for freetype by Sworddragon. Closes #77. Closes #513 2011-03-27 13:09:10 +02:00
GreYFoXGTi d9bdd86e08 replaced a mac 10.6 lib with a 10.5 lib 2011-02-10 04:53:31 +02:00
GreYFoXGTi 69a2595d20 added mysql mac x64 libs
thanks to Allisone
2011-02-10 03:51:40 +02:00
GreYFoXGTi 4c4544da12 Added bam.lua changes by SushiTee 2010-12-01 20:52:00 +02:00
GreYFoXGTi 06415ee6e6 Fixed a merge mistake 2010-11-18 01:35:29 +02:00
GreYFoXGTi b6a4b2b7ba Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-16 22:11:24 +02:00
Sworddragon 96a1b130fa Fixed missing teeworlds icon for gcc 2010-11-16 17:48:29 +01:00
GreYFoXGTi 5ee8796381 Removed sql from mac, people who need sql compile the Mac branch
the boost stuff made my working dir very messy and searching through it takes more time
2010-11-16 15:26:19 +02:00
Allisone ef097cd77c added MySQL support for Mac OS X 10.5 min 32bit and 64bit as team with GreYFoX 2010-11-12 21:39:58 +01:00
GreYFoXGTi 15f9878d25 Fix mysql includes 1.0.5 with mac, didn't work with mysql 1.1.0 2010-10-26 20:37:06 +02:00
GreYFoXGTi abafbdd919 Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-20 01:19:06 +02:00
oy 12b8b629ed added debug info for freetype lib 2010-10-19 19:13:28 +02:00
GreYFoXGTi 663858ea8a Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-19 01:14:15 +02:00
oy d7a8b94f77 updated freetype to 2.43 and fixed a linking problem. Closes #225 2010-10-18 13:39:56 +02:00
GreYFoXGTi 9a5acbbba6 Better Quality
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-01 00:40:48 +02:00
GreYFoXGTi c47cd44b79 Added new icons By Speedy-Consoles AKA Zeta-Hoernchen
Signed-off-by: Speedy-Consoles <rubihome@gmx.de>
2010-09-01 00:32:06 +02:00
GreYFoXGTi c7b05e97a1 Changed the client icon to an icon i designed from the logos Landil made //Thanks Landil again :)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-30 04:37:46 +02:00
GreYFoXGTi 193e350500 Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
	data/editor/entities_clear.png
2010-08-28 16:10:34 +02:00
btd 31d6ed6292 Sql Store 2010-08-26 17:27:36 +04:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-25 17:31:49 +02:00
SushiTee 981b47d0af updated freetype 2010-08-08 19:22:25 +02:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 878ede3080 major update with stuff 2009-10-27 14:38:53 +00:00
Magnus Auvinen 4bb1df3189 moved 0.5 branch to trunk 2009-05-31 09:44:20 +00:00
Johan Althoff baaf1bcf0d Teeworlds server icon for MacOS X 2009-01-12 19:49:06 +00:00
Magnus Auvinen c3b6b87b5a upgraded to bam 0.2.0 2009-01-08 09:48:42 +00:00
Magnus Auvinen 7c3eb2d6db made sdl like a little bampack 2008-11-29 10:19:00 +00:00
Johan Althoff 7a32d03b8a fixed sdl for windows 2008-10-21 16:19:02 +00:00
Magnus Auvinen 96eebfb207 minor fixes 2008-03-22 19:19:56 +00:00
Magnus Auvinen bc108df382 renamed everything. added the new license 2008-03-22 18:40:27 +00:00
Magnus Auvinen ffa923bbeb fixed various small bugs. fixed fair spawning system 2007-12-18 23:21:57 +00:00
Joel de Vahl bff504662c Make releasefor osx. 2007-12-15 13:01:09 +00:00
Johan Althoff c3650b2450 added the config_directory.bat file 2007-12-13 18:43:20 +00:00
Joel de Vahl f6216e9a3a Fixed win32 compile. 2007-10-09 09:04:57 +00:00
Magnus Auvinen f1f9d455f2 moved /trunk/other to /assets 2007-08-14 21:59:16 +00:00
Victor Andreae 4fc2c927dd 2007-08-14 21:26:43 +00:00
Victor Andreae 5fbbd35939 2007-08-14 21:23:54 +00:00
Victor Andreae 2036fe8a4c 2007-08-14 21:21:23 +00:00
Victor Andreae c0431b93fd 2007-08-14 21:17:43 +00:00
Victor Andreae 457c4357c0 2007-08-14 21:14:42 +00:00
Johan Althoff 443b7a36f9 updated windows icons + resource script 2007-08-07 17:45:23 +00:00
Victor Andreae 98a3d5444c 2007-08-05 15:07:48 +00:00
Magnus Auvinen 65179f82cc more homepage tweaks 2007-08-05 13:35:41 +00:00
Victor Andreae 01ff2ecd2e 2007-08-05 13:33:53 +00:00
Victor Andreae 7234c49dda 2007-08-05 13:32:00 +00:00
Magnus Auvinen fb435d3a46 removed old gfx 2007-08-05 13:31:07 +00:00
Victor Andreae 3204e19371 2007-08-05 13:27:52 +00:00
Magnus Auvinen b3499c7f7d new rewritten page 2007-08-05 13:25:08 +00:00
Victor Andreae 7db0781ff8 2007-08-05 13:13:23 +00:00
Magnus Auvinen 0e84f4bca9 commited the new index. rewritten from scratch 2007-08-05 12:14:58 +00:00
Victor Andreae c1509e5cd4 2007-08-05 00:32:14 +00:00
Victor Andreae 22190dcdb8 2007-08-04 23:53:59 +00:00
Victor Andreae eff5c3bc34 2007-08-04 23:46:57 +00:00
Victor Andreae 46f6ea97a5 2007-08-04 23:35:38 +00:00
Johan Althoff 01b55cba85 website: small fixes 2007-08-04 23:29:07 +00:00
Victor Andreae 08d23fd904 2007-08-04 23:19:55 +00:00
Victor Andreae 653217a811 2007-08-04 23:19:13 +00:00
Victor Andreae 3c008e9947 2007-08-04 23:15:19 +00:00
Victor Andreae 929bdb49d0 2007-08-04 23:07:42 +00:00
Victor Andreae 56362977e3 2007-08-04 22:41:42 +00:00
Johan Althoff e2b0437a65 website: added default.css 2007-08-04 22:21:47 +00:00
Johan Althoff 437039d1cd website: added correct changelist 2007-08-04 22:11:25 +00:00
Johan Althoff 6fa55c5352 website update (pending 0.2.0 relelase) - UNFORMATTED 2007-08-04 22:06:36 +00:00
Johan Althoff 82b08d0b7e 2007-08-02 01:34:01 +00:00
Johan Althoff 04b29b76be 2007-08-02 01:33:38 +00:00
Johan Althoff 935e3d88a0 2007-08-01 22:45:55 +00:00
Johan Althoff 71c606f4c6 2007-08-01 22:45:02 +00:00
Joel de Vahl 8be353d62c Don't crash on settings->video 2007-07-23 17:43:01 +00:00
Joel de Vahl 82e9651f1f Updated tileset 2007-07-21 20:39:47 +00:00
trin 509afd5805 Moved tilesets 2007-07-21 20:37:33 +00:00
Joel de Vahl bed8dba7ff Updated tileset 2007-07-21 20:15:18 +00:00
Victor Andreae 06d0ab30e6 2007-07-21 18:49:10 +00:00
Joel de Vahl 99b11d7986 New art 2007-07-21 18:12:10 +00:00
Joel de Vahl 9322e25f50 New art 2007-07-21 18:11:59 +00:00
Johan Althoff 9c56ddd5fa fixed AA ugliness 2007-07-20 12:35:00 +00:00
Johan Althoff d1e20dcac8 first add 2007-07-19 19:42:01 +00:00
Johan Althoff 9fb6baab22 checkin again 2007-07-15 23:53:54 +00:00
Johan Althoff f5086db463 Deleted 2007-07-15 19:08:18 +00:00
Johan Althoff 7a3058b5b1 First checkin 2007-07-15 19:05:14 +00:00
Johan Althoff 0ff824ffcc first add 2007-07-14 16:05:57 +00:00
Johan Althoff 70a971d4a9 2007-05-28 18:37:56 +00:00
Johan Althoff 3099733841 PSD for gui_widgets.tga 2007-05-26 14:59:24 +00:00
Magnus Auvinen 0912abf669 moved some more stuff from data 2007-05-22 16:29:44 +00:00
Magnus Auvinen 9072e56b5f move more stuff out from data 2007-05-22 16:21:27 +00:00
Magnus Auvinen 13042affdd move stuff out from data 2007-05-22 16:20:33 +00:00
Magnus Auvinen 73aa9b71c1 started the major restructure of svn 2007-05-22 15:03:32 +00:00