GreYFoXGTi
2bbd28bb6d
Bigger default Quad for Convenient Zoom
2011-02-16 11:57:54 +02:00
GreYFoXGTi
718d697707
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/collision.cpp
src/game/collision.h
src/game/gamecore.cpp
src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
GreYFoXGTi
68a1a29db8
Reverted 1 Letter Refactoring or Edited it to a full name.
2011-02-13 12:57:10 +01:00
GreYFoXGTi
1b2703aaba
Refactoring & fixed WEAPONSPEC_GUN in content.py
2011-02-12 21:18:41 +01:00
oy
d12db45c48
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 19:10:45 +01:00
GreYFoXGTi
cf881cb74c
Fixed Switch layer tiles loading
2011-02-10 09:00:56 +02: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
5b51295185
Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches
...
fixed the freeze command
Added Freeze Tile to switch layer to set freeze tile custom delay
Added sv_freeze_delay to control default freeze time delay
2011-01-25 12:05:53 +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
oy
73010e7d2e
removed a debug message. Closes #373
2011-01-06 13:21:13 +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
Choupom
b565d4ab18
fixed so Make/Clear Collision buttons are hidden on game layer
2011-01-03 12:54:29 +01:00
GreYFoXGTi
a8efcfcb5a
Fixed CrossMap Tiles Copy
2010-12-19 16:10:42 +02: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
ade61b33b1
removed useless dbg_msg
2010-12-12 04:06:01 +02: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
a0a16e0f48
Few Editor Improvements
2010-12-04 13:54:53 +02:00
GreYFoXGTi
a1f500766e
lalalalalalalalalaaaaaaa
2010-11-23 20:04:36 +02:00
GreYFoXGTi
c4b047a6bb
i do have an excuse, i am ill....
2010-11-23 19:59:36 +02:00
GreYFoXGTi
4e8a4340b8
Made Old Switches Convert to new Switches
2010-11-23 11:43:52 +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
Choupom
57a9235997
reload the map on save if you are authed
2010-11-17 12:30:42 +01:00
GreYFoXGTi
2d7eae757e
Fixed Switch layer Saving
...
Next Ticks and Rotations Fix
2010-11-14 11:18:29 +02:00
GreYFoXGTi
209078c85e
Different Entities Picture
2010-11-14 03:03:24 +02:00
GreYFoXGTi
071fb6a5a3
new Switch System //TODO Rendering Rotation
2010-11-14 02:39:04 +02:00
GreYFoXGTi
1620e071d9
Removed a Tile and ensured stopper server side
2010-11-01 16:21:05 +02:00
GreYFoXGTi
e43bcd80db
Rotation
...
FTW
2010-11-01 03:51:17 +02:00
GreYFoXGTi
68c9323021
fixed shifting for front layer and switch layer
2010-10-22 17:02:11 +02:00
SushiTee
743338ce95
fixed shifting for tele layer and speedup layer
2010-10-22 16:51:34 +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
oy
9c256f69d8
fixed issues with adding and replacing images in the editor. Closes #216
2010-10-16 11:05:42 +02:00
oy
be315edfc0
fixed clamping mousepos in the editor
2010-10-13 20:21:13 +02:00
GreYFoXGTi
47714c9468
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/variables.h
2010-10-13 14:08:35 +02:00
oy
e4fe7457c8
fixed problems with the mouse movement. Closes #214
2010-10-13 12:47:42 +02:00
GreYFoXGTi
d8e6cfcbdd
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/french.txt
src/engine/client/client.cpp
src/engine/server/server.cpp
src/game/server/gamecontext.cpp
2010-10-11 03:56:58 +02:00
Choupom
bed7b64457
fixed map selection in map editor
2010-10-11 00:17:46 +02:00
GreYFoXGTi
40d2068c70
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/editor/ed_layer_tiles.cpp
src/game/server/gamecontroller.cpp
src/game/server/player.cpp
src/game/variables.h
2010-10-10 14:36:02 +02:00
oy
b3c81e7258
added the possibility to shift the tiles of a layer into any direction
2010-10-09 18:38:23 +02:00
oy
ab2df14641
made INT_STEP properties in the editor just change by 1
2010-10-09 13:33:33 +02:00
oy
7ad4d3224c
use file dialog when saving a map which was not loaded from the maps save path
2010-10-08 22:06:12 +02:00
GreYFoXGTi
6ca75f086e
Merge branch 'master' of http://github.com/oy/teeworlds
2010-10-08 13:37:38 +02:00
oy
04234c109e
show filename of the map in the editor. Closes #122
2010-10-08 00:04:46 +02:00
oy
6a26cd6621
fixed various problems with the file dialog in the editor
2010-10-07 23:51:07 +02:00
GreYFoXGTi
faaa8c241e
Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup
2010-10-07 15:33:48 +02:00
oy
3a98f7a048
added mod system. Closes #34
2010-10-06 23:07:35 +02:00
GreYFoXGTi
dff5a70b91
Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup
...
Conflicts:
src/game/editor/ed_editor.cpp
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
2010-10-02 03:32:44 +02:00
GreYFoXGTi
16bb3621c3
Not only the main game layer is always on top, all game layers are on top of other layers, but in a specified order to each other. Closes #38 . again
2010-10-01 21:28:56 +02:00
GreYFoXGTi
c24964ebcd
Added tele, speedup, front and switch layer to the client
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:36:08 +02:00
GreYFoXGTi
896634a061
Total Cleanup
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
GreYFoXGTi
9fde901705
Removed multipliers and changed initial layer size
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 14:44:57 +03:00
GreYFoXGTi
526e36f8a0
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/client/components/menus.h
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/variables.h
2010-09-27 06:32:14 +03:00
oy
feb7e60bb2
fixed map listing
2010-09-24 13:48:23 +02:00
oy
7e0b37e06c
fixed that it checks the current dir for demos too
2010-09-24 13:38:03 +02:00
GreYFoXGTi
a02bceafed
Added Max Speed
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 20:43:23 +03:00
GreYFoXGTi
bf53d85a14
Fixed merge mistake
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 16:30:40 +03:00
GreYFoXGTi
67a5765c9f
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/components/camera.cpp
src/game/client/components/camera.h
src/game/editor/ed_editor.cpp
src/game/editor/ed_layer_tiles.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 21:27:40 +03:00
oy
08f6e7dd07
added button to resize a quad based on the aspect ratio of the image. Closes #169
2010-09-19 17:12:09 +02:00
GreYFoXGTi
2ac229f228
Partially Revert "Changed the way Layers are rendered."Closes #38 .
...
This reverts commit bfd7d11a99
.
2010-09-16 23:08:55 +03:00
oy
9727cd25ec
do not rotate/flip gamelayer tiles. Closes #155
2010-09-16 13:13:53 +02:00
oy
a2083b31e3
fixed last commit
2010-09-16 12:48:32 +02:00
Choupom
582763bc21
made folders in editor ( #80 )
2010-09-16 12:28:10 +02:00
GreYFoXGTi
37d9bbf7c5
Brush is never cleared on layer change.
...
there are enough checks if it has tiles that doesn't belong.
Closes #33 .
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 12:11:32 +03:00
GreYFoXGTi
229106a2bf
Made BrushDraw always put the editor variables. Closes #32 .
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 12:06:02 +03:00
GreYFoXGTi
5d4f50e2d5
Fixed when copying empty tiles in special game layers
...
editor variables were set to 0 ( like force in speedup )
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 12:00:11 +03:00
GreYFoXGTi
bfd7d11a99
Changed the way Layers are rendered. Closes #31 .
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 11:47:45 +03:00
GreYFoXGTi
72e05efc53
Added Evil Teleporter,
...
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-11 02:01:15 +02:00
GreYFoXGTi
616498e7b1
Merge branch 'master' of http://github.com/oy/teeworlds into master
...
Conflicts:
src/engine/client/input.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/network_server.cpp
src/engine/storage.h
src/game/client/components/chat.cpp
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/collision.cpp
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:57:38 +02:00
oy
995d63d7f4
added the possibility to rotate tiles in the editor by SushiTee
2010-09-05 19:01:01 +02:00
GreYFoXGTi
bba6e8c827
When grabbing a tile it copies it's data to the editor
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 20:07:00 +02:00
GreYFoXGTi
d4363d7ae3
Removed Moving objects check points from front layer to avoid confusion
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-30 06:57:29 +02:00
GreYFoXGTi
dd63ab26a9
Some optimizations and Removed Collision and No Hook from Front Layer to avoid vanilla client prediction errors
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-29 05:46:09 +02:00
GreYFoXGTi
ca7e8de0e5
Shame on me ( takes 1 else to fuck me up )
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 02:07:01 +02:00