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 |
|
oy
|
be37147342
|
fixed border rendering in the editor's image preview. Closes #908
|
2012-01-08 01:47:53 +01:00 |
|
|
GreYFoX
|
de4a95c5d2
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
|
2011-08-20 06:50:06 +02:00 |
|
|
oy
|
c38c632d06
|
fixed multiple popup creation in the editor. Closes #836
|
2011-08-13 19:22:01 +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 |
|
|
oy
|
003c0aa281
|
fixed aspect ratio in the editor's image preview. Closes #784
|
2011-08-06 13:08:29 +02:00 |
|
|
oy
|
6312a2d71c
|
fixed few things in th editor
|
2011-07-20 22:18:31 +02:00 |
|
|
SushiTee
|
f7a9e80163
|
added possibility to collapse groups by double clicking them
|
2011-07-15 01:03:22 +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 |
|
|
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 |
|