edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 03:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4410 commits 1 branch 429 tags 411 MiB
Commit graph

64 commits

Author SHA1 Message Date
def 391232017a Add evil checkpoint teleports 2014-02-01 22:20:41 +01:00
def d1a584b4af Add jetpack tile 2013-11-22 15:10:55 +01:00
def 6da8d2146c New mapping entity: Specify number of jumps 2013-08-24 01:03:45 +02:00
def 55b196a68f Fix more 2013-08-14 04:28:16 +02:00
def 0a77fd62fd Fix order of new entities 2013-08-14 04:21:50 +02:00
def bf518df74d New teleport entities 2013-08-13 04:59:25 +02:00
def 111d5c7f10 Add entities to start and stop: Player collisions, Hooking, Infinite jump 2013-08-05 17:47:04 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
 2012-04-12 02:09:31 +02:00
SushiTee 65f4416164 added map info 2012-01-10 23:14:24 +01:00
XXLTomate 26e7a5888f compile fix 2011-12-09 23:00:40 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
oy 9a03989e84 added "Make an option for each envelope: (a) synchronized (b) starting at join" by Choupom 2011-12-04 14:39:47 +01:00
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams ) 
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
 2011-09-02 20:04:18 +02:00
Ravomavain 8bd82a3550 Fix DDRace layers in editor 2011-08-26 20:05:18 +02:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
GreYFoX 06afe36db4 Removed old hook through prediction as 0.5.2 servers are no longer compatible 
made it possible to load old maps
Enumerated layers
 2011-08-13 02:12:40 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
Shereef Marzouk 2084febca7 Removed outdated comment 2011-08-11 10:43:27 +02:00
Choupom c2e8bf5035 made a constant for game layer flag 2011-07-20 21:54:23 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile 
Entities are in the previous commit
 2011-07-19 23:33:12 +02:00
SushiTee d78c0d66e5 ability to name groups and layers 2011-07-15 00:47:52 +02:00
Romain Labolle 38f1db1c4f Adding a checkpoint system for teleporters : 
* Player go through a Checkpoint tile (29 in tele layer)
* He fall in a Check-Teleporter tile (31 in tele layer)
* Player is teleported to the check-TO (30 in tele layer) that have the same number as the last Checkpoint.
Thus players are teleported to the last checkpoint he passed, regardless of whether he made ​​the map in the right direction or not.

Tele tileset may need some improvement.
Closes Pull Request #52
 2011-06-01 17:03:04 +02:00
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 3bae74f21d Added Ability to predict old hook through tiles from DDMax 
fixed a warning
 2011-03-16 17:36:54 +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 af6f96bc7e Added Tile for the new Map Config 2010-12-02 00:45:36 +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 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 8fe9d49cc3 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-09-30 23:36:53 +03:00
GreYFoXGTi 896634a061 Total Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:28:06 +03:00
GreYFoXGTi 68d00cf441 thanks Mo(2) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-28 08:06:06 +03: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 7ecae53f6c Some People just don't know when they have to sleep xD 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-26 17:30:43 +03:00
GreYFoXGTi 18700326ef Fixed doors for super team 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-26 05:44:03 +03:00
GreYFoXGTi 8bff412118 New Doors System 2010-09-26 04:19:08 +03:00
GreYFoXGTi a02bceafed Added Max Speed 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 20:43:23 +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 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 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 8426442936 Separated Freezing Plasma gun from Explosive Plasma gun and added one with both 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 22:32:16 +02:00
GreYFoXGTi 7f0fa6d6b1 Added Switch Layer and it Finally works like it should 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 18:24:56 +02:00