Commit graph

3707 commits

Author SHA1 Message Date
def 6d0bceda6b Fix: Friend selection in server browser 2014-01-16 00:46:13 +01:00
def fe5c26234b add cl_showkillmessages 2014-01-15 15:25:13 +01:00
def ca9b68b317 Hide demo player fully 2014-01-15 15:08:00 +01:00
def f0a242f0e9 Version 2.12 2014-01-15 00:35:26 +01:00
def 31629b15c1 DDNet Version notice 2014-01-14 23:13:17 +01:00
def 028d3d731f DDNet auto binds 2014-01-14 21:47:54 +01:00
def bc9e188309 Revert SetPing 2014-01-14 21:44:40 +01:00
def 9e4114f27d Better 64 player search 2014-01-14 21:40:55 +01:00
def 9de10f9e91 Also show temporary results while server browser is loading 2014-01-14 20:58:47 +01:00
def 0d819aba4d Fix: Don't even send own team's broadcasts if player is spectating someone 2014-01-14 20:27:30 +01:00
def 5353460e84 Make hiding votes window optional 2014-01-14 00:25:25 +01:00
def d158267e92 Better broadcasting for spectators 2014-01-13 17:00:49 +01:00
def fbe1cbe9e8 Another broadcasting fix
Conflicts:
	src/game/server/teams.cpp
2014-01-13 11:31:55 +01:00
def 4d22032a6d Fix: Double hook sound in solo 2014-01-13 11:12:38 +01:00
def e0569094e1 Version 2.11 2014-01-13 01:13:32 +01:00
def f88b693b55 Proper Specator Box 2014-01-12 19:38:22 +01:00
def 5164263f90 Don't display score of 00:00 2014-01-12 16:16:09 +01:00
def adbaae769c Fix various broadcasting issues:
- Sound in solo parts
- Sound when spectating
- Projectiles of players in other teams when spectating
2014-01-12 15:56:16 +01:00
def ac23c862d4 Oops 2014-01-12 03:06:38 +01:00
def 693d68841c More exact showhookcoll 2014-01-12 00:45:25 +01:00
def b632eb3c7d More reasonable player mapping 2014-01-11 23:38:13 +01:00
def 8d2828ed6f Fix: Always render editor quads 2014-01-11 22:57:23 +01:00
def aa64e86f12 Fix: Send proper votes to 64/16 player clients 2014-01-11 22:22:45 +01:00
def 188635162e 64 Player Filter Button 2014-01-11 21:38:50 +01:00
def dce37516f5 Version 2.10 2014-01-11 21:24:09 +01:00
def e8fd827b6d Fix crash in editor 2014-01-11 21:23:19 +01:00
def 6126ad50c4 Fix range of team related bugs by actually removing people from team when they spectate 2014-01-11 15:19:34 +01:00
def cedd472c04 Version 2.9 2014-01-11 14:10:53 +01:00
def 1fbdea7d2f Proper 64 player scoreboard 2014-01-11 14:09:55 +01:00
def 2af9d9f423 Switchable ninjajetpack 2014-01-11 13:59:20 +01:00
def f4b961ecad Final fix 2014-01-11 13:39:35 +01:00
def 3e21d31961 Compile errors 2014-01-11 00:54:52 +01:00
def 4a3f75884e Hopefully fix bug with some malformed maps that can make the client crash 2014-01-11 00:52:23 +01:00
def b768cb1e81 Fix: Solo server crash 2014-01-11 00:52:13 +01:00
def 5d23a38f66 Allow players to see players at every distance, but not effects 2014-01-10 22:54:07 +01:00
def 93a3fecea8 Fix best time in scoreboard 2014-01-10 22:53:18 +01:00
def 38dbcbe776 Version 2.8 2014-01-10 19:33:18 +01:00
def 4f0c61716c Better Scoreboard 2014-01-10 18:15:26 +01:00
def 1fbd91c4e1 Remove useless method declaration 2014-01-10 16:20:21 +01:00
def 9743b0cb58 Better time/score messages 2014-01-10 16:19:46 +01:00
def 19419617e5 Score board (1/2) and (2/2) 2014-01-10 15:45:32 +01:00
def 9b4d792fac Fix: Proper player options menu 2014-01-10 13:55:31 +01:00
def 383d1d22f1 Merge branch 'DDRace64' of github.com:def-/teeworlds into DDRace64 2014-01-10 12:56:38 +01:00
def ef65abfe35 Fix scrolling lists in menus 2014-01-10 12:22:48 +01:00
def 7a3a8f1485 Fix doors in team 0 for solo server 2014-01-09 21:57:44 +01:00
def 86468f2c06 Emote fix 2014-01-09 19:51:26 +01:00
def 2a573d54ff Merge branch 'DDRace64' of github.com:def-/teeworlds into DDRace64 2014-01-09 19:00:48 +01:00
def 9770382007 New Jetpack animation 2014-01-09 19:00:41 +01:00
def ab2563c2b5 Threaded points load 2014-01-09 12:23:23 +01:00
def 6ef5c5de98 Fix memory leak 2014-01-09 04:02:28 +01:00
def 1d02733d31 Version 2.7 2014-01-08 18:21:40 +01:00
def 44964130c3 Fix: Proper scoreboard font size 2014-01-08 09:50:45 +01:00
def 112dc7d7a7 Version 2.6 2014-01-08 08:52:21 +01:00
def 52e83313c8 64 players in server browse 2014-01-08 06:15:56 +01:00
def d696c19e18 Show all 64 players in scoreboard 2014-01-08 04:11:50 +01:00
def f5cab53aa4 Send all votes to ddnet clients 2014-01-08 02:57:18 +01:00
def 6af20de3e8 Also reset team 0 2014-01-08 02:24:31 +01:00
def 874e716fdb fix crash 2014-01-06 20:16:04 +01:00
def 37badd724b Another go at the door opening bug 2014-01-06 18:27:38 +01:00
def 86d9d75e2d Fix: Use character position, not view pos for 16 player compatibility mapping 2014-01-06 15:20:02 +01:00
def 2bd4c1dde4 Merge branch 'DDRace64' of github.com:def-/teeworlds into DDRace64 2014-01-05 23:29:30 +01:00
def 5423e14ac9 Fix: Crash due to null pointer 2014-01-05 23:29:19 +01:00
def 5c2794fcea Remove unused variable 2014-01-04 03:50:56 +01:00
def bdc14849f7 Fix vote window 2014-01-03 13:51:18 +01:00
def edf45538d1 Version 2.5 2014-01-03 03:08:34 +01:00
def e88e0698c7 Name stuff 2014-01-03 03:06:23 +01:00
def 4169e94269 Fix: Remove vote window when map change vote was forced 2014-01-03 03:00:54 +01:00
def e44456c08e Fix: Proper vote status for non-64-player-clients 2014-01-02 21:23:27 +01:00
def 89da13686d Less jumpiness 2014-01-02 14:06:59 +01:00
def 4136af09d7 Fix grenade prediction (thanks to anonymous) 2014-01-02 06:45:48 +01:00
def 96d291075b Version 2.4 2014-01-02 03:49:02 +01:00
def ca22600b4f Next try 2014-01-02 02:54:57 +01:00
def dfe3de179a New revelations 2014-01-02 02:47:06 +01:00
def dcde67b45e Fix 436 2014-01-02 02:27:38 +01:00
def 73dc056d04 Fix 435 2014-01-02 02:26:25 +01:00
def 0bcafcc72b Fix 434 2014-01-02 02:24:49 +01:00
def f1763eee79 Fix 433 2014-01-02 02:23:09 +01:00
def 256ce97ed8 Fix 432 2014-01-02 02:20:27 +01:00
def 8d4301b2e3 Next try to prevent DDRace problems 2014-01-02 02:15:19 +01:00
def b919538663 Revert "DDRace clients don't work well with teams on 64 player servers"
This reverts commit 314c5cb275.
2014-01-02 02:13:10 +01:00
def 314c5cb275 DDRace clients don't work well with teams on 64 player servers 2014-01-02 02:10:27 +01:00
def 28980ef2ba Hopefully fix 64 players 2014-01-02 01:56:09 +01:00
def 0f251a435b Revert "Remove useless code"
This reverts commit 3e28e52d8d.
2014-01-02 01:14:20 +01:00
def 6e985c307f More general superteam 2014-01-01 22:58:19 +01:00
def cd98cd4c3f Fix: Stupid 2014-01-01 22:37:18 +01:00
def a98458a9f3 Fix switches for 64 teams 2014-01-01 22:34:10 +01:00
def 39ba649849 Less restrictive spam protection 2014-01-01 22:06:46 +01:00
def 3e28e52d8d Remove useless code 2014-01-01 15:44:49 +01:00
def 7da88b06fa Name fix 2014-01-01 15:06:06 +01:00
def d54a12b20a Fix Spec Selection for 64 players 2013-12-31 22:15:38 +01:00
def 7a9631ce19 Fix Player Options for 64 players 2013-12-31 22:14:59 +01:00
def 08eb38230f Reverse Translation for DDRace64 2013-12-31 18:25:40 +01:00
def be213e72d3 Version 2.3 2013-12-31 14:51:37 +01:00
def 8025226475 Change rules 2013-12-31 13:36:05 +01:00
def 0aad13c085 Update credits 2013-12-31 13:35:59 +01:00
def d9764a7638 Remove useless broadcast messages 2013-12-31 06:23:40 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def da2cdf7acd Fix: Reset switches when team is locked 2013-12-30 22:30:07 +01:00
def 85f2cebfaf Fix: Disabling chat sound 2013-12-30 19:32:51 +01:00
def b6f8156e1f New fix for solo maps with switches 2013-12-28 16:27:47 +01:00
def 5c6ce4585b Revert "Fix crash for overfull solo servers: One more team"
This reverts commit 2e8c3cfb66.
2013-12-28 16:09:03 +01:00
def 80b33220bf Fix automapper 2013-12-28 13:59:14 +01:00
def a91690f870 Version 2.2 2013-12-28 01:10:13 +01:00
def 104939b407 More flexible auto mapping 2013-12-28 01:09:47 +01:00
def 6ad45448bd Fix name highlighting 2013-12-27 21:39:46 +01:00
def 6794011c3f Version 2.1 2013-12-27 18:36:26 +01:00
def da60fb4dc1 Auto mapper: Support 2 flips 2013-12-27 18:32:58 +01:00
def c1da2444a2 Allow players to see further 2013-12-27 18:29:56 +01:00
def 5453c0c80f Allow longer messages 2013-12-27 04:09:45 +01:00
def 605bd0f81c Only show freeze indication once when still frozen 2013-12-26 19:46:44 +01:00
def 9c5031b34f Don't show BB skins by default 2013-12-26 18:02:37 +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 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
def a90b37544a More HUD control 2013-11-02 03:09:56 +01:00
def 3ed74bc730 Version 1.21 2013-10-30 09:27:31 +01:00
def 463f85b279 fix 2013-10-27 20:16:30 +01:00
def a3985f0a19 Merge branch 'DDRace' of github.com:def-/teeworlds into DDRace 2013-10-27 20:15:57 +01:00
def 9ee125fadd Foo 2013-10-27 20:15:49 +01:00
def 22ce12a9cc Fix: Don't crash when using sv_old_teleport_hook and new teleports 2013-10-26 08:02:45 +02:00
def 64d7b6a117 Push version: 1.20 2013-10-25 03:24:55 +02:00
def 9e1176094d Allow zooming in FastCap 2013-10-24 01:37:04 +02:00
def 1b49f5fab0 Keep solo after map change 2013-10-22 17:04:54 +02:00
def 60b66055bf add snd_name_only 2013-10-21 02:16:45 +02:00
def fe44c5a569 add sv_show_others_default 2013-10-20 23:22:49 +02:00
def 16918aa3a1 Push version 2013-10-18 11:50:50 +02:00
def 24b56ea48a Add /c to settings 2013-10-18 11:47:34 +02:00
def 34e568f41b Add converse command 2013-10-18 11:42:35 +02:00
def 9f45368225 Add antiping_grenade 2013-10-15 18:08:06 +02:00
def 35996eaa69 Revert "Speedup server map change by threading SQL initialization"
Causes problems with high ping servers when initializiation wasn't done
and new map is voted.

