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
GreYFoX
74462d4611
enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable
2011-07-25 22:16:20 +02:00
Choupom
84e5c53432
added color envelope feature for tilemaps
2011-07-20 22:04:13 +02:00
Choupom
c2e8bf5035
made a constant for game layer flag
2011-07-20 21:54:23 +02:00
SushiTee
d78c0d66e5
ability to name groups and layers
2011-07-15 00:47:52 +02:00
oy
7bc07b613f
added auto mapping feature by LordSkelethom
2011-07-09 01:09:06 +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
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
Choupom
0c6f187e3b
renamed editor files
2011-05-03 18:45:42 +02:00
