edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-15 04:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
16623 commits 1 branch 429 tags 412 MiB
Commit graph

1157 commits

Author SHA1 Message Date
12pm 8fb77f1a26 Fit sound name in select button too 2019-03-18 01:14:32 +01:00
12pm ffe50b3b25 Don't change active edit box corners to default 2019-03-12 22:25:01 +01:00
bors[bot] 6a791fe8de Merge #1486 
1486: Fit image name in select button r=def- a=12pm

Adjusts font size a bit and truncates text if it overflows

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-03-12 20:12:09 +00:00
12pm 0dd0de5ad4 Fit image name in select button 
Adjusts font size a bit and truncates text if it overflows
 2019-03-12 19:35:22 +01:00
def 6f9cfd5af1 Increase MAX_PATH_LENGTH to support our own downloadedmaps names 2019-03-12 18:43:03 +01:00
Dennis Felsing 984df7f49d
Merge pull request #1481 from 12pm/game-tiles 
Add auto game tiles to all possible layers, increase layer size if needed
 2019-03-12 16:54:04 +01:00
12pm 7c227c563d Add auto game tiles to all possible layers, increase layer size if needed 2019-03-12 02:35:29 +01:00
Dennis Felsing f0cce859ef
Merge pull request #1476 from ddnet/remove-save 
Remove save group/layer button (fixes #1475)
 2019-03-11 22:58:40 +01:00
Dennis Felsing 40591c2f8b Remove save group/layer button (fixes #1475) 2019-03-11 22:58:18 +01:00
Bojidar Marinov e944817472
Fix automapper not removing the Opaque flag before checking if flags match 2019-03-11 14:35:24 +02:00
Bojidar Marinov 1ca48a38ac
Fixup #1454, inadvertedly broke game layer picker 2019-02-13 21:11:13 +02:00
Bojidar Marinov 352157ddbe
Fix crash when painting tiles from a non-switch to a switch layer 
Fixes #1452.
 2019-02-11 10:41:26 +02:00
12pm 2daafdaad5 Disable unused tiles only for DDNet entities 2019-02-08 04:04:41 +01:00
def e8e2cd9f49 Revert "Reset brush when changing active layer (fixes #485)" 
Made it impossible to copy layer content to another layer and then use
autofiller on that: https://forum.ddnet.tw/viewtopic.php?f=16&t=6450

This reverts commit df6e3a541f.
 2019-01-11 17:57:37 +01:00
Dennis Felsing b0709bbe5f
Merge pull request #1426 from ddnet/mouse-editor 
Hacky mouse editor fix (fixes #1367)
 2019-01-11 12:16:23 +01:00
def df6e3a541f Reset brush when changing active layer (fixes #485) 2019-01-11 12:15:19 +01:00
def 8c4a26fa63 Fix editor fullscreen mode (fixes #1303) 
By initializing ToolBar
 2019-01-11 10:48:23 +01:00
def 9b88d8f418 Hacky mouse editor fix (fixes #1367) 2019-01-11 10:02:15 +01:00
def 16f6e23aaa Nicer fix for crash 2019-01-10 15:44:04 +01:00
def 1c85c962ef Fix automap crash (reported in #1425) 2019-01-10 15:38:04 +01:00
Dennis Felsing f82ab4cb21 Fix editor crash (reported in #1425) 2019-01-09 08:38:49 +01:00
Learath2 c601df8b28 Switch around the colors for used/unused envelopes 2018-11-16 14:51:36 +01:00
Dennis Felsing 045533cef7
Merge pull request #1321 from bojidar-bg/x-add-auto-automapper 
Add option to automatically run the automapper
 2018-11-15 09:30:22 +01:00
Ryozuki 674d3f00e0 add support for blue teleport gun 2018-11-03 10:26:20 +01:00
Ryozuki ddf2e6af36 add tele-activator to the switch layer 2018-11-03 10:26:19 +01:00
Learath abd49ddbf7 Restore old behaviour to be safe :( 2018-10-30 18:56:46 +01:00
Learath 0ecda0ced4 Fix crash introduced by 1e2dce0. Close #1362 2018-10-30 18:13:32 +01:00
def aab6fa152a Fix #1357 2018-10-29 22:16:32 +01:00
bors[bot] 1b0b36c6eb Merge #1316 #1341 #1349 
1316: code improvement on gameclient.cpp r=def- a=Ryozuki



1341: Mark unused envelopes r=def- a=Learath2

Thought I'd do this one as well while looking at the editor code.

1349: Don't ignore CONNECT packets with data that we don't know r=def- a=heinrich5991

This specifically affects 0.6.5. Just treat them the same way as those
without any data.

Co-authored-by: Ryozuki <edgar@ryobyte.com>
Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-10-29 14:31:27 +00:00
Learath 657e869901 Handle Tile and Sound layers 2018-10-14 16:57:30 +03:00
Learath cdce9d84ac Mark unused envelopes. Fix #1139 2018-10-09 13:42:04 +03:00
Bojidar Marinov 823e4ee0f3
Save automapper config as external-typed mapitem 2018-10-09 13:17:05 +03:00
Bojidar Marinov 351fee2666 Optimize automatic automap to automap only around changes. 
Should work, no flaws found when testing with grass_main
 2018-10-09 12:56:48 +03:00
Bojidar Marinov c52a3c970e Add option to automatically run the automapper 
Also, put automapping config selection seperatelly from the automapper button.
Also, add seed parameter to the automapper.
 2018-10-09 12:56:48 +03:00
Learath 4fedd91020 Arrow keys should account for visibility 2018-10-08 19:07:25 +03:00
Learath ad566aa158 Consider the search text when counting elements 2018-10-08 18:43:39 +03:00
Learath 5c4203b747 Reset scroll when search text changes. Fix #1331 2018-10-08 18:43:37 +03:00
Dennis Felsing a09fa562be
Merge pull request #1314 from timakro/pr_editor_entities_gametypes 
Allow choosing game layer entities for different gametypes, closes #1283
 2018-10-07 23:02:20 +02:00
Dennis Felsing fc7b3732e6
Merge pull request #1315 from Learath2/dd_pr_brushsave 
Implement brush saving. Fix #1111
 2018-10-04 10:59:00 +02:00
Dennis Felsing 20b31723c9
Merge pull request #1323 from heinrich5991/pr_ddnet_fix_editor_dontembedvanilla 
Duh. Fix editor embedding vanilla images and not others
 2018-10-03 20:40:48 +02:00
heinrich5991 479dc8ad8f Duh. Fix editor embedding vanilla images and not others 
I don't know how I managed to get this wrong.

Fixes #1178.
 2018-10-03 20:34:13 +02:00
Tim Schumacher ab6f344daa
Fix current selection highlighting 2018-10-02 23:39:22 +02:00
Tim Schumacher fd52bc7a26
List all game layer entities images in directory 2018-10-02 23:08:17 +02:00
Learath fef22f34f2 Implement brush saving. Fix #1111 2018-10-02 03:52:01 +02:00
Tim Schumacher bee694a8cb
Forgot to remove debug 2018-10-01 23:10:46 +02:00
Tim Schumacher 2e36ad67bb
Allow choosing game layer entities for different gametypes, closes #1283 2018-10-01 23:05:36 +02:00
Dennis Felsing 24bd8f2d56
Merge pull request #1312 from timakro/pr_fix_dragging_quads 
Fix #963 dragging quads
 2018-10-01 22:39:15 +02:00
Tim Schumacher 3fd2f60034
Left align editor menu texts like server settings, closes #1215 2018-10-01 21:45:29 +02:00
Tim Schumacher 8da9a5f9f1
Fix #963 dragging quads 2018-10-01 21:12:14 +02:00
Bojidar Marinov 1e2dce06ae
Fix crash when filling selection on tele/switch/speedup layers 2018-09-26 15:53:25 +03:00
Bojidar Marinov 50d53603e1
Add a toggle button for brush coloring 
In some cases (very dark color, etc.) it is impossible to see the tiles.
 2018-09-11 11:35:02 +03:00
bors[bot] 36a243e395 Merge #1251 
1251: Selecting multiple quads r=def- a=Aerll

- shift+drag to select quads. Selection is additive
- left click on any empty space deselects all quads
- moving, resizing, rotating etc. works for every selected quad
- fixed resizing quads on grid and in properties. Vertices don't land on the same spot

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2018-08-21 06:31:06 +00:00
Learath c5d69f9f63 Fix crash with FillSelection 2018-08-19 20:05:42 +03:00
Aerll 520aa7dd0d naming & eol 2018-08-13 16:46:53 +02:00
Aerll f79bf5d03b selecting multiple quads 2018-08-13 11:11:56 +02:00
Aerll 9951b2a187 optimize automapper a bit 2018-08-11 03:01:25 +02:00
bors[bot] 22ff46e204 Merge #1245 
1245: Fix automapper bug r=def- a=Aerll

There is some weird bug caused by my last changes, looks like automapper is working only fine for tiles without rotation.
![unknown](https://user-images.githubusercontent.com/31746984/43928232-73d9e8f4-9c30-11e8-802f-e4d239fdf8d4.png)
![unknown2](https://user-images.githubusercontent.com/31746984/43928244-793a25d4-9c30-11e8-9c37-e1fc5c3fd39b.png)
I'm not really sure why it doesn't work with -1, so I did some workaround.

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2018-08-10 08:17:37 +00:00
Aerll abc55396d0 fix flag test bug 2018-08-09 23:45:04 +02:00
Bojidar Marinov 80c829681e
Don't copy alpha when coloring the brush 2018-08-09 13:07:49 +03:00
Aerll a7a8db4dcb fix crash when deleting layer 2018-08-03 14:14:25 +02:00
bors[bot] 8194274352 Merge #1236 
1236: Copy tile layer color to brush and picker r=heinrich5991 a=bojidar-bg

![Comparision](https://user-images.githubusercontent.com/5276727/43340641-aaebcfc4-91e5-11e8-9d43-c18aff8cd6fc.png)
Before is on the left, after is on the right.


Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2018-07-30 14:25:11 +00:00
bors[bot] b82930b56a Merge #1227 
1227: Allow multiple layers to be selected and edited at the same time. r=heinrich5991 a=bojidar-bg

Resolves #486.

Please test, I'm still not completely sure it won't crash or mess up a map from time to time.

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2018-07-30 14:12:49 +00:00
Bojidar Marinov 0f6bd99d12
Copy tile layer color to brush and picker 2018-07-27 21:38:36 +03:00
Bojidar Marinov 333572acd4
Polish; disable picker and quad/sounds popup menus in multi-select 2018-07-27 16:54:52 +03:00
Dennis Felsing 409abf1b90 Simplify code a bit 2018-07-27 07:51:16 +02:00
Dennis Felsing 4f18d7f9b8
Merge pull request #1213 from Aerll/automapper 
Add 2 new commands for automapper
 2018-07-27 07:49:04 +02:00
Aerll 292f0a2b09 no need for all pos rule tests 2018-07-27 00:23:53 +02:00
Aerll 52fbade30c remove unnecessary tiles overwriting 2018-07-26 22:58:05 +02:00
Aerll 56a5ee6d1b formatting.. 2018-07-26 18:59:29 +02:00
Aerll 2e7a0be516 wrong naming for pointer 2018-07-26 18:26:12 +02:00
Aerll 3c07a2b35b fixes #1213 2018-07-26 14:49:43 +02:00
heinrich5991 5c4e819e44 Use str_startswith, str_endswith instead of ad-hoc implementations 2018-07-26 14:18:23 +02:00
Tim Schumacher 1e3b8c7db5
Fix automapper crash without [section] line 2018-07-26 01:21:20 +02:00
Bojidar Marinov aa091bb8f7
Allow multiple layers to be selected and edited at the same time. 2018-07-25 23:57:58 +03:00
Aerll d235036f7d
Merge branch 'master' into automapper 2018-07-25 00:25:30 +02:00
Bojidar Marinov a635d4a121
Allow entering automapper rule probability as percentage 
Fixes #837
 2018-07-24 21:44:33 +03:00
Aerll d5572dcb23 add 2 new commands to automapper 2018-07-19 17:09:29 +02:00
yangfl 81a39c229b Fix typo 2018-07-10 17:29:02 +08:00
heinrich5991 c07412b6c8 By default, don't embed vanilla images 
Previously, when you added an image to the map in the editor, it would
start off as embedded, i.e. included in the map file. This does not make
sense for vanilla images as every client has those.

That's why we now only mark non-vanilla images as external by default.
 2018-06-29 23:28:49 +02:00
def 89ca2cfe8b Allow some key binds in editor when GUI is hidden 2018-06-26 22:51:43 +02:00
def 6793acafc4 Allow longer server settings in editor 2018-04-27 21:36:29 +02:00
heinrich5991 f8277267a0 Remove mem_alloc and mem_free, use standard C functions instead 
Replace `mem_free` by `free`, and `mem_alloc` by `malloc` or `calloc`
(the latter one being used to allocate a zeroed array of elements,
sometimes, this makes a call to `mem_zero` superfluous).

This results in having to remove `mem_stats` which previously recorded
the number of allocations and their size that the Teeworlds code did
directly.

Remove OOM handling in `src/game/client/components/binds.cpp`.

Remove needless copying in the CSV code in
`src/game/client/components/statboard.cpp`.
 2018-04-09 11:56:39 +02:00
def bd1653a91b Editor: Fix debug client crash 2018-04-04 21:41:14 +02:00
Jupeyy c1a962b870 add ui fixes to work with new text renderer 2018-03-13 21:59:07 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
def 7b6317a5d6 buffer sizes 2017-09-03 08:53:54 +02:00
def 862e26dd08 Clean up time handling a bit 2017-09-03 08:48:21 +02:00
Dennis Felsing eb2634ab0a Merge pull request #852 from heinrich5991/pr_ddnet_fix_extractname 
Add testing; fix, rename and test the `CEditor::ExtractName` function
 2017-08-30 22:09:17 +02:00
heinrich5991 22be1be389 Fix and rename the CEditor::ExtractName function 
Fixes #846.
 2017-08-30 13:59:42 +02:00
heinrich5991 2682480f8a Rename GetUncompressedDataSize to GetDataSize 
Also rename the old `GetDataSize` to `GetFileDataSize`. `GetDataSize`
now returns the actual data size, not the data size before
decompression.
 2017-08-30 08:36:17 +02:00
sctt 0849fa6024 fixing map_resave and adding map_replace_image 
Update datafile.h

Update datafile.cpp

Update datafile.cpp

Update map_resave.cpp

Update datafile.h

Update map_resave.cpp

Update datafile.h

Update datafile.cpp

Update config_store.cpp

Update config_retrieve.cpp

Update io.cpp

Update gamecontext.cpp

Update config_store.cpp

Update CMakeLists.txt

Create map_replace_image.cpp

Update map_replace_image.cpp

fixing bug with height and witdth
 2017-08-29 16:21:16 +02:00
heinrich5991 33315452c3 Merge branch 'master' into leak_fix 2017-07-31 20:42:32 +02:00
def 7428dd0637 Editor: Don't show server settings when picker is active 2017-07-22 12:18:53 +02:00
HMH 476d57c5c5 Also cleanup CEditorMap on destruction 2017-07-21 20:02:46 +02:00
def 4b4f9992d4 Fix disappearing switches in editor 2017-07-15 18:11:01 +02:00
def 9a0706f8b1 Support ctrl-l to load map in editor 2017-07-15 18:08:34 +02:00
def a5bd671e55 Show X and Y coordinates in map editor 2017-07-12 20:25:48 +02:00
def 46cedf3a8c Compiler warnings 2017-07-09 10:27:58 +02:00
def f3e3d57a90 Always close files, cleaner demo recording, fix some other stuff 2017-07-08 13:39:20 +02:00
def 73c61e4169 Let's not save maps that are ok already 2017-06-11 20:18:28 +02:00
def 2bd6316ce7 Add code for fixing old maps by removing unused tiles 2017-06-11 19:53:55 +02:00
HMH 4a0abf6747 Access the correct Flags variable for saving maplayers 2017-04-01 18:16:02 +02:00
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
heinrich5991 54c5faa64c Complete the refactor 2017-03-12 19:52:29 +01:00
Alexandre Díaz 3589ed0b0f Start refactor... 2017-03-12 19:30:55 +01:00
Learath2 09552a6d9f Get rid of trailing whitespaces 2017-02-21 19:11:43 +03:00
BannZay c6e7ad5e45 map details button name fix 2016-11-27 20:55:05 +02:00
BannZay 6f99d05ef6 Merge remote-tracking branch 'upstream/master' into openCurrentMap 2016-08-23 14:40:13 +03:00
BannZay c658411f15 Load Current Map button added 2016-08-23 14:29:53 +03:00
Dennis Felsing d3f04a9470 Remove accidental code 2016-08-23 12:42:01 +02:00
def c91ef1ea81 str_append instead of strcat 2016-08-21 21:14:41 +02:00
BannZay 52d8efdfde editor searchBar added 2016-08-21 03:06:01 +03:00
def c308c348cb Merge branch 'Display tee position in editor proof' 2016-08-03 00:11:10 +02:00
def af250dd74e Fix colors in tele number selection 2016-07-26 20:28:30 +02:00
Tim Schumacher a99a9fecfc Display tee position in editor proof 2016-07-18 08:55:35 +02:00
Andrew e6eb607cc8 PROPTYPE_ANGLE_SCROLL mixed 2016-06-02 17:53:52 +03:00
Andrew a624db90b4 editeable proptype_int_step 2016-06-02 14:50:06 +03:00
def 3d3827a57d Don't render brush when picker is shown 2016-05-22 02:01:22 +02:00
def 668b0b887d Clean up modifier button 2016-05-22 01:43:33 +02:00
Andrew adab934c99 Switcher,speeduper,tuner,teleporter mixed to one button 2016-05-15 18:17:57 +03:00
def d2f5714042 Sort file names case-insensitively 2016-05-15 00:06:32 +02:00
def 475df14134 Fix editor popups a bit 2016-05-14 15:16:52 +02:00
def ff747953b4 Make envelopes unsynchronized by default and explain the setting better (fixes #479) 2016-05-14 00:42:40 +02:00
def 03a48dd09f Add code to remove unused tiles on game and front layers (commented out) 2016-05-11 12:13:54 +02:00
Dennis Felsing bc907f319d Merge pull request #467 from timakro/master 
rename some auto game tile placers
 2016-05-05 18:59:53 +02:00
Tim Schumacher 78f8c9978d fix editor gametiles automapper overlap 2016-05-05 18:40:38 +02:00
Tim Schumacher afd0e5a3eb rename some auto game tile placers 2016-05-05 18:23:04 +02:00
gamertyp b479dd412c Removed a tab 2016-05-04 23:37:02 +02:00
gamertyp e9378973de Re-ordered the Gametiles-menu 2016-05-04 22:33:10 +02:00
gamertyp 7a3f96431a Re-ordered the Gametiles-menu 2016-05-04 22:30:16 +02:00
Tim Schumacher aeea3777a3 show button to mapper when placing unused tiles 2016-05-01 18:12:20 +02:00
Tim Schumacher e61456f381 added auto game tile placer for hookthrough 2016-05-01 17:44:02 +02:00
Dennis Felsing bd40eec54f Merge pull request #446 from timakro/pr_improve_hookthrough_shortcut 
hookthrough shortcut now works for game and front
 2016-05-01 10:13:33 +02:00
Tim Schumacher 01024252b5 fix editor buttons for 5:4 resolutions 2016-05-01 02:34:06 +02:00
Tim Schumacher 04887e44f8 remove useless function 2016-05-01 01:54:37 +02:00
Tim Schumacher 70ffbbbbf9 hookthrough shortcut now works for game and front 2016-05-01 01:47:29 +02:00
def 4761608329 Input fixes from TW master for mouse wheel 2016-04-30 20:11:26 +02:00
def 644fec7e55 Resize window without restarting client 2016-04-30 17:59:58 +02:00
Dennis Felsing 09284c3ba9 Merge pull request #434 from timakro/pr_prevent_unused_tiles 
Prevent placing unused tiles in the editor
 2016-04-29 22:36:35 +02:00
def db8a126315 Merge swick's SDL2 branch 2016-04-29 21:55:48 +02:00
Tim Schumacher d69133c877 prevent placing unused tiles in the editor 2016-04-29 19:23:34 +02:00
def 67bff95a72 Merge remote-tracking branch 'timakro/new_hookthrough' 2016-04-27 18:59:51 +02:00
def 618dc9a6b0 Alert if layer size too big in editor (thanks to Lady Saavik, fixes #404) 2016-04-27 17:49:14 +02:00
Tim Schumacher ef94797c02 forbid placing hookthrough shortcut in front layer 2016-02-09 17:02:14 +01:00
timgame ba60cf509a use index 5 for a shortcut hookthrough tile 2015-11-15 00:00:43 +01:00
H-M-H 930dd8f2ad set colors to 1.000 instead of 0.001 for new colorenvelopes 2015-09-18 23:47:07 +02:00
H-M-H e6cf2241b2 fixed Envelopes-Bug see here: http://forum.ddnet.tw/viewtopic.php? 
f=5&t=2277
 2015-09-18 21:05:44 +02:00
def aa4bbed178 Hopefully fix editor crash with RGB (no transparency) images 2015-09-18 17:15:30 +02:00
def 7487923774 Fix Windows thread handle leak 2015-09-05 04:49:22 +02:00
def 2b1aa40d77 Fix editor color value to be shown with # instead of 0x 2015-08-28 20:28:53 +02:00
def e39fb6b535 Very ugly fix for color picker in editor 2015-08-28 01:28:09 +02:00
heinrich5991 7d9228f3d5 Fix a severe bug with config saving 
Thought I had fixed that long ago...
 2015-08-27 12:55:35 +02:00
heinrich5991 db696c0e78 Fix the 54e61bfe39 cherry-pick, re-add missing line 2015-08-27 12:55:34 +02:00
SushiTee c025dc2235 saving server settings within the map and loading them on init 2015-08-27 12:51:24 +02:00
SushiTee 7bd0f276d4 saving server settings within the map and loading them on init 2015-08-27 12:51:24 +02:00
def fabe25dd45 Switches can be set with number 0 (even if they don't make much sense, fixes #265) 2015-08-22 20:41:46 +02:00
def b5aca60662 Fix mouse hang with editor popup, value selector and escape (fixes #290) 2015-08-22 20:22:23 +02:00
def eac3d900e7 Remove unused variable 2015-08-22 17:50:34 +02:00
def db2256e827 Fix a few whitespace-at-end-of-file issues 2015-08-22 15:27:41 +02:00
BeaR ff3c4f22b4 Add hex value edit field for quad point color 2015-08-20 12:51:30 +02:00
BeaR 6b0d2b9b9a Fix hue picker scaling 2015-08-17 20:19:27 +02:00
BeaR a4cfc10898 Implement an HSV picker for color of quad points 2015-08-17 20:14:23 +02:00
def d5100cdee5 Add ctrl+shift+s for "save as" and ctrl+shift+alt+s for "save copy" 2015-07-26 12:05:45 +02:00
def ce1d615041 Add "Save copy" button so that filename is not changed 2015-07-26 12:05:14 +02:00
def f349818f9d Only save once (hope this doesn't cause any problems) 2015-07-26 12:04:43 +02:00
Dennis Felsing 50a6c30e46 Merge pull request #241 from timgame/DDRace64 
fixed envelope button color
 2015-07-25 00:07:33 +02:00
timgame 6264bb73f3 fixed envelope button color 2015-07-25 00:04:12 +02:00
def 5527870d0a Revert bruch clearing 2015-07-23 00:43:09 +02:00
Chairn ea52c68d2c Zooming will work as in game for editor using numpad. 2015-07-23 00:10:55 +02:00
def f5ff75a19a Fix Speedup angle selector 2015-07-15 02:34:50 +02:00
timgame 929919d44b improved grass_main/0.7 automapper by hi_leute_gll 2015-07-09 19:17:46 +02:00
def 6e8ada1ac8 Fix whitespaces a bit 2015-07-09 02:12:35 +02:00
def f5d31b595c Editor: Scroll Speedup angles by 45° (finer with shift) 2015-07-08 13:55:02 +02:00
def 5f6752d238 Show degrees sign in value selector 2015-07-08 13:38:21 +02:00
def 2d5df86443 Add time.h include for editor to fix windows compilation 2015-07-01 17:17:48 +02:00
def d11f1b0b38 Display local time in editor so that mappers don't lose track of it 2015-07-01 16:38:17 +02:00
def d846583ba7 Make a few value selectors in editor wrap around 2015-06-28 16:17:23 +02:00
def 8e8283e9cf Highlight game layers in editor 2015-06-28 15:02:48 +02:00
def cc5ac820fd Editor: Ctrl-s doesn't ask about overwriting anymore 2015-06-21 13:02:07 +02:00
def d96ff538d3 Allow setting freeze number on switch layer in editor 2015-05-31 18:25:00 +02:00
def aeda4bc6f1 At least reduce the chance of mouse lockups and make them recoverable 2015-05-31 17:34:38 +02:00
def aaaf0cdaeb Don't create too many popups 2015-05-31 17:34:01 +02:00
def f02143e00b Go back in layer/images/sound selection in editor with right mouse click 2015-04-27 13:43:02 +02:00
def b5d722672a On switch layer fix delay number with FillSelection when creating new tiles instead of copying 2015-04-21 04:57:20 +02:00
def cb64bc6859 Move "Add Sound" button down for 5:4 resolutions 2015-04-21 04:34:14 +02:00
def c85865c492 Go back in envelopes with right mouse click 2015-04-21 04:25:49 +02:00
def 6d54de89b6 Get rid of clang static analyzer warnings 2015-04-19 00:31:45 +02:00
def 554c865eeb Fix segfault in editor 2015-04-17 20:14:14 +02:00
def ef994b87a1 Fix: rendering of images in editor when scrolling 2015-04-08 01:15:52 +02:00
def 3992b1346b Hopefully fix compilation on new OS X systems 
Names collided with some new OS X defined names, fixes #189
 2015-04-07 19:07:38 +02:00
H-M-H b97954f635 allow to exit editor valueselectors with mouseclicks 2015-04-07 17:08:01 +02:00
H-M-H 76481a139a fixed issue with wrongly displayed text in editor 2015-04-07 16:43:51 +02:00
def 0945e24ce4 Actual fix for crash with RGB images, convert them to RGBA instead 2015-04-04 18:07:57 +02:00
def c11044318e Hopefully fix map saving with RGB images 2015-04-04 17:16:20 +02:00
H-M-H 5e4d504c80 improved envelopeswitching and deleting 2015-03-30 13:06:05 +02:00
def 34f69f0bfd Cleanup 2015-03-30 11:44:32 +02:00
H-M-H 32606f3822 added labels and improved/fixed few things 2015-03-30 05:27:33 +02:00
H-M-H c98d8e3a63 added textinput for envelopes 2015-03-30 05:06:08 +02:00
H-M-H 68db1c1113 added option to type text into valueselector 2015-03-30 03:20:35 +02:00
def c7617b06d2 Resize font in editor to show full image and sound name 2015-03-29 01:32:07 +01:00
def 91756cc529 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2015-03-10 22:57:52 +01:00
def 05970cc2e2 Add BONUS tile, opposite of PENALTY (for Saavik's new map) 2015-03-10 22:57:40 +01:00
timgame 6188b16e5e added tile -1 and updated grass automappers 2015-03-04 16:03:52 +01:00
timgame d2e1137254 automapper: added 'NewRun' 2015-02-20 00:15:09 +01:00
timgame 758c4b1c4d added 'NOINDEX' and 'OR' to automapper 2015-02-19 22:54:47 +01:00
def 4c2f83714d Fix typo 2014-12-24 01:40:21 +01:00
def 7f0b1dd35f Another color change 2014-12-23 16:00:59 +01:00
def cc7abaef1f Another color change in editor selections 2014-12-23 15:38:59 +01:00
def 3e410bbd34 Add detection whether an image and sound has to be embedded and redesign colors 2014-12-15 18:59:21 +01:00
def 2e7e4cfd46 Code piece to convert race stoppers to ddrace stoppers 2014-12-06 00:56:08 +01:00
BeaR 5d364410de Add editor compatibility with sound layers from older maps 2014-12-05 14:38:16 +01:00
def 158ba846fa Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-12-01 20:35:52 +01:00
def 49f6f2dff2 Fix some editor popup 2014-12-01 20:35:30 +01:00
Dennis Felsing 598c6c9968 Merge pull request #111 from cinaera/pr_pan 
Add option to enable/disable panning per voice
 2014-11-30 13:26:01 +01:00
BeaR 186de4e08e Add option to enable/disable panning per voice 2014-11-30 12:23:05 +01:00
BeaR 5f4067c483 Check array boundary for shape type 2014-11-30 11:33:44 +01:00
BeaR 98d42adf9d Implement sound logic for shaped sounds, fix rectangle height property in editor and submit voice shape information to audio interface 2014-11-29 14:29:40 +01:00
BeaR 485aa4ce54 Add editor properties for rectangle shaped sources and visualize falloff distance 2014-11-29 13:20:04 +01:00
BeaR fbcd560eb0 Working on adding editor UI support for sound shapes 2014-11-28 20:25:43 +01:00
BeaR a045a20fba Render sound shapes 2014-11-28 20:01:25 +01:00
BeaR 9996751161 Remove deprecated falloff distance 2014-11-28 19:21:59 +01:00
BeaR d1327742e7 Start adding support for custom shaped audio fields 
Add version check for sound layers
 2014-11-27 16:18:15 +01:00
def 913d5ac226 Fix editor in Images & Sounds views when GUI is deactivated (Reported by Welf) 2014-11-19 21:58:25 +01:00
BeaR c3689658b4 Fix editor sound replacing 2014-11-09 14:58:28 +01:00
def 0b1118938d Don't try to load preview images of directories 2014-10-28 22:54:24 +01:00
def 26260181bd Some work on Opus map sounds (not working yet) 2014-10-27 16:23:53 +01:00
def 699fb60532 Fix: Mapping sounds in editor works even when the sound system is disabled 2014-10-25 01:23:39 +02:00
def 3d9b232157 Minor Sound cleanup 2014-10-25 01:07:24 +02:00
def 12102a14a6 Fix sound and image loading 2014-10-24 23:03:16 +02:00
def 61b704dac3 Cleanup 2014-10-24 22:15:55 +02:00
def 73567c898e Cleanup 2014-10-24 22:13:46 +02:00
def a0bfc5a083 Add shift + right click to delete a quad (Suggestion by Welf) 2014-10-23 15:55:50 +02:00
BeaR 1e42136f5d Fix wrong memory allocation and sound selection 2014-10-23 12:19:26 +02:00
Dennis Felsing 792a891dfa Merge pull request #71 from cinaera/pr_speaker 
Add editor icon for audio source
 2014-10-21 12:15:18 +02:00
BeaR 09f8630b68 Add editor icon for audio source 2014-10-21 12:07:09 +02:00
timgame 62ca346122 Merge branch 'DDRace64' of https://github.com/def-/ddnet into DDRace64 2014-10-21 00:06:57 +02:00
timgame beb125da36 remove basetile 2014-10-20 23:55:55 +02:00
def d213a30bed Change new to mem_alloc (thanks BeaR) 2014-10-19 14:09:23 +02:00
def 0b2bf15c35 Clean up compiler warnings 2014-10-19 13:19:36 +02:00
BeaR b67fab8fdb Fix parallax scrolling for audio sources and remove global property 2014-10-18 18:41:58 +02:00
BeaR 920ac531aa Add support for position envelopes to sound sources 2014-10-18 18:41:55 +02:00
BeaR 0a70d49566 Remove distance from envelopes, add falloff distance to source properties and render it in the editor 2014-10-18 18:41:55 +02:00
BeaR 655c2466b9 Start adding a sound envelope 2014-10-18 18:41:54 +02:00
BeaR dfea1e9e71 Remove debug rendering for sound layers and unused item members 2014-10-18 18:41:53 +02:00
BeaR b5d0034674 Add embedded sound support 2014-10-18 18:41:53 +02:00
BeaR 66d02de673 Fix saving of sounds 2014-10-18 18:41:52 +02:00
BeaR dd35d2be84 Add editor support for editing sound source properties 2014-10-18 18:41:52 +02:00
BeaR 39f93716e0 Support replaying mapsounds 2014-10-18 18:41:52 +02:00
BeaR 2e36bd9906 Add missing file 2014-10-18 18:41:51 +02:00
BeaR 5df94f772f Add support for sound sources 2014-10-18 18:41:51 +02:00
BeaR 2bd9df2626 Adding support for saving/loading sound layers 2014-10-18 18:41:51 +02:00
BeaR d968b42f2f Add support for sound layers 2014-10-18 18:41:51 +02:00
BeaR 30989566bb Correctly load sound in the editor on add 2014-10-18 18:41:50 +02:00
BeaR 90975fbe9e Start adding UI for loading sounds in the editor 2014-10-18 18:41:50 +02:00
BeaR 1f4430f3d0 Editor: Add feature to zoom to mouse position 2014-10-07 20:07:46 +02:00
BeaR fa83e5b340 Editor: Scale quad point selection indicator with zoomlevel 2014-10-07 14:49:45 +02:00
def 85c953d25b Consistently allow rotations and flipping in editor 2014-10-01 18:55:53 +02:00
def 6cecffe67c Fix editor input on Android 2014-09-29 13:13:56 +02:00
def 31b049533c 3 more keys to be disabled on text input 2014-09-27 11:06:55 +02:00
def 01f2b6ea02 Fix buggy envelope editor while tile picker is active 2014-09-27 11:04:09 +02:00
Dennis Felsing 912c4fae5c Merge pull request #49 from timgame/DDRace64 
automapper supports rotation (and changed "CheckEmptyTiles" to "NoDefaultRule")
 2014-09-27 11:02:42 +02:00
def b94981019b Disable key inputs in editor when typing in a field 2014-09-27 11:01:58 +02:00
timgame 20aaa37cb9 automapper supports rotation 2014-09-27 10:11:28 +02:00
def 2c610053c1 Fix: Selecting quads works after having rotated one 2014-09-22 22:25:05 +02:00
timgame 8dc728de96 added option to automap tiles with index 0 2014-09-20 20:57:29 +02:00
timgame 442f88bd2b automapper works without basetile 2014-09-15 14:45:37 +02:00
def 6ab4c566e9 Add a small close button in editor for people who happen to accidentally click on the Editor symbol in menu, but are unable to find File -> Exit 2014-09-12 23:07:47 +02:00
def 51c508192a Negative clipping width and height make no sense 2014-08-31 15:24:19 +02:00
def 3edd1bb53f Fix client crash when holding space and adding a group in editor 2014-08-24 13:38:46 +02:00
def b4b1f4d1a8 fix tileset selection 2014-08-22 15:40:23 +02:00
def a5ec9e3240 Show current quad when pressing space in editor 2014-08-21 00:56:35 +02:00
def 6e7594c22a Keys still work in editor with TAB pressed 2014-08-21 00:21:18 +02:00
def 9d8357b5ca Don't show proof lines in editor when space is pressed 2014-08-21 00:05:44 +02:00
def 5e45e50d74 Add color for used images in editor (for Saavik) 2014-07-10 05:20:40 +02:00
def de3a786917 Fix: Shifting front layer works 2014-06-13 00:59:00 +02:00
def e3b94ead93 Editor: Show all images to choose from, no matter how many 2014-06-12 01:09:02 +02:00
def 11f6ac6f38 Fix: Always allow adding more images 2014-06-12 00:36:26 +02:00
def 0701f67810 Fix: Proper menu size in editor 2014-06-03 23:56:00 +02:00
def 58de05ffdb Fix: Actually remove old tiles after moving 2014-06-01 13:16:25 +02:00
def 6adb99608e Editor feature: Add possibility to set how far to shift layer 2014-06-01 01:32:54 +02:00
def 6fe6db8954 Implement horizontal and vertical flipping for quad brushes 2014-05-17 17:47:47 +02:00
def 0a49301eea New editor feature: Show if tele and switch numbers are used already 2014-05-17 17:19:48 +02:00
def da9e9d4069 Fix: Info with Grid and animations works (Thanks Obst) 2014-05-13 22:33:37 +02:00
def 0bceef9903 Make larger image selection popups show fully on screen (Thanks to Obst) 2014-05-12 10:41:41 +02:00
def 15ecbb71d1 fixed compiling using visual studio 2013 by renaming the round function 2014-04-22 23:46:55 +02:00
def f2dccafd4e Preview when loading PNGs in editor 2014-03-28 22:47:57 +01:00
def c98ad5bf22 Merge branch 'new' into DDRace64 
Conflicts:
	src/game/editor/layer_tiles.cpp
 2014-03-23 23:18:43 +01:00
def ecb3422280 Fix degrees (°) 2014-03-23 17:42:00 +01:00
HMH d301010a95 Made texture rendering for layers less resourceintensive 2014-03-23 17:10:49 +01:00
HMH 655546c4d3 added creating button for tunelayer and a popup menu for TuneZone Numbers 2014-03-23 17:10:48 +01:00
HMH c7e52211d7 merged tunelayer: added Buttons, put an Image for the tunelayer took over most code from other layers and adapted for tunelayer 2014-03-23 17:10:48 +01:00
HMH 8f6d76a27e added saving/loading code for tunelayer 2014-03-23 17:10:48 +01:00
HMH 12ac06f1f2 added functions for editing Tunelayer (mostly copied from other layers); put Snap(&Rect) into all Fillselection-functions (fix) and made if(Empty) more precise (fix); merged tunelayer into other functions 2014-03-23 17:10:48 +01:00
HMH c84eaea33d declared functions needed for new tunelayer in CLayerTune for editor, kinda just copied from the other layers 2014-03-23 17:10:48 +01:00
def 66d3595b44 Minor editor fixes by HMH 2014-03-19 10:26:38 +01:00
def f765cc577b Fix: Working Checktele-auto-setting 2014-02-15 01:19:38 +01:00
def 5e2381f746 Remove duplicated Delete button in editor 2014-02-14 20:54:42 +01:00
def 24c5dc3c6a Make editor undo optional because of too many bug reports 2014-02-13 22:27:11 +01:00
def 92ba863ff0 Automatic conversion of tiles to checkpoint teleports 2014-02-12 21:44:05 +01:00
def 9ae59a1923 Fix: Don't delete all files in editor directory but only files starting with undo_ 2014-02-11 19:51:38 +01:00
def 42ed2807cb Add penalty tile 2014-02-09 23:31:29 +01:00
def 391232017a Add evil checkpoint teleports 2014-02-01 22:20:41 +01:00
def e074c52d4b Crude way of preventing crashes with editor undo 2014-01-26 21:50:30 +01:00
def 4f6e2eb11f Only reload map afer saving in editor if we're on localhost 2014-01-24 03:41:30 +01:00
def a031ec343a Editor Undo: Fix some issues 2014-01-19 18:06:56 +01:00
def d092b8007d Add editor undo function (by MAP94) 2014-01-19 04:02:01 +01:00
def 8d2828ed6f Fix: Always render editor quads 2014-01-11 22:57:23 +01:00
def e8fd827b6d Fix crash in editor 2014-01-11 21:23:19 +01:00
def 3e21d31961 Compile errors 2014-01-11 00:54:52 +01:00
def 4a3f75884e Hopefully fix bug with some malformed maps that can make the client crash 2014-01-11 00:52:23 +01:00
def 80b33220bf Fix automapper 2013-12-28 13:59:14 +01:00
def 104939b407 More flexible auto mapping 2013-12-28 01:09:47 +01:00
def da60fb4dc1 Auto mapper: Support 2 flips 2013-12-27 18:32:58 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
 2013-12-26 18:02:22 +01:00
def 6da8d2146c New mapping entity: Specify number of jumps 2013-08-24 01:03:45 +02:00
def bf518df74d New teleport entities 2013-08-13 04:59:25 +02:00
m!nus ee9a8ce4b7 prevent map editor from crashing if loaded map is invalid 2013-05-26 10:58:03 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02:00
oy 0e92dd5603 fixed some merge problems 2013-02-24 18:55:55 +01:00
oy 8b4026cbbf fixed last commit 
Conflicts:

	src/game/editor/editor.cpp
	src/game/editor/editor.h
 2013-02-24 18:26:49 +01:00
BeaR d58afefaae Some graphic batching: 
Speed up for displaying debugtext and envelopepreview
(This reduces the performance hit especially for the 'Show Info' mode in the editor)

Conflicts:

	src/engine/client/client.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
 2013-02-24 18:23:06 +01:00
BeaR dfd15bc899 Fix Renderingbug: 
If u change the alpha value inside a colorenvelope, the tileset-/quad-rendering is messed sometimes
http://i.solidfiles.net/580a9699c4.png(map: run_exchange by delo)
 2013-02-24 18:01:01 +01:00
Magnus Auvinen 1711be955b fixed all the errors that the clang static analayzer found 2013-02-24 17:58:34 +01:00
oy 4fb57dea91 fixed editor crash on replacing images. Closes #981 2013-02-24 17:44:45 +01:00
oy ff75c3ba2d fixed some memory leaks in the map editor 2013-02-24 17:41:15 +01:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
 2012-04-12 02:09:31 +02:00
SushiTee f737910e0a fixed FillSelection so it actually fills the current selection 2012-01-12 22:03:55 +01:00
SushiTee 65f4416164 added map info 2012-01-10 23:14:24 +01:00
oy a9db705c14 fixed that refocus is done when using Home-key in a editor edit box. Closes #821 2012-01-08 13:36:47 +01:00
oy f8b895181a show animation/grid/zoom level in the map editor. Closes #780 2012-01-08 13:16:19 +01:00
oy bafd22ebe7 show path in the editor file dialog. Closes #786 2012-01-08 13:14:02 +01:00
oy be37147342 fixed border rendering in the editor's image preview. Closes #908 2012-01-08 01:47:53 +01:00
oy 58f5779508 - disabled clipping lines in the tile picker 
- fixed aspect ratio of the image in the tile picker
Closes #833
 2012-01-08 01:14:52 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
Choupom 1efb494169 fixed #791 Ability to disable the magnetic behaviour of the grid 2011-12-04 22:44:06 +01:00
oy 9a03989e84 added "Make an option for each envelope: (a) synchronized (b) starting at join" by Choupom 2011-12-04 14:39:47 +01:00
GreYFoX 5ebf60891c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-12-01 19:48:09 +02:00
oy e858c9396b renamed a variable 2011-11-29 22:15:27 +01:00
SushiTee c22b6c4b4f fixed selecting of quad points 2011-11-29 22:03:10 +01:00
SushiTee 48d21b61a2 fixed links between tile layer color envelopes when deleting envelopes 2011-11-29 22:01:03 +01:00
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams ) 
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
 2011-09-02 20:04:18 +02:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +02:00
Ravomavain 8bd82a3550 Fix DDRace layers in editor 2011-08-26 20:05:18 +02:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
SushiTee 2ceb0fde91 fixed editor zooming if gui is not active 2011-08-16 23:15:51 +02:00
oy 2708256186 fixed quad selection via envelope preview 2011-08-16 21:35:00 +02:00
oy f36cc57bdd fixed last commit 2011-08-15 20:12:31 +02:00
Alexandre de5eccef3f Fix Stuffs & clean comments 2011-08-15 18:07:09 +02:00
Alexandre 367bb4b837 Map Editor: Envelope Preview 2011-08-15 18:07:05 +02:00
oy c38c632d06 fixed multiple popup creation in the editor. Closes #836 2011-08-13 19:22:01 +02:00
oy 4e830a71a1 decreased top offset of image add button in the editor. Closes #834 2011-08-13 18:53:41 +02:00
GreYFoX 06afe36db4 Removed old hook through prediction as 0.5.2 servers are no longer compatible 
made it possible to load old maps
Enumerated layers
 2011-08-13 02:12:40 +02:00
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
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
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