Commit graph

123 commits

Author SHA1 Message Date
H-M-H 87471f752b fixes this: http://stackoverflow.com/questions/19901934/strange-linking-
error-dso-missing-from-command-line
2015-03-29 23:23:16 +02:00
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