edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-11 10:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
8038 commits 1 branch 429 tags 411 MiB
Commit graph

1521 commits

Author SHA1 Message Date
def d0c85acc0d Add cl_show_centisecs 2014-12-02 13:19:06 +01:00
Dennis Felsing b525de33b5 Merge pull request #112 from trml/prediction_weapons 
Prediction weapons
 2014-12-02 11:24:52 +01:00
nuborn 03bc769c09 prediction of hammer (hits) and grenade (explosions) 2014-12-01 01:31:58 +01:00
BeaR 186de4e08e Add option to enable/disable panning per voice 2014-11-30 12:23:05 +01:00
BeaR 98d42adf9d Implement sound logic for shaped sounds, fix rectangle height property in editor and submit voice shape information to audio interface 2014-11-29 14:29:40 +01:00
BeaR 9996751161 Remove deprecated falloff distance 2014-11-28 19:21:59 +01:00
BeaR d1327742e7 Start adding support for custom shaped audio fields 
Add version check for sound layers
 2014-11-27 16:18:15 +01:00
def 0071fbaf8d Make detail flag work for sounds (fixes #103) 2014-11-25 21:01:31 +01:00
def 91bc16c037 Add an option to assume demos to be race demos 2014-11-25 20:46:21 +01:00
def a840df5635 Don't add duplicate skins (fixes #102) 2014-11-25 20:13:40 +01:00
def 4b3dd81a74 Disable map sounds with snd_enable 0 as well (fixes #98) 2014-11-25 19:56:31 +01:00
def d7e5a7b9ab Whitespace cleanup 2014-11-24 19:10:19 +01:00
def bfcc82ff03 Fix demo saving 2014-11-24 18:29:38 +01:00
def 8c07ae19a1 Allow for more than 9 DDNet locations 2014-11-21 14:11:04 +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 9fb02ade4f Remove BB skins 2014-11-07 02:20:36 +01:00
def e67acc7d5c Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-11-02 11:01:34 +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 e096cb56a0 Revert "Revert "Revert "Add option for weapons prediction""" 
This reverts commit 99c928fc17.
 2014-11-02 10:59:18 +01:00
BeaR 475c637996 Play sounds and envelopes also on pause 2014-10-31 16:10:09 +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
Dennis Felsing 8334f1641a Merge pull request #89 from trml/fix_antipingweapons 
Add updated/fixed weapons prediction
 2014-10-28 20:07:47 +01:00
def 30801c4e15 Add bind for dyncam to settings 2014-10-28 16:42:26 +01:00
nuborn 99c928fc17 Revert "Revert "Add option for weapons prediction"" 
This reverts commit 451cc8949d.
 2014-10-28 15:51:36 +01:00
nuborn 8f7e24b4db Revert "Revert "Add antiping for weapons (by nuborn)"" 
This reverts commit 755e9f4d1c.
 2014-10-28 15:50:28 +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 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 451cc8949d Revert "Add option for weapons prediction" 
This reverts commit 5d0bf727b0.
 2014-10-27 19:54:18 +01:00
def 26260181bd Some work on Opus map sounds (not working yet) 2014-10-27 16:23:53 +01:00
def 71eb763e53 Fix: Don't autoswitch weapons on (dd)race(network) servers (fixes #57) 2014-10-26 02:01:03 +01:00
def 35f8b7a6dd Add option for disabling gun sounds 2014-10-26 01:00:30 +02:00
def 8d230306d8 Fix sound enabling and disabling (fixes #82) 2014-10-25 02:52:08 +02:00
def 5d0bf727b0 Add option for weapons prediction 2014-10-23 17:34:24 +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
Dennis Felsing 9baf62a3f0 Merge pull request #60 from Wohoo-GC/DDRace64 
Teammate switching team reported on chat
 2014-10-21 12:18:19 +02:00
Wohoo-GC 98305dab0e Mouse button 2 to decrease FSAA samples in menu 2014-10-19 18:01:03 +02:00
def f609417d43 Don't clear rcon history when connecting to new server 2014-10-19 13:11:57 +02:00
BeaR 2b1272ed69 Work on nicer audio timing 2014-10-18 18:41:59 +02:00
BeaR b67fab8fdb Fix parallax scrolling for audio sources and remove global property 2014-10-18 18:41:58 +02:00
BeaR ef3b801999 Add volume slider for map sounds 2014-10-18 18:41:57 +02:00
BeaR 0931e6ed28 Fix sound envelopes ingame 2014-10-18 18:41:55 +02:00
BeaR e211c7a2b2 Ingame sound pos envelope support 2014-10-18 18:41:55 +02:00
BeaR 0a70d49566 Remove distance from envelopes, add falloff distance to source properties and render it in the editor 2014-10-18 18:41:55 +02:00
BeaR dfea1e9e71 Remove debug rendering for sound layers and unused item members 2014-10-18 18:41:53 +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 2e30e96ba5 Improve sound replay 2014-10-18 18:41:52 +02:00
BeaR 39f93716e0 Support replaying mapsounds 2014-10-18 18:41:52 +02:00
BeaR 5df94f772f Add support for sound sources 2014-10-18 18:41:51 +02:00
BeaR 2f837a4c44 Notify player on chat highlight (windows only) 2014-10-18 16:17:36 +02:00
def 1144ba77c6 Split up demo recording into 3 separate recorders 2014-10-16 17:42:13 +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 1fc38356a5 Fix cl_show_ids 2014-10-11 22:47:13 +02:00
Wohoo-GC 3a2f078360 SHIFT+TAB invert completion order 2014-10-06 23:37:35 +02:00
Wohoo-GC 200fc3545b SHIFT+TAB invert completion order 2014-10-06 23:36:39 +02:00
Dennis Felsing 3875741604 Merge pull request #51 from savander/DDRace64 
Skin name in skin selector (next to the Skin useful)
 2014-10-06 21:24:59 +02:00
def 4809fcd325 Sort player completion by name 2014-10-06 13:06:35 +02:00
def 89b2e78bc8 Shift+TAB for player completion (by Wohoo) 2014-10-06 13:02:55 +02:00
savander 66d0e3f57e Skin name in skin selector 2014-10-05 22:26:47 +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 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
laxa a40bacc542 Remove useless <string.h> 2014-09-23 18:36:14 +02:00
laxa 41aa9300de Added button for ClOutputBroadcast + fix the multi-line display 2014-09-23 18:34:48 +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
def 89b92b4d6b Cleanup 2014-09-23 09:52:18 +02:00
laxa 080ffc4df4 Sort ingame menus -> kick player -> move players to spectator 2014-09-23 08:03:26 +02:00
laxa f13f040468 Sort playerlist inside game from Player tab 2014-09-23 02:10:59 +02:00
def a5406762f6 Fix menu 2014-09-21 15:08:25 +02:00
laxa f5ef04a3f7 Change the placement tab of cl_reset_wanted_weapon_on_death 2014-09-21 15:03:42 +02:00
laxa 9f5556a2e4 Add buton for cl_reset_wanted_weapon_on_death 2014-09-21 14:38:34 +02:00
laxa 718e45d84d Added cl_reset_wanted_weapon_on_death 2014-09-21 14:11:27 +02:00
def 3c833bd93e Make the initial ping in serverbrowser less wrong (still not perfect) 2014-09-20 16:20:27 +02:00
def 4ea77f1080 Oops 2014-09-20 16:11:29 +02:00
def 060b794a9d Suggest Novice servers to new players 2014-09-20 16:08:11 +02:00
def 7a2021806b Fix ingame ddnet menu (thanks east) 2014-09-20 13:49:29 +02:00
def d6aea5ba40 Prepare DDNet gametype name 2014-09-20 13:48:59 +02:00
def 684ad0b890 Ingame DDNet menu 2014-09-20 13:41:20 +02:00
def 520b84328f Fix 5:4 resolution in menu 2014-09-20 13:37:00 +02:00
east c4fc429e99 small cleanup 2014-09-20 11:47:51 +02:00
east 66a3d89bf6 Merge remote-tracking branch 'def/DDRace64' into ddsrvs 2014-09-20 00:38:09 +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
Tobias Urlaub b6c93baf72 Fix: also record a demo when the start line is on the front layer 2014-09-19 20:56:15 +02:00
east 9db12d455d working on CDDNetCountry 2014-09-18 16:13:06 +02:00
east c2b7482546 Merge remote-tracking branch 'def/DDRace64' into ddsrvs 2014-09-18 14:14:25 +02:00
def f3707c26f8 Fix: Show tune layer when cl_overlay_entities is less than 100 2014-09-17 19:56:42 +02:00
def bbc21005dc Use space AND colon 2014-09-13 23:50:35 +02:00
def f8fa71de63 Use space as delimiter for ID 2014-09-13 21:48:55 +02:00
east e732008157 DDNet serverlist added 2014-09-13 16:36:25 +02:00
def 886044532b Only disable user inputs in race mods 2014-09-13 12:31:39 +02:00
def 3f8abd10ce Add preparation for broadcast output 2014-09-10 23:20:04 +02:00
def bb6c3ba951 Ignore user inputs when paused 2014-09-07 01:53:20 +02:00
def 93b57433b4 Fix: Reset zoom when going out of spectate mode (in zcatch for example) 2014-09-07 01:41:02 +02:00
def 07a46ab024 Cleanup in menu 2014-09-06 01:43:20 +02:00
def 0da1ba238c Add cl_cpu_throttle_inactive 2014-09-06 01:42:59 +02:00
def fc9ab26be0 Repopulate demo list after closing demo player because a new demo could have been created (Thanks Saavik) 2014-09-05 21:17:04 +02:00
def 4133e642f8 Remove Damage Indications when entering game (fixes #29) 2014-09-03 14:17:44 +02:00
def 45a5f65e55 Add demo speed setting in menu 2014-08-29 16:13:55 +02:00
def 489349d30b Use × instead of x to indicate speed in demo player 2014-08-29 16:13:28 +02:00
def e320d2a455 New Android fix try 2014-08-27 03:57:14 +02:00
def 29ef486c55 Fix Android gamepad 2014-08-27 03:49:42 +02:00
def c6b63c34ba Don't show quit popup on update 2014-08-26 22:06:35 +02:00
Dennis Felsing fa750bd032 Merge pull request #16 from east/ddnet 
don't render hooks to non-active character cores
 2014-08-25 16:56:25 +02:00
east c3eeeaadcd don't render hooks to non-active character cores 2014-08-25 16:53:11 +02:00
east eb67f6d04b Merge remote-tracking branch 'def/DDRace64' into demoslice 2014-08-25 11:20:18 +02:00
east 862a520857 DemoPlayer: Refuse to overwrite demo 2014-08-25 11:19:00 +02:00
def 91e8eed73d Don't reset wanted weapon on kill (by laxa) 2014-08-24 03:05:01 +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 d08e58daa8 Show IDs in scoreboard on any server type 2014-08-23 11:32:54 +02:00
def 3c4bf96b8c Recording with multiple clients working 2014-08-22 14:18:16 +02:00
east bb8076a3ba DemoPlayer: Additional speed meter added 2014-08-22 10:00:48 +02:00
def 4617157754 Half transparent chat and emoticons 2014-08-22 02:32:05 +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
def 038129f9ce Allow disabling custom and new skins in client 2014-08-17 05:34:16 +02:00
def 1c4fac8afd Display map name while downloading 2014-08-16 01:06:17 +02:00
def 5f6be4d0bc Make emoticon selector reset when you point it in the middle 2014-08-16 00:59:50 +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 fb35f90bee Bandana Brother -> Custom 2014-08-11 22:38:47 +02:00
def ee6fcdf876 Automatic timeout protect message in client 2014-08-09 19:17:21 +02:00
def 5864a47c4b Show tune layers in entities again 2014-07-26 12:33:25 +02:00
def b0594d5e5a Change some default binds 2014-07-26 01:12:32 +02:00
Dennis Felsing 0652fcf1c3 Merge pull request #8 from CookieMichal/DDRace64 
[Fixed] Warning C4805
 2014-07-10 18:49:27 +02:00
def 2bf417b41f Add setting for disconnect confirmation 2014-07-10 16:50:59 +02:00
def 5e89631637 Revert "Add 00Necrid skin" 
This reverts commit b52afd5464.
 2014-07-10 16:46:46 +02:00
def b52afd5464 Add 00Necrid skin 2014-07-10 16:19:56 +02:00
def c5b36f8038 Minor textual changes in client 2014-07-09 21:59:03 +02:00
CookieMichal 3274fca115 [Fixed] Warning C4805 
Warning C4805: '!=' : unsafe mix of type 'int' and type 'bool' in operation
 2014-07-09 00:12:32 +02:00
Dennis Felsing 550ed6d704 Merge pull request #7 from CookieMichal/DDRace64 
Fixed color of normal messages
 2014-07-08 21:44:47 +02:00
def c1eb944057 Minor fix 2014-07-08 21:04:04 +02:00
def cf89fcd7a6 Demo map length in MiB and KiB instead of B 2014-07-08 20:35:27 +02:00
def 15ff17d8f8 Cleanup of some menus, added editor button, added disconnect question 2014-07-08 20:21:19 +02:00
CookieMichal 93ef86e1cc [Fixed] Color of normal messages 2014-07-08 19:09:30 +02:00
def 417e4110ed Hopefully fix rare crash on dummy switch 2014-07-08 02:17:08 +02:00
def 3d802dd5aa Fix: ingame menu doesn't stop reacting anymore 2014-07-08 02:00:13 +02:00
def bbe597ef04 Add cl_dummy_resetonswitch 2014-07-08 01:41:45 +02:00
def c384098ee7 Grammar 2014-07-07 17:35:14 +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
def af52cc60d2 Move auto-reconnect to general settings 2014-06-28 01:07:41 +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 ec152dfb46 Fix vote in Android 2014-06-16 16:26:50 +02:00
def 42fde6b593 Add CPU throttle setting 2014-06-16 15:43:11 +02:00
def 2f491a7d2f Better on screen keys for Android 2014-06-16 14:44:00 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def c4dac1b0cd Fix: Don't crash when standing on start line and connecting dummy 2014-06-05 16:28:59 +02:00
def c67742f60a Add news 2014-06-05 12:11:41 +02:00
def af12bd92ec Bring back old cl_showothers 2014-05-25 00:59:52 +02:00
def 1b97bf3bcf Add menus settings for timeout 2014-05-24 21:46:42 +02:00
def 74844c98a6 Fix camera with dummy 2014-05-23 19:28:26 +02:00
def 62c474b489 Fix: Player keeps looking at the same position when paused 2014-05-22 17:03:52 +02:00
def b2f5a1b96e Fix showothers 2014-05-18 01:35:15 +02:00
def b82950c9f9 Fix dummy highlight 2014-05-17 23:31:29 +02:00
def e85d594f81 Other teams alpha settable 2014-05-17 23:00:52 +02:00
def 78d29e3301 Also highlight name of dummy 2014-05-17 22:45:44 +02:00
def 1296b1bf49 Fix compile for Mac 2014-05-17 19:30:24 +02:00
def 42811dc896 Autoupdater asks for permission to update + Autoupdater fixes 2014-05-17 14:28:50 +02:00
def 50ceebee23 Fix: Weapon switching with dummy 2014-05-10 18:22:51 +02:00
def 5b1c866b35 Feature: Separate inputs for dummy and player 2014-05-10 14:31:00 +02:00
def bcec9d025d Fix: More FPS with cl_overlay_entities under 100 2014-05-08 15:58:02 +02:00
def 4f8171fcde Revert "Fix menus for 1280x1024" 
This reverts commit 17478a4f17.
 2014-05-08 14:08:15 +02:00
def 9e53ed5367 Minor code cleanup 2014-05-07 03:50:23 +02:00
def a79b6079fa Add cl_old_gun_position 2014-05-06 16:25:00 +02:00
def 26cb3030c3 Draw +showhookline with alpha too 2014-05-06 16:17:41 +02:00
def 147e8176e3 Make player direction arrows transparent when player is in other team 2014-05-06 13:48:08 +02:00
def 17478a4f17 Fix menus for 1280x1024 2014-05-06 13:38:59 +02:00
def d0d76074cb Less ambigious text 2014-05-04 18:42:01 +02:00
def 9340b1400f Add team chat sound deactivation 2014-05-04 18:35:37 +02:00
def e220f1b5a8 Fix: Better positioning of ingame menu buttons for 5:4 and 4:3 resolutions 2014-05-04 00:11:11 +02:00
def 0f8f055c14 Typo 2014-05-03 23:58:14 +02:00
def d57634792d Add ping and gametype colorization (Thanks to NooBxGockeL and Gamerclient) 2014-05-03 17:24:34 +02:00
def 1704e27828 Fix: Also set alpha value on text when using cl_overlay_entities 2014-05-01 20:15:53 +02:00
def bdb2dfeb79 Fix menu for entities overlay 2014-05-01 18:17:39 +02:00
def bf6fb6eb0f cl_overlay_entities instead of cl_show_entities 2014-05-01 17:44:35 +02:00
def e213ea27b4 Fix: Draw player direction arrows at different positions 2014-05-01 01:42:44 +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 a3cdbce6f9 Fix +showhookcoll with dummy 2014-04-30 13:32:47 +02:00
def 5eb7a74558 Fix: Tunings and Tunezones with dummies 2014-04-29 03:34:23 +02:00
def 95df7deb56 fix 2014-04-28 22:13:59 +02:00
def 7a5f32f155 Add hammerfly for dummies 2014-04-28 22:12:50 +02:00
def 832932c295 Fix: Dummy shouldn't shoot after toggling 2014-04-28 18:21:10 +02:00
def 474d307a9a Fix: Only allow changing dummy when dummy is connected 2014-04-28 15:34:56 +02:00
def 9f509eeedb Fix: Dummy setting updates 2014-04-28 15:19:57 +02:00
def 215e5dbcab Disable autoupdate on Mac 2014-04-28 00:23:04 +02:00
def 866882efa1 Fix name size 2014-04-27 23:14:52 +02:00
def 7bcc51d488 Basic updating (thanks to unsigned char* 2014-04-27 05:01:03 +02:00
def 60ce467afb Other wording 2014-04-26 21:11:00 +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 f72eafad61 Fix: Proper spectating 2014-04-24 14:59:16 +02:00
HMH d79ce4beec put dbg_tuning a little higher so its better readable 2014-04-18 14:43:33 +02:00
def 3006d3b03b Cleanup DDNet menu 2014-04-15 22:10:46 +02:00
def e56a99f5fc Colored chat messages 2014-04-15 00:49:24 +02:00
def b731221b2a Better team differentiation ingame (colored nameplates and more transparency 2014-04-12 16:55:01 +02:00
def af66d26bd5 Add cl_show_other_hook_coll 2014-04-10 20:33:05 +02:00
def cb5fa76f85 Alternative fix for console input (doesn't break other things at least) 2014-03-30 22:58:59 +02:00
def 92dffdbbcc Add cl_show_ninja 2014-03-28 13:39:30 +01:00
def 6be24a310a Fix double selection in spec-view 2014-03-24 01:48:07 +01:00
def ed56ea64e5 Fix double selection in spec-view 2014-03-24 01:47:52 +01:00
def b864bf908c Team colors in spec-view 2014-03-24 00:04:44 +01:00
def 48f441bdc6 Sort spec-view same as scoreboard 2014-03-23 23:23:41 +01:00
def c98ad5bf22 Merge branch 'new' into DDRace64 
Conflicts:
	src/game/editor/layer_tiles.cpp
 2014-03-23 23:18:43 +01:00
def 9ae68b5efb Don't show tune layer with cl_show_entities 2014-03-23 17:44:02 +01:00
HMH adc1f9924c added displaying tunelayer on showentities 2014-03-23 17:10:48 +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 434b2bec52 More info in player options 2014-02-19 14:49:08 +01:00
def db0410c443 Add SPEC info to serverbrowser 2014-02-19 14:24:26 +01:00
def 99a086200f Only keep holding hook, reset all other keys on /pause and chat 2014-02-18 22:26:17 +01:00
def d1493d8c3e Fix: Hook prediction should never loop forever 2014-02-17 23:12:29 +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 9d64525e5d Fix rendering of layers with cl_show_entities and crashes 2014-02-10 19:19:49 +01:00
def f1661fc6b4 Sorted scoreboard and spectator view 2014-02-08 22:24:57 +01:00
def 182c5aefc9 Fix +showhookcoll in demo 2014-02-08 19:06:24 +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 ceeb44ef2e Bring back old DDRace record window as cl_showrecord and add compatibility for current time in race servers 2014-02-06 23:49:25 +01:00
def 89556e184b No sound when you whisper, as some people are afraid of it 2014-02-06 18:17:29 +01:00
def c4e0cca046 Fix +showhookcoll when player hooking is disabled 2014-02-05 03:39:09 +01:00
def 2cac8c7ab5 Scoreboard fix 2014-02-02 23:23:10 +01:00
def 6b8e6dcb10 Fix Player Options 2014-02-02 21:06:05 +01:00
def 5b07793c16 Better scoreboard colors 2014-02-02 20:12:53 +01:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def e97d3ba788 Fix: +showhookcoll fixes 2014-01-30 04:10:52 +01:00
def 3e5bcb0213 Absolutely perfect +showhookcoll 2014-01-27 05:06:23 +01:00
def 8ec5aa46c5 Fix: Possible crash on map change 2014-01-27 05:06:03 +01:00
def 36568b97f2 Don't stop hooking when player is chatting 2014-01-26 01:53:53 +01:00
def 237b6c189a Better transparency for /showothers 2014-01-24 23:11:33 +01:00
def 57889d5fbc Also show proper times in Serverbrowser 2014-01-24 22:09:52 +01:00
def 221fd3a02b Fix 2014-01-22 17:19:21 +01:00
def 7465939054 More exact scrolling in Demo Player 2014-01-22 17:14:47 +01:00
def b1d2d4f59e Zooming in demo player 2014-01-22 16:59:43 +01:00
def 853f510fc9 Proper old team 2014-01-22 15:38:05 +01:00
def 3426bc5fcf Fix: Better teams in scoreboard 2014-01-22 14:04:15 +01:00
def 25f69ecdeb Display teams in scoreboard 2014-01-22 01:39:18 +01:00
def 97d7037011 Render transparency properly when spectating 2014-01-22 00:31:17 +01:00
def 6e67cd0540 Render players in other teams half transparent 2014-01-22 00:24:26 +01:00
def f0d79b8388 Trying to get better team support 2014-01-22 00:08:30 +01:00
def 214d32fadd Special scoreboard between 32 and 48 players 2014-01-19 22:08:33 +01:00
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 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 5353460e84 Make hiding votes window optional 2014-01-14 00:25:25 +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 693d68841c More exact showhookcoll 2014-01-12 00:45:25 +01:00
def 188635162e 64 Player Filter Button 2014-01-11 21:38:50 +01:00
def 1fbdea7d2f Proper 64 player scoreboard 2014-01-11 14:09:55 +01:00
def 93a3fecea8 Fix best time in scoreboard 2014-01-10 22:53: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 ef65abfe35 Fix scrolling lists in menus 2014-01-10 12:22:48 +01:00
def 44964130c3 Fix: Proper scoreboard font size 2014-01-08 09:50:45 +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 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 4136af09d7 Fix grenade prediction (thanks to anonymous) 2014-01-02 06:45:48 +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 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def 85f2cebfaf Fix: Disabling chat sound 2013-12-30 19:32:51 +01:00
def 6ad45448bd Fix name highlighting 2013-12-27 21:39:46 +01:00
def 5453c0c80f Allow longer messages 2013-12-27 04:09:45 +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 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 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 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 51321c6011 Tab 2013-11-13 13:25:12 +01:00
def bbb1f6ab3c Smaller zoom 2013-11-13 13:24:56 +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 9e1176094d Allow zooming in FastCap 2013-10-24 01:37:04 +02:00
def 60b66055bf add snd_name_only 2013-10-21 02:16:45 +02:00
def 24b56ea48a Add /c to settings 2013-10-18 11:47:34 +02:00
def 9f45368225 Add antiping_grenade 2013-10-15 18:08:06 +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 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 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 23b44fa812 Add dialog settings for ddnet features 2013-08-30 09:50:05 +02:00
def 9028d77471 Add +showhookcoll from H-Client 2013-08-24 01:50:35 +02:00
def 58039066f4 Add local time screen at top 2013-08-23 00:45:48 +02:00
def 7d2b92b68f Add default binds 2013-08-18 03:33:55 +02:00
def 62c2e1211b Fix DDRace menu corner to look correct 2013-08-03 15:24:20 +02:00
def 637ccb3e66 Enable zoom for spectators 2013-06-23 03:35:46 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02: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
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 f010791231 added options for the threaded stuff in the menu and set version 2013-02-24 19:43:09 +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 76d7569e15 limit the number of chat messages a player can queue to 3 2013-02-24 17:28:11 +01:00
oy 2f86ad3c4b fixed chat ignore feature 2013-02-24 17:24:30 +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
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
oy c045071b40 always show default country flag on invalid country index 2012-02-05 15:53:22 +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 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 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
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
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
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
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
Learath2 81b34086e2 Fix for zoom issue. 2011-12-23 10:43:46 +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
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 713dd3bc08 fixed controls rendering with low ui scale 2011-12-04 22:43:41 +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
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
Ravomavain 5b44fae0ce Remove unneeded variables 2011-09-02 12:05:14 +02:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +02:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +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
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
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
SushiTee 83652c91ec fixed a warning in client (mac) 2011-08-01 21:03:51 +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
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00
Choupom 84e5c53432 added color envelope feature for tilemaps 2011-07-20 22:04:13 +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
oy f4ce34f01c close spectator/emoticon menu when changing to team/spectator via bind. Closes #768 2011-07-11 12:02:45 +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 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 1239150846 fixed password popup UI issue. Closes #583 2011-06-27 16:39:23 +02:00
oy fb309436b4 improved friends feature 2011-06-26 17:10:13 +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
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 101d9de3c3 added aspect ratio in display modes list in settings 2011-06-02 17:36:17 +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
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
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 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 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 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
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 d0ed9612e1 Properly done cl_show_entities 2011-04-19 16:32:42 +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
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 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 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
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +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 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 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 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 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
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 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 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 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 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 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 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 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 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 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 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
oy b64db75a6b added an option to ignore other players in chat 2011-03-22 22:41:27 +01: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
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 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 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
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
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 ee178d5a48 Client Cheat showing entities in game 2011-03-16 14:48:16 +02:00
oy 156e23b592 added loading/support for country flags to the client 2011-03-16 12:09:22 +01:00
oy 7b91ebd01c show actual page and fixed overlapping in the console 2011-03-15 09:15:46 +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 ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +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 90d93ba7b2 Client showothers 2011-02-23 22:22:05 +02:00
GreYFoX 0e5ef2e4f4 Fixed show ids 
Fixed missing letter
 2011-02-23 18:12:34 +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
oy 088ec3e2f3 made the client's map search work with sub folders. Closes #254 2011-02-21 11:23:30 +01:00
GreYFoXGTi 7455ebfee9 I had a crash here, dunno why! 2011-02-17 11:24:11 +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
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
GreYFoXGTi 78ee6148f8 SortHash 
Loading String
 2011-02-16 12:22:55 +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
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
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +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
GreYFoXGTi 4ca79188dc DDRace Flags Finalized 2011-02-05 06:13:32 +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 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 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 e16bd4d000 Mac Compilation 
This may appear un-important, but it's important for mac compilation!
 2011-01-29 02:53:33 +02:00
heinrich5991 dc8ec160e5 removed the usage of std::string in scoreboard 2011-01-26 20:54:19 +01:00
SushiTee c0b905f852 -fixed compiler warnings 
-fixed mac compiling
 2011-01-26 14:45:44 +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
oy fa2cd82335 clamp maximum ping value in the server browser filters 2011-01-23 18:04:31 +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
GreYFoXGTi 109cbd4e28 The DDRace scoreboard is now for all Race types 2011-01-21 10:07:32 +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 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 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 216967c3bf release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +01: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
oy b94c70d351 close the scoreboard when opening the menu in the demo player. Closes #407 2011-01-12 01:33:16 +01:00
oy 3f4556a861 hide the broadcast when the scoreboard is active. Closes #408 2011-01-12 01:18:07 +01:00
oy 1f55237919 made the end game message in team games a bit smaller so it doesn't overlap the scoreboard. Closes #406 2011-01-12 01:10:40 +01:00
oy d79fd3d4c0 added dm score hud. Closes #356 2011-01-12 01:01:05 +01:00
oy b60d6deb51 made m_paInfoByScore within gameclient's snap state work and cleaned up render scoreboard 2011-01-11 23:03:01 +01:00
oy 8f999837c6 improved the count down timer. Closes #391 2011-01-10 00:58:03 +01:00
oy 9819163c5f fixed some overlapping in the server browser. Closes #376 2011-01-10 00:18:30 +01:00
GreYFoXGTi 959b05d557 Merge branch 'master' of http://github.com/oy/teeworlds 2011-01-10 00:45:58 +02:00
oy 9358b24113 reset demo player on end and when pressing the stop button. Closes #401 2011-01-09 23:42:37 +01:00
oy 91f642fac2 fixed cut off broadcast. Closes #398 2011-01-09 23:25:07 +01:00
oy eedaf62d97 fixed that the client crashes if it has no skins 2011-01-06 22:55:57 +01:00
GreYFoXGTi 6889adc0bb Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	.gitignore
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h & Cleaned it up
 2011-01-06 23:32:19 +02:00
oy 418dd8eccc added fix by CarmineZ for missing option in the control settings. Closes #395 2011-01-06 13:17:54 +01:00
GreYFoXGTi 82eac5cf3b ScoreBoard now is different for DDRace only 2011-01-06 06:45:53 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 1d9190fd5b Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/russian.txt
	readme.txt
	src/game/variables.h
 2011-01-06 01:49:58 +02:00
oy 13902fef6c show an error popup when demo deletion fails 2011-01-05 22:22:07 +01:00
oy 18461535fd changed time left localisation in the map download popup to allow better translations 2011-01-05 17:28:53 +01:00
oy 2992d9a6c6 scale control settings as well 2011-01-05 12:19:06 +01:00
Damian Kaczmarek 073044747b -Working ui_scale parameter. 
(doing it properly would require lots of framework/interface job ...)
 2011-01-05 12:14:36 +01:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
 2011-01-04 22:37:09 +02:00
oy 67f86e3547 added option to change nameplates size by RushPL 2011-01-04 13:11:01 +01:00
oy bcba9e5c89 moved HslToRgb stuff 2011-01-04 11:58:25 +01:00
oy 336f00ae89 added colours for tile layers by Choupom 2011-01-04 11:38:14 +01:00
Choupom 533d28e35a made team colors for nameplates (fixes #207) 2011-01-03 12:54:58 +01:00