Commit graph

2646 commits

Author SHA1 Message Date
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 8b75cc3d00 Revert "Show spectators the whole game"
This reverts commit 819c792f6c.
2013-12-24 23:59:06 +01:00
def d98e53f7f4 Allow seeing more 2013-12-24 23:55:42 +01:00
def 033df0da7c Revert "Show everyone entire game"
This reverts commit 987efe8604.
2013-12-24 23:54:53 +01:00
def bb46b6acbf Version 1.26 2013-12-23 20:43:36 +01:00
def d0d8aaa56c Fix: Proper jetpack strength 2013-12-23 20:40:43 +01:00
def ec4a83eb1a Fix: Don't change tune parameters 2013-12-23 20:33:01 +01:00
def 70a0774453 Add /dnd 2013-12-22 18:30:13 +01:00
def 2e8c3cfb66 Fix crash for overfull solo servers: One more team 2013-12-22 01:52:40 +01:00
def ad724453ad Better fix for slow Map loading 2013-12-20 12:27:10 +01:00
def 83c9744dc8 Version 1.25 2013-12-20 03:34:20 +01:00
def 06fed6e596 Disable Tilemap Skip Generation (Makes map loading 30 times faster) 2013-12-20 03:33:50 +01:00
def faca94b084 Merge branch 'DDRace' of github.com:def-/teeworlds into DDRace 2013-12-19 23:04:12 +01:00
def 0b70f874dc Add sv_team 3 (forced random team for you, useful for solo ddrace) 2013-12-19 23:04:01 +01:00
def 8f7cafa455 Merge branch 'DDRace' of github.com:def-/teeworlds into DDRace 2013-12-18 17:21:49 +01:00
def e2efec67ec Change "Set Ping" message 2013-12-18 17:01:39 +01:00
def c6cca39ace Version 1.24 2013-12-18 16:56:20 +01:00
def da9ff2a696 Add: Set Ping to any value you want 2013-12-18 16:54:20 +01:00
def 2d6a4874e3 Don't consider showing entities and zooming out cheats 2013-12-18 16:53:46 +01:00
def 652d742d6a Fix: Show correct IP in server info 2013-12-18 04:11:26 +01:00
def 3f5035fd35 Merge branch 'DDRace' of github.com:def-/teeworlds into DDRace 2013-12-17 14:50:00 +01:00
def f944ce1099 Version 1.23 2013-12-17 14:49:46 +01:00
def 72bc639a0c TeleOuts as pointer; Hopefully fixes Visual Studio crash 2013-12-12 14:35:01 +01:00
def f87449d86c Only give team ranks to teams consisting of 2 players or more 2013-12-10 18:45:28 +01:00
def aed599746e More verbose /lock message 2013-12-10 00:24:38 +01:00
def bc8ad79c29 Consequently use minutes when telling player times 2013-12-09 17:24:02 +01:00
def bfc6558a32 Indicate when ninja ends 2013-12-09 13:53:26 +01:00
def 7237fe2a31 Add random_map 2013-12-07 00:15:56 +01:00
def 2dc5573ea7 Create binary names to be case sensitive in SQL queries 2013-11-28 16:00:01 +01:00
def 5460982a45 Merge branch 'DDRace' of github.com:def-/teeworlds into DDRace 2013-11-28 15:15:14 +01:00
def ce8d17744a Add /mappoints 2013-11-28 15:11:59 +01:00
def 586f0254ad Allow /showothers for all 2013-11-27 18:00:22 +01:00
def 24be89224f Proper ranks for /points and /top5points 2013-11-26 23:16:33 +01:00
def 7af88ed004 Reset extended teleports 2013-11-24 19:23:58 +01:00
def e34384a5a7 Push version to 1.22 2013-11-22 15:12:50 +01:00
def d1a584b4af Add jetpack tile 2013-11-22 15:10:55 +01:00
def d9ace010cb Fix /top5team 2013-11-19 22:36:04 +01:00
def f8beef7e87 Proper rank positions ingame 2013-11-19 22:15:08 +01:00
def db1304b597 Fix Null Pointer bug 2013-11-16 02:36:04 +01:00
def a12c5e9c5e Saner locking messages 2013-11-16 00:58:31 +01:00
def eba45c4f0a Add /lock 2013-11-16 00:44:49 +01:00
def 1a8da052f0 Fix SQL teamrace time comparison to be more exact 2013-11-14 19:39:28 +01:00
def 295a1aaa50 Code cleanup 2013-11-14 16:26:25 +01:00
def 9a1ff10b0a Add button to disable chat 2013-11-14 16:23:15 +01:00
def 3dda7569e6 Display saved scores 2013-11-14 16:08:04 +01:00
def 0b305471d2 Add jetpack 2013-11-13 13:25:26 +01:00
def 51321c6011 Tab 2013-11-13 13:25:12 +01:00
def bbb1f6ab3c Smaller zoom 2013-11-13 13:24:56 +01:00
def 582562ed1e Remove useless code 2013-11-09 00:07:57 +01:00
def 64c29fd509 More chat highlighting 2013-11-09 00:04:54 +01:00