Commit graph

108 commits

Author SHA1 Message Date
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