GreYFoX
|
5b27758650
|
Removed level stuff
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
|
2011-08-13 02:11:06 +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 |
|
Choupom
|
84e5c53432
|
added color envelope feature for tilemaps
|
2011-07-20 22:04:13 +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 |
|
|
SushiTee
|
6cd2ab3887
|
added grid to editor
|
2011-07-11 12:03:16 +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 |
|
|
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 |
|