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
f737910e0a
fixed FillSelection so it actually fills the current selection
2012-01-12 22:03:55 +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
c6fd4a2cc5
General whitespace and tab cleanup
2011-08-11 10:59:14 +02:00
oy
5fc5b63dac
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
2011-08-06 22:30:18 +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
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
Choupom
bf6ca3e33d
fixed tiles infos in groups with custom para or offset in editor
2011-06-27 16:50:38 +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
oy
ca6e129da6
fixed size of characters in editor's tileselection screen on zoom. Closes #665
2011-05-05 01:50:23 +02:00
Choupom
0c6f187e3b
renamed editor files
2011-05-03 18:45:42 +02:00
