edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
1878 commits 1 branch 424 tags 415 MiB
Commit graph

276 commits

Author SHA1 Message Date
GreYFoXGTi 616498e7b1 Merge branch 'master' of http://github.com/oy/teeworlds into master 
Conflicts:
	src/engine/client/input.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/network_server.cpp
	src/engine/storage.h
	src/game/client/components/chat.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/collision.cpp
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:57:38 +02:00
Fujnky 4123f28bba Improved demo player another bit. 
* Replaced the reset button by more common stop button
* Made the demo player automatically reset after demo ended
 2010-09-04 16:23:20 +02:00
GreYFoXGTi 3f9839188d ... 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-31 09:12:32 +02:00
GreYFoXGTi 5f66a8f663 Corrected a tile background 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-30 19:41:09 +02:00
GreYFoXGTi 51586d0e05 Reworked and Added more stoppers 
added filled entities which can be used to detect if a map has something that is not shown in editor or map_hack if you replace entities.png or entities_clear.png respectively
updated the Test.map to test the new tiles

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-30 06:45:09 +02:00
GreYFoXGTi f3d1c123a4 updated test map 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-29 09:11:26 +02:00
GreYFoXGTi 6f521709c4 Forgot 2010-08-29 06:40:20 +02:00
GreYFoXGTi 277ce3b77e Made stop tiles stop you earlier and fixed bug with stoppers + draggers 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-29 02:05:45 +02:00
GreYFoXGTi 8426442936 Separated Freezing Plasma gun from Explosive Plasma gun and added one with both 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 22:32:16 +02:00
GreYFoXGTi c6803b405f Removed Old Door System 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 21:38:13 +02:00
GreYFoXGTi eab7ad207b Added Check for map options tile 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 21:34:21 +02:00
GreYFoXGTi 11f480a79b Changed the Loading String to Loading DDRace Client 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 19:59:24 +02:00
btd 28a668c2c8 Remake entities_clear.png. Thanks Landil and Fisico for original works 2010-08-28 16:16:16 +04:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server 
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-25 17:31:49 +02:00
GreYFoXGTi 4a0d787399 Further More Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 01:38:58 +02:00
GreYFoXGTi dc7d3f8275 Removed Tiles that wouldn't work correctly 2010-08-22 01:15:20 +02:00
GreYFoXGTi edd58fba7d fixed hammer_me 2010-08-20 16:57:42 +02:00
btd bbd48810ad Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 19:20:39 +04: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
GreYFoXGTi 465272651d New Layout 2010-08-12 14:30:46 +03:00
GreYFoXGTi afa93fb203 draft of the current entities not ready waiting on Fisico to come online xD 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-10 19:33:52 +03:00
Fujnky f8b9f342d3 Fix for l10n in menus_demo.cpp and sime german l10n tweaks. 2010-06-11 15:50:47 +08:00
vierkant 8625f42e30 Dutch translation. Some small errors and the editor translations 2010-06-09 20:40:12 +08:00
Magnus Auvinen 0d78e2d2cd Merge remote branch 'fujnky/master' 
Conflicts:
	data/languages/portuguese.txt
 2010-06-09 13:01:36 +02:00
Fujnky 7ca5e0fbb1 Fixed localizations, most german translation strings fit in buttons now. 2010-06-07 16:17:40 +02:00
Fujnky 7cc7c8f84e Merged with master 2010-06-07 16:00:01 +02:00
oy 2ba877bc64 added update for portuguese translation by slinack 2010-06-06 23:44:42 +02:00
Fujnky bf68f803e3 Internationalized editor and updated german localization 2010-06-05 23:36:52 +02:00
vierkant 7b19d24b84 better translation 2010-06-04 04:20:25 -07:00
vierkant bd04ae2d77 sorted alphabetically 2010-06-04 02:41:13 -07:00
vierkant b7a4193467 Dutch translation 2010-06-03 10:06:34 -07:00
Fujnky 551170656d Fixed localization for 'Error loading demo'-Popup 2010-06-03 17:41:45 +02:00
Fujnky 5a641132e7 Fixed localization for 'Error loading demo'-Popup 2010-06-03 17:07:15 +02:00
Fujnky d581e413c8 More localization fixes 2010-06-03 11:30:05 +02:00
Fujnky 64ddee0a21 Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-02 21:47:47 +02:00
Fujnky 0d4c0ccef5 Some localization fixes 2010-06-02 21:03:15 +02:00
oy 25408a102b added fix for portuguese translation by slinack 2010-06-02 20:27:53 +02:00
Tom Adams 6fca512a95 added fix for italian language by Lanta and fixed a bug with the id in votekick menu 2010-05-31 20:05:45 +00:00
Tom Adams dca90950e6 added fix for czech translation by khubajsn 2010-05-31 14:54:03 +00:00
Tom Adams 262b566c94 increased the fontsize of the chat messages 2010-05-30 17:08:54 +00:00
Thomas d96f2583e1 updated french.txt (Ubu) 2010-05-30 16:41:43 +00:00
Tom Adams 08df0fe63d added fix for italian translation by Lanta 2010-05-30 14:26:04 +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 84e307029b added another fix to portuguese translation by yemDX 2010-05-30 00:51:34 +00:00
Tom Adams baa57830ad fixed bubble sort loop (#802), 2 entries in the language files and a possible overrun 2010-05-29 23:57:30 +00:00
Tom Adams 7d8c8f09d7 added fix for portuguese translation by yemDX 2010-05-29 15:22:42 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Dominik Geyer 9b99ec0e60 updated german translation 2009-06-18 10:18:55 +00:00
Magnus Auvinen 0160f26514 updated german translation 2009-06-15 13:32:46 +00:00
Magnus Auvinen 658cd5a78f updated german translation 2009-06-15 12:39:47 +00:00