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
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
GreYFoXGTi
2208aad385
Just Making Sure
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 01:45:48 +02:00
GreYFoXGTi
3a444a3b22
I did this fine in the morning (in the lost commit) but now it just doesn't work :s
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 01:30:50 +02:00
GreYFoXGTi
fd7c0c39ac
Reworked the Front Layer after reworking the front layer a similar bug was found, but this time fixed on double save, so i added a work around that double saves ( I'm not proud of this T.T )
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 08:14:47 +02:00
GreYFoXGTi
b3736dded4
Bye Bye Client-Side Front Layer T.T ( getting ready for a full rework of the front layer )
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 06:23:34 +02:00
GreYFoXGTi
7f8fb7a5a7
Merging the client manually into the server
...
but i can't get the client to accept the console class of the server -.-" yet..
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-25 17:31:49 +02:00
oy
41afca6db2
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
2010-08-25 01:17:02 +02:00
oy
8cd7093c63
added localisation fixes and map editor tool tips by sworddragon
2010-08-24 23:44:25 +02:00
oy
c1611b7ce9
added localisation fixes by sworddragon
2010-08-24 23:44:16 +02:00
oy
cabecb7fa9
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
2010-08-18 00:06:00 +02:00
oy
4c2dcc4f2b
added localisation fixes and map editor tool tips by sworddragon
2010-08-16 01:29:11 +02:00
oy
5922cbb56d
added localisation fixes by sworddragon
2010-08-16 00:45:04 +02:00
oy
9753f62d46
added tool tip for value selector button in the editor
2010-08-10 13:47:33 +02:00
oy
d471663913
added localisation fixes by fujnky
2010-08-09 00:35:37 +02:00
SushiTee
866f76727b
using PROPTYPE_INT_SCROLL for layer size in editor
2010-08-08 23:46:23 +02:00
oy
2967c57ddc
added possibility to delete envelopes and to save their names within a map by sushitee
2010-08-06 20:18:53 +02:00
oy
3824d885a2
fixed envelope index in the quad popup, so that it fits the envelope menu. Closes #118
2010-07-18 13:57:17 +02:00
oy
bc8274f48b
fixed last commit
2010-07-18 13:44:30 +02:00
SushiTee
97204482e2
fixed issue #150
...
holding CTRL while moving a point allows to be a lot more precise
2010-07-18 13:33:34 +02:00
SushiTee
b6d07edda8
fixed issue #57
2010-07-17 20:05:17 +02:00
xalduin
052820dc88
Issue #92 , fixed scrollbars in editor
2010-07-04 16:59:02 +02:00
oy
bd02c2043e
fixed editor popups shown outside the screen
2010-06-28 15:12:43 +02:00
oy
ff3eda23ae
automatically add the map extension when saving a map with the editor
2010-06-25 19:41:55 +02:00
oy
82f5a56d89
fixed crash in the map editor
2010-06-25 18:56:58 +02:00
oy
6b713157a7
added button to restore the map focus. Closes #116
2010-06-22 14:15:52 +02:00
oy
62ffaa9142
added a lost newline
2010-06-22 02:07:52 +02:00
oy
d01776bf3f
auto-add background when creating new map. Closes #50
2010-06-22 01:15:12 +02:00
oy
3475d2ae1b
fixed freeze in the map editor GUI. Closes #138
2010-06-20 15:27:44 +02:00
oy
d7c106ca90
fixed border function in the editor. Closes #117
2010-06-11 13:44:28 +02:00
xalduin
22f11d6839
Restore map focus on load map/new map
2010-06-10 20:38:04 +08:00
xalduin
7fa21400d6
Mouse wheel no longer moves layer/image scrollbar
2010-06-09 20:41:00 +08:00
Fujnky
7ca5e0fbb1
Fixed localizations, most german translation strings fit in buttons now.
2010-06-07 16:17:40 +02:00
Fujnky
7cc7c8f84e
Merged with master
2010-06-07 16:00:01 +02:00
xalduin
2d99a0360f
Images are now sorted on Append
2010-06-05 18:47:30 -04:00
xalduin
80a7c53dec
Issue #92 scrollbars added for layer/image toolbars
2010-06-05 18:46:47 -04:00
Fujnky
34bd0a09b7
minor typo fix
2010-06-05 23:37:50 +02:00
Fujnky
bf68f803e3
Internationalized editor and updated german localization
2010-06-05 23:36:52 +02:00
xalduin
cc181cda5b
Merge remote branch 'upstream/master'
2010-06-02 15:21:31 -04:00
oy
7a1953e60b
added fix for editor quad editing by ghost91 Closes #18
2010-06-02 20:50:48 +02:00
xalduin
9e6c909624
Removed unnecessary SortImages call in RenderImages
2010-06-02 13:26:17 -04:00
xalduin
a99cbfc742
Image sorting working, less hackish
2010-06-02 12:12:32 -04:00
xalduin
f2920ea5d8
Sort by map name when opening map
...
When opening a map, the list of map names is now sorted alphabetically.
2010-06-02 05:11:12 +08:00
xalduin
be5b6aa4de
Sort by map name when opening map
...
When opening a map, the list of map names is now sorted alphabetically.
2010-06-01 16:49:35 -04:00
Tom Adams
54692ceaf1
added fix for editor->append by xalduin
2010-05-31 21:55:45 +00:00
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00
Magnus Auvinen
878ede3080
major update with stuff
2009-10-27 14:38:53 +00:00
Magnus Auvinen
69511102de
improved the font system even futher. utf8 is now used everywhere. it uses less memory as well
2009-06-13 08:22:37 +00:00
Magnus Auvinen
4bb1df3189
moved 0.5 branch to trunk
2009-05-31 09:44:20 +00:00
Alfred Eriksson
affb99fd2b
added animation speed controllers to the editor
2009-01-24 10:43:27 +00:00
Alfred Eriksson
5103c214bd
use enter in editor file dialogs
2009-01-11 18:29:41 +00:00
Joel de Vahl
2a7402dd6c
use dmg for osx deliver, build universal binary, fix backspace being entered as a character
2009-01-11 12:10:30 +00:00
Alfred Eriksson
d7b0da8a0b
added mouse wheel scrolling in file dialogs
2009-01-10 17:17:38 +00:00
Dominik Geyer
12127c0acd
editor: use CTRL-key instead of ALT-key to move world/view; ticket #551
2008-11-02 20:52:07 +00:00
Alfred Eriksson
41114313d6
fixed the clipping of the file box
2008-11-01 17:34:31 +00:00
Alfred Eriksson
74a5cabce3
fixed #546
2008-10-29 12:15:58 +00:00
Magnus Auvinen
bd5b2b9f85
removed glfw and portaudio. SDL is now a requirement
2008-10-23 16:18:33 +00:00
Magnus Auvinen
d15f0cfcf2
fixed editor edit box function
2008-10-21 18:43:07 +00:00
Magnus Auvinen
b49e4da20b
fixed editor saving, open and append. note that you can only save maps to your user directory
2008-10-21 18:40:46 +00:00
Magnus Auvinen
d15860e44f
renamed gc_render* to render*
2008-10-20 23:46:39 +00:00
Dominik Geyer
13513864cf
fixed compiler warnings
2008-10-18 15:09:53 +00:00
Alfred Eriksson
8c4cfd54b8
added zoom by scroll
2008-10-18 10:04:51 +00:00
Dominik Geyer
397b9a764b
data-dir autodetection; data-dir override; compiled-in data-dir; messagebox if detection fails; does chdir into data-dir
2008-10-01 17:16:22 +00:00
Magnus Auvinen
8f9e2031dc
repaired the editor
2008-09-23 13:28:57 +00:00
Alfred Eriksson
c3ff86330f
merge from 0.4.3: lots of small stuff
2008-09-07 08:30:49 +00:00
Alfred Eriksson
5c93ab7655
merged from 0.4.3: screenshot by f10
2008-09-01 18:38:08 +00:00
Magnus Auvinen
67aa042dcb
compile fixes for windows
2008-09-01 17:30:20 +00:00
Magnus Auvinen
432602c4ca
renamed gc_ui.* to ui.*
2008-08-30 21:31:01 +00:00
Magnus Auvinen
dfe499248f
major commit. game client restructure. not complete, loads of stuff not working, but the structure is there
2008-08-27 15:48:50 +00:00
Magnus Auvinen
d711dd190c
continued with clean up
2008-08-17 08:52:24 +00:00
Magnus Auvinen
817f431377
moved out e_system, e_detect, vmath and math to a little base library
2008-08-14 17:19:13 +00:00
Magnus Auvinen
3705064b10
renamed .h to .hpp in game because they are c++ headers
2008-06-12 12:09:34 +00:00
Magnus Auvinen
f6c67c29cd
large commit with loads of clean up. more is comming
2008-06-12 10:51:48 +00:00
Magnus Auvinen
ae71bff086
some clean up and increased the size of a strings in the console
2008-03-29 14:34:40 +00:00
Magnus Auvinen
1f246d9dcb
fixed protection so that the fonts doesn't get resampled
2008-03-29 11:55:42 +00:00
Magnus Auvinen
7a3874745c
fixed loads of graphical optimizations
2008-03-29 11:44:03 +00:00
Magnus Auvinen
119bb8a5f8
fixed so that maps are downloaded to maps/. fixed so that you can't select non-existing envelopes in the editor
2008-03-23 12:51:14 +00:00
Magnus Auvinen
bede40f27d
added shortcuts n,m for flipping tiles
2008-03-22 11:13:21 +00:00
Magnus Auvinen
48d4aa0e89
added the rifle to the maps and removed it from the starting inventory
2008-03-21 19:05:35 +00:00
Magnus Auvinen
45a047ce47
fixed bug in text rendering. added option for detail layers
2008-03-21 17:39:09 +00:00
Magnus Auvinen
a339dcf731
fixed editor bug and added ctf1
2008-03-21 01:01:56 +00:00
Magnus Auvinen
65e074db91
fixed some more editor stuff
2008-03-21 00:13:55 +00:00
Magnus Auvinen
c984efd3a9
fixed some bugs in the editor
2008-03-20 23:59:41 +00:00
Magnus Auvinen
78155fa6d7
fixed so you can append maps in the editor. broken the loading of old maps however :D
2008-03-09 23:29:14 +00:00
Magnus Auvinen
23ffe1ff65
updated to svn version of portaudio. fixed a couple of issues with linux and multiple sound devices.
2008-03-05 19:38:47 +00:00
Magnus Auvinen
c20d99b81d
added option to delete quads
2008-03-02 15:59:52 +00:00
Magnus Auvinen
bb5cfafd7c
fixed so that images get a name when they are just added
2008-03-02 15:55:02 +00:00
Magnus Auvinen
323ea57485
removed the option to delete the game layer and group
2008-03-02 15:53:53 +00:00
Magnus Auvinen
91e4c2252b
added rotate to editor. fixed so that the game handles envelopes
2008-02-05 19:11:34 +00:00
Magnus Auvinen
5f32f5b36f
added laser weapon
2008-02-02 18:05:16 +00:00
Magnus Auvinen
1fe3202f0b
cleaned up the console code. added the ability to tune the game in runtime.
2008-02-02 12:38:36 +00:00
Magnus Auvinen
7bc733dc10
large update. cleaned up some code. added new effects for almost everything
2008-01-29 21:39:41 +00:00
Magnus Auvinen
2d4824efd5
fixed envelope crashbug
2008-01-19 23:43:51 +00:00
Magnus Auvinen
f9782f628f
support for external images in the map editor
2008-01-19 14:23:53 +00:00
Magnus Auvinen
b5a6dacfa3
fixed naming of images
2008-01-19 13:02:22 +00:00
Magnus Auvinen
6f2b43af9b
fixed remove and replace image
2008-01-19 12:32:08 +00:00
Magnus Auvinen
dd21ae1bc7
large commit. documented a bit. editor updates. general cleanup of everything
2008-01-19 10:57:25 +00:00
Magnus Auvinen
57c4765993
editor update and other stuff
2008-01-17 23:09:49 +00:00
Magnus Auvinen
a9c90d6ac0
fixed better image selection
2008-01-13 22:37:58 +00:00
Magnus Auvinen
c04df11f1e
editor update
2008-01-13 22:03:32 +00:00
Magnus Auvinen
e26b898b74
various fixes. continued on the editor
2008-01-13 16:30:30 +00:00
Magnus Auvinen
06671c4494
fixed various issues
2008-01-13 13:42:59 +00:00
Magnus Auvinen
4c987519b0
removed some old code
2008-01-13 11:43:43 +00:00
Magnus Auvinen
ea245b969d
new mapformat in place. continued the cleanup. some effects are gone, gonna be redone so no biggie. CTF isn't working now.
2008-01-13 11:15:32 +00:00
Magnus Auvinen
906ece7894
continued the cleanup
2008-01-12 17:09:00 +00:00
Magnus Auvinen
99f0a47d6b
first round of code cleanup
2008-01-12 15:07:57 +00:00