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
13843 commits 1 branch 429 tags 411 MiB
Commit graph

182 commits

Author SHA1 Message Date
Learath Lea 1f4ddfe0ba Add some indication that the update is happening. 
Prevent unexpected restart.
 2015-03-08 19:51:13 +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
east 9db12d455d working on CDDNetCountry 2014-09-18 16:13:06 +02:00
east e732008157 DDNet serverlist added 2014-09-13 16:36:25 +02:00
east 862a520857 DemoPlayer: Refuse to overwrite demo 2014-08-25 11:19:00 +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 038129f9ce Allow disabling custom and new skins in client 2014-08-17 05:34:16 +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 15ff17d8f8 Cleanup of some menus, added editor button, added disconnect question 2014-07-08 20:21:19 +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
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 42811dc896 Autoupdater asks for permission to update + Autoupdater fixes 2014-05-17 14:28:50 +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 3dce4c9489 Add dummy (Thanks to //toast and Monsta) 2014-04-26 20:29:42 +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 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
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
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 fb309436b4 improved friends feature 2011-06-26 17:10:13 +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
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 593a8ee6ec improved settings menu. Closes #564 2011-04-01 19:36:44 +02:00
oy 9712e4004c improved the add/remove friend and ignore/notice chat buttons 2011-03-29 00:48:36 +02:00
oy 867f944459 added graphic buttons for remove/add friend and chat ignore/notice 2011-03-28 21:10:37 +02: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 ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
oy b4bec53359 added clan name and country flag selector to the player settings 2011-03-16 21:31:55 +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 0bc13c91eb made cl_threadsoundloading work again 2011-02-27 17:56:03 +01:00
GreYFoX 5ffe4e9429 Added In-Game Page DDRace 2011-02-23 09:33:21 +02:00
oy 088ec3e2f3 made the client's map search work with sub folders. Closes #254 2011-02-21 11:23:30 +01: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
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
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 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 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 bf6fcc20f4 added an error popup on startup when the sound couldn't be initialised. Closes #425 2011-01-17 13:28:15 +01: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
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 3956c34b6d Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
 2010-12-16 04:15:05 +02:00
oy 1d7df01e9a added map download progress by kaddyd 2010-12-16 01:52:29 +01:00
GreYFoXGTi 2f5f332cbb Merge branch 'master' into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
 2010-12-13 03:43:22 +02:00
oy c0530b0d09 added language popup on first start. Closes #336 2010-12-12 19:20:30 +01:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
 2010-11-22 00:26:00 +02:00
Choupom 38c2a1b45c fixed so every demo infos are not loaded when making the demos list 2010-11-20 21:34:13 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
 2010-11-18 01:10:59 +02:00
oy d94355729d added icons in the demo browser and the editor's file dialog. Closes #209 2010-11-17 19:46:50 +01:00
GreYFoXGTi fb88a8e4e7 Added In-Game Server Browser. Closes #65. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-30 00:44:52 +02:00
Choupom d2519f7ab9 small ui fixes 2010-10-25 18:59:33 +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
Choupom 61201fea13 added reason to kick a player in the callvote tab 2010-10-11 00:31:21 +02:00
oy 85b9c60158 added info in the demo browser by Choupom 2010-10-09 13:27:21 +02:00
oy a075889312 fixed a listing problem in the demo browser 2010-10-08 00:13:05 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
oy aaf8e2bc8e cleaned up demo listing and fixed its sorting. Closes #73 2010-09-29 00:53:53 +02:00
oy 7e0b37e06c fixed that it checks the current dir for demos too 2010-09-24 13:38:03 +02:00
Choupom 582763bc21 made folders in editor (#80) 2010-09-16 12:28:10 +02:00
oy 5588e1ec8c fixed selected index when deleting a demo and added a popup to confirm the deletion 2010-09-05 17:53:31 +02:00
Choupom fcfaa8389f added Remove button in demos browser (#66) 2010-09-05 17:40:51 +02:00
oy 16f201794d fixed a variable name 2010-08-16 04:12:03 +02:00
Fujnky 4d8c4ffadb Improved the replay control buttons in the demo player a lot. 
* Now there is a combined play/pause button + a reset button
* Replaced the ugly strings with nice graphics
 2010-08-13 03:17:13 +02:00
oy 5d442ae329 refresh the server browser if the "favorites"-tab is active and a new entry has been added with "add_favorite"-command 2010-07-04 16:10:00 +02:00
Choupom 8e8cbdb562 fix for folders in demo browser 2010-06-10 20:38:16 +08:00
Choupom 848764544f added folders in demo browser (#25) 2010-06-04 22:14:02 +02: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