edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
7745 commits 1 branch 424 tags 415 MiB
Commit graph

172 commits

Author SHA1 Message Date
def f893ed6ec4 Fix and clean up autoupdater 2015-03-13 15:14:00 +01:00
heinrich5991 fa0708b99d Make the secure random stuff platform-independent 2015-03-06 01:35:08 +01:00
fisted 68e30c29b3 added free md5 implementation w/o deps 2015-03-05 00:13:48 -08:00
eeeee 56c42c3c31 websockets support in server 2015-02-08 19:11:34 -08:00
def d4c6141fa2 Fix some bam stuff 2015-02-05 19:52:13 +01:00
def a8b2672739 Minor curl fixes 2015-02-05 18:03:34 +01:00
def 05ae3f41bb Let's try to make curl build 2015-02-05 17:54:42 +01:00
Learath Lea d7771f8f7d Fix debug build on MinGW. Add json_get_boolean. 2015-01-19 22:14:50 +01:00
def 4ccdaf6f1b Only do -static-libgcc and -static-libstdc++ on Windows with gcc 2015-01-19 22:14:49 +01:00
def bf1c7b33dd Revert "No more static linking" 
This reverts commit 191dca338a.
 2015-01-19 22:14:49 +01:00
def 0696f68212 No more static linking 2015-01-19 22:14:49 +01:00
def c0f309a82e Oops 2015-01-19 22:14:49 +01:00
def 72278a18cb Fix cl_default_zoom bug 2015-01-19 22:14:48 +01:00
fisted 095d172903 Link against libcurl. 
Conflicts:
	scripts/make_release.py
 2015-01-05 22:43:09 +02:00
def 7e89917ddd Rename ping -> twping 2014-11-24 23:22:37 +01:00
def 7ff73a2ee5 Add ping tool 2014-11-24 21:16:03 +01:00
def 2a44f0cc0f Merge branch 'Sound' into DDRace64 
Conflicts:
	bam.lua
	other/opus/include/ogg/ogg.h
	other/opus/include/opus/opus.h
	other/opus/include/opus/opus_custom.h
	other/opus/include/opus/opus_defines.h
	other/opus/include/opus/opus_multistream.h
	other/opus/include/opus/opus_types.h
	other/opus/include/opusfile.h
	src/engine/client/sound.cpp
 2014-10-28 22:08:59 +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 c69f2470d7 Use path to libopusfile-0.lib as suggested by BeaR 2014-10-28 16:47:18 +01:00
def 47e86a0451 Fix compilation on Windows with mingw (hope it works with VS as well) 2014-10-28 16:17:53 +01:00
def 0c41753585 Fix Windows path 2014-10-28 16:07:41 +01:00
def 636f407645 Working compilation on Linux 2014-10-28 16:03:11 +01:00
BeaR 5562fac602 Add opus as external library (windows only) 2014-10-28 14:38:50 +01:00
def 40e589681e Clean up bam.lua a bit 2014-10-28 10:00:46 +01:00
def 7d7b78938e Fix opus compilation 2014-10-28 09:51:15 +01:00
def 24881449b3 Revert "Add OGG" 
This reverts commit 28d276cd7e.
 2014-10-28 01:34:15 +01:00
def 3b1d23f42c Revert "Add Opus" 
This reverts commit a7dafa40c7.
 2014-10-28 01:34:09 +01:00
def ca52f841b0 Revert "Add opusfile" 
This reverts commit 827699263c.
 2014-10-28 01:34:03 +01:00
def 0b1de66bdf Revert "Some work on Opus map sounds (not working yet)" 
This reverts commit 26260181bd.
 2014-10-28 01:33:58 +01:00
def 26260181bd Some work on Opus map sounds (not working yet) 2014-10-27 16:23:53 +01:00
def 827699263c Add opusfile 2014-10-27 09:25:24 +01:00
def a7dafa40c7 Add Opus 2014-10-27 09:22:52 +01:00
def 28d276cd7e Add OGG 2014-10-27 09:05:49 +01:00
BeaR 2c8df155aa Fix compiler settings for cl 2014-10-19 16:00:53 +02:00
east 6ab9279211 json related updates 2014-09-18 16:11:22 +02:00
def 8273af8842 Always do -lrt for mysql server 2014-08-31 23:53:38 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def 2cfe67369b Fix sql compile on some platforms 2014-05-20 23:20:05 +02:00
def 6774a92029 Cleanup 2014-03-29 00:24:34 +01:00
def 520d0ab623 Fix: sql_server compilation 2013-12-30 04:54:29 +01:00
def 0cb8a4e1ac Update bam.lua to work with Mac OS X 2013-12-30 02:53:13 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
 2013-12-26 18:02:22 +01:00