This reverts commit 13a6f5f2e8.
2013-10-15 07:07:33 +02:00
def 13a6f5f2e8 Speedup server map change by threading SQL initialization 2013-10-14 20:51:50 +02:00
def 2b11b5fc0e Allow adding default text to chat binds 2013-10-14 01:40:42 +02:00
def db7154273d ddnet -> Network 2013-10-10 12:10:10 +02:00
def ddbb9633a8 Fix gun prediction (by p) 2013-10-09 19:51:20 +02:00
def 9596cf385b Version 1.18 2013-10-09 16:27:48 +02:00
def 2a70aefc63 Show correct nameplates without antiping 2013-10-09 16:23:18 +02:00
def dc6d2305d5 Add AntiPing 2013-10-09 16:02:23 +02:00
def f0b6ff9c4c Readd chat sounds and add option to disable them 2013-10-08 17:23:00 +02:00
def 7dbce81bbf Allow more colors 2013-10-08 16:32:27 +02:00
def 845ca5ec7c Fix menu 2013-10-08 15:43:23 +02:00
def 3032567028 Version 2013-10-07 23:56:11 +02:00
def e69e023f16 Don't kill when joining team 0 2013-10-07 14:09:30 +02:00
def ffc18b6933 After voting only show votes when scoreboard is open 2013-10-07 12:13:33 +02:00
def 3a2d196104 Fix controls settings 2013-10-07 11:51:19 +02:00
def a4296f4bb7 Fix: Super can always jump 2013-09-29 17:16:49 +02:00
def 46f6cefdd6 Fix sql 2013-09-29 15:29:32 +02:00
def f364c2d6bc Fix: Team 0 can be any size 2013-09-17 00:58:33 +02:00
def 185f132a24 Don't send "Muted text" 2013-09-02 21:30:00 +02:00
def ce2f689e5f Version 2013-08-30 19:00:29 +02:00
def 23b44fa812 Add dialog settings for ddnet features 2013-08-30 09:50:05 +02:00
def 1cc6977611 Fix jumping 2013-08-24 02:25:58 +02:00
def 9028d77471 Add +showhookcoll from H-Client 2013-08-24 01:50:35 +02:00
def 6da8d2146c New mapping entity: Specify number of jumps 2013-08-24 01:03:45 +02:00
def 762dd451d3 fix 2013-08-23 20:46:08 +02:00
def 71946ac0f8 Fix 2013-08-23 15:25:46 +02:00
def c53d167ab8 Fix 2013-08-23 03:02:45 +02:00
def bed7225da6 Fix: Better looking 2013-08-23 03:01:01 +02:00
def 91cbb4745e More compact time representation 2013-08-23 02:56:31 +02:00
def 58039066f4 Add local time screen at top 2013-08-23 00:45:48 +02:00
def 48d84b2784 More correct door reset 2013-08-22 06:07:31 +02:00
def 40ff09be29 Revert visual studio fix 2013-08-18 22:19:02 +02:00
def 7d2b92b68f Add default binds 2013-08-18 03:33:55 +02:00
def a2c7feda17 Add afk vote timer 2013-08-18 03:27:30 +02:00
def a54c035e36 Text fix 2013-08-18 01:06:36 +02:00
def a93eec47f7 Revert "Add /w to cmdlist"
This reverts commit 8a380147f1.
2013-08-18 01:05:06 +02:00
def 8a380147f1 Add /w to cmdlist 2013-08-18 00:40:41 +02:00
def 0a3177ed71 Fix: Team score saving for players with sql escaped characters 2013-08-17 06:10:44 +02:00
def 5f5f175ab4 Merge branch 'DDRace' of github.com:def-/teeworlds into DDRace 2013-08-16 00:53:36 +02:00
def a837b251ab Whisper case-insensitive 2013-08-16 00:53:24 +02:00
def deb619c52d Merge branch 'fix_deen' of https://github.com/cinaera/teeworlds into DDRace 2013-08-15 14:12:18 +02:00
def f3415c2aa5 Fix cheat to finish every map in less than a second 2013-08-14 20:12:53 +02:00
BeaR ee6192900c fix previous commit 2013-08-14 19:56:55 +02:00
def af69765063 Revert "fix visual studio build"
This reverts commit 62409f740a.
2013-08-14 17:31:15 +02:00
def 55b196a68f Fix more 2013-08-14 04:28:16 +02:00
def 1970f692d7 More fix 2013-08-14 04:24:29 +02:00
def 0a77fd62fd Fix order of new entities 2013-08-14 04:21:50 +02:00
def 8acea035bd DDRaceNetwork -> DDraceNetwork 2013-08-13 18:32:33 +02:00
def 0d6acbda16 Fix spec voting 2013-08-13 18:14:03 +02:00
BeaR 62409f740a fix visual studio build 2013-08-13 14:06:29 +02:00
def bf518df74d New teleport entities 2013-08-13 04:59:25 +02:00
def ed02dbed33 Whisper: Make chars with spaces work even without "" 2013-08-12 23:02:39 +02:00
def 0a5433178d ddnet.no-ip.info -> ddnet.tw 2013-08-12 21:55:04 +02:00
def 32109b0f15 Missing buffer 2013-08-12 20:35:46 +02:00
def 72ca64501f New SQL, automatic reconnect 2013-08-12 20:13:12 +02:00
def 131a7a7ad7 Fix: Don't allow empty whispers 2013-08-10 04:30:59 +02:00
def ccc777f792 Max 4 commands per second 2013-08-10 04:21:20 +02:00
def a1e9cc5c51 Spam protect whisper 2013-08-10 03:40:59 +02:00
def b4f0b96acc Fix /whisper 2013-08-09 15:07:17 +02:00
def 7f4fe15e1c Add Whispering 2013-08-09 15:04:20 +02:00
def 33566a626c Try to fix memory leaks 2013-08-08 01:47:49 +02:00
def b567c32820 ddnet Info 2013-08-07 04:47:03 +02:00
def 987efe8604 Show everyone entire game 2013-08-07 04:08:28 +02:00
def f32d22b4fd Fix order in team top5 2013-08-06 20:03:14 +02:00
def 53d6fe3db8 use correct first name 2013-08-06 19:28:17 +02:00
def 6d272e91b5 SQL: clear strings first 2013-08-06 19:26:28 +02:00
def bd5fd4ec6e Prevent memory leaks 2013-08-06 05:14:53 +02:00
def 4987b26b7b Fix prediction 2013-08-05 19:58:51 +02:00
def 111d5c7f10 Add entities to start and stop: Player collisions, Hooking, Infinite jump 2013-08-05 17:47:04 +02:00
def 861267a06c Add sv_team_max_size 2013-08-05 03:43:58 +02:00
def 02ac497531 Fix: No ninja in solo 2013-08-04 22:50:14 +02:00
def e4201940cd Fix: Don't reset doors for spectators 2013-08-04 04:46:26 +02:00
def 7dc439e13f Fix: Delete points at correct position 2013-08-03 17:28:11 +02:00
def 6169c78a79 Close memory leaks 2013-08-03 17:22:50 +02:00
def cce5e262de Send an information about how many points were earned 2013-08-03 15:26:17 +02:00
def 62c2e1211b Fix DDRace menu corner to look correct 2013-08-03 15:24:20 +02:00
def 3cfe974092 Make ninja work only on team mebers 2013-08-02 21:10:43 +02:00
def 8f9a1c24fb Remove iostream 2013-08-01 22:28:11 +02:00
def 6935a9678b Fix: team 0 doesn't count players 2013-08-01 22:27:19 +02:00
def 819c792f6c Show spectators the whole game 2013-08-01 16:03:07 +02:00
def 10a343d96b Fix: Only insert better team times, otherwise update 2013-08-01 00:58:00 +02:00
def fd757e1e19 Change name to DDRaceNetwork 2013-07-31 19:08:07 +02:00
def 8720186c75 Revert "Revert "Restrict rcon output (east)""
This reverts commit 35cf8832a9.
2013-07-31 01:31:53 +02:00
def 9ae9b53c7f Revert "Spam protect commands too"
This reverts commit 5de7f9a858.
2013-07-31 01:31:05 +02:00
def 35cf8832a9 Revert "Restrict rcon output (east)"
This reverts commit ba5b98dd1d.
2013-07-31 01:27:29 +02:00
def 5de7f9a858 Spam protect commands too 2013-07-30 23:31:52 +02:00
def ba5b98dd1d Restrict rcon output (east) 2013-07-30 23:26:30 +02:00
def 55743535c6 Don't allow voting "info" 2013-07-30 00:41:35 +02:00
def 7f3b86227c Don't allow voting "info" 2013-07-30 00:39:27 +02:00
def aad8b97dae Don't allow voting "info" 2013-07-30 00:36:21 +02:00
def f5c6db789b Add support to teleport others, not just yourself 2013-07-29 21:25:10 +02:00
def 5e537f24c6 Fix: When a player is spec-voted while being in pause he can't rejoin because he stays in pause 2013-07-28 23:43:27 +02:00
def cdf2818575 Add reload_points to reload the point map file 2013-07-28 17:53:07 +02:00
def 919f6d1cb2 Merge branch 'spec-vote' into DDRace 2013-07-28 17:06:35 +02:00
def 0fc8e0fdf7 Fix team rank 2013-07-28 16:18:33 +02:00
def d59a0c3135 Fix team rank 2013-07-28 15:32:23 +02:00
def e3db85b629 Remove sql requesting player output 2013-07-27 23:27:12 +02:00
def d85081851f Allow specmode switching more often 2013-07-25 23:36:19 +02:00
def dc240f7d55 Fix SQL score output 2013-07-25 23:36:00 +02:00
def 43ecc1c7a3 Add rcon: totele i 2013-07-23 23:37:00 +02:00
def c7fef524e6 Don't follow from-teles without a corresponding to-tele 2013-07-23 02:13:13 +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
def 796548ff65 Don't reset hook pos in red teleports, allow holding hook while going through tele 2013-07-22 18:03:32 +02:00
def 3a80c5f5fb Make evil (red) teleports work as normal (blue) teleports when weapons- or hook-through-teleport are activated 2013-07-22 17:37:14 +02:00
def d4c0f31b32 Make client compile 2013-07-22 17:20:34 +02:00
def 66776503c4 Correct name lengths in SQL queries 2013-07-22 14:34:17 +02:00
def a69f8c42f5 Rename error message 2013-07-22 13:07:49 +02:00
def 4a9d932438 Fix /points rank numbers 2013-07-22 00:03:48 +02:00
def 7a29b07d4e Add support for a reset file to execute on map change or reload 2013-07-21 23:42:08 +02:00
def 536fadd034 Rename commands 2013-07-21 13:35:01 +02:00
def 42a8783f00 Add /teamrank and /teamtop5 2013-07-21 08:46:52 +02:00
def 012de29d60 Fix brackets 2013-07-21 05:01:01 +02:00
def c42e9f1399 Add /points and /toppoints using points.cfg file 2013-07-21 04:52:23 +02:00
def e49960a34a Fix tele shooting 2013-07-20 14:16:45 +02:00
def d9d16369d1 Fix 2013-07-20 14:06:56 +02:00
def 38a0874b61 Laser through teleport can hit oneself 2013-07-20 14:04:12 +02:00
def 81163821d4 Still support no tele-hook 2013-07-20 13:41:52 +02:00
def 8721cf346c Make hook work through multiple teleports 2013-07-20 13:39:17 +02:00
def 7f89f1f078 Fix: No twitching on hook 2013-07-19 03:22:47 +02:00
def c276ee1255 Fix shotgun pulling direction immediately after teleport 2013-07-19 02:04:50 +02:00
def ae53eb201e Set sv_teleport_hook and sv_teleport_weapons off by default 2013-07-19 01:26:14 +02:00
def 1b68bf65f2 Add server options for sv_teleport_hook and sv_teleport_weapons 2013-07-19 01:23:48 +02:00
def 6fb11efa40 Make lasers go through teleporters 2013-07-19 01:06:48 +02:00
def 54b942fa7e Make hooks go through teleporters 2013-07-19 00:27:17 +02:00
def 717219e1c2 Make projectiles shoot through teleporters 2013-07-19 00:27:08 +02:00
def fa3938d7a6 Fix: If a player just killed himself he could kick players from every
team in the time before he respawned.
2013-07-13 19:14:56 +02:00
def 85b5277bb5 Reset zoom when player joins team 2013-07-11 17:25:51 +02:00
def 0aade21960 Only allow voting team members to spectators to prevent abuse 2013-07-11 03:03:36 +02:00
def 9c145fcc35 Don't try to reset doors when there are none 2013-07-11 02:06:15 +02:00
def 5e83eff2ce Revert "Don't try to reset doors when there are none"
This reverts commit 7bf704a6ed.
2013-07-11 02:02:14 +02:00
def 7bf704a6ed Don't try to reset doors when there are none 2013-07-11 01:56:03 +02:00
def 637ccb3e66 Enable zoom for spectators 2013-06-23 03:35:46 +02:00
def 413429871f Add quad disable function 2013-06-23 02:58:46 +02:00
def 6d33fcc5a6 Fix door opening cheat 2013-06-23 02:51:04 +02:00
m!nus ee9a8ce4b7 prevent map editor from crashing if loaded map is invalid 2013-05-26 10:58:03 +02:00
Teetime 61671f3bcd Fixed a missing check if killer is alive in tdm 2013-04-07 14:41:53 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02:00
oy 75cdc0a769 drop game messages when client isn't ingame. Closes #1081 2013-03-23 15:59:27 +01:00
oy 7e8374447a switched filenames of highlight and client chat message to prevent some misunderstanding there. #966 2013-03-20 22:38:06 +01:00
XXLTomate 8521e088fd removed dbg_msg 2013-03-18 13:02:14 +01:00
XXLTomate f91f3e61f9 fixed checkpoints 2013-03-18 12:58:29 +01:00
oy b2a9e98bf4 fixed client crash on removing friends. Closes #1077 2013-03-16 16:03:38 +01:00
oy 878af82d8f fixed frozen GUI caused by popups 2013-03-16 15:30:40 +01:00
oy 2f1389e5cd fixed version string of the versionserver 2013-02-25 22:31:30 +01:00
oy f010791231 added options for the threaded stuff in the menu and set version 2013-02-24 19:43:09 +01:00
oy 0e92dd5603 fixed some merge problems 2013-02-24 18:55:55 +01:00
oy 8b4026cbbf fixed last commit
Conflicts:

	src/game/editor/editor.cpp
	src/game/editor/editor.h
2013-02-24 18:26:49 +01:00
BeaR d58afefaae Some graphic batching:
Speed up for displaying debugtext and envelopepreview
(This reduces the performance hit especially for the 'Show Info' mode in the editor)

Conflicts:

	src/engine/client/client.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
