Commit graph

1962 commits

Author SHA1 Message Date
def 56fbd92be9 number check 2014-11-16 21:51:36 +01:00
def eba1fb5b8b Fix wait time on windows (Thanks to Tobii) 2014-11-15 18:14:24 +01:00
def 36a9c00aed Make sound more exact 2014-11-15 00:13:20 +01:00
def 808f889c00 Improve server wakeup timing 2014-11-11 13:00:02 +01:00
def 4e9b6ea336 Ugly fix for client (TODO: improve) 2014-11-10 00:17:31 +01:00
def aede6df2ca Cache get_time calls 2014-11-10 00:08:50 +01:00
def bc9d632103 Clean up whitespace detection a bit and add BRAILLE PATTERN BLANK (U+2800) 2014-11-08 20:14:12 +01:00
def c9ceef7523 Add workaround for FlashWindowEx on mingw with old winapi32 2014-11-05 01:46:40 +01:00
def 627d6386ee Revert "Revert "Revert "Add antiping for weapons (by nuborn)"""
This reverts commit 8f7e24b4db.
2014-11-02 10:59:22 +01:00
def 36375b67e2 Revert "update the version number required for extra antiping features"
This reverts commit 80dbdc3d5b.
2014-11-02 10:58:58 +01:00
def fb0ca67adb Revert "Fix version for antiping projectile"
This reverts commit e651124d59.
2014-11-02 10:58:34 +01:00
def d3797289c1 Revert "improve antiping for weapons (particularly in vanilla) by taking into account more of the info already available to the client"
This reverts commit 56036dcd7b.
2014-11-02 10:58:21 +01:00
def 11583ed434 Allow 256 voices 2014-10-30 00:14:16 +01:00
BeaR f5fa00cfb7 Prevent integer overflow (fixes segfault in the soundengine) 2014-10-29 22:45:48 +01:00
def 0da475ea65 Fixes #91 2014-10-29 19:53:51 +01:00
def e97fa68627 Antiping for Weapons should work with 6.0 as well 2014-10-29 10:50:04 +01:00
Dennis Felsing 346d7a04f3 Merge pull request #90 from trml/improve_antipingweapons
Small improvements to antiping for weapons
2014-10-29 00:34:45 +01:00
def ec55a87972 Fix opus map sound crash 2014-10-28 22:42:31 +01:00
def 2a44f0cc0f Merge branch 'Sound' into DDRace64
Conflicts:
	bam.lua
	other/opus/include/ogg/ogg.h
	other/opus/include/opus/opus.h
	other/opus/include/opus/opus_custom.h
	other/opus/include/opus/opus_defines.h
	other/opus/include/opus/opus_multistream.h
	other/opus/include/opus/opus_types.h
	other/opus/include/opusfile.h
	src/engine/client/sound.cpp
2014-10-28 22:08:59 +01:00
nuborn 56036dcd7b improve antiping for weapons (particularly in vanilla) by taking into account more of the info already available to the client 2014-10-28 21:13:55 +01:00
def e651124d59 Fix version for antiping projectile 2014-10-28 20:07:51 +01:00
nuborn 80dbdc3d5b update the version number required for extra antiping features 2014-10-28 18:30:15 +01:00
nuborn 8f7e24b4db Revert "Revert "Add antiping for weapons (by nuborn)""
This reverts commit 755e9f4d1c.
2014-10-28 15:50:28 +01:00
BeaR 5562fac602 Add opus as external library (windows only) 2014-10-28 14:38:50 +01:00
BeaR 49373ee412 Fix opus sound loading 2014-10-28 14:01:21 +01:00
def e283e10685 A bit better, but still buggy 2014-10-28 12:22:49 +01:00
def 9b3ca0d8a1 Something that sounds a bit more like music (NumFrames wrong or op_read wrong?) 2014-10-28 10:27:00 +01:00
def 7d7b78938e Fix opus compilation 2014-10-28 09:51:15 +01:00
def f1cca50695 Fix Mac OSX compilation 2014-10-28 02:25:45 +01:00
def 3730e19b5c Fix Android compilation 2014-10-28 02:01:51 +01:00
def 24881449b3 Revert "Add OGG"
This reverts commit 28d276cd7e.
2014-10-28 01:34:15 +01:00
def 3b1d23f42c Revert "Add Opus"
This reverts commit a7dafa40c7.
2014-10-28 01:34:09 +01:00
def ca52f841b0 Revert "Add opusfile"
This reverts commit 827699263c.
2014-10-28 01:34:03 +01:00
def 0b1de66bdf Revert "Some work on Opus map sounds (not working yet)"
This reverts commit 26260181bd.
2014-10-28 01:33:58 +01:00
def f4231100a7 Make triangle quad rendering optional, as it seems to cause performance problems 2014-10-28 01:12:11 +01:00
def eaaa29f5f6 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-10-27 20:03:50 +01:00
def 755e9f4d1c Revert "Add antiping for weapons (by nuborn)"
This reverts commit 48e66a2ab3.

Conflicts:
	src/game/client/gameclient.cpp
	src/game/version.h