def 0172bdc524 fix bam.lua for windows and os x 2013-08-13 05:31:51 +02:00
def 3de0daaffd add -lrt 2013-08-12 20:38:11 +02:00
def 72ca64501f New SQL, automatic reconnect 2013-08-12 20:13:12 +02:00
def f8c9a89106 Static linking 2013-08-05 15:38:57 +02:00
def 1cee48f6c1 Can only set sv_test_cmds at start, then it stays, and determines whether gametype is DDRace (no cheats) or TestDDRace (cheats) 2013-07-23 00:15:50 +02:00
oy 0be51ca98a added a check for ppc building on mac os x. Closes #1006 2013-02-24 18:08:36 +01:00
oy 56ae76f465 made building tw with the SDK of the minimum mac os x version a config option. #964 2013-02-24 17:37:22 +01:00
oy cc048315a9 fixed some targets within mac building 2013-02-24 17:36:27 +01:00
Ravomavain 956532d7cd Forward CFLAGS and LDFLAGS to the compiler (Closes DDRace/teeworlds#212) 2013-02-03 20:23:40 +02:00
Ravomavain 4481eabcc5 remove banmaster from sources 2012-05-01 21:57:09 +02:00
GreYFoX 5c2d8297fb Revert "Cleaned up bam.lua, added buildbot support" 
This reverts commit 5b455dc4a9.

Conflicts:

	bam.lua
 2012-04-12 16:46:47 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
 2012-04-12 02:09:31 +02:00
heinrich5991 5b455dc4a9 Cleaned up bam.lua, added buildbot support 2012-03-27 22:49:19 +02:00
oy d7089ea76a fixed compiler warnings for gcc on windows 2012-01-08 00:01:34 +01:00
Shereef Marzouk c496bf3c4e Merge branch 'master' of https://github.com/oy/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/make_release.py
 2011-12-14 17:01:47 +02:00
Krzysztof Socha 1fb4ead61a added x86_64 mac support to bam.lua 2011-12-10 18:12:58 +01: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 f12095fb51 fixed win64 building 2011-12-04 22:28:58 +01:00
GreYFoX 116daa67d3 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-09-13 01:01:25 +02:00
Ian Wilson 5dd2d189ad Fixes for compiling with Solaris kernel. 
Fixed typo in CONF_PLATFORM_SOLARIS. Made sure that we don't try to use
the gcc endianness for Solaris. Included sys/filio.h for Solaris so that
FIONBIO is defined. Added linking flags -lsocket and -lnsl for Solaris
in bam.
 2011-09-12 00:16:31 +02:00
GreYFoX fbdae20eb2 disabled warning C4291: no matching operator delete found; memory will not be freed if initialization throws an exception 2011-09-03 01:29:59 +02:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
oy 244d2bab3c fixed compiler setting. Closes #272 2011-08-19 00:10:58 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
Choupom 7f15b3ac57 fixed several stuffs 2011-05-03 19:25:11 +02:00
GreYFoX 2a37807879 Disabled Mac Sql Release by defaule, users who need it must compile with server_sql_release 2011-04-15 07:02:02 +02:00
GreYFoX 9397c4a55f some make release changes for adding sql server files 
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
 2011-04-15 04:32:53 +02:00
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
 2011-04-14 01:27:49 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX 4a46168631 Temporarily removed crash features til it's fixed, made version 1.071a 
changed some names for the build bot to work
 2011-04-12 03:52:01 +02:00
Shereef Marzouk 0354625f9b fixed Mac compilation 2011-04-10 00:05:34 +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
GreYFoX 312e36ff04 Added Missing Server Icon 2011-03-31 23:12:07 +02:00
Choupom e9ab42795a refactored dilate 2011-03-31 22:58:06 +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 2a09e66667 more mac bam.lua changes 2011-02-10 18:18:09 +02:00
Shereef Marzouk aa8edfa058 bam.lua fixed 2011-02-10 18:11:07 +02:00
GreYFoXGTi 69a2595d20 added mysql mac x64 libs 
thanks to Allisone
 2011-02-10 03:51:40 +02:00
GreYFoXGTi d7e4153ec4 Added banmaster by heinrich5991 2011-02-07 08:25:38 +02:00
GreYFoXGTi b5f545f0e7 Fixed Mistake 2011-01-06 14:24:30 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 22192c1047 Applied Oy's Changes to bam.lua on the parts i modified in DDRace 2010-12-12 03:42:50 +02:00
GreYFoXGTi 0c9b1937ff Merge branch 'master' into DDRace 
Conflicts:
	bam.lua
 2010-12-12 03:39:13 +02:00
oy 369e22cd4e fixed mac building 2010-12-12 01:08:58 +01:00
SushiTee 5c7d523fe4 droping mac 10.4 compatibility and fixed compatibility to 10.5 when compiling in 10.6 (fixed #274) 2010-12-11 20:37:35 +01:00
GreYFoXGTi 24ea2663a1 Fixed Compiler warnings 2010-12-07 20:33:56 +02:00
GreYFoXGTi a9ce77c9da Fixed make_release.py 2010-12-05 19:28:55 +02:00
GreYFoXGTi cb77b7cee2 Reworked bam.lua 2010-12-04 17:04:41 +02:00
GreYFoXGTi a838ad9da6 server_release on windows has no sql by default because my sql on the server_release version of windows doesn't work, but it does on server_debug 2010-12-04 16:31:54 +02:00
GreYFoXGTi 9803a74664 so now windows mysql is fucked up and i don't know why 2010-12-04 03:12:30 +02:00
GreYFoXGTi ed3b009a31 Replaced sql build config with nosql, to make sql added by default. 
server build configs are currently server_release/server_debug or server_nosql_release/server_nosql_debug
this is also reported to work fine on macosx without any user changes
 2010-12-01 21:10:45 +02:00
GreYFoXGTi 4c4544da12 Added bam.lua changes by SushiTee 2010-12-01 20:52:00 +02:00
GreYFoXGTi b8fe169419 Added Mac Fixes by Allisone (Trust) 2010-11-22 11:09:27 +02:00
GreYFoXGTi c5254a91e4 fixed a bam.lua merge mistake 2010-11-18 01:42:40 +02:00
GreYFoXGTi 1721955b11 fixed a previous merge 2010-11-17 13:20:48 +02:00
GreYFoXGTi b6a4b2b7ba Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-16 22:11:24 +02:00
Sworddragon 30fd715fc2 Cleaned up bam.lua a bit 2010-11-16 17:49:03 +01:00