GreYFoXGTi
|
526e36f8a0
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/client/components/menus.h
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/variables.h
|
2010-09-27 06:32:14 +03:00 |
|
oy
|
7e0b37e06c
|
fixed that it checks the current dir for demos too
|
2010-09-24 13:38:03 +02: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 |
|
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
|
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 |
|
|
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
|
57f54108b5
|
fixed a variable name
|
2010-08-24 23:47:10 +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 |
|