GreYFoX
|
0df6d0541f
|
Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
Conflicts:
bam.lua
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/game/client/components/binds.cpp
src/game/client/components/chat.h
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/controls.cpp
src/game/client/components/emoticon.h
src/game/client/components/maplayers.cpp
src/game/client/components/menus.h
src/game/client/components/scoreboard.h
src/game/client/components/spectator.h
src/game/client/components/voting.h
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/client/render.h
src/game/collision.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/gamecore.cpp
src/game/gamecore.h
src/game/layers.cpp
src/game/layers.h
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/laser.h
src/game/server/entities/pickup.cpp
src/game/server/entities/pickup.h
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gameworld.cpp
src/game/server/gameworld.h
src/game/server/player.cpp
src/game/variables.h
|
2011-04-14 01:27:49 +02:00 |
|
oy
|
06115dd49d
|
added "Whitespace and line Endings cleanup" by GreYFoX
|
2011-04-13 20:37:12 +02:00 |
|
|
GreYFoX
|
f7f6058a92
|
Merged Oy, Cleaned up, removed some useless features and code parts
Added Icon by landil
alot more...
|
2011-04-09 22:32:17 +02:00 |
|
|
GreYFoX
|
87cde802b1
|
Added a new entities_clear
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
|
2011-03-16 19:48:16 +02:00 |
|
|
GreYFoX
|
ee178d5a48
|
Client Cheat showing entities in game
|
2011-03-16 14:48:16 +02:00 |
|
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +02:00 |
|
|
GreYFoXGTi
|
4737588827
|
New Delayed Switches
|
2010-11-22 23:10:12 +02:00 |
|
|
GreYFoXGTi
|
5d9ee1736e
|
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
|
2010-11-22 00:26:00 +02:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
|
GreYFoXGTi
|
071fb6a5a3
|
new Switch System //TODO Rendering Rotation
|
2010-11-14 02:39:04 +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
|
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
|
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
|
05f3757491
|
added optimisations by sworddragon
|
2010-08-05 20:55:51 +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 |
|