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

522 commits

Author SHA1 Message Date
GreYFoXGTi bf53d85a14 Fixed merge mistake 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 16:30:40 +03:00
GreYFoXGTi 67a5765c9f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/components/camera.cpp
	src/game/client/components/camera.h
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_layer_tiles.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-19 21:27:40 +03:00
oy 08f6e7dd07 added button to resize a quad based on the aspect ratio of the image. Closes #169 2010-09-19 17:12:09 +02:00
GreYFoXGTi 2ac229f228 Partially Revert "Changed the way Layers are rendered."Closes #38. 
This reverts commit bfd7d11a99.
 2010-09-16 23:08:55 +03:00
oy 9727cd25ec do not rotate/flip gamelayer tiles. Closes #155 2010-09-16 13:13:53 +02:00
oy a2083b31e3 fixed last commit 2010-09-16 12:48:32 +02:00
Choupom 582763bc21 made folders in editor (#80) 2010-09-16 12:28:10 +02:00
GreYFoXGTi 37d9bbf7c5 Brush is never cleared on layer change. 
there are enough checks if it has tiles that doesn't belong.
Closes #33.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 12:11:32 +03:00
GreYFoXGTi 229106a2bf Made BrushDraw always put the editor variables. Closes #32. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 12:06:02 +03:00
GreYFoXGTi 5d4f50e2d5 Fixed when copying empty tiles in special game layers 
editor variables were set to 0 ( like force in speedup )

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 12:00:11 +03:00
GreYFoXGTi bfd7d11a99 Changed the way Layers are rendered. Closes #31. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 11:47:45 +03:00
GreYFoXGTi 72e05efc53 Added Evil Teleporter, 
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-11 02:01:15 +02:00
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
oy 995d63d7f4 added the possibility to rotate tiles in the editor by SushiTee 2010-09-05 19:01:01 +02:00
GreYFoXGTi bba6e8c827 When grabbing a tile it copies it's data to the editor 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-31 20:07:00 +02:00
GreYFoXGTi d4363d7ae3 Removed Moving objects check points from front layer to avoid confusion 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-30 06:57:29 +02:00
GreYFoXGTi dd63ab26a9 Some optimizations and Removed Collision and No Hook from Front Layer to avoid vanilla client prediction errors 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-29 05:46:09 +02:00
GreYFoXGTi ca7e8de0e5 Shame on me ( takes 1 else to fuck me up ) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 02:07:01 +02:00
GreYFoXGTi 2208aad385 Just Making Sure 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 01:45:48 +02:00
GreYFoXGTi 3a444a3b22 I did this fine in the morning (in the lost commit) but now it just doesn't work :s 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 01:30:50 +02:00
GreYFoXGTi fd7c0c39ac Reworked the Front Layer after reworking the front layer a similar bug was found, but this time fixed on double save, so i added a work around that double saves ( I'm not proud of this T.T ) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-27 08:14:47 +02:00
GreYFoXGTi b3736dded4 Bye Bye Client-Side Front Layer T.T ( getting ready for a full rework of the front layer ) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-27 06:23:34 +02: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
oy 41afca6db2 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-25 01:17:02 +02:00
oy 8cd7093c63 added localisation fixes and map editor tool tips by sworddragon 2010-08-24 23:44:25 +02:00
oy c1611b7ce9 added localisation fixes by sworddragon 2010-08-24 23:44:16 +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 4c2dcc4f2b added localisation fixes and map editor tool tips by sworddragon 2010-08-16 01:29:11 +02:00
oy 5922cbb56d added localisation fixes by sworddragon 2010-08-16 00:45:04 +02:00
oy 9753f62d46 added tool tip for value selector button in the editor 2010-08-10 13:47:33 +02:00
oy d471663913 added localisation fixes by fujnky 2010-08-09 00:35:37 +02:00
SushiTee 866f76727b using PROPTYPE_INT_SCROLL for layer size in editor 2010-08-08 23:46:23 +02:00
oy 2967c57ddc added possibility to delete envelopes and to save their names within a map by sushitee 2010-08-06 20:18:53 +02:00
oy 3824d885a2 fixed envelope index in the quad popup, so that it fits the envelope menu. Closes #118 2010-07-18 13:57:17 +02:00
oy bc8274f48b fixed last commit 2010-07-18 13:44:30 +02:00
SushiTee 97204482e2 fixed issue #150 
holding CTRL while moving a point allows to be a lot more precise
 2010-07-18 13:33:34 +02:00
SushiTee b6d07edda8 fixed issue #57 2010-07-17 20:05:17 +02:00
xalduin 052820dc88 Issue #92, fixed scrollbars in editor 2010-07-04 16:59:02 +02:00
oy bd02c2043e fixed editor popups shown outside the screen 2010-06-28 15:12:43 +02:00
oy ff3eda23ae automatically add the map extension when saving a map with the editor 2010-06-25 19:41:55 +02:00
oy 82f5a56d89 fixed crash in the map editor 2010-06-25 18:56:58 +02:00
oy 6b713157a7 added button to restore the map focus. Closes #116 2010-06-22 14:15:52 +02:00
oy 62ffaa9142 added a lost newline 2010-06-22 02:07:52 +02:00
oy d01776bf3f auto-add background when creating new map. Closes #50 2010-06-22 01:15:12 +02:00
oy 3475d2ae1b fixed freeze in the map editor GUI. Closes #138 2010-06-20 15:27:44 +02:00
oy d7c106ca90 fixed border function in the editor. Closes #117 2010-06-11 13:44:28 +02:00
xalduin 22f11d6839 Restore map focus on load map/new map 2010-06-10 20:38:04 +08:00
xalduin 7fa21400d6 Mouse wheel no longer moves layer/image scrollbar 2010-06-09 20:41:00 +08: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
xalduin 2d99a0360f Images are now sorted on Append 2010-06-05 18:47:30 -04:00
xalduin 80a7c53dec Issue #92 scrollbars added for layer/image toolbars 2010-06-05 18:46:47 -04:00
Fujnky 34bd0a09b7 minor typo fix 2010-06-05 23:37:50 +02:00
Fujnky bf68f803e3 Internationalized editor and updated german localization 2010-06-05 23:36:52 +02:00
xalduin cc181cda5b Merge remote branch 'upstream/master' 2010-06-02 15:21:31 -04:00
oy 7a1953e60b added fix for editor quad editing by ghost91 Closes #18 2010-06-02 20:50:48 +02:00
xalduin 9e6c909624 Removed unnecessary SortImages call in RenderImages 2010-06-02 13:26:17 -04:00
xalduin a99cbfc742 Image sorting working, less hackish 2010-06-02 12:12:32 -04:00
xalduin f2920ea5d8 Sort by map name when opening map 
When opening a map, the list of map names is now sorted alphabetically.
 2010-06-02 05:11:12 +08:00
xalduin be5b6aa4de Sort by map name when opening map 
When opening a map, the list of map names is now sorted alphabetically.
 2010-06-01 16:49:35 -04:00
Tom Adams 54692ceaf1 added fix for editor->append by xalduin 2010-05-31 21:55:45 +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 69511102de improved the font system even futher. utf8 is now used everywhere. it uses less memory as well 2009-06-13 08:22:37 +00:00
Magnus Auvinen 4bb1df3189 moved 0.5 branch to trunk 2009-05-31 09:44:20 +00:00
Alfred Eriksson affb99fd2b added animation speed controllers to the editor 2009-01-24 10:43:27 +00:00
Alfred Eriksson 5103c214bd use enter in editor file dialogs 2009-01-11 18:29:41 +00:00
Joel de Vahl 2a7402dd6c use dmg for osx deliver, build universal binary, fix backspace being entered as a character 2009-01-11 12:10:30 +00:00
Alfred Eriksson d7b0da8a0b added mouse wheel scrolling in file dialogs 2009-01-10 17:17:38 +00:00
Dominik Geyer 12127c0acd editor: use CTRL-key instead of ALT-key to move world/view; ticket #551 2008-11-02 20:52:07 +00:00
Alfred Eriksson 41114313d6 fixed the clipping of the file box 2008-11-01 17:34:31 +00:00
Alfred Eriksson 74a5cabce3 fixed #546 2008-10-29 12:15:58 +00:00
Magnus Auvinen bd5b2b9f85 removed glfw and portaudio. SDL is now a requirement 2008-10-23 16:18:33 +00:00
Magnus Auvinen d15f0cfcf2 fixed editor edit box function 2008-10-21 18:43:07 +00:00
Magnus Auvinen b49e4da20b fixed editor saving, open and append. note that you can only save maps to your user directory 2008-10-21 18:40:46 +00:00
Magnus Auvinen d15860e44f renamed gc_render* to render* 2008-10-20 23:46:39 +00:00
Dominik Geyer 13513864cf fixed compiler warnings 2008-10-18 15:09:53 +00:00
Alfred Eriksson 8c4cfd54b8 added zoom by scroll 2008-10-18 10:04:51 +00:00
Dominik Geyer 397b9a764b data-dir autodetection; data-dir override; compiled-in data-dir; messagebox if detection fails; does chdir into data-dir 2008-10-01 17:16:22 +00:00
Magnus Auvinen 8f9e2031dc repaired the editor 2008-09-23 13:28:57 +00:00
Alfred Eriksson c3ff86330f merge from 0.4.3: lots of small stuff 2008-09-07 08:30:49 +00:00
Alfred Eriksson 5c93ab7655 merged from 0.4.3: screenshot by f10 2008-09-01 18:38:08 +00:00
Magnus Auvinen 67aa042dcb compile fixes for windows 2008-09-01 17:30:20 +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
Magnus Auvinen d711dd190c continued with clean up 2008-08-17 08:52:24 +00:00
Magnus Auvinen 817f431377 moved out e_system, e_detect, vmath and math to a little base library 2008-08-14 17:19:13 +00:00
Magnus Auvinen 3705064b10 renamed .h to .hpp in game because they are c++ headers 2008-06-12 12:09:34 +00:00
Magnus Auvinen f6c67c29cd large commit with loads of clean up. more is comming 2008-06-12 10:51:48 +00:00
Magnus Auvinen ae71bff086 some clean up and increased the size of a strings in the console 2008-03-29 14:34:40 +00:00
Magnus Auvinen 1f246d9dcb fixed protection so that the fonts doesn't get resampled 2008-03-29 11:55:42 +00:00
Magnus Auvinen 7a3874745c fixed loads of graphical optimizations 2008-03-29 11:44:03 +00:00
Magnus Auvinen 119bb8a5f8 fixed so that maps are downloaded to maps/. fixed so that you can't select non-existing envelopes in the editor 2008-03-23 12:51:14 +00:00
Magnus Auvinen bede40f27d added shortcuts n,m for flipping tiles 2008-03-22 11:13:21 +00:00
Magnus Auvinen 48d4aa0e89 added the rifle to the maps and removed it from the starting inventory 2008-03-21 19:05:35 +00:00
Magnus Auvinen 45a047ce47 fixed bug in text rendering. added option for detail layers 2008-03-21 17:39:09 +00:00
Magnus Auvinen a339dcf731 fixed editor bug and added ctf1 2008-03-21 01:01:56 +00:00
Magnus Auvinen 65e074db91 fixed some more editor stuff 2008-03-21 00:13:55 +00:00
Magnus Auvinen c984efd3a9 fixed some bugs in the editor 2008-03-20 23:59:41 +00:00
Magnus Auvinen 78155fa6d7 fixed so you can append maps in the editor. broken the loading of old maps however :D 2008-03-09 23:29:14 +00:00
Magnus Auvinen 23ffe1ff65 updated to svn version of portaudio. fixed a couple of issues with linux and multiple sound devices. 2008-03-05 19:38:47 +00:00
Magnus Auvinen c20d99b81d added option to delete quads 2008-03-02 15:59:52 +00:00
Magnus Auvinen bb5cfafd7c fixed so that images get a name when they are just added 2008-03-02 15:55:02 +00:00
Magnus Auvinen 323ea57485 removed the option to delete the game layer and group 2008-03-02 15:53:53 +00:00
Magnus Auvinen 91e4c2252b added rotate to editor. fixed so that the game handles envelopes 2008-02-05 19:11:34 +00:00
Magnus Auvinen 5f32f5b36f added laser weapon 2008-02-02 18:05:16 +00:00
Magnus Auvinen 1fe3202f0b cleaned up the console code. added the ability to tune the game in runtime. 2008-02-02 12:38:36 +00:00
Magnus Auvinen 7bc733dc10 large update. cleaned up some code. added new effects for almost everything 2008-01-29 21:39:41 +00:00
Magnus Auvinen 2d4824efd5 fixed envelope crashbug 2008-01-19 23:43:51 +00:00
Magnus Auvinen f9782f628f support for external images in the map editor 2008-01-19 14:23:53 +00:00
Magnus Auvinen b5a6dacfa3 fixed naming of images 2008-01-19 13:02:22 +00:00
Magnus Auvinen 6f2b43af9b fixed remove and replace image 2008-01-19 12:32:08 +00:00
Magnus Auvinen dd21ae1bc7 large commit. documented a bit. editor updates. general cleanup of everything 2008-01-19 10:57:25 +00:00
Magnus Auvinen 57c4765993 editor update and other stuff 2008-01-17 23:09:49 +00:00
Magnus Auvinen a9c90d6ac0 fixed better image selection 2008-01-13 22:37:58 +00:00
Magnus Auvinen c04df11f1e editor update 2008-01-13 22:03:32 +00:00
Magnus Auvinen e26b898b74 various fixes. continued on the editor 2008-01-13 16:30:30 +00:00
Magnus Auvinen 06671c4494 fixed various issues 2008-01-13 13:42:59 +00:00
Magnus Auvinen 4c987519b0 removed some old code 2008-01-13 11:43:43 +00:00
Magnus Auvinen ea245b969d new mapformat in place. continued the cleanup. some effects are gone, gonna be redone so no biggie. CTF isn't working now. 2008-01-13 11:15:32 +00:00
Magnus Auvinen 906ece7894 continued the cleanup 2008-01-12 17:09:00 +00:00
Magnus Auvinen 99f0a47d6b first round of code cleanup 2008-01-12 15:07:57 +00:00