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
|
9727cd25ec
|
do not rotate/flip gamelayer tiles. Closes #155
|
2010-09-16 13:13:53 +02: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
|
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 |
|
SushiTee
|
866f76727b
|
using PROPTYPE_INT_SCROLL for layer size in editor
|
2010-08-08 23:46:23 +02:00 |
|
Fujnky
|
bf68f803e3
|
Internationalized editor and updated german localization
|
2010-06-05 23:36:52 +02: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
|
d15860e44f
|
renamed gc_render* to render*
|
2008-10-20 23:46:39 +00:00 |
|
Alfred Eriksson
|
c3ff86330f
|
merge from 0.4.3: lots of small stuff
|
2008-09-07 08:30:49 +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
|
7a3874745c
|
fixed loads of graphical optimizations
|
2008-03-29 11:44:03 +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
|
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
|
7bc733dc10
|
large update. cleaned up some code. added new effects for almost everything
|
2008-01-29 21:39:41 +00:00 |
|
Magnus Auvinen
|
6f2b43af9b
|
fixed remove and replace image
|
2008-01-19 12:32:08 +00:00 |
|
Magnus Auvinen
|
57c4765993
|
editor update and other stuff
|
2008-01-17 23:09:49 +00:00 |
|
Magnus Auvinen
|
c04df11f1e
|
editor update
|
2008-01-13 22:03:32 +00:00 |
|
Magnus Auvinen
|
06671c4494
|
fixed various issues
|
2008-01-13 13:42:59 +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 |
|