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

599 commits

Author SHA1 Message Date
Bojidar Marinov d08f03fecf
Changing vanila skins option no longer requires restart 
Fixes #1216
 2018-07-24 19:56:09 +03:00
fokkonaut b8b97eb740 added skin prefix (#1218) 2018-07-24 17:26:39 +02:00
ChillerDragon 0ebf7b614d Oop! forgot one 2018-07-06 11:37:33 +02:00
ChillerDragon 4e9eac432c Better button id for dummy settings (thanks to deen) 2018-07-06 11:24:57 +02:00
ChillerDragon e31f53f651 Fix ui for low mousesens 2018-05-01 17:51:36 +02:00
Jupeyy c7114e734c more ui text positioning fixes 2018-04-04 02:40:30 +02:00
Jupeyy c1a962b870 add ui fixes to work with new text renderer 2018-03-13 21:59:07 +01:00
Jupeyy ced0ea3f82 set the gfx refresh rate limit higher for the console 2018-03-02 03:29:02 +01:00
Learath 20cac1c2bb Fix dyncam confusion. Closes #783 
Remove "vanilla" dyncam toggle.
 2018-02-22 20:40:14 +01:00
Learath2 8cfebaa0b2 Fix #1031 2018-02-13 03:45:43 +01:00
def 151da9af97 Remove Emojis 2018-01-25 20:03:18 +01:00
def 4682eaff56 Add option to turn off emojis (fixes #936) and add options in settings menu 2018-01-13 10:37:24 +01:00
Savander b2b82eb3dd
Localize friend message 2017-10-28 01:21:32 +02:00
def cb00a294b8 Enable gfx_opengl3 by default 2017-10-20 22:52:38 +02:00
def 02aeae416b Infinity = no limit 2017-10-20 22:47:59 +02:00
Jupeyy 1814fa8d19 make OpenGL 3.3 experimental option, and don't initialize it as default 2017-10-10 15:35:20 +02:00
def c2c453bd45 Make sending name to info.ddnet.tw optional, show dialog at start and some minor fixes 2017-09-07 20:51:46 +02:00
def 278c1ee198 Add Toggle ghost control (fixes #823) 2017-09-03 19:23:59 +02:00
def 89ed22e8d8 Introduce ddnet-info.json 
- Single json file containing all information for the client
- Fetched from https://info.ddnet.tw/info?name=deen
- Replaces versionsrv, news, ddnet-maps.json and ddnet-ranks.json
- Servers are sorted by most popular ones for respective player
- Always stays < 100 ms response time, compared to occasional 50 s for
  old ddnet-ranks.json
 2017-09-03 17:42:04 +02:00
def 0b5dcdc478 Disable vsync by default and warn about possible delay 2017-08-08 19:53:16 +02:00
def 379f060126 Version 10.7.1 2017-07-25 19:09:05 +02:00
def 8d621dfc00 Add kitty skins (by Ravie + fuzzy ninja by patwo.*) 2017-07-25 00:11:37 +02:00
def a9498b15cb Fat skins 2017-07-25 00:11:37 +02:00
def bcec0f1bb1 ctrl-f to search, ctrl-x to exclude, ctrl-r to reason 2017-07-24 18:05:19 +02:00
def ec885f3e25 Fix layout 2017-07-22 22:43:20 +02:00
def f09a0f640f Fix mouse sensitivity setting dialog and introduce new one for ui mouse sens (#fixes 804) 2017-07-22 22:31:14 +02:00
def d50b39c530 Fix controls rectangle overlapping topbar and being clickable outside of scope 2017-07-22 17:35:30 +02:00
def 2d68aed009 More settings in controls menu. use listbox (fixes #802) 2017-07-22 13:41:18 +02:00
def 66f6f16e81 Windows DPI fixes #2 2017-07-09 09:44:07 +02:00
def e4b3c17829 Add option to disable long pain sound (used when shooting in freeze) 2017-06-06 18:58:23 +02:00
def 8553ed727b Replace cl_cpu_throttle with cl_refresh_rate 2017-06-02 21:33:45 +02:00
def c2400c79cf Rename cl_show_other_hook_coll to cl_show_hook_coll_other and add cl_show_hook_coll_own (fixes #741) 2017-05-14 12:03:09 +02:00
SheikhZayx ea0e4948b4 CSV file instead of statboard screenshot 
En-/Disable statboard being saved as csv
 2017-04-26 05:10:31 +02:00
Learath2 55c5c3eac6 Properly calculate the width. Fixes #699 2017-03-22 12:10:22 +01:00
Learath2 9919173ceb Just color the heart preserving team information. Fixes #606 2017-03-10 18:49:39 +01:00
Dennis Felsing 761c3c9be1 Merge pull request #646 from heinrich5991/pr_ddnet_brace_style 
Fix the brace style in some places
 2017-03-09 13:31:21 +01:00
Learath2 5317be824e Fix coloring of team chat. Fixes #648 2017-03-06 10:24:00 +01:00
heinrich5991 ba5af42b1f Fix the brace style in some places 2017-03-04 15:43:49 +01:00
Learath2 fa22425f26 Add a checkbox to disable friend heart 2017-02-27 23:56:22 +03:00
Learath2 c76849c51a Add sliders for friend chat color 2017-02-27 23:39:06 +03:00
Learath2 3b2d707f31 Add a second page to HUD page 2017-02-27 23:38:24 +03:00
heinrich5991 fce9ec6cda Replace UI elements for the timeout code 
Now you can regenerate your timeout seed with the click of a button.
 2016-10-03 13:56:15 +02:00
H-M-H b648b530d5 Merge branch 'master' into sqlmasters 2016-05-20 23:40:29 +02:00
def 695bf346ac Make gfx_refresh_rate functional (fixes #255) 2016-05-10 17:43:27 +02:00
def f3a4069867 Set gfx_highdpi to 0 as default (needs someone to fix it on Win >= 8.1 and Mac) 2016-05-08 19:40:53 +02:00
def 9bd30ce447 Make high-dpi screen support optional 2016-05-07 17:47:05 +02:00
def 25fda2751c Fix "vanilla skins only" setting in menu 2016-05-07 15:59:58 +02:00
def c325b08087 Add inp_mouseold for warped mouse input 2016-05-07 15:59:13 +02:00
H-M-H e351080dd3 removed double semicolons 2016-05-04 00:24:54 +02:00
def 13143eac23 Reconnect for timeout instead of bans, some simplification 2016-05-01 11:12:07 +02:00
def 4761608329 Input fixes from TW master for mouse wheel 2016-04-30 20:11:26 +02:00
def 1446adee2c Window resizing only with X11 (not on Windows and Mac OS X) 2016-04-30 19:19:19 +02:00
def 644fec7e55 Resize window without restarting client 2016-04-30 17:59:58 +02:00
def 7a5b79e48a More SDL2 graphics goodness, partially from TW master 2016-04-30 00:43:11 +02:00
def 354696afb7 switch between fullscreen and windowed mode without restarting the client (by oy) 2016-04-29 21:56:38 +02:00
def db8a126315 Merge swick's SDL2 branch 2016-04-29 21:55:48 +02:00
heinrich5991 e8be975f5b Merge pull request #417 from awaysoft/add_simplified_chinese_support 
Add font support for chinese, japanese, korean.
 2016-03-03 16:48:28 +01:00
Tom ff1c6705d6 fix compile warning 2016-03-03 23:40:19 +08:00
Tim Schumacher 9e6e062793 added cl_skin_filter_string for skin quick search 2016-02-14 19:51:49 +01:00
Tom 26a1a9f331 replace strstr to str_find 2016-02-13 18:51:21 +08:00
Tim Schumacher 94f3da4a47 removed localize for search symbol 2016-02-12 21:31:58 +01:00
Tim Schumacher 438720959b added quick search for skin selection 2016-02-12 18:52:10 +01:00
Tom 7f95961078 fix a compile problem in linux 2016-02-06 00:38:19 +08:00
Tom 96510284e3 Add font support for chinese, japanese, korean. 
Added some character to DejaVuSans Font, so Language List can show CJK names.
Modify code to let ddnet choose DejavuWenQuanYiMicroHei when user choose CJK language, this font is merge from Dejavu and WenQuanYiMicroHei.
 2016-02-06 00:13:57 +08:00
Henningstone 6fa6190f84 Fix menus music playing ingame, closes #349 2015-10-16 19:31:01 +02:00
def 24f973613a Fix menu 2015-09-26 01:15:08 +02:00
def ed49e3214a Some more minor settings menu fixes 2015-08-28 20:44:07 +02:00
def ecc9cbfe99 Fix background map in settings in 5:4 resolution 2015-08-28 20:26:39 +02:00
def ecfa185601 Fix settings positioning 2015-08-28 01:18:45 +02:00
def 8c0febdd41 Another dyncam fix 2015-08-27 21:56:41 +02:00
def 1dddf42cbb Simplify Dyncam and fix #311 2015-08-27 20:26:05 +02:00
def c1ca91560e Improve settings menu a bit 2015-08-27 16:20:16 +02:00
Chairn 4b270771bf Added string+box in ddnet menu. Added 10 secs protection for loading. 2015-08-27 09:13:43 +02:00
def fe22edadaa Hide console window on Windows by default 2015-08-26 12:40:50 +02:00
Nikita Zyuzin 0b9e2f144c Add prefix Cl to dummy and player variables 2015-08-07 00:16:33 +04:00
def 6e8ada1ac8 Fix whitespaces a bit 2015-07-09 02:12:35 +02:00
def 30e3861117 More reasonable default key bindings 2015-07-07 12:40:22 +02:00
def 9f5a2f7f93 Fix wording in settings 2015-07-01 16:45:41 +02:00
def 4c3b97d6ba Add size variable for clan plates 2015-06-29 02:06:27 +02:00
savander a65243d8e9 Rermove Localize from server message 2015-06-26 21:39:36 +02:00
savander 52e60afafa Added missing Localize() 2015-06-26 20:44:55 +02:00
def 885f1a3276 Add support to show clan above name plates 2015-06-22 00:34:10 +02:00
def 7c665a7b97 Add auto-antiping based on ping 2015-06-21 18:00:09 +02:00
def d9b7f4e1f4 Fix settings menu 2015-05-31 22:40:38 +02:00
Nikita Zyuzin 88c0d798e8 Fix tabulation 2015-05-21 16:34:20 +04:00
Nikita Zyuzin d06d085696 Add menu setting for auto stat board screenshot 2015-05-21 14:26:50 +04:00
Nikita Zyuzin 42759e8909 Fix restart on new round and grabs count 2015-05-21 00:23:58 +04:00
Nikita Zyuzin f8b73701ca Remove code duplication 
Replace ad hoc solution to dynamic camera key binding with call to console
command
 2015-05-19 15:51:51 +04:00
Nikita Zyuzin 7c41cb1afe Add dynamic camera console toggle feature 2015-05-11 14:21:34 +04:00
def 710a786f88 Rename AutoUpdater to Updater because you have to press a button now 2015-04-18 21:17:27 +02:00
def ba4f961594 Some more autoupdater changes and a button to check for autoupdates 2015-03-14 10:45:11 +01:00
def 62da96b518 Fix update done message a bit 2015-03-13 16:51:57 +01:00
def b306f4133d Fix button size for 5:4 resolution 2015-03-13 16:49:52 +01:00
def f893ed6ec4 Fix and clean up autoupdater 2015-03-13 15:14:00 +01:00
Learath Lea 1f4ddfe0ba Add some indication that the update is happening. 
Prevent unexpected restart.
 2015-03-08 19:51:13 +02:00
Learath Lea fd4b9d1f06 Add Perform Update to settings 2015-03-05 23:09:14 +02:00
Learath Lea 467efee39b Do not reintroduce old buttons. 2015-03-05 22:10:06 +02:00
Learath 09ce649238 First get rid of the old autoupdate 
Conflicts:
	src/engine/client/client.cpp
	src/engine/client/client.h

Conflicts:
	src/engine/shared/config_variables.h
 2015-02-23 20:23:35 +02:00
def ec01b6cd16 Add menu setting for dummy copy moves 2015-02-16 11:40:33 +01:00
def 3d686a223f Add an option to disable http map download (not working yet) 2015-01-20 00:21:28 +01:00
def 0ed314eef9 Add default zoom setting 2015-01-03 03:13:21 +01:00
def b694c865b4 Fix distance in menu 2014-12-14 17:34:50 +01:00
def e816e2e0e0 Clean up menus 2014-12-14 17:16:44 +01:00
def 3b0f768478 Add setting to ignore clan in friends and enable by default 2014-12-12 17:15:29 +01:00
def eb12370db0 Rename cl_antiping to cl_antiping_players and add cl_antiping metasetting 2014-12-08 13:49:39 +01:00
def 14382356d9 Add AntiPing weapons button 2014-12-05 18:47:27 +01:00
def 91bc16c037 Add an option to assume demos to be race demos 2014-11-25 20:46:21 +01:00
def 9fb02ade4f Remove BB skins 2014-11-07 02:20:36 +01:00
def e096cb56a0 Revert "Revert "Revert "Add option for weapons prediction""" 
This reverts commit 99c928fc17.
 2014-11-02 10:59:18 +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
def 451cc8949d Revert "Add option for weapons prediction" 
This reverts commit 5d0bf727b0.
 2014-10-27 19:54:18 +01:00
def 35f8b7a6dd Add option for disabling gun sounds 2014-10-26 01:00:30 +02:00
def 5d0bf727b0 Add option for weapons prediction 2014-10-23 17:34:24 +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
BeaR ef3b801999 Add volume slider for map sounds 2014-10-18 18:41:57 +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
laxa 41aa9300de Added button for ClOutputBroadcast + fix the multi-line display 2014-09-23 18:34:48 +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
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 45a5f65e55 Add demo speed setting in menu 2014-08-29 16:13:55 +02:00
def c97a412913 Timeout code for dummy, timeout code working on solo servers 2014-08-17 19:10:08 +02:00
def 038129f9ce Allow disabling custom and new skins in client 2014-08-17 05:34:16 +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 2bf417b41f Add setting for disconnect confirmation 2014-07-10 16:50:59 +02:00
def c5b36f8038 Minor textual changes in client 2014-07-09 21:59:03 +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 42fde6b593 Add CPU throttle setting 2014-06-16 15:43:11 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +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 b2f5a1b96e Fix showothers 2014-05-18 01:35:15 +02:00
def e85d594f81 Other teams alpha settable 2014-05-17 23:00:52 +02:00
def 42811dc896 Autoupdater asks for permission to update + Autoupdater fixes 2014-05-17 14:28:50 +02:00
def a79b6079fa Add cl_old_gun_position 2014-05-06 16:25:00 +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 0f8f055c14 Typo 2014-05-03 23:58:14 +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 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 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 3006d3b03b Cleanup DDNet menu 2014-04-15 22:10:46 +02:00
def af66d26bd5 Add cl_show_other_hook_coll 2014-04-10 20:33:05 +02:00
def 92dffdbbcc Add cl_show_ninja 2014-03-28 13:39:30 +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 24c5dc3c6a Make editor undo optional because of too many bug reports 2014-02-13 22:27:11 +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 fe5c26234b add cl_showkillmessages 2014-01-15 15:25:13 +01:00
def bc9e188309 Revert SetPing 2014-01-14 21:44:40 +01:00
def 5353460e84 Make hiding votes window optional 2014-01-14 00:25:25 +01:00
def e88e0698c7 Name stuff 2014-01-03 03:06:23 +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 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 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 a90b37544a More HUD control 2013-11-02 03:09:56 +01: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 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 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
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 4d36c0f77e prevent that you can play the music ingame. Closes #947 2013-02-24 17:32:29 +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
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 3e918075df added an option to show only chat messages from friends 2012-01-09 23:29:15 +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 535324d6ed added an entry for the kill command to the controls menu. Closes #652 2012-01-08 00:20:02 +01:00
oy b592d7a591 cleaned up playing of global sounds 2012-01-06 19:38:40 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
Choupom 713dd3bc08 fixed controls rendering with low ui scale 2011-12-04 22:43:41 +01:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +02:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +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 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 5f4a5b3366 added country flags to language selectors 2011-07-12 20:33:53 +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 fdf6db5fd6 fixed that music resets on password prompt. Closes #695 2011-06-27 23:26:01 +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 101d9de3c3 added aspect ratio in display modes list in settings 2011-06-02 17:36:17 +02:00
GreYFoX 00ef75390f Laying off some caps 2011-04-17 20:02:32 +02:00
GreYFoX dad66bffc3 General DDRace binds improvements 2011-04-17 19:45:48 +02:00
GreYFoX 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
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 32a85dabe3 Fixed some merge mistakes, NOTE: This will be be buggy to say the least 2011-04-09 23:01:10 +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 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
oy 401543c7a9 added some space for colour channel translations in the graphic settings as well 2011-04-02 19:34:02 +02:00
oy 2c9b454fb8 added some more space for the translations of the colour channels 2011-04-02 12:13:23 +02:00
oy 593a8ee6ec improved settings menu. Closes #564 2011-04-01 19:36:44 +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 0e6aca2b28 fixed a missing translation 2011-03-31 18:24:02 +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 05244d4dad decreased the size of the "reset to defaults"-button in the settings menu 2011-03-22 00:40:43 +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 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 ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +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 5571ec70fa More Settings in the Settings tab 2011-02-23 08:36:14 +02:00
GreYFoXGTi 6904956a14 Added some DDRace Menu Items 
Enforced cl_ddrace_cheats on zoom
 2011-02-16 11:20:27 +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 f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02: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
SushiTee c0b905f852 -fixed compiler warnings 
-fixed mac compiling
 2011-01-26 14:45:44 +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
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
oy 67f86e3547 added option to change nameplates size by RushPL 2011-01-04 13:11:01 +01:00
oy c0530b0d09 added language popup on first start. Closes #336 2010-12-12 19:20:30 +01:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
oy a0985314c9 made it possible to "recycle" auto recorded demos 2010-12-11 18:55:28 +01:00
oy 4756c031c5 save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu 2010-12-08 01:55:13 +01:00
oy e6698b1118 apply custom colour to blood colour. Closes #314 2010-11-24 01:11:56 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
Choupom d2519f7ab9 small ui fixes 2010-10-25 18:59:33 +02:00
oy 662f43919c fixed overlapping restart warning 2010-10-16 11:27:49 +02:00
oy 639c32d661 do not show the restart warning in the settings if you change back to actual settings. Closes #90 2010-10-16 11:24:42 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
oy 27425facff fixed last commit 2010-09-24 13:21:03 +02:00
oy 0905b7755d localised the language names. Closes #153 2010-09-16 13:32:56 +02:00
oy c52ee7baa9 unbind a key with right mouse button in the controls menu. Closes #67 2010-09-12 17:15:09 +02:00
oy 5437513a0d use escape key to abort binding a control key in the menu 2010-09-12 13:40:24 +02:00
oy cabecb7fa9 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-18 00:06:00 +02:00
oy d471663913 added localisation fixes by fujnky 2010-08-09 00:35:37 +02:00
oy 4322113435 fixed overlapping skin name in the player settings 2010-08-07 20:52:33 +02:00
SushiTee e79bfb243c struct LANGUAGE should be a class CLanguage 2010-08-06 01:48:06 +08:00
Tom Adams 651cd062e6 fixed english localisation bug 2010-05-31 11:07:58 +00:00
Thomas 361380d630 *some esthetic changes 
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
 2010-05-30 12:01:11 +00:00
Tom Adams e16fdc3f3e added clipping to editboxes (#773) and made their cursors blink 2010-05-29 15:53:57 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 878ede3080 major update with stuff 2009-10-27 14:38:53 +00:00
Magnus Auvinen b3c1bae2e9 cleaned up localization. fixed motd so it shows when connecting to a server 2009-06-15 09:46:25 +00:00
Magnus Auvinen 307cf4aa64 done language selector 2009-06-15 08:15:53 +00:00
Magnus Auvinen ab171f8f30 updated localization 2009-06-15 07:34:25 +00:00
Magnus Auvinen 6309d7ad56 continued with localization 2009-06-15 06:45:44 +00:00
Magnus Auvinen bc20e9c433 localization update 2009-06-13 17:18:06 +00:00
Magnus Auvinen 6d9ccee95d base for the localization system 2009-06-13 16:54:04 +00:00
Magnus Auvinen 0c9dfd81fd fixed vsync option 2009-01-21 20:55:07 +00:00
Magnus Auvinen d0bcf50ef5 fixed fsaa sampling and reduction of fsaa if gfx init fails 2009-01-11 12:13:18 +00:00
Magnus Auvinen bd5b2b9f85 removed glfw and portaudio. SDL is now a requirement 2008-10-23 16:18:33 +00:00
Magnus Auvinen d15860e44f renamed gc_render* to render* 2008-10-20 23:46:39 +00:00
Magnus Auvinen 6224fc7763 fixed sending of new player info when player changes something in the info 2008-10-20 23:38:23 +00:00
Magnus Auvinen da473cf614 fixed various issues with binding keys like enter and f1-f15 2008-10-20 23:10:00 +00:00
Magnus Auvinen e76e0e6f7e fixed so that the gui removes previous key binding if you change it 2008-10-20 22:46:58 +00:00
Dominik Geyer a4e922cf5a decreased width of slidebars in graphics-tab to fit 2008-10-17 15:26:02 +00:00
Alfred Eriksson 78d129c051 major restructuring of the controls settings page 2008-10-05 18:27:20 +00:00
Dominik Geyer 35a1252607 minor: fixed formatting 2008-10-05 15:59:36 +00:00
Dominik Geyer 2f1fa5f292 added option for scoreboard-bind to controls-page 2008-10-05 15:56:58 +00:00
Magnus Auvinen 6d44adb711 fixed keybindings. reworked the voting a bit. added vote spamming protection. added ingame voting hud. 2008-09-25 14:04:02 +00:00
Magnus Auvinen 0a48454a55 removed the GAMETYPE_ enum 2008-08-31 14:37:35 +00:00
Magnus Auvinen 432602c4ca renamed gc_ui.* to ui.* 2008-08-30 21:31:01 +00:00
Magnus Auvinen dfe499248f major commit. game client restructure. not complete, loads of stuff not working, but the structure is there 2008-08-27 15:48:50 +00:00