2013-02-24 18:23:06 +01:00
oy 7eddbe0dc9 play only one weapon no ammo sound per second. #993 2013-02-24 18:02:57 +01:00
BeaR d8ff437c5e Set value higher 2013-02-24 18:01:13 +01:00
BeaR dfd15bc899 Fix Renderingbug:
If u change the alpha value inside a colorenvelope, the tileset-/quad-rendering is messed sometimes
http://i.solidfiles.net/580a9699c4.png(map: run_exchange by delo)
2013-02-24 18:01:01 +01:00
Magnus Auvinen 1711be955b fixed all the errors that the clang static analayzer found 2013-02-24 17:58:34 +01:00
oy 4fb57dea91 fixed editor crash on replacing images. Closes #981 2013-02-24 17:44:45 +01:00
oy ff75c3ba2d fixed some memory leaks in the map editor 2013-02-24 17:41:15 +01:00
heinrich5991 7b545f3ed9 Added borderless window functionality
This might become handy for users with multiple monitors,
	might resolve other issues aswell
2013-02-24 17:38:19 +01:00
oy 4e4019986a made the client not play the chat sound for empty chat messages. Closes #967 2013-02-24 17:36:54 +01:00
oy 86cd0cefd7 fixed wrapping problems when rendering console input 2013-02-24 17:34:51 +01:00
oy 86708818e9 fixed wrong map download speed when switching to the editor while downloading. Closes #951 2013-02-24 17:34:02 +01:00
oy 0bce750a33 count spectators in the server browser when 'count players only'-filter is disabled 2013-02-24 17:33:37 +01:00
oy 4d36c0f77e prevent that you can play the music ingame. Closes #947 2013-02-24 17:32:29 +01:00
oy 0036a07ce7 fixed that client displays active vote after connecting to a server 2013-02-24 17:29:05 +01:00
oy 32c8dd6cf5 increased time for client info resend to prevent possible overlap 2013-02-24 17:28:39 +01:00
oy 76d7569e15 limit the number of chat messages a player can queue to 3 2013-02-24 17:28:11 +01:00
oy 5de2763f82 skip auto screenshot when the editor is active. #931 2013-02-24 17:27:44 +01:00
oy 2f86ad3c4b fixed chat ignore feature 2013-02-24 17:24:30 +01:00
oy ffa93a007c fixed a bug with spectating a player 2013-02-24 17:24:12 +01:00
oy e291a60e7e fixed map initialisation. Closes #64 2013-02-24 17:09:42 +01:00
BeaR 6d74d52c22 Fix problem with show other players: (Closes DDRace/teeworlds#210)
sending packet on setting change
2013-02-03 20:23:44 +02:00
Shereef Marzouk 4c95ed5006 Version Bump to 1.15a. (Closes #198) 2013-02-01 13:25:28 +02:00
Shereef Marzouk 0081251628 Fixes not displaying the nick when /rank {nick} is used. (Closes #197) 2013-02-01 13:25:00 +02:00
eeeee 56ad4f3c73 prevent bullets from drifting 2013-02-01 13:12:33 +02:00
Shereef Marzouk b000c9e4e1 Fixed team blocking by disconnect (Closes #206) 2013-02-01 13:08:23 +02:00
Learath2 6f98bcfee0 Update src/game/server/gamecontext.cpp 2013-01-27 23:31:50 +02:00
Learath2 c55cae6492 Reduced length of new year event to 2 days. 2012-12-23 19:53:57 +02:00
eeeee 1c8c20c93e added sv_events 2012-12-23 19:47:47 +02:00
Shereef Marzouk 38aa2cac78 Player name when requesting another player's. closes #197.
Edited from github directly needs to be tested
2012-11-26 12:54:17 +02:00
Shereef Marzouk 7f7a46b497 Player name when requesting another player's
Edited from github directly needs to be tested
2012-11-26 12:47:41 +02:00
aelio_ru b68840b30b Fixes inactive dragger after map change or server start, Fixes #181. 2012-08-26 09:23:11 +02:00
Learath2 ec3c96abd6 Fixes records for maps in subfolder. Closes #46 2012-07-20 14:25:44 +02:00
Learath2 f98734e86e Made a log line more useful. 2012-05-01 21:58:40 +02:00
Ravomavain cd5046a1a9 Prevent laser draggers from dragging paused players. Fix XXLTomate#16
Reset velocity on resume to avoid other bugs.
2012-05-01 21:57:09 +02:00
eeeee 96c1bd513c made cl_showhud 0 hide records 2012-04-12 13:02:43 +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
Learath2 d5dcfa3c4f Fixed obligatory Teams (sv_team 2). 2012-04-11 16:16:30 +02:00
Shereef Marzouk 53225b718d Version 1.13a 2012-04-11 15:44:18 +03:00
Learath2 44d34b0033 Fixed paused players getting afk kicks. 2012-04-11 14:41:02 +02:00
Learath2 f053fd64a0 Forgot a return at can't pause while spectator or dead 2012-04-11 14:40:04 +02:00
Sebastian Wick 57d90a16eb fixes srv crash if typing '/top5 -999999' 2012-03-23 22:32:20 +01:00
Learath2 5e6d5a28f0 Follow up fix for pause and spec cant spec or pause in spectators. 2012-03-08 18:24:23 +02:00
Learath2 e06fd51ec1 Fixed a bug i experienced in a up to date server 2012-03-07 19:51:30 +02:00
Shereef Marzouk 65bbd53009 removed useless ve line 2012-03-02 00:53:19 +02:00
Learath2 50b2d85abb Fixed according the comment of GreYFoX. 2012-02-14 22:38:06 +02:00
Learath2 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00
oy c045071b40 always show default country flag on invalid country index 2012-02-05 15:53:22 +01:00
SushiTee 1e602bf31b fixed showing player spawn effect only to players who should see 2012-02-05 14:48:09 +01:00
oy d17ee055a2 fixed an issue about resending player info 2012-01-29 12:44:33 +01:00
SushiTee e359f82c69 init m_LockTeams with 0 to prevent locked teams on server start 2012-01-26 22:18:21 +01:00
SushiTee 4b2a34e1c5 force vote only if there is a vote 2012-01-26 22:17:26 +01:00
SushiTee f737910e0a fixed FillSelection so it actually fills the current selection 2012-01-12 22:03:55 +01:00
SushiTee 65f4416164 added map info 2012-01-10 23:14:24 +01:00
oy fa81141110 added demo markers by Choupom. Closes #837 2012-01-10 23:13:19 +01:00
oy e8f9145a0d deactivate player ignore setting if show just friends chat is active and player isn't a friend 2012-01-10 23:03:23 +01:00
oy 4efd65359e show notification when game is paused 2012-01-10 22:40:48 +01:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
oy 9251796c3a fixed rendering on pause/specific speed for damage indicators and muzzle in the demo player 2012-01-09 23:43:53 +01:00
oy 3e918075df added an option to show only chat messages from friends 2012-01-09 23:29:15 +01:00
oy e97cfaecad buffered chat input. Closes #916 2012-01-09 23:13:51 +01:00
oy 590dbac239 put the game version constants all together in one file. Closes #870 2012-01-09 02:02:02 +01:00
oy 4fde2cf7f2 add tuning to demo. Closes #899 2012-01-09 00:49:20 +01:00
oy 7c300ccc7b added player names to dm score hud and repositioned the player name in team games. Closes #871 2012-01-09 00:28:42 +01:00
oy 526262ea55 increased the size of emoticons in the selector. Closes #625 2012-01-09 00:23:58 +01:00
oy e960cbdff3 added a config to display the code string of a country flag instead of the image. Closes #897 2012-01-08 18:16:38 +01:00
oy 3811476c6e removed multiple updating of the renderinfo for ninjas. Closes #855 2012-01-08 15:44:49 +01:00
oy 3626286d0d skip inactive kick for debug dummies to avoid console spam 2012-01-08 15:26:37 +01:00
oy 57a975f38e added a server command to lock teams. Closes #831 2012-01-08 13:55:20 +01:00
oy a9db705c14 fixed that refocus is done when using Home-key in a editor edit box. Closes #821 2012-01-08 13:36:47 +01:00
oy f8b895181a show animation/grid/zoom level in the map editor. Closes #780 2012-01-08 13:16:19 +01:00
oy bafd22ebe7 show path in the editor file dialog. Closes #786 2012-01-08 13:14:02 +01:00
oy be37147342 fixed border rendering in the editor's image preview. Closes #908 2012-01-08 01:47:53 +01:00
oy 58f5779508 - disabled clipping lines in the tile picker
- fixed aspect ratio of the image in the tile picker
Closes #833
2012-01-08 01:14:52 +01:00
oy 535324d6ed added an entry for the kill command to the controls menu. Closes #652 2012-01-08 00:20:02 +01:00
oy 6649d651a8 switched client and highlight chat sound. Closes #630 2012-01-06 20:06:13 +01:00
oy 2785293469 don't start playing the music again if we're quitting 2012-01-06 20:03:57 +01:00
oy f3ebfae18e drop multiple chat sounds that are played within 300ms. Closes #440 2012-01-06 19:47:49 +01:00
oy b592d7a591 cleaned up playing of global sounds 2012-01-06 19:38:40 +01:00
GreYFoX c46f3e06e7 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2012-01-04 20:10:07 +02:00
oy 7328098f8d Merge pull request #912 from matricks/threadedflip
Threadedflip
2012-01-03 15:40:30 -08:00
Magnus Auvinen c1942ca6cb fixed the render frame time and cleaned up some more code 2012-01-01 13:38:46 +01:00
Ravomavain ebf64758b1 Make spectators see the same thing as the player they spectate 2012-01-01 00:15:16 +02:00
Ravomavain 02372ac0b0 Don't allow kill if player is paused 2012-01-01 00:15:16 +02:00
Ravomavain c85d7bcc0f Make spectators hear the same thing as the player they spectate 2012-01-01 00:15:16 +02:00
Ravomavain af8fac1bac Little fix to allow 2 players to spectate each other 2012-01-01 00:15:15 +02:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
2012-01-01 00:11:56 +02:00
GreYFoX 250b3b9416 i was scared that @heinrich5991 may send people to kill me while i sleep for hard coding something into DDRace 2011-12-31 19:16:40 +02:00
oy c975390195 made vote ban check if the ip matches an authed player 2011-12-31 12:11:48 +01:00
Magnus Auvinen b31abc4053 fixed so that you can select graphics backend via gfx_threaded 2011-12-31 10:29:25 +01:00
Magnus Auvinen 4e923442e4 fixed the broken damage indicators 2011-12-31 10:15:54 +01:00
Magnus Auvinen 8e56885795 initial commit of the threaded graphics. can start game and render the gui. no textures at the moment. still waits for the swap for now 2011-12-31 01:06:04 +01:00
Ravomavain 9de29f3775 Paused players can hear sounds. Fix #127. 2011-12-31 01:44:37 +02:00
Ravomavain 88be9657d2 Enhance pausing system (by @heinrich5991):
* enhance /pause (@heinrich5991)
 * add /spec command to pause without leaving the game (@heinrich5991)
 * if sv_pauseable is set to 0, /pause behave as /spec (@heinrich5991)
 * should fix #124 and #127 (@ravomavain)
2011-12-31 01:44:36 +02:00
GreYFoX 21be03f3c6 fixed messages 2011-12-31 01:34:48 +02:00
GreYFoX 7820e48ec6 Minor changes 2011-12-31 01:33:11 +02:00
oy ccaec79567 made it possible to automatically swap teams between rounds 2011-12-30 22:47:26 +01:00
oy 11cc0e78d7 removed chat spam for the team commands 2011-12-30 22:30:28 +01:00
oy ed4158e837 fixed last commit 2011-12-30 22:17:51 +01:00
BeaR afb1d5e201 Swap and Shuffle Teams 2011-12-30 21:52:01 +01:00
Magnus Auvinen 8ffe582615 ugly incomplete hack to put the rendering into another thread so we don't have to wait for the flip 2011-12-30 16:02:22 +01:00
GreYFoX 7d462b565d Fixed the bugs i know of with the last few commits 2011-12-30 16:51:08 +02:00
oy b44ee3d975 reworked ban system 2011-12-29 23:36:53 +01:00
oy 353f5cc8d6 fixed that the flag grab sound is played several times in a server side demo. Closes #901 2011-12-29 13:56:24 +01:00
GreYFoX 2baa440866 Happy New Year, all tees are now born happy, Version v1.11 2011-12-29 14:39:51 +02:00
GreYFoX 9af4f1e172 Added race started check 2011-12-29 14:35:14 +02:00
GreYFoX 799f4de2b3 Added the following settings to Close #123.
sv_time_in_broadcast, 1, 0, 1, CFGFLAG_SERVER, "Whether to display time in broadcast every interval or not by default, later the choice can be changed by players via chat commands"
sv_time_in_broadcast_interval, 1, 0, 60, CFGFLAG_SERVER, "How often to update the broadcast time"
sv_time_in_gametimer, 0, 0, 1, CFGFLAG_SERVER, "Whether to display time in the round/game timer or not by default, later the choice can be changed by players via chat commands"
Added the following Chat commands to give the player the choice over their settings:
"saytime", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTime, this, "Privately messages you your current time in this current running race"
"saytimeall", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTimeAll, this, "Publicly messages everyone your current time in this current running race"
"time", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConTime, this, "Privately shows you your current time in this current running race in the broadcast message"
"broadcasttime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetBroadcastTime, this, "Personal Setting of showing time in the broadcast, broadcasttime s, where s = on for on, off for off, toggle for toggle and nothing to show current status"
"servergametime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetServerGameTime, this, "Personal Setting of showing time in the round/game timer, servergametime s, where s = on for on off for off, toggle for toggle and nothing to show current status"
Fixed Chat Command "eyeemote" and made it a set + toggle instead of just toggle for better bin techneques
Moved some vars from CCharacter to CPlayer to keep their status evern after death but not after disconnect.
So now players have the choice to see which timer they wanna see if any.

Note: These changes are all untested Stay away from this update on your main server until they are tested, i don't even know if they will compile propperly
2011-12-29 14:17:34 +02:00
GreYFoX ff6b9609f3 sv_nameless_score default 0 Whether nameless tee has a score or not. Closes #100. 2011-12-29 11:39:01 +02:00
GreYFoX 66c321c547 Added sv_eye_emote_change_delay default to 1 to Close #94. 2011-12-27 12:20:12 +02:00
GreYFoX 539b686f85 Let's see if this helps #85 or not! 2011-12-26 15:31:05 +02:00
GreYFoX 49e875e3a3 v1.1a 2011-12-26 14:07:57 +02:00
GreYFoX 41eed130cd removed TODO 2011-12-26 13:56:51 +02:00
GreYFoX b68f5facea Fixed DDRace hud.cpp 2011-12-26 13:56:24 +02:00
GreYFoX 6bedea0c6a DDRace Score in Time Format 2011-12-26 13:45:41 +02:00
GreYFoX 8b09813288 old useless todo 2011-12-26 11:56:12 +02:00
GreYFoX e96da00103 Fixed Some Todos in the code 2011-12-26 11:15:43 +02:00
GreYFoX cdab951296 Increasing the Readability on primitive editors of DDRace Specific files (All files that does not exist in oy/teeworlds) 2011-12-25 15:51:47 +02:00
GreYFoX ee115b5346 Version update 2011-12-25 15:34:07 +02:00
GreYFoX bfed5bad1a Added License INfo to missing files and updated the old ones 2011-12-25 15:33:05 +02:00
GreYFoX 4da271df56 Deleted a useless state and added onTeamStateChanged Event 2011-12-25 15:19:03 +02:00
GreYFoX 8a7c0df1d5 Mini performance improvement 2011-12-25 15:00:47 +02:00
GreYFoX 28cd7afa24 You srsly REALLY can't join teams that fast! 2011-12-25 13:20:10 +02:00
Learath2 81b34086e2 Fix for zoom issue. 2011-12-23 10:43:46 +02:00
Shereef Marzouk 1871207bfe Version and Credits 2011-12-14 17:05:48 +02: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
oy 6e20c32859 removed some resource loading spam. Closes #894 2011-12-10 18:23:29 +01:00
oy 99f04a7f87 let the server check if the input aims the center. Closes #889 2011-12-10 18:21:12 +01:00
XXLTomate 26e7a5888f compile fix 2011-12-09 23:00:40 +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
Choupom 1efb494169 fixed #791 Ability to disable the magnetic behaviour of the grid 2011-12-04 22:44:06 +01:00
Choupom 713dd3bc08 fixed controls rendering with low ui scale 2011-12-04 22:43:41 +01:00
oy 8e0ce38e29 fixed sv_max_client usage 2011-12-04 16:51:33 +01:00
oy 9a03989e84 added "Make an option for each envelope: (a) synchronized (b) starting at join" by Choupom 2011-12-04 14:39:47 +01:00
Choupom 873c5a77bc some trivial fixes 2011-12-04 14:21:20 +01:00
oy b99ac459be fixed envelope rendering when seeking in the demo player 2011-12-04 14:04:12 +01:00
SushiTee e411d8f591 made envelope rendering more smooth 2011-12-04 13:15:24 +01:00
Shereef Marzouk 198334ef66 Merge pull request #125 from XXLTomate/PullVictims2
Pull victims2
2011-12-01 10:03:48 -08:00
GreYFoX 077217a802 incremented version 2011-12-01 19:51:51 +02:00
GreYFoX 5ebf60891c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-12-01 19:48:09 +02:00
oy df4e11dc82 fixed fixed camera position when chatting as spectator. Closes #880 2011-11-30 01:47:35 +01:00
oy 05f77f64af added caching for the play command. Closes #891 2011-11-30 01:41:00 +01:00
oy e858c9396b renamed a variable 2011-11-29 22:15:27 +01:00
SushiTee c22b6c4b4f fixed selecting of quad points 2011-11-29 22:03:10 +01:00
SushiTee 48d21b61a2 fixed links between tile layer color envelopes when deleting envelopes 2011-11-29 22:01:03 +01:00
XXLTomate 9a59dd4158 victims at force_vote; cmd description updated 2011-11-08 22:08:37 +01:00
GreYFoX 323e63453b fixed team cheat. Closes #103 2011-11-08 15:21:03 +02:00
GreYFoX df0798a673 Fixed pickup sounds. Closes #111 2011-11-08 14:15:31 +02:00
GreYFoX 09232125b4 Ability to disable emotes. Closes #115 2011-11-08 14:09:42 +02:00
GreYFoX d6845f0502 Vote enforcer as command executer
Force pause doesn't need the client id to be positive
Fixed force pause parameter reading

partially helps #124
2011-11-08 13:56:08 +02:00
XXLTomate 137a447065 Victims without callback(s) 2011-11-08 12:30:54 +02:00
Ravomavain 24fc16543c Fix chat commands being too verbose if console_output_level is set on config file. Close #116 2011-10-31 19:16:43 +01:00
XXLTomate 771293a922 Fixing muteID 2011-10-12 21:31:33 +02:00
Shereef Marzouk b5f8738acd Merge pull request #118 from XXLTomate/ddracePullSqlFix
fixing sql score by @Laxa
unrevised untested @XXLTomate thanks but please test and maintain i didn't even see the changed code
2011-10-12 10:29:12 -07:00
XXLTomate a2cec1b990 fixing sql score by @Laxa 2011-10-12 19:17:48 +02:00
GreYFoX 1837c76a07 fixed a crash 2011-09-08 01:02:09 +02:00
GreYFoX d9f973b8da SQL Fix 2011-09-08 00:51:55 +02:00
GreYFoX eda127392a 0.6 trunk, 1.096a 2011-09-05 15:51:58 +02:00
GreYFoX 9f16db0969 Fixed tuning reset 2011-09-05 13:55:47 +02:00
Sergey b326fc245f Count change_map in sv_vote_map_delay too. 2011-09-04 22:24:40 +02:00
GreYFoX df5a63948a Fixed warning: src/game/server/teams.cpp:206: suggest parentheses around && within || 2011-09-03 01:10:08 +02:00
Ravomavain 7b8575f755 There is a variable for that, use it! :p 2011-09-03 01:08:37 +02:00
Ravomavain 04981004d5 Improve Checkpoint-teleporters: if no matching destination is found for the current checkpoint, check previous ones 2011-09-03 01:08:37 +02:00
GreYFoX fe5e9f4ad7 Removed redundant command from console 2011-09-03 00:28:56 +02:00
GreYFoX 37d3bfee81 0.6 trunk, 1.095a 2011-09-02 22:25:38 +02:00
GreYFoX abfd5555b0 DDRace tuning vars reset every map, but default Teeworlds tuning vars don't 2011-09-02 20:37:03 +02:00
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams )
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
2011-09-02 20:04:18 +02:00
Ravomavain 5b44fae0ce Remove unneeded variables 2011-09-02 12:05:14 +02:00
Ravomavain b24b67518a Allow chat commands to be used in remote console 2011-09-02 12:05:14 +02:00
GreYFoX 5035506825 Fixed team collision and 0.6 trunk, 1.094a 2011-09-01 20:29:08 +02:00
GreYFoX d960765552 fixed warning: src/game/server/entities/laser.cpp:93: 'f' may be used uninitialized in this function 2011-09-01 02:14:05 +02:00
GreYFoX f845f271ad Fixed warning: src/game/server/ddracechat.cpp:267: unused variable 'pSelf' 2011-09-01 00:30:37 +02:00
GreYFoX dd3568338f 0.6 trunk, 1.093a 2011-08-31 23:37:04 +02:00
GreYFoX b7e3bbb824 added fix for #82 by BeaR 2011-08-31 23:36:41 +02:00
GreYFoX aad11d2cae 0.6 trunk, 1.092a 2011-08-31 23:00:00 +02:00
Ravomavain 7d1a392f03 Fix chat command and close #81 2011-08-31 22:58:48 +02:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +02:00
GreYFoX 71239fadb2 no more victims 2011-08-31 13:12:46 +02:00
GreYFoX 3ad8284716 Fixed #77. top5 2011-08-31 12:30:18 +02:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +02:00
GreYFoX bf5374adbf Reverted a change 2011-08-31 02:48:58 +02:00
GreYFoX f2e34075b8 Fixed the /cmd crash Fixes #76
deleted the chat console on destruction
2011-08-31 02:39:08 +02:00
eeeee cfde5a20ec allow usage of eyeemotes in freeze 2011-08-31 02:36:47 +02:00
GreYFoX 03bd3823ec Fixed SQL Compilation 2011-08-27 23:32:40 +02:00
GreYFoX 4ca0681689 Added chat commands for only chat and available to all users
Thanks @heinrich5991 for this idea of a separate console object to handle it
2011-08-27 17:11:39 +02:00
GreYFoX 7e19f1bca3 Fixed rendering of maps like Hardcore_02
Since the game layers are allowed only once, there is not way for this to run twice
2011-08-27 15:05:28 +02:00
eeeee 2d4c965c7e prevent excess draggers snapping to save loads of traffic 2011-08-27 14:09:06 +02:00
eeeee 9f8ba5cf45 it was possible to avoid being kicked by afk stuff by opening chat 2011-08-27 14:09:06 +02:00
GreYFoX 9fe96f6b04 Test Commands check and feedback on command not executed 2011-08-26 23:24:46 +02:00
GreYFoX 94c0088c1b Set the AccessLevel at login 2011-08-26 20:23:47 +02:00
Ravomavain 8bd82a3550 Fix DDRace layers in editor 2011-08-26 20:05:18 +02:00
GreYFoX b75a26eed9 Fixed the console 2011-08-26 20:03:30 +02:00
Ravomavain e8229f537f Fix loading of old maps 2011-08-26 16:34:25 +02:00
Ravomavain 15d0a40825 Add user level access and use this level for /cmds if player is not authed. 2011-08-26 16:28:14 +02:00
Ravomavain 5912395554 Clarify this if statement. 2011-08-26 16:28:14 +02:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
oy b1e7797b19 fixed compiling with mingw 2011-08-19 00:12:30 +02:00
SushiTee 2ceb0fde91 fixed editor zooming if gui is not active 2011-08-16 23:15:51 +02:00
oy 2708256186 fixed quad selection via envelope preview 2011-08-16 21:35:00 +02:00
oy f36cc57bdd fixed last commit 2011-08-15 20:12:31 +02:00
Alexandre de5eccef3f Fix Stuffs & clean comments 2011-08-15 18:07:09 +02:00
Alexandre 367bb4b837 Map Editor: Envelope Preview 2011-08-15 18:07:05 +02:00
oy c38c632d06 fixed multiple popup creation in the editor. Closes #836 2011-08-13 19:22:01 +02:00
oy 4e830a71a1 decreased top offset of image add button in the editor. Closes #834 2011-08-13 18:53:41 +02:00
oy 7058726236 changed default UiPage to PAGE_INTERNET. Closes #839 2011-08-13 18:50:17 +02:00
GreYFoX 06afe36db4 Removed old hook through prediction as 0.5.2 servers are no longer compatible
made it possible to load old maps
Enumerated layers
2011-08-13 02:12:40 +02:00
GreYFoX 5b27758650 Removed level stuff
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
2011-08-13 02:11:06 +02: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
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
Shereef Marzouk 2084febca7 Removed outdated comment 2011-08-11 10:43:27 +02:00
oy 5fc5b63dac just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer 2011-08-06 22:30:18 +02:00
oy de05682d87 fixed play hooking when tune player_collision is 0. Closes #825 2011-08-06 13:57:59 +02:00
oy 003c0aa281 fixed aspect ratio in the editor's image preview. Closes #784 2011-08-06 13:08:29 +02:00
oy f1ea039df7 added separator in image menu. Closes #785 2011-08-05 19:52:39 +02:00
oy 2b2ddde04f sort players in kick/move to spec vote and player options by team. Closes #809 2011-08-05 19:52:38 +02:00
oy e5395f00b3 fixed that activating a quad point doesn't align it on the grid and made moving the pivot use the grid. Closes#792 2011-08-05 19:52:37 +02:00
oy fee2c2c452 fixed an overlapping in the editor. Closes #794 2011-08-05 19:52:36 +02:00
oy b7605dd0b5 reset quad point selection when activating a different quad. Closes #819 2011-08-05 19:52:34 +02:00
oy 72eb98c75e changed to trunk again 2011-08-05 19:52:33 +02:00
oy 709c05bb37 improved description for restart command. Closes #796 2011-08-05 19:52:32 +02:00
oy 435639636e Merge pull request #808 from SushiTee/master
fixed a warning
2011-08-03 13:53:18 -07:00
Shereef Marzouk 8877cf2293 Refactored some pointers 2011-08-02 12:35:14 +02:00
Shereef Marzouk 2b5c532589 converted white spaces to tabs 2011-08-02 12:14:49 +02:00
Shereef Marzouk 29de27f9dd Used the enum const TILESLAYERFLAG_GAME instead of 1 2011-08-02 12:14:00 +02:00
SushiTee 83652c91ec fixed a warning in client (mac) 2011-08-01 21:03:51 +02:00
oy 50edfd37c0 made 0.6.1 release 2011-07-31 23:17:00 +02:00
oy 10c3e844d7 show alpha2 country code strings next to the flag in the country code selectors. Closes #805 2011-07-31 02:04:46 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy 7db6d1e056 fixed problem with player collision. Closes #722 2011-07-30 18:08:24 +02:00
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00
oy 65d312fd06 fixed problem with lineinput. Closes #802 2011-07-28 22:01:14 +02:00
GreYFoX 74462d4611 enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable 2011-07-25 22:16:20 +02:00
GreYFoX 831aea796e Saving hitting status on pause 2011-07-25 21:15:51 +02:00
Choupom b7aa8af7aa thats why magic values sux 2011-07-23 18:42:51 +02:00
GreYFoX 344944c9d4 --b * 2 2011-07-22 16:23:03 +02:00
GreYFoX d965eb7453 utter noobness 2011-07-22 16:15:39 +02:00
GreYFoX cdbbf9e74b Removed a useless line
ps. commiting from the car while driving via iPhone xD
2011-07-22 16:02:56 +02:00
GreYFoX dd015c33c0 Fixing the sound for the laser when a player DCs after shooting it 2011-07-22 15:03:15 +02:00
GreYFoX 8f927a6033 Fixed a crash 2011-07-22 14:52:28 +02:00
GreYFoX d7fe844690 1.082a 2011-07-22 14:33:07 +02:00
GreYFoX 2964919bf2 Some logic fixes 2011-07-22 14:29:27 +02:00
GreYFoX b0420e66ee used Teams() instead of ((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams 2011-07-22 00:01:12 +02:00
GreYFoX 3d07ffdbdd Added the Missing Single Tee No Hitting Logic 2011-07-21 03:13:59 +02:00
oy 6312a2d71c fixed few things in th editor 2011-07-20 22:18:31 +02:00
Choupom 84e5c53432 added color envelope feature for tilemaps 2011-07-20 22:04:13 +02:00
Choupom c2e8bf5035 made a constant for game layer flag 2011-07-20 21:54:23 +02:00
Choupom 188e622373 fixed auto_map.h header guard 2011-07-20 21:54:19 +02:00
GreYFoX 959b11b13d Admin protection closes #59 2011-07-20 03:18:03 +02:00
GreYFoX a6922db418 1.081a 2011-07-19 23:33:46 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile
Entities are in the previous commit
2011-07-19 23:33:12 +02:00
SushiTee f7a9e80163 added possibility to collapse groups by double clicking them 2011-07-15 01:03:22 +02:00
SushiTee ef881a5321 added layer/image scrolling via mouse wheel 2011-07-15 01:02:11 +02:00
SushiTee d78c0d66e5 ability to name groups and layers 2011-07-15 00:47:52 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
oy 5f4a5b3366 added country flags to language selectors 2011-07-12 20:33:53 +02:00
SushiTee 6cd2ab3887 added grid to editor 2011-07-11 12:03:16 +02:00
oy f4ce34f01c close spectator/emoticon menu when changing to team/spectator via bind. Closes #768 2011-07-11 12:02:45 +02:00
Romain Labolle a6dc6f34b6 Display a message when an admin forces a vote. Closes #759 2011-07-11 11:28:04 +02:00
oy 7bc07b613f added auto mapping feature by LordSkelethom 2011-07-09 01:09:06 +02:00
oy e18390fea8 fixed that client resets tuning. Closes #746 2011-07-05 23:32:32 +02:00
oy 20fbe2f92c fixed that player friends are marked as online in the friends list if they match a clan friend 2011-07-05 23:23:33 +02:00
oy ac9c3b8f7f made the dropped flag sign blink faster the last 5 seconds to indicate that it's about to return. Closes #631 2011-07-05 23:15:24 +02:00
oy ab1f7d6f95 clamped information flow when moving as spectator in free-view. Closes #551 2011-07-05 22:58:54 +02:00
oy b153003b0b fixed dm wincheck 2011-07-04 18:30:24 +02:00
oy 7648ba3024 added a different mouse sens for menus/editor 2011-07-03 00:36:07 +02:00
Choupom 4a5c13d1de fixed so Reset Filter button resets all filters 2011-07-02 19:23:36 +02:00
Johannes Loher 3f583d44f9 fixed so there can't be a negative time being displayed when timelimit runs out while there is warmup. If warmup is active, the time will be displayed as if there was no timelimit. 2011-07-01 18:34:28 +02:00
oy 123eab41c8 made it possible to filter by player country in the server browser. Closes #654 2011-06-29 22:27:32 +02:00
oy 8035e022fd fixed cursor positioning by mouse in edit boxes 2011-06-29 18:39:58 +02:00
oy fdf6db5fd6 fixed that music resets on password prompt. Closes #695 2011-06-27 23:26:01 +02:00
oy 47cdd2524b do not try to play sound when it isn't enabled 2011-06-27 22:57:06 +02:00
oy e8938e3d80 set the minimum of seconds remaining in map downloading popup to 1 2011-06-27 22:35:23 +02:00
oy 08b6ffd52c fixed possible server stressing 2011-06-27 17:20:46 +02:00
Johannes Loher f80c46e24d fixed so you can use whatever time you want on set_team and so that it uses minutes 2011-06-27 17:07:51 +02:00
Johannes Loher 14f98a9ded Added possibility to deny changing of team after a set_team for a certain amount of time. Added server setting to do this automatically for spec votes. fixes #640. 2011-06-27 17:07:23 +02:00
Choupom bf6ca3e33d fixed tiles infos in groups with custom para or offset in editor 2011-06-27 16:50:38 +02:00
oy 1239150846 fixed password popup UI issue. Closes #583 2011-06-27 16:39:23 +02:00
nsinreal 66a8000620 Fixed ninja: always set last active weapon after ninja's end 2011-06-27 16:28:49 +02:00
oy fb309436b4 improved friends feature 2011-06-26 17:10:13 +02:00
oy c10c7d9ac3 improved sudden death in ctf. Closes #617 2011-06-19 17:32:00 +02:00
oy 957b81af07 made it possible to restrict player information in spectator mode 2011-06-19 11:28:39 +02:00
oy 4dc79a9ec1 fixed spawn bug. Closes #634 2011-06-15 01:03:14 +02:00
Choupom c1ebda73e3 fixed #687 Bug with the ctf score when the round starts, fixed so you can't grab the flag if the game is over 2011-06-11 18:34:05 +02:00
Choupom 558b110504 fixed #633 Correct sound effects in following spectactor mode 2011-06-11 18:33:30 +02:00
oy eae1a97297 fixed marker position in chat 2011-06-09 23:54:11 +02:00
oy fd965ca4b2 made name highlighting in chat more strict 2011-06-09 23:49:06 +02:00
oy 37bdc4c2a1 removed some unneeded stuff 2011-06-09 23:40:35 +02:00
oy 4f402f85bb added ':' after names on start and a space separator in chat tab completion 2011-06-09 23:37:59 +02:00
oy e1ef01f656 made tab completion for names in chat start with the ones that match on the beginning 2011-06-09 23:28:20 +02:00
oy 9845d757ef removed file extension from the demo name in the demo player 2011-06-09 22:44:22 +02:00
oy 348806d993 abort "move to spectator"-vote when the player disconnects 2011-06-09 22:31:55 +02:00
oy 2cc10fd6f0 fixed that the player keeps action when activating chat. Closes #719 2011-06-09 22:30:03 +02:00
GreYFoX 9c4b1c9892 fixed a crash, closes #56 2011-06-07 17:21:47 +02:00
GreYFoX 457fee998d Refactored a variable 2011-06-07 17:05:19 +02:00
GreYFoX e6189d05c4 On name change relaod scores, fixes %55 2011-06-07 17:05:07 +02:00
GreYFoX 1bfcfb7d6f Changed max of force pause to be 360 seconds
Note if force pause was abused once infront of me i would make even admins have to go through a vote
2011-06-07 16:55:06 +02:00
Romain Labolle 3f2dc36151 Fixing Force-pause:
* sv_vote_pause_time : maximum 15s, default 10s
* Removing sv_vote_pause_auto (so afk stay in pause)
* force_pause require config level
* force_unpause set force-pause timer to 0
2011-06-07 16:49:36 +02:00
Romain Labolle bb971bdcf0 Adding vote to force-pause players (instead of just moving them to spectators).
* Add the following config variables :
  * sv_vote_pause: Allow voting to pause players (instead of moving to spectators) (default: 1)
  * sv_vote_pause_time: The time (in seconds) players have to wait in pause when paused by vote (default: 60)
  * sv_vote_pause_auto: Automatically unpaused players after the force-pause delay or not (default: 0)
* Add the following functions :
  * force_pause v?i : Force v to pause for i seconds
  * force_unpause v : Force v to unpause
2011-06-07 16:48:49 +02:00
Romain Labolle 0ae0b0bb83 Adding pause specific message when players use /pause (instead of joined the game/spectators). 2011-06-07 16:48:48 +02:00
Romain Labolle c17d3cdeda Reworking teams to allow pausing in team
* Adding wrappers functions to modify character or pause data if player are in game or paused.
* Moved OnFinish() function to teams.cpp so it can also be called on paused players.
* Pause is now enabled for team players.
* Adding bool CPlayer::IsPlaying() function that return true if the player is either in game or in pause. (false if spectator/dead).
2011-06-07 16:48:48 +02:00
GreYFoX 413bf4a39e Credits and version 1.08a 2011-06-07 16:48:01 +02:00
GreYFoX c3df972fe3 Optimized checkpoint code 2011-06-05 13:56:04 +02:00
GreYFoX c1962bff25 Removed sv_broadcAst
this commit is funny cause it was made from my iPhone and it only took 8 minutes
2011-06-03 21:55:57 +02:00
GreYFoX bee10fda8f Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
	src/game/server/gamecontext.cpp
2011-06-02 19:13:40 +02:00
Choupom 603071ee92 fixed data struct names 2011-06-02 17:42:30 +02:00
Choupom deff0ce7c4 fixed netevent struct names 2011-06-02 17:40:08 +02:00
Choupom 1a02017094 fixed some strings 2011-06-02 17:39:05 +02:00
Choupom 101d9de3c3 added aspect ratio in display modes list in settings 2011-06-02 17:36:17 +02:00
GreYFoX 25f69d704b Version 1.77a, Beware this version maybe buggy contains more than one untested/unrevised commits, but from trusted Developers 2011-06-01 17:06:00 +02:00
Romain Labolle 38f1db1c4f Adding a checkpoint system for teleporters :
* Player go through a Checkpoint tile (29 in tele layer)
* He fall in a Check-Teleporter tile (31 in tele layer)
* Player is teleported to the check-TO (30 in tele layer) that have the same number as the last Checkpoint.
Thus players are teleported to the last checkpoint he passed, regardless of whether he made ​​the map in the right direction or not.

Tele tileset may need some improvement.
Closes Pull Request #52
2011-06-01 17:03:04 +02:00
Romain Labolle 813f689957 Tune reset clean up (fix #50)
* Removing old unused DDRaceTunesReset() function.
* Adding ResetTuning() function to reset tunes.
* Adding ResetTuning() and some settings reset (sv_hit/sv_endless_drag/sv_old_laser) to CGameContext::OnInit() which is loaded on each map load.
GreYFoX:
Repositioned the new Functions
2011-06-01 16:43:20 +02:00
GreYFoX a232cdc90a Unified SetTeam Time with Pause time fixing a CRTITCAL cheat reported by TbMa P.S. He is NOT a Rogue ;-), Thanks very much Mr.TbMa 2011-06-01 16:12:35 +02:00
GreYFoX eb70e55ead Merge branch 'master' of git://github.com/oy/teeworlds 2011-05-17 09:00:25 +02:00
PsychoGod 210d98666c Scroll fix, protect scrolling 2 windows at the same time 2011-05-17 01:15:54 +02:00
oy 896ef2f235 removed load/save binds in the editor 2011-05-16 19:54:35 +02:00
Romain Labolle 5fad119b5f nethash.c moved to nethash.cpp fix GreYFox/DDRace#48 2011-05-09 23:59:58 +02:00
GreYFoX f7f1f72d5c 1.76a 2011-05-09 18:48:03 +02:00
GreYFoX 2ab15cc752 fixed 1 line merge mistake. fixes #45 2011-05-09 18:45:35 +02:00
GreYFoX ee97bfcad3 fixed last merge 2011-05-09 18:40:14 +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
eeeee a58996b6bf return from afk handling code immediately if player got kicked, as player struct is zeroed out
closes #47
2011-05-09 18:22:05 +02:00
oy e4c85b00db fixed that some demos show a negative length in the demo browser. Closes #660 2011-05-09 17:55:12 +02:00
oy cd2114c758 fixed problem with the file dialog in the editor 2011-05-09 17:37:04 +02:00
oy 8d5badc260 skip player input if the chat is active to prevent abusing the linked emoticon. Closes #678 2011-05-05 02:13:32 +02:00
oy 15e1d4f1d6 distinguish [chat] and [teamchat] in console messages. Closes #643 2011-05-05 02:08:39 +02:00
oy 8ad6f3d7fc show flags in spectator menu. Closes #636 2011-05-05 02:00:43 +02:00
oy 5b2f5f0778 fixed problem with connecting on double click in the server browser. Closes #662 2011-05-05 01:56:31 +02:00
oy 193fb192c5 added maximum zoom level in the editor. Closes #664 2011-05-05 01:53:12 +02:00
oy ca6e129da6 fixed size of characters in editor's tileselection screen on zoom. Closes #665 2011-05-05 01:50:23 +02:00
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
oy 41ebc9bc9d fixed cursor marker position in console 2011-05-03 23:30:50 +02:00
Choupom f8d21b48af fixed a l10n bug for some languages 2011-05-03 23:10:20 +02:00
Choupom 7f15b3ac57 fixed several stuffs 2011-05-03 19:25:11 +02:00
Choupom 4dfcfc6913 fixed a variable name 2011-05-03 18:46:18 +02:00
Choupom 0c6f187e3b renamed editor files 2011-05-03 18:45:42 +02:00
Choupom 8e773a55ad show tee pos and vel in tiles in debug hud 2011-05-03 18:13:12 +02:00
Choupom 7b87cfa68a made envelopes synchronized with other clients 2011-05-03 18:12:32 +02:00
heinrich5991 9fb36fd802 added strict game type filter 2011-05-02 19:25:38 +02:00
GreYFoX aba78d9e2e Fixed and refactored 2nd afk warning thanks to @ravomavain for noticing it 2011-04-23 19:59:25 +02:00
GreYFoX 96cec72681 Version 1.075a 2011-04-20 22:42:13 +02:00
GreYFoX fae976c98b Sending Scores in negative to clients. closes #36 2011-04-20 22:40:56 +02:00
GreYFoX 151775460a Code Style 2011-04-20 18:47:25 +02:00
Romain Labolle f4ca6d9ad5 Some Clean up: closes #28
* m_VoteEnforcer variable is never used.
* pController variable is not used in OnMessage scoop.
* CNetObj_ClientInfo have now only 4 m_Name ints, so change it to 4 in ghost.cpp
2011-04-20 18:07:38 +02:00
GreYFoX 9221bce3f4 Rechecked and fixed the afk kicking system. fixes #27 2011-04-20 16:34:03 +02:00
GreYFoX 9e5336a13d fixed plasma snapping 2011-04-20 16:05:05 +02:00
GreYFoX 0584f2b7a2 Added Plasma Gun tweaking
made the default 3 plasmas per second more cpu friendly
2011-04-20 15:59:40 +02:00
GreYFoX dca0057bc1 Fixed a possible crash 2011-04-19 21:44:02 +02:00
GreYFoX 34d33fc829 Version 1.074a 2011-04-19 16:33:46 +02:00
GreYFoX d0ed9612e1 Properly done cl_show_entities 2011-04-19 16:32:42 +02:00
GreYFoX 83318d0583 Refactored some stuff in CLight and fixed CLight::Snap 2011-04-19 15:34:59 +02:00
GreYFoX f5d38a84f9 formatting 2011-04-19 15:15:40 +02:00
GreYFoX 2fff744724 fixed laser snapping 2011-04-19 15:15:21 +02:00
GreYFoX a76759eeb5 Fixed a 1 line merge mistake 2011-04-19 14:53:42 +02:00
GreYFoX 95408a8fd8 fixed a crash on toooooooo many draggers 2011-04-18 00:05:56 +02:00
GreYFoX 00ef75390f Laying off some caps 2011-04-17 20:02:32 +02:00
GreYFoX dad66bffc3 General DDRace binds improvements 2011-04-17 19:45:48 +02:00
GreYFoX 5924b5a8bf Fixed blank squares and cl_show_entities to show other layers
P.S. this might introduce a client crash bug, but it needs to happen for me to trace it
2011-04-17 19:14:49 +02:00
GreYFoX cbfa9b6679 little cleanup 2011-04-17 18:19:46 +02:00
GreYFoX 4c11e9460b added "fixed brush rotating and flipping for tele and speeduplayer" by SushiTee 2011-04-17 18:00:01 +02:00
GreYFoX 81dd1a3439 fixed showing quads while showing entities 2011-04-17 11:27:46 +02:00
oy bda0927a87 disable envelope editor when the picker is shown 2011-04-16 19:00:28 +02:00
oy 246cbed786 colorized background of entries in the server browser scoreboard so it's more obvious what belongs together 2011-04-16 18:55:36 +02:00
oy 726bbbbdb0 added missing localisation in the demo player 2011-04-16 18:37:57 +02:00
GreYFoX c6ca0fd6b0 Fixed Reset Filter 2011-04-15 06:40:42 +02:00
GreYFoX 89abd3ad81 1.073a 2011-04-15 06:37:02 +02:00
GreYFoX 561ce64666 Renamed cheats to testing commands sv_test_cmds
Since these are testing commands, anyone can use them and only on their selves no login needed
Revised some rcon commands
cleanup some unwanted codes
2011-04-15 06:04:21 +02:00
GreYFoX 14e4557dfc Made EMOTICON_WTF eye action EMOTE_SURPRISE 2011-04-15 04:38:48 +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 c5d992dc2c nothing 2011-04-14 04:42:09 +02:00
GreYFoX 7c6d405e2a Fixed vote abortion by admin login 2011-04-14 04:26:13 +02:00
GreYFoX c37bad0be8 fixed a crash 2011-04-14 04:00:22 +02:00
GreYFoX dc886b7b2e New emoticons eye actions 2011-04-14 01:36:51 +02:00
GreYFoX 2a0e272950 1.072a 2011-04-14 01:29:00 +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
GreYFoX f7892d3f00 Administrator privacy, re-enabled disabled functions 2011-04-14 00:53:33 +02:00
GreYFoX 61129aa15e avoided confusion between rcon kill and and local console kill 2011-04-14 00:51:29 +02:00
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 1d426f1df9 fixed problem with ui_page 2011-04-13 20:45:16 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +02:00
Choupom 2179ae0113 fixed need restart warning in settings 2011-04-13 17:49:31 +02:00
oy 876eac1048 added fix to make [Shift] only change the time of the point and not his value for envelopes in map editor by Choupon 2011-04-13 17:47:02 +02:00
oy 537e5fa7b6 added default keys for spectator next/previous and updated localisations 2011-04-13 17:39:26 +02:00
Johannes Loher 2e09bd6b9d Extended the control settings so spectate_next and spectate_previous can be set there. 2011-04-13 17:32:32 +02:00
GreYFoX dd70b687ed Better ICons + Mac Icons
Disabled Emotional tees until reworked
2011-04-13 01:34:39 +02:00
GreYFoX e3cc1c405e Merge branch 'master' of git://github.com/oy/teeworlds 2011-04-12 21:05:55 +02:00
Choupom ffe40db053 fixed map download speed and remaining time 2011-04-12 19:29:06 +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
GreYFoX 0ee65685be Fixed Crazy shotgun bullets 2011-04-12 00:28:00 +02:00
GreYFoX 03095b5ecf Nothing 2011-04-12 00:27:52 +02:00
GreYFoX b4f05a6772 removed comments from voting - no longer needed 2011-04-10 15:32:56 +02:00
GreYFoX b2c67df7e7 fixed hammer hit 2011-04-10 15:07:36 +02:00
oy 3788d2392d moved to trunk version again and added update for Portuguese translation by Slinack 2011-04-10 02:23:39 +02:00
Shereef Marzouk 0354625f9b fixed Mac compilation 2011-04-10 00:05:34 +02:00
GreYFoX 32a85dabe3 Fixed some merge mistakes, NOTE: This will be be buggy to say the least 2011-04-09 23:01:10 +02:00
GreYFoX aaac8a3f77 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/version.h
2011-04-09 22:33:06 +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 f677b397a3 made 0.6.0 release 2011-04-09 20:42:51 +02:00
oy caf1a9f912 made translations ready for 0.6 release and added fixed friends/mute icons 2011-04-09 18:08:11 +02:00
oy c902d98be3 moved vote tabs on top 2011-04-09 00:03:56 +02:00
oy 9643fc36ae added new hammer hit effect by SushiTee and Crises 2011-04-08 19:11:41 +02:00
oy b5510d4cf9 fixed possible client crash with extra projectiles on disconnect 2011-04-08 11:22:44 +02:00
SushiTee dce5222f78 removed unused function 2011-04-07 19:52:44 +02:00
oy b985fdc20a added new friend/mute buttons by Crises and reworked the player options like Landil suggested. Closes #579 2011-04-06 20:18:31 +02:00
oy ebca792975 improved call vote tab. Closes #573 2011-04-06 11:41:40 +02:00
oy 9b97eb282a prevent that you can add votes with an empty description 2011-04-05 20:06:41 +02:00
oy 2401cc2ec3 highlight the followed player in scoreboard and show their score on top 2011-04-05 19:00:00 +02:00
oy 5c6e274a88 added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566 2011-04-04 20:37:12 +02:00
Johannes Loher 622b3de9bd Added more convenient variabe names for sectate_next and spectator_previous 2011-04-04 17:29:32 +02:00
Johannes Loher 1364631211 Added functionality to switch to the next and the previous player while spectating. 2011-04-04 17:29:08 +02:00
oy 0046825953 fixed server crash on remove vote 2011-04-04 16:58:53 +02:00
oy c20a33ede7 added more space for translations in demo details. Closes #592 2011-04-03 23:33:43 +02:00
Choupom 733f0b3390 reimplemented extra projectiles 2011-04-03 22:57:03 +02:00
SushiTee b6f607e73b little more space between killmessages so the tees dont overlap 2011-04-02 22:24:57 +02:00
oy ab810cab25 fixed that player options just show players as friends not clans 2011-04-02 19:51:05 +02:00
oy 401543c7a9 added some space for colour channel translations in the graphic settings as well 2011-04-02 19:34:02 +02:00
Choupom b3cb33eec0 replace team name by clan name if possible 2011-04-02 18:11:43 +02:00
SushiTee 4adad07ad8 polished scoreboard a bit 2011-04-02 15:18:52 +02:00
SushiTee 0db6022c64 centering scoreboard (goals and spectators) correctly 2011-04-02 15:18:45 +02:00
oy 2c9b454fb8 added some more space for the translations of the colour channels 2011-04-02 12:13:23 +02:00
oy 30c45b7899 removed newline from a localisation. Closes #572 2011-04-02 12:08:46 +02:00
oy 37b75f90e4 fixed that unsaved map notice in quit popup overlaps 2011-04-02 12:01:10 +02:00
oy 1b69541e7b increased size of UIServerAddress 2011-04-01 23:16:14 +02:00
SushiTee 747113d855 fixed moving if player collision is turned off 2011-04-01 21:48:54 +02:00
oy 593a8ee6ec improved settings menu. Closes #564 2011-04-01 19:36:44 +02:00
oy a6fced3d3a made new version notification show up in red colour 2011-04-01 18:06:59 +02:00
oy 9a4426779d decreased the font size for some menu buttons and tabs to give translations more room 2011-04-01 17:57:04 +02:00
oy d7b6c3543b fixed a compiler warning. Closes #565 2011-04-01 17:46:20 +02:00
heinrich5991 b6fa69cedb the server shows the disconnect reason of clients now 2011-04-01 00:05:35 +02:00
oy 32876b9ba7 changed the output level of a console message 2011-03-31 21:46:01 +02:00
oy cd9176331d auto add .demo if not present when renaming a demo 2011-03-31 18:33:46 +02:00
oy 0e6aca2b28 fixed a missing translation 2011-03-31 18:24:02 +02:00
oy 08c03104b4 changed ingame vote menu so it fits the other tabs and it's makes localisations easier 2011-03-31 15:43:12 +02:00
oy 693bd39e77 added quad positioning in the editor 2011-03-29 12:08:46 +02:00
oy 9712e4004c improved the add/remove friend and ignore/notice chat buttons 2011-03-29 00:48:36 +02:00
oy 0307138950 added better headlines for tabs in vote menu 2011-03-28 23:51:46 +02:00
oy f9288eb5b1 fixed that spectators go to free view if the followed player joins spectators and prevent that you can follow spectators 2011-03-28 23:45:47 +02:00
oy 141089f257 fixed more compiler warnings 2011-03-28 23:30:56 +02:00
oy 867f944459 added graphic buttons for remove/add friend and chat ignore/notice 2011-03-28 21:10:37 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
oy 63d2019b19 fixed that chat overlaps the spectator hud 2011-03-27 23:43:45 +02:00
oy 7bd79f9f43 added remove_favorite command by Choupom 2011-03-27 18:05:11 +02:00
GreYFoX 85fa86102f Refactored e to Event 2011-03-27 17:21:30 +02:00
GreYFoX eb344c83ce Chat History. Closes #521 2011-03-27 17:21:07 +02:00
oy 4d5443affa added demo loading speed enhancement by MAP94. Closes #555 2011-03-27 16:42:47 +02:00
oy 2aa1bda97e made mouse wheel change speed in demo player. Closes #524 2011-03-27 16:26:50 +02:00
oy 5060f42b63 added fix for collision bug with other tees. Closes #279. Closes #511 2011-03-27 16:15:10 +02:00
oy 67b026f65f added an option to disable ingame HUD. Closes #523 2011-03-27 14:40:15 +02:00
oy edf10b8b13 added an option to disable team colors for name plates. Closes #544 2011-03-27 14:30:59 +02:00
oy d4f2b8de87 fixed skin colour of spectators 2011-03-27 11:52:16 +02:00
oy 722644008f added a respawn delay command for tdm 2011-03-26 22:38:05 +01:00
oy 5b328e5484 added a limit for the number of votes that can be added to the server and send options as lists when a client joins. Closes #459 2011-03-26 22:06:29 +01:00
oy 6e1b6b102a added menu to add/remove a vote on the server 2011-03-26 18:43:43 +01:00
oy fbeace5272 cleaned up some voting code 2011-03-26 17:44:34 +01:00
oy b8f144ba81 added a vote that allows to move a player to spectators. Closes #58 2011-03-26 16:56:59 +01:00
oy 0e207fba6f fixed problem with force_vote command 2011-03-26 16:24:12 +01:00
oy fee3f19b32 added HSplitMid function 2011-03-26 16:19:37 +01:00
oy 6ece07ee74 added force_vote command 2011-03-25 12:06:45 +01:00
oy 359b806e95 added remove_vote command. Closes #47 2011-03-25 11:49:35 +01:00
oy a4580d451f added reasons to vote in general and show reason in vote hud. Closes #219 2011-03-25 10:26:59 +01:00
oy 8ad3def65e added aliases for votes. Closes #144 2011-03-25 09:49:21 +01:00
oy d78c84b105 removed local player from kick vote menu 2011-03-25 09:27:46 +01:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
GreYFoX 8695fc77bd 1.07a 2011-03-22 23:41:54 +02:00
oy b64db75a6b added an option to ignore other players in chat 2011-03-22 22:41:27 +01:00
GreYFoX 741de082fc fixed linux compilation 2011-03-22 21:56:52 +02:00
GreYFoX 61dcc7b848 Re-Added noother's afk kick
Disabled vanilla afk kick by default
enumerated variables.h
2011-03-22 21:49:12 +02:00
GreYFoX 1172a79693 fixed compilation 2011-03-22 21:15:15 +02:00
Sebastian Wojtowicz 55ce870597 Client utf8 converting (servernames,playernames) in Internet tab and (playernames,playermessage) in chat and hud 2011-03-22 21:11:10 +02:00
Sebastian Wojtowicz 500605cbee Server utf8 Conversion 2011-03-22 21:04:27 +02:00
oy 05244d4dad decreased the size of the "reset to defaults"-button in the settings menu 2011-03-22 00:40:43 +01:00
oy 2beae20208 don't use highlight chat sound for server messages 2011-03-22 00:34:07 +01:00
oy eaef2ce48a added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115 2011-03-22 00:31:42 +01:00
oy 588a411666 added a popup to create a new folder in the editor's file dialog and show an error if it fails 2011-03-20 22:53:50 +01:00
oy 8d159ce65a removed localisation in the editor 2011-03-20 17:04:03 +01:00
oy 18e5412358 added sound for highlighted chat message. Closes #508 2011-03-20 15:58:59 +01:00
oy 96808a1145 made it possible to just show the number of player slots of a server (instead of client ones). Closes #68 2011-03-20 15:33:49 +01:00
oy 2547bfa4fc linked console commands player_clan and player_country to the client's info update 2011-03-20 11:17:51 +01:00
oy 79aa9d640e fixed that server browser shows the correct country flag 2011-03-20 11:15:24 +01:00
GreYFoX 5b4d7a4658 Refactored + fixed sv_hit 0 + laser through others 2011-03-19 22:21:42 +02:00
oy 3d63afacc2 fixed a problem with the country flag selector, changed a localisation and the format of a file 2011-03-19 19:31:00 +01:00
oy da8c0c61b5 made scoreboard show clan name and country flag and fixed overlapping spectator names. Closes #203. Closes #335 2011-03-19 18:28:47 +01:00
GreYFoX ed5c9c1d92 sv_show_other the ability to use the command showothers 2011-03-19 11:22:03 +02:00
oy 079de7bc10 fixed that the server browser shows matching map name 2011-03-18 19:14:35 +01:00
oy a8bf857c68 improved server browser list resorting and made search work on IP addresses. Closes #482 2011-03-18 19:03:13 +01:00
oy a3c9ec889f fixed problem with the text colour when using the spectator menu 2011-03-18 18:03:50 +01:00
oy f8ae9f7732 made server browser show clan name and country code for players 2011-03-18 17:59:48 +01:00
GreYFoX 0d0f72b059 stopped spamming the console 2011-03-18 02:10:48 +02:00
GreYFoX b7d5014d3c fixed a little mistake 2011-03-18 01:36:03 +02:00
GreYFoX 974f429957 Added git revision to several places 2011-03-18 01:21:07 +02:00
GreYFoX 45f3cf042a Fixed a login with cheats
Renamed a constant
2011-03-18 00:17:01 +02:00
GreYFoX c74cda68e0 Fixed tuned server behavior 2011-03-17 19:20:44 +02:00
oy 0313485d6b fixed that PageMenu buttons change their inactive colour ingame 2011-03-17 17:48:45 +01:00
GreYFoX 8c2ef1f1ea version 1.063a
some default binds
2011-03-17 03:50:07 +02:00
oy b4bec53359 added clan name and country flag selector to the player settings 2011-03-16 21:31:55 +01:00
GreYFoX 87cde802b1 Added a new entities_clear
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
2011-03-16 19:48:16 +02:00
GreYFoX 3bae74f21d Added Ability to predict old hook through tiles from DDMax
fixed a warning
2011-03-16 17:36:54 +02:00
GreYFoX 0cbcdd027a Removed Helper made Moderators able to moderate only
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 16:27:30 +02:00
GreYFoX 16c074741f To have Cheats you must set a password and sv_register 0
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 15:41:26 +02:00
GreYFoX cccfb09e32 Reverted Team to it's old state without leader or Strict until it's reworked 2011-03-16 15:14:25 +02:00
GreYFoX ee178d5a48 Client Cheat showing entities in game 2011-03-16 14:48:16 +02:00
GreYFoX 3059199505 Fixed a crash 2011-03-16 13:59:36 +02:00
GreYFoX 2dc557d77b Fixed Rifle and Shotgun not affecting tees after Passing through owner when sv_old_laser = 1 2011-03-16 13:59:36 +02:00
GreYFoX ca447b7aa4 http://bugs.mysql.com/bug.php?id=50046 2011-03-16 13:59:17 +02:00
oy 156e23b592 added loading/support for country flags to the client 2011-03-16 12:09:22 +01:00
oy 30d9c9f4d9 made network support clan name and country code for players 2011-03-15 11:23:49 +01:00
oy 27e5a6af0d made clients sending startinfo a requirement to prevent empty player infos 2011-03-15 09:58:57 +01:00
oy 7b91ebd01c show actual page and fixed overlapping in the console 2011-03-15 09:15:46 +01:00
oy 83e83947cf give ninja players the momentum they had before slicing, after slicing. Closes #120 2011-03-13 19:00:00 +01:00
oy 09dc08859d added a function to set the text outline colour and increased readability of nameplates on bright backgrounds. Closes #205 2011-03-13 12:55:00 +01:00
oy 01ea32f816 removed unused stuff from CMenus::RenderServerInfo 2011-03-13 11:14:35 +01:00
oy be8f669333 added extended demo infos in the demo browser 2011-03-13 10:41:10 +01:00
oy a04eb45354 added rename button to the demo browser and updated localisation entries 2011-03-12 19:08:44 +01:00
oy 5c723f5d2f added info about the actual recorded demo length in the notification box 2011-03-12 18:34:16 +01:00
oy b834426548 fixed several problems with spectator view in game and demo player. Closes #83 2011-03-12 18:07:57 +01:00
oy 7b98b3dded fixed camera in spectator mode 2011-03-10 17:57:15 +01:00
oy 1f10c1e8bf fixed problem with ctf if there're no flags 2011-03-10 10:14:41 +01:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
oy 6205583d64 added fix so that the ghost is alpha blended 2011-03-07 10:06:19 +01:00
oy 0640acb27e added a command to set a minimum player limit that is needed to start a kick vote 2011-03-04 17:35:50 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
oy 4bede550be only update the ping if the scoreboard is active. Closes #27 2011-03-01 18:31:20 +01:00
oy 0bc13c91eb made cl_threadsoundloading work again 2011-02-27 17:56:03 +01:00
oy d9ce720387 made engine an interface 2011-02-27 15:03:57 +01:00
GreYFoX 709f0cd0f9 Removed Spam checks from ConRank
Moved CGameContext::ProcessSpamProtection(int ClientID) away from vanilla functions
Made Muted text shown to sender
Corrected a + to *
Added FileScore ShowRank to Spam protection
changed SendChatTarget to SendChat in SQLScore and added it into the Spam protection
2011-02-27 10:07:57 +02:00
EliteKuchen 55144629dc wrong names 2011-02-26 20:49:29 +02:00
heinrich5991 652443f068 fixed rewritten mutes 2011-02-26 20:45:02 +02:00
heinrich5991 d506be71ea added standard 'me' for victim console argument 2011-02-26 20:45:01 +02:00
GreYFoX 355dd98bfa lol i missed this 2011-02-26 15:48:15 +02:00
heinrich5991 3d0aab503f rewritten mutes 2011-02-23 23:45:31 +02:00
GreYFoX 90d93ba7b2 Client showothers 2011-02-23 22:22:05 +02:00
GreYFoX bef7a1fbbd Emote normal
lol
2011-02-23 21:53:15 +02:00
GreYFoX 0e5ef2e4f4 Fixed show ids
Fixed missing letter
2011-02-23 18:12:34 +02:00
GreYFoX b3da5344c1 Fixed banning Higher level players
Fixed abort vote on login
removed ComparePlayers (useless i think)
Refactored last_mapvote
2011-02-23 16:27:11 +02:00
GreYFoX 9e54b25740 Fixed 2 Teams bugs
Added comments so that remembering what CGameTeams::SetForceCharacterTeam does won't be hard
Raised the version so that bug tracking is easier
2011-02-23 14:14:56 +02:00
GreYFoX 6d181a2daa Fixed a merge mistake 2011-02-23 09:43:05 +02:00
GreYFoX 5ffe4e9429 Added In-Game Page DDRace 2011-02-23 09:33:21 +02:00
GreYFoX 5571ec70fa More Settings in the Settings tab 2011-02-23 08:36:14 +02:00
GreYFoX 48b29bebd4 Possibly Fixed a Teams bug 2011-02-23 08:18:38 +02:00
Romain Labolle 0209ef4126 The first parameter of set_team is the victim (cf. line 1190) 2011-02-23 08:02:55 +02:00
GreYFoX e6643607f4 Reset Team from Super to normal on death 2011-02-23 07:31:39 +02:00
Romain Labolle 7ac12219ea move/move_raw/up/down/left/right commands may apply on Victim not on player who typed the command 2011-02-21 21:40:13 +02:00
oy 45eee0c8c2 fixed spawning on crappy maps 2011-02-21 12:35:14 +01:00
oy 088ec3e2f3 made the client's map search work with sub folders. Closes #254 2011-02-21 11:23:30 +01:00
GreYFoXGTi 937d81c85b Upped the version again to 1.052a just for bug tracking 2011-02-21 00:42:12 +02:00
GreYFoXGTi 4e9e60524e Fixed last commit 2011-02-21 00:41:15 +02:00
GreYFoXGTi 2e1094f15d Welcome Trust o_0 Aeeeh ?! 2011-02-20 20:17:38 +02:00
Sebastian Wojtowicz c3739e0e4d fixed a bug that prevented records to be saved in files 2011-02-20 19:11:04 +02:00
Sebastian Wojtowicz 968762b144 Fixed a casting error 2011-02-19 20:10:03 +02:00
Sebastian Wojtowicz 84196b1ef3 some little cleanup
If /times is entered with no params it now shows last 5 times of server in general
2011-02-19 19:53:15 +02:00
oy 4f91026a01 added an editor function to show tile informations (index, flip/rotate status) 2011-02-18 11:41:27 +01:00
oy ae94c36f54 made game tile construction in the editor more usable 2011-02-18 10:49:54 +01:00
GreYFoXGTi 7455ebfee9 I had a crash here, dunno why! 2011-02-17 11:24:11 +02:00
GreYFoXGTi 417b18963f windows compiling 2011-02-16 19:56:20 +02:00
GreYFoXGTi d9bb3d652c fixed cl_ddrace_scoreboard 2011-02-16 19:11:24 +02:00
GreYFoXGTi 793ea4a499 Don't holdup spawning if tees are there
fixed cl_ddrace_scoreboard
2011-02-16 19:04:41 +02:00
oy b2f66978c9 fixed overlapping image names in the editor. Closes #442 2011-02-16 12:36:51 +01:00
oy d939b84125 removed no longer needed progression browse info 2011-02-16 12:31:47 +01:00
GreYFoXGTi cd998a2a93 sv_reset_pickups 1 to remove weapons on start tiles 2011-02-16 13:08:14 +02:00
GreYFoXGTi 6e3818c779 Don't Reset Controls 2011-02-16 12:59:30 +02:00
oy 927954a53b added new emoticons. Closes #362 2011-02-16 11:45:19 +01:00
oy b59c710eba changed netversion to 0.6 2011-02-16 11:32:40 +01:00
GreYFoXGTi 78ee6148f8 SortHash
Loading String
2011-02-16 12:22:55 +02:00
GreYFoXGTi 55794249c8 No Front Layer by Default
Makes it possible to map other game types too
2011-02-16 12:01:51 +02:00
GreYFoXGTi 2bbd28bb6d Bigger default Quad for Convenient Zoom 2011-02-16 11:57:54 +02:00
GreYFoXGTi 6904956a14 Added some DDRace Menu Items
Enforced cl_ddrace_cheats on zoom
2011-02-16 11:20:27 +02:00
noother 901859a494 fixed all known bugs in racedemos & ghosts, including "ghost is shown when playing a demo", "ghost doesn't reset when crossing the startline
again" (this conflicts with racemod however, where the time isn't reset on crossing the start tiles again. This should be removed in
DDRace.), "ghost sometimes doesn't save"  (this was because of kill tiles right next to finish tiles, and it just wasn't quick enough when
going through them fast), "demos contain a lot of garbage before the actual run (prior attempts)" ghosts and racedemos should now work 100%
2011-02-16 10:39:26 +02:00
GreYFoXGTi 335a8f69c2 Morning Cleanup 2011-02-16 10:21:23 +02:00
GreYFoXGTi 2fd0ff1b85 Added Show IDs
and altered last commit
2011-02-15 03:14:32 +02:00
XXLTomate f0201597c6 DDRace Settings-tab
Checkbox for DDRace Scoreboard
2011-02-15 02:36:22 +02:00
Sebastian Wojtowicz 6963a233a4 Added a new command /last5times (for sql scores only)
Added index to name in race sql table, so search is faster
2011-02-15 02:27:20 +02:00
Sebastian Wojtowicz 60de0da1c3 Added timestamp into MySQL ranking, and function to have ago time web2.0 like printed on asking for /rank 2011-02-15 02:27:19 +02:00
GreYFoXGTi 604ae5286f Several Fixes and some more on the way 2011-02-14 23:34:46 +02:00
GreYFoXGTi d68e853ca7 StickyTeams, TeamStrict Logic and fixed some team bugs 2011-02-14 20:44:02 +02:00
GreYFoXGTi 29c9bf531d Fixed merge errors 2011-02-14 09:43:44 +02:00
GreYFoXGTi 40a218b5ee Fixed Braces in /yes and /no 2011-02-13 22:21:17 +02:00
Romain Labolle 806a1babc1 Mute may not affect chat commands (like /pause) 2011-02-13 19:48:54 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy 09cd38d320 cleaned up skin initialisation 2011-02-13 13:58:59 +01:00
oy 3c7adc6a7f fixed nethash 2011-02-13 13:06:19 +01:00
GreYFoXGTi 0ec755ee74 Reverted In-accurate naming 2011-02-13 12:58:04 +01:00
GreYFoXGTi 68a1a29db8 Reverted 1 Letter Refactoring or Edited it to a full name. 2011-02-13 12:57:10 +01:00
Choupom 7bfbe24a1c added flag return message on death tile collision 2011-02-13 12:24:19 +01:00
GreYFoXGTi cd574d10a7 Added sv_vote_majority, 1 like vanilla, 0 Consider number of yes against Number of Yes + No 2011-02-12 22:31:42 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
Carmine e45ad2a085 only a simple wrong name 2011-02-12 19:30:56 +01:00
oy d12db45c48 added editor function to construct different game tiles from a layer. Closes #460 2011-02-12 19:10:45 +01:00
GreYFoXGTi 21816e5bbf Checked and updated Ghost and Autorecord from Racemod updates, by Redix and Sushi Tee
Old Ghosts are no longer compatible
2011-02-11 08:01:10 +02:00
oy c2ad73cfe8 fixed negative download speed. Closes #473 2011-02-10 12:38:20 +01:00
oy 0c119ba99b fixed possible problem with localisations if the linereader flushes its memory between reading the origin and the replacement string 2011-02-10 12:07:00 +01:00
oy 3f05289328 fixed a possible problem with occupied spawn points and cleaned up spawn code a bit 2011-02-10 12:05:55 +01:00
GreYFoXGTi cf881cb74c Fixed Switch layer tiles loading 2011-02-10 09:00:56 +02:00
GreYFoXGTi a7c512bd82 oops forgot those braces 2011-02-10 04:47:11 +02:00
GreYFoXGTi beec56aee0 prevented a useless SendchatTarget
added some missing code
2011-02-10 02:50:18 +02:00
GreYFoXGTi 127abaeed9 Added checks for normal stoppers
All stopper Bugs are now fixed
Removed elses, it's not like the return is gonna let it go to the next if
2011-02-10 02:24:10 +02:00
GreYFoXGTi 870fd3b246 Readability and performance Improvement 2011-02-10 02:08:13 +02:00
GreYFoXGTi c1ebccd8a2 Fixed infinite Loop
Don't tell Oy to add this, he will just say we don't support mods
2011-02-09 01:03:42 +02:00
GreYFoXGTi c735384b52 If you Edit the Source Don't use the game mode DDRace 2011-02-08 18:35:48 +02:00
GreYFoXGTi 55c368b679 Formatting
Raised version for statistical analysis
2011-02-08 14:52:23 +02:00
GreYFoXGTi ae06076d10 Mute By Fisted 2011-02-08 14:44:59 +02:00
GreYFoXGTi e5bff28375 Fixed a Stopper bug
1 still remains
2011-02-07 04:22:13 +02:00
GreYFoXGTi 6c3698469b Fixed some bugs
fixed a mistake
Official Noobness
2011-02-06 20:38:24 +02:00
GreYFoXGTi acea19e9b5 Console::PrintResponse instead of SendChatTarget
Thanks Julian->Assange for pointing it out
2011-02-05 06:56:21 +02:00
GreYFoXGTi 89889fa1d1 Fixed double jump sound
how did i miss this!
2011-02-05 06:33:11 +02:00
GreYFoXGTi ec7c64ac0b Fixed some warnings 2011-02-05 06:23:56 +02:00
GreYFoXGTi f901fc65fa Removed DeepFreeze Messages
Removed some curl brackets
2011-02-05 06:18:32 +02:00
GreYFoXGTi 4ca79188dc DDRace Flags Finalized 2011-02-05 06:13:32 +02:00
GreYFoXGTi 693ad89c00 DeepFreeze = EMOTE_PAIN, freeze stays EMOTE_BLINK (eyes closed) 2011-02-05 04:28:05 +02:00
GreYFoXGTi 2c36457b94 Fixed warnings 2011-02-05 03:33:53 +02:00
GreYFoXGTi 24a688b2c3 Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother 2011-02-04 22:15:02 +02:00
GreYFoXGTi 3da1860654 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
2011-02-04 18:54:54 +02:00
GreYFoXGTi 30f010593c Teams with leaders
this maybe buggy but i will fix the bugs when they are reported
2011-02-04 18:49:37 +02:00
GreYFoXGTi ff839af9ba Fixed a collision error 2011-02-04 18:49:36 +02:00
fisted addbf8e3d6 automatic mute on spam 2011-02-03 14:39:00 +01:00
fisted 00f47c18c4 player muting by ip 2011-02-03 13:02:32 +01:00
GreYFoXGTi 984d10970e Localization and Cooler Browser Filter 2011-01-31 00:30:53 +02:00
GreYFoXGTi 9d98ce7e72 Version 1.03a 2011-01-30 23:51:14 +02:00
GreYFoXGTi 0aa3e8f546 Forgot to do this with the other DDRace Flags 2011-01-30 21:11:32 +02:00
GreYFoXGTi 3223a9d4c5 Few Improvements 2011-01-30 20:07:02 +02:00
GreYFoXGTi 82d01c6166 Added Extra checks for m_pDoor and a new function TileExists(int) 2011-01-30 19:03:22 +02:00
GreYFoXGTi f1b002e7fa DDRace flags for the server browser (client-sided).
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
2011-01-30 18:21:41 +02:00
GreYFoXGTi 5961edf6ce Better Performance, Fixed a mistake and added check for next tiles (Left, Right, Bottom and Above). 2011-01-30 01:58:47 +02:00
oy be68a4f516 added fix by CarmineZ about missing tool tips in the editor 2011-01-29 18:48:55 +01:00
GreYFoXGTi 57c8739bb9 Show join a team message without spam 2011-01-29 16:31:50 +02:00
GreYFoXGTi 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +02:00
GreYFoXGTi e16bd4d000 Mac Compilation
This may appear un-important, but it's important for mac compilation!
2011-01-29 02:53:33 +02:00
GreYFoXGTi b2e96bf9eb formatting and refactoring 2011-01-26 23:09:54 +02:00
DemonulPierdut/-/Julian /[Assange/] c98be07e2a fixed my spam team thing :P 2011-01-26 23:03:38 +02:00
GreYFoXGTi b59e130037 DeathMask 2011-01-26 23:03:20 +02:00
GreYFoXGTi 4e32aee417 Commented some dbg_msgs
may need them in the future
2011-01-26 22:59:55 +02:00
GreYFoXGTi 3356455007 Fixed double hook sounds 2011-01-26 22:57:23 +02:00
heinrich5991 dc8ec160e5 removed the usage of std::string in scoreboard 2011-01-26 20:54:19 +01:00
SushiTee d7057ef9e1 fixed server compiling in mac (sql is not working though) 2011-01-26 14:45:44 +02:00
SushiTee c0b905f852 -fixed compiler warnings
-fixed mac compiling
2011-01-26 14:45:44 +02:00
GreYFoXGTi 5b51295185 Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches
fixed the freeze command

Added Freeze Tile to switch layer to set freeze tile custom delay

Added sv_freeze_delay to control default freeze time delay
2011-01-25 12:05:53 +02:00
GreYFoXGTi 4e36d2f069 Merge branch 'greyfox' of https://github.com/JulianAssange/DDRaceExtra 2011-01-24 21:25:17 +02:00
GreYFoXGTi f1a8b6b7ad Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
2011-01-24 14:06:55 +02:00
DemonulPierdut/-/Julian /[Assange/] 2f45abdc40 fixed the sv_team 1 message.. lol it never told u too join a team :D 2011-01-24 22:36:05 +11:00
DemonulPierdut/-/Julian /[Assange/] 8ff2b1a95f for some reason hooking wasnt masked propley. 2011-01-24 06:23:04 +11:00
DemonulPierdut/-/Julian /[Assange/] 422b6c7c0d added more team mask's.. The sounds were fucking annoying lol 2011-01-24 05:56:20 +11:00
oy fa2cd82335 clamp maximum ping value in the server browser filters 2011-01-23 18:04:31 +01:00
oy 83fc81092f fixed position of the hammer damage effect. Closes #448 2011-01-23 17:58:28 +01:00
oy 3727deee43 increased mouse scroll value from 1 to 3 in the other listboxes too 2011-01-23 17:54:19 +01:00
Carmine 0c43e6f906 increase scroll value in the server list broswer, from 1 to 3 2011-01-23 17:53:58 +01:00
heinrich5991 43b67aaa57 added server command to clear the votes. this fixes #47 partially 2011-01-23 17:53:53 +01:00
GreYFoXGTi e0bb8731a7 minor changes 2011-01-21 19:59:52 +02:00
GreYFoXGTi 0a08e1ca06 blocked voting invalid votes, by Floff aka LemonFace 2011-01-21 15:40:39 +02:00
GreYFoXGTi 1f302ea22a Made doors check for Collision or NoLaser
* Renamed a Function
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2011-01-21 15:18:50 +02:00
GreYFoXGTi 1276bebfe1 Fixed Speedup Tiles ( made them skip-able ) 2011-01-21 11:53:58 +02:00
GreYFoXGTi 109cbd4e28 The DDRace scoreboard is now for all Race types 2011-01-21 10:07:32 +02:00
GreYFoXGTi a1fc979867 fixed grammar mistake, thanks fisted 2011-01-20 22:30:22 +02:00
Floff Floffsson 8c32c01653 added unmute + some minor fix 2011-01-20 22:27:54 +02:00
GreYFoXGTi 9891ab8a10 Added timer to reduce join-spam when loading a new map by Floff aka LemonFace
removed an extra line
2011-01-20 22:25:09 +02:00
GreYFoXGTi 7d6c546fcb DDRace entities no longer uses NETOBJTYPE but instead CGameWorld::ENTTYPE 2011-01-20 22:01:21 +02:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
2011-01-20 16:10:32 +02:00
oy 7c67a1334c fixed a typo 2011-01-20 01:35:21 +01:00
fisted 372b62566b fixed tower bug 2011-01-20 00:15:18 +01:00
oy 1701241636 added hammerhit simplification by fisted. Closes #443 2011-01-19 22:41:44 +01:00
oy 9a9c10b1a3 added a missing close handle 2011-01-19 22:14:40 +01:00
oy 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
oy 1359db5476 prevent that removing an entity aborts traversing the entity list in gameworld 2011-01-19 15:31:42 +01:00
oy 68faba809c made dbg dummies work again 2011-01-18 19:09:53 +01:00
oy da84771345 removed some old checks 2011-01-18 18:53:19 +01:00
oy 0b14286c7f skip spectators in dm hud 2011-01-18 17:56:09 +01:00
oy 3b3ca9cd67 rearranged the goals within the scoreboard a bit 2011-01-17 16:31:24 +01:00
oy 99e9d4910a fixed that team mates are regarded when evaluating the spawn position. Closes #426 2011-01-17 15:55:23 +01:00
Floff Floffsson 2edeeadce0 Team messages fixed 2011-01-17 14:59:28 +01:00
Floff Floffsson 3e530ac02d SetClientAuthed() moved 2011-01-17 14:59:12 +01:00
oy 02db5bfe66 decreased the height of the scoreboard a bit. Closes #417 2011-01-17 13:55:14 +01:00
oy 99c6b87c1a hide broadcast when motd is active. Closes #420 2011-01-17 13:46:59 +01:00
oy 813f0797d8 fixed scoreboard active check. Closes #423 2011-01-17 13:42:40 +01:00
oy bf6fcc20f4 added an error popup on startup when the sound couldn't be initialised. Closes #425 2011-01-17 13:28:15 +01:00
oy 40f6740742 fixed few spelling mistakes and disabled an unused command 2011-01-17 12:56:49 +01:00
oy 216967c3bf release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +01:00
Floff Floffsson 645f31141d deepfreeze tiles 2011-01-17 00:38:24 +02:00
GreYFoXGTi 9c66a2d54c Endless Hook Tile for ingameplay by Floff aka LemonFace 2011-01-17 00:13:21 +02:00
GreYFoXGTi b502e6fd28 Fixed warnings and some white spaces 2011-01-12 11:10:57 +02:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
2011-01-12 11:08:17 +02:00