Commit graph

266 commits

Author SHA1 Message Date
def b7d4beccea Fix buffer overflow when pasting text (thanks to Im 'corneum) 2016-05-11 17:51:27 +02:00
def bfcf0c4067 Fix auto reconnect abortion 2016-05-07 16:12:23 +02:00
def 1b668047c8 Clean up auto reconnect and make it independent of rendering 2016-05-04 18:23:00 +02:00
def bad26a3a8a Pressing shift makes slider move slower (fixes #455) 2016-05-03 15:11:52 +02:00
def a1151fd296 ban -> Timeout 2016-05-01 11:15:45 +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 a1403ef457 Make sure GetClipboardText's null returns are handled properly 2016-04-29 21:56:38 +02:00
def 632db36fe4 Add clipboard copy&paste support (by swick) 2016-04-29 21:56:38 +02:00
Henningstone 8279855bb0 Show ingame Ghost tab only on race servers 2016-04-28 22:40:46 +02:00
def ec7d28ed86 Change ingame menu layout a bit: Browser, Ghost directly instead of Network tab 2016-04-27 20:14:03 +02:00
Tim Schumacher 6e7dbec76e made fading border in menu more customizeable 2016-02-16 17:04:46 +01:00
def ed49e3214a Some more minor settings menu fixes 2015-08-28 20:44:07 +02:00
def d95145819f Fix oversize headers on Android 2015-06-22 01:39:08 +02:00
def 3cedbd5061 Revert "Add key binding for R to refresh serverbrowser"
This reverts commit db60bf6527.
2015-05-12 23:28:10 +02:00
def db60bf6527 Add key binding for R to refresh serverbrowser 2015-05-11 21:57:11 +02:00
def b6008f5b20 Only refresh serverbrowser when necessary 2015-05-11 21:51:06 +02:00
def 32feea555f Also fix popup title flow on disconnect extra text (not just title) 2015-04-27 23:17:28 +02:00
def aa517af7c7 Don't let popup title flow out of box 2015-03-29 14:20:34 +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 ebf331febb Show the function of search and exclusion edit boxes when empty (Suggestion by Saavik) 2014-12-24 03:38:40 +01: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 520b84328f Fix 5:4 resolution in menu 2014-09-20 13:37:00 +02:00
east e732008157 DDNet serverlist added 2014-09-13 16:36:25 +02:00
def c6b63c34ba Don't show quit popup on update 2014-08-26 22:06:35 +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 1c4fac8afd Display map name while downloading 2014-08-16 01:06:17 +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 c1eb944057 Minor fix 2014-07-08 21:04:04 +02:00
def 15ff17d8f8 Cleanup of some menus, added editor button, added disconnect question 2014-07-08 20:21:19 +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 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def c67742f60a Add news 2014-06-05 12:11:41 +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 4f8171fcde Revert "Fix menus for 1280x1024"
This reverts commit 17478a4f17.
2014-05-08 14:08:15 +02:00
def 17478a4f17 Fix menus for 1280x1024 2014-05-06 13:38:59 +02:00
def 9f509eeedb Fix: Dummy setting updates 2014-04-28 15:19:57 +02:00
def 7bcc51d488 Basic updating (thanks to unsigned char* 2014-04-27 05:01:03 +02:00
def c6c438fe02 Fix: Only set standard search when starting for the first time 2014-02-15 01:19:07 +01:00
def e88e0698c7 Name stuff 2014-01-03 03:06:23 +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 db7154273d ddnet -> Network 2013-10-10 12:10:10 +02:00
def dc6d2305d5 Add AntiPing 2013-10-09 16:02:23 +02:00
def 62c2e1211b Fix DDRace menu corner to look correct 2013-08-03 15:24:20 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02:00
oy 878af82d8f fixed frozen GUI caused by popups 2013-03-16 15:30:40 +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
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 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 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 2785293469 don't start playing the music again if we're quitting 2012-01-06 20:03:57 +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
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 5ebf60891c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-12-01 19:48:09 +02:00
oy 05f77f64af added caching for the play command. Closes #891 2011-11-30 01:41:00 +01: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
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 7648ba3024 added a different mouse sens for menus/editor 2011-07-03 00:36:07 +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 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
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 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
Choupom f8d21b48af fixed a l10n bug for some languages 2011-05-03 23:10:20 +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
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
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 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 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 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 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 7bd79f9f43 added remove_favorite command by Choupom 2011-03-27 18:05:11 +02:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +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 0313485d6b fixed that PageMenu buttons change their inactive colour ingame 2011-03-17 17:48:45 +01:00
oy b4bec53359 added clan name and country flag selector to the player settings 2011-03-16 21:31:55 +01:00
oy a04eb45354 added rename button to the demo browser and updated localisation entries 2011-03-12 19:08:44 +01:00