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
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
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
GreYFoXGTi
2bbd28bb6d
Bigger default Quad for Convenient Zoom
2011-02-16 11:57:54 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
GreYFoXGTi
1b2703aaba
Refactoring & fixed WEAPONSPEC_GUN in content.py
2011-02-12 21:18:41 +01:00
GreYFoXGTi
3da1860654
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
2011-02-04 18:54:54 +02:00
oy
be68a4f516
added fix by CarmineZ about missing tool tips in the editor
2011-01-29 18:48:55 +01:00
SushiTee
c0b905f852
-fixed compiler warnings
...
-fixed mac compiling
2011-01-26 14:45:44 +02:00
GreYFoXGTi
6889adc0bb
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
.gitignore
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
oy
7487a22956
added better texture moving in the editor by nsinreal. Closes #372
2011-01-06 21:58:42 +01:00
GreYFoXGTi
ddc5dd7ab3
Cleaned up & Re-arranged stuff
2011-01-06 05:46:10 +02:00
GreYFoXGTi
c5648311ed
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/german.txt
src/game/client/components/scoreboard.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/variables.h
2011-01-04 22:37:09 +02:00
oy
336f00ae89
added colours for tile layers by Choupom
2011-01-04 11:38:14 +01:00
GreYFoXGTi
ccbd057255
Revert merge branch 14.11 converter merged by noother
2010-12-19 04:02:59 +02:00
GreYFoXGTi
e803f30f52
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/entities/character.cpp
src/game/server/entities/flag.cpp
src/game/server/player.cpp
src/game/variables.h
2010-12-16 06:06:23 +02:00
oy
a3797482da
removed 360 degree rotation in the editor. Closes #352
2010-12-16 04:27:00 +01:00
GreYFoXGTi
73dbc159bc
Merge branch 'master' of github.com:GreYFoXGTi/DDRace
2010-12-16 04:11:02 +02:00
GreYFoXGTi
2f5f332cbb
Merge branch 'master' into DDRace
...
Conflicts:
src/engine/client/client.cpp
src/engine/shared/config_variables.h
2010-12-13 03:43:22 +02:00
oy
c75a75b64f
made it possible to automatically take game over screenshots. Closes #339
2010-12-12 16:48:13 +01:00
GreYFoXGTi
4510ced422
Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace
2010-12-10 21:20:34 +02:00
GreYFoXGTi
2c51511260
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
...
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
2010-12-10 20:58:53 +02:00
oy
7414271309
check the return values of RemoveFile and CreateFolder
2010-12-07 23:47:41 +01:00
GreYFoXGTi
aa30c29b35
Fixed Some Editor Mistakes
2010-12-07 17:51:59 +02:00
GreYFoXGTi
987881c02a
Further More Editor Improvements
2010-12-04 14:05:14 +02:00
GreYFoXGTi
32c8a349f5
Made An Older Switch Layer Converter
2010-11-23 11:36:57 +02:00
GreYFoXGTi
4737588827
New Delayed Switches
2010-11-22 23:10:12 +02:00
GreYFoXGTi
5d9ee1736e
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
oy
97a7dea152
added localisation updates by Sworddragon
2010-11-21 14:25:00 +01:00
oy
e4f1e18c4e
fixed entry names in the demo browser and the editor's file dialog. Closes #301
2010-11-21 12:33:13 +01:00
Sworddragon
fc9211c777
Updated copyrights
2010-11-20 21:26:06 +01:00
GreYFoXGTi
a109e1150d
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/config_variables.h
src/game/client/components/console.cpp
src/game/client/gameclient.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
2010-11-18 01:10:59 +02:00
oy
d94355729d
added icons in the demo browser and the editor's file dialog. Closes #209
2010-11-17 19:46:50 +01:00
oy
3d3572f845
fixed some compiler warnings
2010-11-17 18:36:19 +01:00
oy
ca80d2a347
reload the map on save just when the map name is equal
2010-11-17 13:08:29 +01:00
GreYFoXGTi
209078c85e
Different Entities Picture
2010-11-14 03:03:24 +02:00
GreYFoXGTi
bfc20da61d
Merge branch 'master' of http://github.com/oy/teeworlds
2010-10-18 01:15:24 +02:00
SushiTee
1127c7b830
fixed compiling error
2010-10-17 17:10:55 +02:00
GreYFoXGTi
ddf2883cb2
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/console.cpp
src/game/server/gamecontext.cpp
2010-10-16 21:59:59 +02:00
oy
0edad8e640
made it possible to specify which layers/groups should be saved within the map
2010-10-16 18:50:05 +02:00
oy
85fd272846
added the possibility to create a new folder within the editor's save file dialog
2010-10-16 18:33:54 +02:00
