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
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
f1ea039df7
added separator in image menu. Closes #785
2011-08-05 19:52:39 +02:00
oy
e5395f00b3
fixed that activating a quad point doesn't align it on the grid and made moving the pivot use the grid. Closes#792
2011-08-05 19:52:37 +02:00
oy
fee2c2c452
fixed an overlapping in the editor. Closes #794
2011-08-05 19:52:36 +02:00
oy
b7605dd0b5
reset quad point selection when activating a different quad. Closes #819
2011-08-05 19:52:34 +02:00
Shereef Marzouk
2b5c532589
converted white spaces to tabs
2011-08-02 12:14:49 +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
oy
6312a2d71c
fixed few things in th editor
2011-07-20 22:18:31 +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
Choupom
188e622373
fixed auto_map.h header guard
2011-07-20 21:54:19 +02:00
SushiTee
f7a9e80163
added possibility to collapse groups by double clicking them
2011-07-15 01:03:22 +02:00
SushiTee
ef881a5321
added layer/image scrolling via mouse wheel
2011-07-15 01:02:11 +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
oy
7648ba3024
added a different mouse sens for menus/editor
2011-07-03 00:36:07 +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
eb70e55ead
Merge branch 'master' of git://github.com/oy/teeworlds
2011-05-17 09:00:25 +02:00
oy
896ef2f235
removed load/save binds in the editor
2011-05-16 19:54:35 +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
cd2114c758
fixed problem with the file dialog in the editor
2011-05-09 17:37:04 +02:00
oy
193fb192c5
added maximum zoom level in the editor. Closes #664
2011-05-05 01:53:12 +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
oy
5fbf6d0bfd
fixed compiler warnings. Closes #679
2011-05-05 01:43:27 +02:00
Choupom
0c6f187e3b
renamed editor files
2011-05-03 18:45:42 +02:00
GreYFoX
d0ed9612e1
Properly done cl_show_entities
2011-04-19 16:32:42 +02:00
GreYFoX
a76759eeb5
Fixed a 1 line merge mistake
2011-04-19 14:53:42 +02:00
GreYFoX
cbfa9b6679
little cleanup
2011-04-17 18:19:46 +02:00
GreYFoX
4c11e9460b
added "fixed brush rotating and flipping for tele and speeduplayer" by SushiTee
2011-04-17 18:00:01 +02:00
oy
bda0927a87
disable envelope editor when the picker is shown
2011-04-16 19:00:28 +02:00
GreYFoX
9397c4a55f
some make release changes for adding sql server files
...
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
2011-04-15 04:32:53 +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
oy
876eac1048
added fix to make [Shift] only change the time of the point and not his value for envelopes in map editor by Choupon
2011-04-13 17:47:02 +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
oy
693bd39e77
added quad positioning in the editor
2011-03-29 12:08:46 +02:00
oy
eaef2ce48a
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-22 00:31:42 +01:00
oy
588a411666
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 22:53:50 +01:00
oy
8d159ce65a
removed localisation in the editor
2011-03-20 17:04:03 +01:00
oy
d9ce720387
made engine an interface
2011-02-27 15:03:57 +01:00
oy
088ec3e2f3
made the client's map search work with sub folders. Closes #254
2011-02-21 11:23:30 +01:00
oy
4f91026a01
added an editor function to show tile informations (index, flip/rotate status)
2011-02-18 11:41:27 +01:00
oy
ae94c36f54
made game tile construction in the editor more usable
2011-02-18 10:49:54 +01:00
oy
b2f66978c9
fixed overlapping image names in the editor. Closes #442
2011-02-16 12:36:51 +01:00
GreYFoXGTi
55794249c8
No Front Layer by Default
...
Makes it possible to map other game types too
2011-02-16 12:01:51 +02:00