2014-10-27 20:03:22 +01:00
def 26260181bd Some work on Opus map sounds (not working yet) 2014-10-27 16:23:53 +01:00
def 827699263c Add opusfile 2014-10-27 09:25:24 +01:00
def a7dafa40c7 Add Opus 2014-10-27 09:22:52 +01:00
def 28d276cd7e Add OGG 2014-10-27 09:05:49 +01:00
def 5fd50e0b46 Fix warning at client start 2014-10-27 09:05:22 +01:00
def 9453b80e66 Forgotten 2014-10-26 02:57:03 +02:00
def 0f257bf553 Add delay (of 1 minute by default) to loading savegames 2014-10-26 02:39:12 +02:00
def 59fccf18f0 Add window highlight on Linux (fixes #65) 2014-10-26 02:25:36 +02:00
def 35f8b7a6dd Add option for disabling gun sounds 2014-10-26 01:00:30 +02:00
def 34c39b43f0 Cleanup 2014-10-25 02:53:26 +02:00
def 8d230306d8 Fix sound enabling and disabling (fixes #82) 2014-10-25 02:52:08 +02:00
def 699fb60532 Fix: Mapping sounds in editor works even when the sound system is disabled 2014-10-25 01:23:39 +02:00
def 12102a14a6 Fix sound and image loading 2014-10-24 23:03:16 +02:00
def 48e66a2ab3 Add antiping for weapons (by nuborn) 2014-10-23 17:31:29 +02:00
def f8f8f0613e Rename "Ambient" to "Map Sound" 2014-10-23 15:53:23 +02:00
BeaR 78aa7c51be Prevent modulo 0 2014-10-23 12:04:46 +02:00
BeaR 2b1272ed69 Work on nicer audio timing 2014-10-18 18:41:59 +02:00
BeaR ef3b801999 Add volume slider for map sounds 2014-10-18 18:41:57 +02:00
BeaR e211c7a2b2 Ingame sound pos envelope support 2014-10-18 18:41:55 +02:00
BeaR 8addf25b24 Add support to modulate voice volume and falloff distance 2014-10-18 18:41:54 +02:00
BeaR 774be5561e Fix crash when loading sound files threaded (double io_close) 2014-10-18 18:41:54 +02:00
BeaR b5d0034674 Add embedded sound support 2014-10-18 18:41:53 +02:00
BeaR 96a6d6d85b Take sample duration into account when enqueuing sound sources 2014-10-18 18:41:53 +02:00
BeaR 16084d93cf Working on correctly replay sounds 2014-10-18 18:41:52 +02:00
BeaR 2f837a4c44 Notify player on chat highlight (windows only) 2014-10-18 16:17:36 +02:00
def 082ecfe691 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-10-16 17:42:38 +02:00
def 1144ba77c6 Split up demo recording into 3 separate recorders 2014-10-16 17:42:13 +02:00
BeaR 944218ca9f Render quads as triangle fans 2014-10-15 15:44:29 +02:00
def 607a27718e Revert "Removed InputData Array"
This reverts commit 83f6fc70fa.
2014-10-12 17:52:53 +02:00
Tomew 83f6fc70fa Removed InputData Array 2014-10-12 17:19:09 +02:00
def 3ff6b951c1 Configurable messages 2014-10-12 12:51:54 +02:00
def fda12b88bf Make sv_client_suggestion optional 2014-10-12 11:35:36 +02:00
def 32fedf3518 Automatically rcon-authenticate dummy on connection if player is authenticated already 2014-10-01 12:41:10 +02:00
def bc916da43c Print client version in status 2014-09-30 13:21:44 +02:00
def 932fb826c7 Add cl_zoom_background_layers (set to 0 to keep background nice when zoomed out) 2014-09-29 21:13:35 +02:00
def c54cf2e7ba Cleanup 2014-09-26 02:41:25 +02:00
def c78cea9046 Add sv_demo_chat (0 by default to disable recording chat) 2014-09-26 02:40:58 +02:00
def b4f77c4b71 Add sv_player_demo_record (mostly from Teerace) 2014-09-26 02:05:31 +02:00
def 1bee3af878 Print broadcasts by default 2014-09-23 19:34:43 +02:00
def a32e9272eb Restore Law & Order 2014-09-23 19:06:25 +02:00
Dennis Felsing 8abc15f48d Merge pull request #47 from Laxa/upstream
Add cl_output_broadcast + add button for it + fix multi-line display.
2014-09-23 18:55:13 +02:00
def d38bf7f83a typo 2014-09-23 17:33:33 +02:00
laxa 36153fc7fd Add conf variable for broadcast ouput; made broadcast output works with multiple lines 2014-09-23 10:37:44 +02:00
Dennis Felsing 028d6b98f4 Merge pull request #43 from Laxa/upstream
Added cl_reset_wanted_weapon_on_death
2014-09-21 15:05:52 +02:00
laxa 718e45d84d Added cl_reset_wanted_weapon_on_death 2014-09-21 14:11:27 +02:00
def bde8c33c20 Hopefully real fix now 2014-09-20 21:44:43 +02:00
def 572b4f91bd Fix serverbrowser for more than 24 players again 2014-09-20 21:14:19 +02:00
def 36b33d6138 Fix: Prevent animated server names and fake 0 pings in serverbrowser 2014-09-20 15:48:30 +02:00
def 7035bf87fd Refresh DDNet tab when a new serverlist was received 2014-09-20 15:35:01 +02:00
def d2ef256f06 Final compilation fix for Windows 2014-09-20 14:42:12 +02:00
def 4a703576ab Revert "Now Windows compiling (by Tobii)"
This reverts commit 5b4878d0d4.
2014-09-20 14:41:38 +02:00
def 5b4878d0d4 Now Windows compiling (by Tobii) 2014-09-20 14:30:18 +02:00
def 3b3955632c Hopefully fix Windows compile 2014-09-20 14:20:43 +02:00
def d6aea5ba40 Prepare DDNet gametype name 2014-09-20 13:48:59 +02:00
east c4fc429e99 small cleanup 2014-09-20 11:47:51 +02:00
east 603727232a ddnet server list zlib compression added 2014-09-20 11:36:46 +02:00
east cda02a3d9a versionsrv serverlist download added 2014-09-20 00:36:22 +02:00
east 202d5d8866 Filter flag grid added 2014-09-19 23:52:09 +02:00
east 9db12d455d working on CDDNetCountry 2014-09-18 16:13:06 +02:00
east 6ab9279211 json related updates 2014-09-18 16:11:22 +02:00
east d161005658 json parser added 2014-09-18 14:40:29 +02:00
east c2b7482546 Merge remote-tracking branch 'def/DDRace64' into ddsrvs 2014-09-18 14:14:25 +02:00
Tobias Urlaub 45823466ec Fix: Rcon spoofing protection bans clients after password change 2014-09-16 21:14:31 +02:00
east e732008157 DDNet serverlist added 2014-09-13 16:36:25 +02:00
def a36358190b Mac OS X compilation 2014-09-11 21:38:23 +02:00
def efeb2b9417 Minor fix 2014-09-11 21:38:13 +02:00
def 5b72302672 Instead of banning players for reconnecting too often, make them wait 3 seconds (fixes #27) 2014-09-09 23:27:28 +02:00
def 49682f4a8d Threaded logger output 2014-09-09 23:02:05 +02:00
def d44e6088bb console output cleanup 2014-09-09 22:23:56 +02:00
def 54497647b4 Minor console output cleanup 2014-09-06 23:22:35 +02:00
def 0da1ba238c Add cl_cpu_throttle_inactive 2014-09-06 01:42:59 +02:00
def 4133e642f8 Remove Damage Indications when entering game (fixes #29) 2014-09-03 14:17:44 +02:00
def f66febb009 Revert "Only connect dummy when we're fully connected to the server"
This reverts commit 96502a2d88.
2014-09-03 13:58:06 +02:00
def 96502a2d88 Only connect dummy when we're fully connected to the server 2014-09-01 17:36:10 +02:00
def f1288127a3 Don't crash on broken demo files 2014-08-31 03:13:42 +02:00
def 9f4ac93d90 fifoconsole cleanup 2014-08-29 19:42:34 +02:00
timgame 6784045da0 Merge branch 'DDRace64' of https://github.com/def-/ddnet into DDRace64 2014-08-29 17:05:26 +02:00
timgame 7929d9a0c8 added client fifo 2014-08-29 16:52:08 +02:00
def 2df6034b44 By default don't show demo speed 2014-08-29 16:13:13 +02:00
def c653a09f82 Use settings_ddnet.cfg instead of settings.cfg 2014-08-26 22:25:22 +02:00
def b2f8f272db Only use rcon spoofing protection on ddnet servers as it's buggy on others 2014-08-26 22:10:22 +02:00
def c6b63c34ba Don't show quit popup on update 2014-08-26 22:06:35 +02:00
def dff02ab916 Record server name into sql table record_race 2014-08-26 03:46:24 +02:00
def f55e82c939 Default kill protection value 2014-08-25 00:20:07 +02:00
def d51328f7d7 Kill protection cleanup 2014-08-25 00:18:51 +02:00
savander 1577201364 Kill protection 2014-08-24 23:24:33 +02:00
Dennis Felsing 25bbecc0c9 Merge pull request #10 from east/demoslice
Extended demo player features
2014-08-23 18:36:20 +02:00
east 070ebe2895 merge fixed 2014-08-23 17:57:32 +02:00
east 8624d0a747 DemoPlayer: Save dialog added 2014-08-23 17:48:04 +02:00
def 803745fee1 Fix: Working 64 player server info in LAN tab (by Savander) 2014-08-22 19:59:38 +02:00
def 2cff296c25 Protect from IP spoofing of rcon commands 2014-08-22 13:54:13 +02:00
east bb8076a3ba DemoPlayer: Additional speed meter added 2014-08-22 10:00:48 +02:00
def bdd8e77d46 also show all players for 32 player serves in serverbrowser 2014-08-21 13:57:21 +02:00
def c9d70ed81b Try to fix crash related to bad connection and reconnecting 2014-08-18 23:50:24 +02:00
def 0916d8aba5 Fix timeout code stuff 2014-08-17 19:19:40 +02:00
def c97a412913 Timeout code for dummy, timeout code working on solo servers 2014-08-17 19:10:08 +02:00
def 5b058b9941 Disable joystick on non-android by default 2014-08-17 16:33:43 +02:00
Dennis Felsing 8d7eef1916 Merge pull request #7 from feca1997/patch-1
Y should be U
2014-08-17 05:07:49 +02:00
def f1e4700ae8 Add a timeout protection message 2014-08-17 05:04:37 +02:00
def ce0eb1a2c2 try fix 2014-08-17 04:20:36 +02:00
Kálmán Ferenc acd0dc2ae3 Y should be U 2014-08-16 16:50:01 +02:00
def 91bafa82e8 oops 2014-08-16 15:51:25 +02:00
def a3523a1fde fix some timeout situation setting (thanks east) 2014-08-16 15:49:45 +02:00
def 2bdc6a1f4d Some more tries to fix timeout stuff 2014-08-16 15:43:49 +02:00
def 07aa08703d Remove (probably buggy) implicit timeout protection 2014-08-16 14:43:22 +02:00
def 23f67b5afe Really disconnect dummy on map change 2014-08-16 12:55:37 +02:00
def 1c4fac8afd Display map name while downloading 2014-08-16 01:06:17 +02:00
def a2195cebb0 oops 2014-08-15 17:49:49 +02:00
def 07862b84c0 Fix: reset timeout situation 2014-08-15 17:47:38 +02:00
def efd76d18c2 fix 2014-08-15 14:32:29 +02:00
def 7654438033 Add sv_shutdown_when_empty 2014-08-15 14:32:21 +02:00
def b797978f5f Fix: Exclude dummies from spoof protection 2014-08-15 13:21:39 +02:00
east f1ee4aa48c CDemoEditor: slice begin/end markers added 2014-08-13 17:32:03 +02:00
east 65b2426349 CDemoEditor: added new buttons to demo player 2014-08-13 16:35:15 +02:00
def c493ef4408 imports 2014-08-13 13:00:18 +02:00
def 83cb1cdaea Initialize random number earlier 2014-08-13 12:58:53 +02:00
def 5436e45e2f Use another connection (with a truly random port) to request connection infos 2014-08-13 12:03:53 +02:00
def bf5fdadcd6 Add Spoof protection (by someone) 2014-08-13 02:00:45 +02:00
east 64810cf11c worked on CDemoEditor 2014-08-12 16:21:06 +02:00
def e90d84b89f Fix the wrong "Timeout Protection over" error 2014-08-11 22:22:01 +02:00
def ee6fcdf876 Automatic timeout protect message in client 2014-08-09 19:17:21 +02:00
def 85b7475ae4 remove debug output 2014-08-09 18:13:21 +02:00
def a39c46ea1d Only extend timeout when code was entered 2014-08-09 18:08:00 +02:00
def f04537dee5 Working great 2014-08-09 17:53:24 +02:00
def f859f350ca Kind of working with timeout code 2014-08-09 17:25:29 +02:00
def 459c25c656 Some renames 2014-08-09 16:30:12 +02:00
def a8a247116d Only on real timeouts 2014-08-09 15:37:10 +02:00
def 4af575654b Kind of working 2014-08-09 14:50:51 +02:00
def 127dc1c196 Try timeout 2014-07-28 20:44:17 +02:00
def 145f0434f5 Add /save by the glorious HMH 2014-07-26 14:46:31 +02:00
def b1da901028 Fix: Only allow dummy reconnect every 5 seconds 2014-07-25 02:43:01 +02:00
def f2139dae94 For blocker servers disable rejoin to team 0 after finish 2014-07-19 17:11:00 +02:00
def 53346dddfc Try to fix the movement on dummy connect 2014-07-16 14:45:53 +02:00
def 2bf417b41f Add setting for disconnect confirmation 2014-07-10 16:50:59 +02:00
def bbe597ef04 Add cl_dummy_resetonswitch 2014-07-08 01:41:45 +02:00
CookieMichal 5d8386b286 Colors of messages and laser.
Added:
 * Settings tab (HUD)
 * Posibility to change color of:
  - Team messages
  - System messages
  - Highlighted messages
  - Normal messages
  - Laser (inner and outline)
 * Some commands

Changed:
 * Moved some settings from DDNet to HUD
2014-07-07 15:47:11 +02:00
CookieMichal e236758118 Fixed compilator warnings 2014-07-07 15:42:46 +02:00
def 11e67f95e3 inp_grab 1 on osx by default 2014-06-28 21:51:04 +02:00
def e6bcb528cd Cleanup 2014-06-27 10:13:57 +02:00
CookieMichal b9943706b3 Added:
* Second DDNet settings page with some settings
 * Auto reconnect feature
 * In-game commands:
  - reconnect_ban
  - reconnect_ban_timeout
  - reconnect_full
  - reconnect_full_timeout
Changed:
 * Disconnected popup
 * Name for first DDNet settings page

Signed-off-by: CookieMichal <MrCookieMichal@gmail.com>
2014-06-27 00:28:57 +02:00
def 13f0a455e1 Unneded include 2014-06-22 02:41:46 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def 26dbb86d0b Fix: Save news in teeworlds settings directory 2014-06-05 15:19:26 +02:00
def c67742f60a Add news 2014-06-05 12:11:41 +02:00
def 458331597e Fix: Dummy can see 64 players on non-ddnet servers 2014-06-04 23:19:05 +02:00
def 726cf67348 Add sv_rank_cheats 2014-05-25 10:55:33 +02:00
def af12bd92ec Bring back old cl_showothers 2014-05-25 00:59:52 +02:00
def 5bb64c00d7 Higher timeout possible 2014-05-24 21:42:34 +02:00
def bf38e947a8 Fix: Dummy connect and disconnect (Thanks to Kati) 2014-05-24 21:34:06 +02:00
def 7dc7165157 Seems like 64 player rerequests are bad for switching between Internet
and LAN
2014-05-22 17:02:58 +02:00
def e8e6b71db4 Add variable sv_vote_time 2014-05-19 02:23:01 +02:00
def 6004442df5 Higher client timeout 2014-05-18 20:52:40 +02:00
def e85d594f81 Other teams alpha settable 2014-05-17 23:00:52 +02:00
def bede303976 Fix: Dummy connect 2014-05-17 21:37:55 +02:00
def f0ed57a9a3 Fix: Dummy can connect without port 2014-05-17 20:00:01 +02:00
def 2db6673a46 Reset dummy connect time to fix dummy connect on new server 2014-05-17 19:06:33 +02:00
def 2c1dc335cc Only consider dummy connected when 2 snapshots were received 2014-05-17 18:57:46 +02:00
def 4b8a52d7c9 Fix: Rerequest 64 player infos 2014-05-17 16:15:01 +02:00
def 73103df309 Make autoupdater only run when ddnet servers can be reached 2014-05-17 15:42:32 +02:00
def 42811dc896 Autoupdater asks for permission to update + Autoupdater fixes 2014-05-17 14:28:50 +02:00
def 46fb8c8b7f Readd old graphics code for old computers 2014-05-16 01:01:30 +02:00
def 66db170279 Some defaults 2014-05-15 23:26:33 +02:00
def b0dc35080e Fix: Only allow dummy connect every 5 seconds (Thanks Monsta) 2014-05-13 20:26:59 +02:00
def b3fa81ab72 Fix compilation 2014-05-12 23:57:42 +02:00
def 32782a9629 Some more sane defaults 2014-05-12 23:52:15 +02:00
def 04c30739c5 cl_show_direction off by default 2014-05-11 21:12:55 +02:00
def 6cdca20e4d Fix last 2014-05-10 20:58:29 +02:00
def 102997a989 Only allow dummy connect when we're connected to server 2014-05-10 20:40:54 +02:00
def c0be97b8c3 No more crashing on map change with dummy 2014-05-10 20:25:29 +02:00
def 25cfa741e5 Fix: Stop the random shootings at dummy switch 2014-05-10 20:23:26 +02:00
def 96068e0149 Fix random dummy jumps at switch (for the 100th time) 2014-05-10 18:20:03 +02:00
def 5b1c866b35 Feature: Separate inputs for dummy and player 2014-05-10 14:31:00 +02:00
def 0d5790b8cd No more Connection Problems on dummy connect 2014-05-09 16:46:04 +02:00
def 07658af221 Set gfx_finish to 0 by default (1 seems to make more problems than it solves) 2014-05-08 15:51:39 +02:00
def d2623bbb05 Fix potential crash with dummy 2014-05-08 14:58:42 +02:00
def 98c9fe33bf Fix: Dummy shouldn't hammer on switch (except after hammerfly, which is harder to fix) 2014-05-07 15:24:53 +02:00
def 9ae6ce7097 Fix: You still receive whispers and team messages for dummy 2014-05-07 03:34:21 +02:00
def a79b6079fa Add cl_old_gun_position 2014-05-06 16:25:00 +02:00
def 239fdce024 Fix: Always start dummy hammer immediately 2014-05-05 04:56:37 +02:00
def b6e319f1c5 Fix dummy switching (hopefully crashes as well) 2014-05-04 23:29:29 +02:00
def 9340b1400f Add team chat sound deactivation 2014-05-04 18:35:37 +02:00
HMH 44a20aca2e use predicted characters for dummy_hammer 2014-05-04 17:32:26 +02:00
def c316c3f5a3 Fix: Better dummy behaviour on switches 2014-05-03 23:28:48 +02:00
def a0eee3f1a7 Fix: No wrong pings in serverbrowser 2014-05-03 20:57:19 +02:00
def d1cb8a8e06 Fix: No more random inputs when you hold dummy switch pressed... 2014-05-03 20:29:31 +02:00
def 820926d836 Store dummy snapshots for better dummy switching 2014-05-03 20:24:45 +02:00
HMH addfe47d4c fix correct dummy-tunings now 2014-05-03 02:44:28 +02:00
def bf6fb6eb0f cl_overlay_entities instead of cl_show_entities 2014-05-01 17:44:35 +02:00
def 873d17ceed Fix: Dummy stop hammering immediately when cl_dummy_hammer is toggled off 2014-04-30 17:51:34 +02:00
def c4118a3878 Fix: Make inputs work 100% when you're in freeze.
This was random before, now these parts are a lot more reasonable
Client-side fix so it works on all servers
2014-04-30 15:21:23 +02:00
def 89777a294b Fix: Dummy starts hammering immediately on switch
This allows perfect hammerfly start timing
2014-04-30 15:15:27 +02:00
def 567e55ca57 Fix dummy delta switching 2014-04-30 13:32:12 +02:00
def 158900cbc1 Fix: Dummy holds keys after freeze 2014-04-29 03:24:40 +02:00
def 83c06cd264 Fix server update 2014-04-28 23:11:15 +02:00
def c85b99fbae Add server updater 2014-04-28 22:47:47 +02:00
def 92ad47b641 Fix: Autoupdater for 64 bit Linux 2014-04-28 22:39:27 +02:00
def 1738ff6010 Cleanup 2014-04-28 22:20:03 +02:00
def 8b816dce44 Fix: Proper weapon for dummy 2014-04-28 22:16:24 +02:00
def 7a5f32f155 Add hammerfly for dummies 2014-04-28 22:12:50 +02:00
def 82abac307a More dummy fixes 2014-04-28 20:43:08 +02:00
def a7862a200f Fix: Map changing with dummy 2014-04-28 19:36:08 +02:00
def 8687fd1317 Less lags on dummy switch 2014-04-28 17:26:31 +02:00
def 4782d34667 Some more dummy fixes 2014-04-28 16:47:44 +02:00
def 9f509eeedb Fix: Dummy setting updates 2014-04-28 15:19:57 +02:00
def 9bf6f3ed6c Fix: Connecting to server names instead of IPs with dummy 2014-04-28 14:12:24 +02:00
def 085fea62b6 More Mac fixes 2014-04-28 01:00:02 +02:00
def d63f44e316 Make compile on Mac 2014-04-28 00:41:19 +02:00
def 215e5dbcab Disable autoupdate on Mac 2014-04-28 00:23:04 +02:00
def 3bbc2c4ef7 Fix dummy issues 2014-04-27 13:44:04 +02:00
def 94c81fd9ab Allow dummy to rcon too 2014-04-27 12:51:02 +02:00
def ed05b601e3 Basic updating (thanks to unsigned char*) 2014-04-27 05:01:25 +02:00
def 7bcc51d488 Basic updating (thanks to unsigned char* 2014-04-27 05:01:03 +02:00
def 5345bb6273 Fix dummy bugs 2014-04-26 21:10:39 +02:00
def 378d613de9 Add tee directions 2014-04-26 21:00:14 +02:00
def 3dce4c9489 Add dummy (Thanks to //toast and Monsta) 2014-04-26 20:29:42 +02:00
def 4b70e195c1 Multiline broadcasts 2014-04-19 00:40:21 +02:00
def 3006d3b03b Cleanup DDNet menu 2014-04-15 22:10:46 +02:00
def 7ae973af0d Make jetpack strength a tuning 2014-04-12 11:12:29 +02:00
def af66d26bd5 Add cl_show_other_hook_coll 2014-04-10 20:33:05 +02:00
def 28cc8f7724 Fix: Show the server you're connected to in the server browser too 2014-04-05 00:07:58 +02:00
def b8775d27c4 Revert "sv_pistol_damage"
This reverts commit a5449c9af0.
2014-04-02 19:55:42 +02:00
def a5449c9af0 sv_pistol_damage 2014-03-31 20:34:54 +02:00
def 2db9e5c7b0 Hopefully fix screenshots 2014-03-29 17:04:06 +01:00
def 5563ae9a7b Make DDRace tile prediction optional 2014-03-28 23:53:12 +01:00
def 92dffdbbcc Add cl_show_ninja 2014-03-28 13:39:30 +01:00
def 4485fecdbd Only stop rendering tune layer text 2014-03-28 12:56:52 +01:00
def e6052ed411 add sv_pause_messages 2014-03-26 14:21:49 +01:00
def c98ad5bf22 Merge branch 'new' into DDRace64
Conflicts:
	src/game/editor/layer_tiles.cpp
2014-03-23 23:18:43 +01:00
HMH d301010a95 Made texture rendering for layers less resourceintensive 2014-03-23 17:10:49 +01:00
def 6ead8f0531 Add sv_vote_max_total 2014-03-22 19:53:43 +01:00
def 17ec1eabda More resonable sound settings 2014-03-22 10:24:10 +01:00
def 61a5d9429d Add cl_unpredicted_shadow 2014-03-21 14:01:14 +01:00
def ffde53a443 Add sv_map_vote to disable /map 2014-03-07 23:58:22 +01:00
def 607e41cdd3 Fix: Always refresh serverlist properly, don't let 64 player packets disrupt us 2014-02-26 02:17:41 +01:00
def 96855e2b95 Fix crash on server change by ignoring snapshots of old server 2014-02-26 01:25:22 +01:00
def 92e0b5fe3c Add fake tunings so that freeze prediction is correct (by HMH) 2014-02-19 21:55:37 +01:00
def 9728245ac6 Bigger buffer to allow more than 1500 skins for Broken (does not seem to impact performance) 2014-02-18 23:53:46 +01:00
def 4429092ca5 Add sv_save_worse_scores 2014-02-18 22:08:43 +01:00
def c6c438fe02 Fix: Only set standard search when starting for the first time 2014-02-15 01:19:07 +01:00
def 24c5dc3c6a Make editor undo optional because of too many bug reports 2014-02-13 22:27:11 +01:00
def 17102bdf09 Still have to keep crashmeplx 2014-02-13 19:53:30 +01:00
def dd17150160 Remove old code so that we work on 128p player servers 2014-02-13 04:39:29 +01:00
def 096caff08c Saner default settings 2014-02-12 18:51:47 +01:00
def 41703cd5b9 Add gfx_backgroundrender to fix crashes on some systems 2014-02-12 12:38:57 +01:00
def 79a99a994c Remove non-threaded graphics as they strongly decrease performance in many cases 2014-02-07 23:33:15 +01:00
def b77f98e3c1 On server updates we can't find out who is using ddnet client, so send extended server info to everyone 2014-02-03 15:21:13 +01:00
def 823a04333a Add /showall 2014-02-02 19:56:10 +01:00
def 48c292b8bf Only render if window is visible 2014-02-02 11:54:34 +01:00
def 3ca4514d21 Fix: Editor, Debug mode always open immediately 2014-01-31 01:41:57 +01:00
def 8d877973ee ShowOthers for regular DDRace client 2014-01-30 17:28:30 +01:00
def b21dc83b1a Compatibility for old servers 2014-01-30 17:15:54 +01:00
def caa1f15d12 Fix possible crashes 2014-01-30 16:54:58 +01:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def e074c52d4b Crude way of preventing crashes with editor undo 2014-01-26 21:50:30 +01:00
def d092b8007d Add editor undo function (by MAP94) 2014-01-19 04:02:01 +01:00
def f5590aecbc Oops 2014-01-16 20:31:00 +01:00
def 601604c55b Ban players for abusing join/leave 2014-01-16 15:11:42 +01:00
def d859f490ce Better performance when CPU throttled 2014-01-15 21:40:28 +01:00
def a563bc136f Allow more br_max_requests 2014-01-15 21:37:16 +01:00
def 948197b598 Only wake up server once every second if noone is connected anyway 2014-01-15 16:52:22 +01:00
def 95431199ba Less CPU for versionsrv 2014-01-15 00:02:19 +01:00
def 31629b15c1 DDNet Version notice 2014-01-14 23:13:17 +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 333efc37b0 Update 64 player server infos 2014-01-14 20:40:29 +01:00
def c90568ce71 Support for 9th mouse key (by Tolsi) 2014-01-14 20:33:18 +01:00
def a0e5c6759d Only sort players on last packet 2014-01-13 23:15:54 +01:00
def d158267e92 Better broadcasting for spectators 2014-01-13 17:00:49 +01:00
def 3d70e203c5 Remove connfilter because of too many false positives 2014-01-12 16:32:06 +01:00
def 188635162e 64 Player Filter Button 2014-01-11 21:38:50 +01:00
def 8af9f9d6a3 Fix: Properly show 64 player servers 2014-01-11 04:08:01 +01:00
def 736891c945 Change serverbrowser request order 2014-01-11 03:53:50 +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 9743b0cb58 Better time/score messages 2014-01-10 16:19:46 +01:00
def 383d1d22f1 Merge branch 'DDRace64' of github.com:def-/teeworlds into DDRace64 2014-01-10 12:56:38 +01:00
def d437c57d26 Fix null pointer 2014-01-10 12:01:13 +01:00
def 7b81946dd6 oops 2014-01-09 21:08:50 +01:00
def 9112f1e526 Fix stupid bug 2014-01-09 21:08:03 +01:00
def ba9a29c704 Fix that sometimes 64 player servers show up as 16 player 2014-01-09 15:40:11 +01:00
def 35ea08915a Don't allow negative offsets 2014-01-08 18:16:52 +01:00
def 488df63f92 Too verbose debugging output 2014-01-08 07:55:26 +01:00
def 8bcd622412 Fix stupid merge 2014-01-08 07:50:58 +01:00
Patrick Rathje 5114570794 Hotfix for Refresh 2014-01-08 07:46:24 +01:00
Patrick Rathje 4c080fe137 Better Refreshing
Conflicts:
	src/engine/client/client.cpp
	src/engine/client/serverbrowser.cpp
	src/engine/client/serverbrowser.h
	src/engine/masterserver.h
	src/engine/shared/masterserver.cpp
2014-01-08 07:46:09 +01:00
Patrick Rathje 020bb16f54 Faster Refreshing
Conflicts:
	src/engine/client/serverbrowser.cpp
2014-01-08 07:42:19 +01:00
def 52e83313c8 64 players in server browse 2014-01-08 06:15:56 +01:00
def e88e0698c7 Name stuff 2014-01-03 03:06:23 +01:00
def 9f3da1e66e Fix: Allow executing multiple commands 2014-01-03 02:25:04 +01:00
def fb520d3ed4 Change server name output 2014-01-01 23:36:53 +01:00
def 863990c1cc Serverinfo 2014-01-01 14:58:39 +01:00
def 1e947dbe52 Fix: Check whether file is actually a FIFO 2014-01-01 14:08:13 +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 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 ec4a83eb1a Fix: Don't change tune parameters 2013-12-23 20:33:01 +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 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
oy 77478707f2 fixed a server crash due to faulty offsets. #1173 2013-12-15 12:30:27 +01:00
def 71e59546aa Longer ban for network stress 2013-11-23 20:19:30 +01:00
def 2b343624d4 Don't drop clients in any case 2013-11-17 02:27:28 +01:00
def 9a1ff10b0a Add button to disable chat 2013-11-14 16:23:15 +01: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 5fa57ed5ab Remove gfx_clear 2013-10-09 17:11:34 +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 e33375f32c gfx_clear default 2013-10-07 04:11:04 +02:00
def 280368d46a 2048 favorites 2013-10-07 03:56:39 +02:00
def 220499b5da 1024 friends 2013-10-07 03:54:08 +02:00
oy 7cb173ec53 fixed master server lookup for servers. #1047 2013-09-25 14:56:47 +02:00
def 5a2bd2e4df Revert "No network connect limit"
This reverts commit 888b23a3e4.
2013-09-09 21:53:13 +02:00
def 888b23a3e4 No network connect limit 2013-09-05 23:50:24 +02:00
def 43c963ad2f Less strict connection limit 2013-09-03 22:07:15 +02:00
def cb42cabc41 Disable netlimit by default 2013-08-30 09:50:33 +02:00
def 48870102e0 Entities background color 2013-08-29 17:14:03 +02:00
def a2c7feda17 Add afk vote timer 2013-08-18 03:27:30 +02:00
def 639bd5309a Higher default netlimit 2013-08-16 17:52:34 +02:00
def 4f79d90212 More reasonable netfiltering hopefully 2013-08-10 04:10:39 +02:00
def c259c2752c Don't drop clients 2013-08-10 04:05:33 +02:00
def ba0550e3ba Better default sv_netlimit value 2013-08-10 03:45:44 +02:00
def f876701869 no thread remove 2013-08-08 02:10:47 +02:00
def cc52c74f6f Disable fifo console on non-Unix 2013-08-06 06:45:13 +02:00
def 1a8e713e45 Disable fifo console on non-Unix 2013-08-06 06:44:53 +02:00
def bd5fd4ec6e Prevent memory leaks 2013-08-06 05:14:53 +02:00
def 34b7ea6193 Only ban if trying to connect within 0.5 seconds 2013-08-06 04:04:36 +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 05d2cb8383 Reset traffic statistics 2013-08-04 18:09:28 +02:00
def 60865b7dbf More advanced netlimit 2013-08-04 17:50:12 +02:00
def a83c5702ff Reduce netlimit to 10kb/s 2013-08-04 05:20:12 +02:00
def edd742177f Fix: kb/s instead of b/s 2013-08-04 04:48:38 +02:00
def a5f974bbe9 More settings for netlimit 2013-08-04 04:37:15 +02:00
def 84e7bb5658 Merge branch 'netlimit' into DDRace 2013-08-04 04:32:44 +02:00
def b51cc77189 Add sv_netlimit 2013-08-04 04:32:04 +02:00
def da778f4e66 Don't write over memory limit... 2013-08-04 04:24:33 +02:00
def 7b2578b517 Only record when we're actually recording 2013-08-04 04:24:21 +02:00
def 71ba923133 Move netlimit over to regular server 2013-08-04 04:24:03 +02:00
def 6169c78a79 Close memory leaks 2013-08-03 17:22:50 +02:00
def 82f3734dd7 Try to implement netlimit (level too high, map downloads might fail) 2013-07-31 05:36:52 +02:00
def 8720186c75 Revert "Revert "Restrict rcon output (east)""
This reverts commit 35cf8832a9.
2013-07-31 01:31:53 +02:00
def 35cf8832a9 Revert "Restrict rcon output (east)"
This reverts commit ba5b98dd1d.
2013-07-31 01:27:29 +02:00
def ba5b98dd1d Restrict rcon output (east) 2013-07-30 23:26:30 +02:00
def e871fbbaad Try to prevent network spamming issues 2013-07-30 22:48:31 +02:00
def 764a73e997 Fix: Allow fifo to be created 2013-07-30 03:16:02 +02:00
def 5cd69f29ac Add Fifo console for easier automation 2013-07-29 21:03:59 +02:00
def abb362b3bb Allow announcement interval from 1 to 300 2013-07-26 22:17:55 +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 d4c0f31b32 Make client compile 2013-07-22 17:20:34 +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 c42e9f1399 Add /points and /toppoints using points.cfg file 2013-07-21 04:52:23 +02:00
def 6d26e07e1f Single config variable for background color without quads 2013-07-11 17:13:45 +02:00
def 6105f60a89 Make RGB values of background colors independent 2013-06-23 20:56:05 +02:00
def 8421903897 Grey background colors when quads disabled 2013-06-23 13:41:13 +02:00
def 413429871f Add quad disable function 2013-06-23 02:58:46 +02:00
BeaR 9b81779ae3 Using MemoryBarrier() for CPUs not supporting SSE2 2013-04-26 16:44:59 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02:00
oy 678863fa7e increased minimum required connect time for clients to 1 second. #1070 2013-03-20 22:47:48 +01:00
PsychoGod 471d479300 one more centering window in graphics 2013-03-03 13:42:25 +02:00
oy 5e090fbfed made the demoplayer support 0.6.1 based demos 2013-02-26 00:00:38 +01:00
PsychoGod ebdd1af7a3 window center position when windowed on Windows :3 2013-02-25 13:48:31 +02:00
oy 718653ff85 set default values for threaded graphics and async renderer to 0 2013-02-24 19:18:13 +01:00
oy ea2898e94a prevent quick join/quit flood. #1070 2013-02-24 19:13:45 +01:00
oy 313a0949b0 make sure clients are authed for map downloads 2013-02-24 18:57:23 +01:00
oy 0e92dd5603 fixed some merge problems 2013-02-24 18:55:55 +01:00
oy 118d2ac837 show reason for closing a connection within a debug message. Closes #1061 2013-02-24 18:31:30 +01:00
oy 07c97822bb increased sleep time when tw is minimized and made it adjustable via cputhrottle otherwise 2013-02-24 18:31:23 +01:00
oy 73386fdf0f fixed last commit 2013-02-24 18:29:41 +01:00
BeaR 68390fe04a Bug: Losing render-commands if commandbuffer is full(gfx)
Problem:
If there is a new draw call, it is checked if there is enough free memory for the vertices in the databuffer but not if we have enough free space in the commandbuffer to add the command
So we lose some commands during a frame cuz the commandbuffer is full

This fixes the 2nd part of issue 1004
2013-02-24 18:29:27 +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 df5ab998c2 readded texture resampling 2013-02-24 18:08:10 +01:00
oy 71af97a5e3 fixed texture memory usage calculation in graphics threaded
Conflicts:

	src/engine/client/graphics_threaded.cpp
2013-02-24 18:07:35 +01:00
oy 2948d2392b fixed last commit 2013-02-24 18:02:37 +01:00
BeaR 1cfbfda6fa Missed a file.. 2013-02-24 18:02:09 +01:00
BeaR c3dd09cebf Readded Texturecompression-support 2013-02-24 18:01:58 +01:00
Johannes Loher 678b6faceb Fixed threaded gfx and building on Mac OS X 2013-02-24 18:01:23 +01:00
Magnus Auvinen 1711be955b fixed all the errors that the clang static analayzer found 2013-02-24 17:58:34 +01:00
Magnus Auvinen 98042012a6 cleaned up warnings that clang spits out. some bugs found with it.
Conflicts:

	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
2013-02-24 17:54:29 +01:00
oy 8ca7933653 Show user authlevel on status command. Closes #985 2013-02-24 17:46:05 +01:00
oy 521eaf038b fixed missing messages when net connection closes 2013-02-24 17:41:39 +01:00
oy 865d0f7365 limit characters within player names to ascii range to prevent utf8 impersonating 2013-02-24 17:40:41 +01:00
BeaR 0adaf8a752 #913
Fix Input Handling
2013-02-24 17:39:31 +01:00
heinrich5991 86fe9757c5 Removed useless enum 2013-02-24 17:38:29 +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 b7e5bb54ad fixed semaphore on macosx 2013-02-24 17:35:51 +01:00
oy 7be3c2e634 fixed resetting the error string of a net connection. Closes #954 2013-02-24 17:35:08 +01:00
oy 86cd0cefd7 fixed wrapping problems when rendering console input 2013-02-24 17:34:51 +01:00
oy 14cd83de10 fixed ban range check to make sure the whole ip matches and not just rely on the hash. Closes #946 2013-02-24 17:34:22 +01:00
oy f1fc3337f5 prevent that the server uses close messages from clients. Closes #950 2013-02-24 17:32:48 +01:00
oy 0e40ab434a fixed a check 2013-02-24 17:31:57 +01:00
oy 13d06e45ac fixed used nettype in server browser and try to use ipv4 and ipv6 socket when using a bindaddr. Closes #940 2013-02-24 17:26:59 +01:00
oy ffd89938d7 fixed registering of ban commands. Closes #942 2013-02-24 17:26:30 +01:00
oy fa85cede53 reset rcon AuthTries on logout. Closes #941 2013-02-24 17:26:10 +01:00
oy 2a4af1573b auto adjust the screen resolution on first start. Closes #921 2013-02-24 17:25:55 +01:00
oy 38256d0d45 skip screenshot when window isn't active. Closes #931 2013-02-24 17:25:14 +01:00
Teetime b4ed006f83 fix for saving bans in a file 2013-02-24 17:03:48 +01:00
heinrich5991 921f5f9239 fixed map downloading auth check 2013-02-16 14:37:53 +02:00
Learath2 c843d62ec7 Defaults to gfx_threaded 0. Partially fixes #213 2013-02-13 18:34:46 +02:00
oy 6295b33965 set default value for asynchronous rendering to disabled for now. #1001 2013-02-01 11:38:09 +02:00
oy a7574f75d2 fixed last commit 2013-02-01 11:38:09 +02:00
BeaR c86ebb34df Bug: Losing render-commands if commandbuffer is full(gfx)
Problem:
If there is a new draw call, it is checked if there is enough free memory for the vertices in the databuffer but not if we have enough free space in the commandbuffer to add the command
So we lose some commands during a frame cuz the commandbuffer is full

This fixes the 2nd part of issue 1004
2013-02-01 11:38:09 +02:00
eeeee 1c8c20c93e added sv_events 2012-12-23 19:47:47 +02:00
eeeee ee2647de41 turns out that Drop was needed after all :S 2012-12-23 20:10:31 +03:00
Learath2 3ececbd5f7 Fixes the last commit 2012-11-19 19:52:23 +02:00
Learath2 17140fc755 Added a config variable to control the map window.Closes #172 2012-11-14 20:34:23 +02:00
eeeee cae8c68d87 send ahead window for maps downloading. works with vanilla client. 2012-11-12 21:50:46 +02:00
BeaR 50b722b2b4 Closes #153.
Fix Input Handling
2012-11-12 20:39:36 +02:00
oy 2db2f51bf5 fixed ban range check to make sure the whole ip matches and not just rely on the hash. Closes #946 2012-07-04 16:55:16 +03:00
oy 2a92f369fc fixed registering of ban commands. Closes #942 2012-07-04 16:54:09 +03:00
Ravomavain 52ba9eea04 remove other banmaster related code 2012-05-02 01:18:11 +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 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00