GreYFoXGTi
|
40d2068c70
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/editor/ed_layer_tiles.cpp
src/game/server/gamecontroller.cpp
src/game/server/player.cpp
src/game/variables.h
|
2010-10-10 14:36:02 +02:00 |
|
oy
|
b3c81e7258
|
added the possibility to shift the tiles of a layer into any direction
|
2010-10-09 18:38:23 +02:00 |
|
|
oy
|
7ad4d3224c
|
use file dialog when saving a map which was not loaded from the maps save path
|
2010-10-08 22:06:12 +02:00 |
|
|
GreYFoXGTi
|
6ca75f086e
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-08 13:37:38 +02:00 |
|
|
oy
|
6a26cd6621
|
fixed various problems with the file dialog in the editor
|
2010-10-07 23:51:07 +02:00 |
|
|
GreYFoXGTi
|
faaa8c241e
|
Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup
|
2010-10-07 15:33:48 +02:00 |
|
|
oy
|
3a98f7a048
|
added mod system. Closes #34
|
2010-10-06 23:07:35 +02:00 |
|
|
GreYFoXGTi
|
c24964ebcd
|
Added tele, speedup, front and switch layer to the client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:36:08 +02:00 |
|
|
GreYFoXGTi
|
896634a061
|
Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:28:06 +03:00 |
|
|
GreYFoXGTi
|
a02bceafed
|
Added Max Speed
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-22 20:43:23 +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
|
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
|
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
|
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
|
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
|
2967c57ddc
|
added possibility to delete envelopes and to save their names within a map by sushitee
|
2010-08-06 20:18:53 +02:00 |
|
xalduin
|
a99cbfc742
|
Image sorting working, less hackish
|
2010-06-02 12:12:32 -04: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 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|