Commit graph

41 commits

Author SHA1 Message Date
def 4f0c61716c Better Scoreboard 2014-01-10 18:15:26 +01:00
def 3dc996e3cc New ddnet-tiles by phacrum and 645654 2014-01-06 15:19:00 +01:00
def 4b5785d45b Add ddnet-tiles and rules 2013-12-28 01:09:40 +01:00
def ea6f6c0e37 Add fadeout tiles and automapper rules for them 2013-12-27 18:33:46 +01:00
def d1a584b4af Add jetpack tile 2013-11-22 15:10:55 +01:00
def 111d5c7f10 Add entities to start and stop: Player collisions, Hooking, Infinite jump 2013-08-05 17:47:04 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
2011-05-09 18:36:13 +02:00
oy d5e065b6c7 added tileset bugfixes by Crises 2011-05-02 18:00:02 +02:00
GreYFoX aaac8a3f77 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/version.h
2011-04-09 22:33:06 +02:00
oy aecb97fa0a fixed problem with jungle_main 2011-04-09 21:15:25 +02:00
oy 42fdd6540c added new graphics and maps 2011-04-09 16:48:51 +02:00
Floff Floffsson 645f31141d deepfreeze tiles 2011-01-17 00:38:24 +02:00
GreYFoXGTi 9c66a2d54c Endless Hook Tile for ingameplay by Floff aka LemonFace 2011-01-17 00:13:21 +02:00
GreYFoXGTi c97105a113 fixed missing tile from Fisico 2010-12-12 01:16:39 +02:00
GreYFoXGTi a25bbce836 New Entities by Fisico, I split them and reworked into separate files 2010-12-12 01:05:11 +02:00
GreYFoXGTi 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
GreYFoXGTi 1620e071d9 Removed a Tile and ensured stopper server side 2010-11-01 16:21:05 +02:00
GreYFoXGTi e43bcd80db Rotation
FTW
2010-11-01 03:51:17 +02:00
GreYFoXGTi 51f5241e63 new entities.png 2010-10-16 21:25:08 +02:00
GreYFoXGTi 9fde901705 Removed multipliers and changed initial layer size
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 14:44:57 +03:00
GreYFoXGTi 8f48989f73 Fixed Dragger + Stopper Bug
Fisico ReDrew some entities

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 12:01:54 +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 3f9839188d ...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 09:12:32 +02:00
GreYFoXGTi 51586d0e05 Reworked and Added more stoppers
added filled entities which can be used to detect if a map has something that is not shown in editor or map_hack if you replace entities.png or entities_clear.png respectively
updated the Test.map to test the new tiles

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-30 06:45:09 +02:00
GreYFoXGTi 6f521709c4 Forgot 2010-08-29 06:40:20 +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
Johan Althoff dc5ef00c32 Landil update, merged and fixed grass tiles (and other fixes) 2009-01-12 00:10:43 +00:00
Magnus Auvinen 7e0eb11136 dilated desert and added new jungle tileset 2009-01-11 20:11:41 +00:00
Johan Althoff b36e59111a testing a new pallette for the desert tileset 2009-01-11 19:29:51 +00:00
Johan Althoff 13cec11894 Background desaturation fixes 2009-01-11 18:57:31 +00:00
Magnus Auvinen 6713a85cd5 resized the clouds textures to POT textures 2009-01-11 18:34:30 +00:00
Johan Althoff 85649ca84e Color mismatch on desert_main.png fixed
desert_mountains.png brightened, desaturated and color-adjusted
2009-01-11 17:14:43 +00:00
Alfred Eriksson fec578e084 commiting new maps and mapres. have fun! 2009-01-11 15:22:57 +00:00
Magnus Auvinen d0b55de9b2 reverted wrongful commit 2008-10-17 11:27:00 +00:00
Magnus Auvinen 35bcd41aa2 added hammer hit effect. added reset of all systems on state change. solves a lot of possible memory errors 2008-10-17 11:23:21 +00:00
Joel de Vahl 839fb6ed4f New background for dm6 2008-03-22 19:17:27 +00:00
Magnus Auvinen 1c43fc249f removed old tilesets 2008-03-22 15:20:18 +00:00
Magnus Auvinen 918a090329 fixed dm6. fixed the desert tileset aswell 2008-03-22 10:01:29 +00:00
Magnus Auvinen 30d0a42e0d started to retile dm6 with desert tileset. no where near done 2008-03-21 19:49:15 +00:00
Magnus Auvinen 9dc0b670f8 cleaned up in the data folder 2008-01-19 16:34:34 +00:00
Magnus Auvinen f9782f628f support for external images in the map editor 2008-01-19 14:23:53 +00:00