bors[bot]
49bed71932
Merge #5696
...
5696: Add option for parallax-aware zoom r=def- a=Fireball-Teeworlds
## How this works
Currently we have parallax X and Y parameters that control how far away a layer feels. Currently it's only taken into account for camera moving sideways.
This pull request makes zoom behave as if the camera was moving closer or further away, taking into account the distance to the layer.
In order to provide flexibility, this behaviour is using a separate parallax value, similar to how we have separate values for X and Y. Para Zoom will default to the minimum of parallax X, Y, clamped to be between 0 and 100. This seems to look well on most maps.
This pull request also introduces two new features to the Editor:
* Controls for configuring per-group Para Zoom value. If Custom Zoom is set to No, Para Zoom will automatically keep following to the default value described above, so that people new to the feature don't have to figure out how it works.
* Zoom button that previews the zoom behavior (next to Proof at the top).
## Editor Screenshots
### Para Zoom controls
![screenshot_2022-08-22_21-38-04](https://user-images.githubusercontent.com/68162181/186014490-f7b91245-460f-405f-8d5c-3f91db2a1b9a.png )
![screenshot_2022-08-22_21-37-58](https://user-images.githubusercontent.com/68162181/186014522-03b6e814-4dd9-4d07-9af9-7db5fb434a56.png )
### Zoom Button
![screenshot_2022-08-22_21-40-46](https://user-images.githubusercontent.com/68162181/186014856-2d1d499d-9011-439c-b217-536957e0c1e3.png )
![screenshot_2022-08-22_21-40-50](https://user-images.githubusercontent.com/68162181/186014874-6d2939d3-00ff-4327-a790-414b5151ba31.png )
## In-Game Screenshots
Video: https://youtu.be/W7eXQN0gRFI
This is an older version of the pull request that had an option to disable the new behaviour. The current version can only be disabled in map editor for a particular map.
### Springlobe 3
With new feature:
![screenshot_2022-08-02_04-28-19](https://user-images.githubusercontent.com/68162181/182286371-b67cee1c-73d8-4a24-a9c3-1b28340a3b42.png )
Without:
![screenshot_2022-08-02_04-28-25](https://user-images.githubusercontent.com/68162181/182286367-24555381-1700-4ff1-80c7-39e5dce63820.png )
### Beyond Dreams
With new feature:
![screenshot_2022-08-02_04-28-59](https://user-images.githubusercontent.com/68162181/182286322-114ecb90-0860-462c-9012-bb2f3ff848fb.png )
Without:
![screenshot_2022-08-02_04-28-55](https://user-images.githubusercontent.com/68162181/182286654-f34da72b-7991-4f42-89ad-679279fcb83e.png )
## Checklist
- [X] Tested the change ingame
- [X] Provided screenshots if it is a visual change
- [X] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [X] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [X] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck ) (optional)
Co-authored-by: Fireball <fireball.teeworlds@gmail.com>
2022-08-22 21:15:41 +00:00
Corantin H
d81f15181e
Use int for coordinates
2022-08-20 22:30:32 +02:00
Corantin H
ae8b9914aa
Editor: added a goto button
2022-08-20 20:47:46 +02:00
Corantin H
29a3baaa75
Editor: added the possibility to duplicate layers
2022-08-19 13:20:50 +02:00
Robert Müller
51fb3e9a22
Merge CUIEx
class into CUI
...
There is no need to separate the UI in two classes anymore, as the dependency on `CRenderTools` has been removed.
2022-08-12 19:59:19 +02:00
Robert Müller
7b20009980
Move CUI::CORNER_*
enum to IGraphics::CORNER_*
...
Entirely automatic replacement in preparation for moving rect drawing methods from `CRenderTools` to `IGraphics`.
2022-08-12 17:42:04 +02:00
Fireball
5d886d80f8
Parallax Zoom: use CMapItemGroupEx to store parallax value
2022-08-10 03:05:23 +01:00
Fireball
4ed997f304
Parallax Zoom: fix QuadEnvPoint scaling (and other UI distances)
2022-08-06 16:45:03 +01:00
Fireball
54f7a9817d
Parallax Zoom: Zoom preview button in Editor
...
Known issue: Quad Env Points are scaled incorrectly for Groups with
ParallaxZoom != 100 (in Zoom mode).
2022-08-06 02:30:37 +01:00
Fireball
5bf7f60bf6
Parallax Zoom: Add default zoom option to the editor
...
Safe defaults for map editing: unless opted-in, Parallax Zoom
will default to maximum(parallax{x,y}).
2022-08-06 01:31:42 +01:00
Fireball
a90c86e9a5
Parallax-aware zoom
...
How this works: parallax values configure perceived distance from camera
when it's moving along x and y axes. Assume that zoom is moving the
camera away and scale layers accordingly, with background layers
(furtherst away) changing the least.
New per-ItemGroup (LayerGroup) setting allows to set the new parallax
value independently from the other two. This can be used to do tricks
like on Time Shop zoom correctly or make it feel like the camera is
changing the field of view at the same time as moving in space.
2022-08-05 00:40:58 +01:00
Chairn
a69dc599a9
Huge variable naming format
...
Fix pointer and pointer array variable naming
Huge renaming to match our rules
Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[
(?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[
Further format static variables
Format almost all pointer names accordingly
Used regex: (?!(return)\b)\b\w+
\*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p]
clang-format
Fix CI fail
Fix misnamed non pointer as pointer and non array as array
Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b
(?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[]
clang-format
Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-07-08 18:01:29 +02:00
Chairn
32318a7c90
Reworked color system
...
Removed duplicate structs. Replaced 4 floats array with appropriate
struct where applicable
2022-07-06 11:39:51 +02:00
Robert Müller
ac40efa263
Only apply size and color if changed, when editing multiple layers
...
To prevent the color of all layers from being reset to zero when changing just the size.
2022-06-27 23:20:09 +02:00
Robert Müller
70866d6d0c
Fix names of SCommonPropState
member variables
2022-06-27 23:20:09 +02:00
Chairn
a3a85bee5f
Remove useless typedef in c++
2022-06-25 21:05:54 +02:00
Robert Müller
2add5d5c3c
Organize game-client and editor includes
2022-06-17 20:32:56 +02:00
Robert Müller
eb7e210fc1
Separate editor update and render to fix slow joystick input
2022-06-15 17:37:22 +02:00
ChillerDragon
3667061b68
Use nullptr in generated and editor
...
-Wzero-as-null-pointer-constant
2022-06-13 18:28:13 +02:00
Chairn
14f7f2e041
Remaining formatting and fix github code scanning
2022-06-11 22:03:23 +02:00
Chairn
01edaec628
Format vector variables names ( fixes #5209 )
2022-06-11 21:38:49 +02:00
Robert Müller
e0e1f49530
Extract BrushFlipXImpl and BrushFlipYImpl
2022-06-06 11:29:52 +02:00
Robert Müller
19e97829ce
Extract CLayerTiles::ShiftImpl
2022-06-06 10:59:36 +02:00
Robert Müller
91d2ba1865
Organize game-client includes
2022-05-29 21:24:43 +02:00
Robert Müller
0c69495522
Use std::vector instead of array in editor
2022-05-27 16:36:39 +02:00
Robert Müller
662cb58132
Use std::vector<CFilelistItem> instead of sorted_array
2022-05-26 23:49:30 +02:00
Jupeyy
2677949e58
Add missing nanosecond conversions
2022-05-22 16:08:11 +02:00
Jupeyy
3c597aff95
Switch to nanoseconds
2022-05-18 18:05:41 +02:00
Chairn
583d6e6c01
Mark virtual function as override using a script:
...
while IFS= read -r line; do file=${line%%:*}; lineno=$(echo $line | cut
-d':' -f2); echo "Treating $file line $lineno"; sed -i -e
"${lineno}s/virtual //" -e "${lineno}s/);\$/) override;/" -e
"${lineno}s/)\$/) override/" -e "${lineno}s/const\$/const override/" -e
"${lineno}s/) {/) override {/" -e "${lineno}s/) const {/) const override
{/" -e "${lineno}s/const;$/const override;/" "$file"; done < a
2022-05-17 23:47:32 +02:00
Robert Müller
52100dbbe7
Use qualified std::swap only
2022-05-15 19:25:36 +02:00
Robert Müller
dee7393555
Remove unused includes of base/tl/string.h
2022-05-07 00:02:43 +02:00
ChillerDrgon
fe712214a9
Editor: ctrl+leftclick tile to select layer
2022-04-08 14:59:33 +02:00
bors[bot]
e632859707
Merge #4687
...
4687: Add Vulkan backend r=def- a=Jupeyy
This adds a Vulkan 1.0 backend and new features to the graphic settings to select the GPU(if multiple Vulkan GPUs are supported, and a new list for renderers (see screenshot below))
Mutleasy benchmark (CPU bound):
Vulkan multithreaded, single threaded vs OpenGL
(lower graphs are histograms, code by `@Chairn` )
Y = Frametimes in microseconds
lower graphs = amount of frametimes that happened (histogram)
(since the renderer speed differs, you should look at it more like a spread of values rather than the actual values)
![Figure_1](https://user-images.githubusercontent.com/6654924/153448356-941222a3-8bd3-424d-8685-a43389a4f691.png )
Vulkan is especially good in these scenarios, beating OpenGL 3.3 almost 3x with my setup (~600-700 FPS vs. ~1700-1800FPS)
Remaining TODO list:
- [x] compile shaders in cmake ( e.g. `https://gist.github.com/evilactually/a0d191701cb48f157b05be7f74d79396 ` )
- [ ] needs windows vulkan libraries
- [x] add build instructions (packages)
- [x] get away from coherent memory even for staging buffers (flushing memory just seems to be faster)
- [ ] a lot of testing :P
![screenshot_2022-02-10_17-13-46](https://user-images.githubusercontent.com/6654924/153449066-38d8741b-60c1-4c0c-ba50-57cc07aa2f9d.png )
![screenshot_2022-02-10_17-13-50](https://user-images.githubusercontent.com/6654924/153449075-91ef3b7b-7238-4cad-9a4c-aeb2d784238b.png )
If there are bugs and it's crashing inside the driver the best you can do is to start the client with `dbg_gfx 4` which will (if supported) add Khronos standard validation layers + verbose debugging information + validation layer extensions, e.g. a synchronization validation layer and validation errors reported by the GPU driver directly.
(setting for dbg_gfx (0: none, 1: minimal, 2: affects performance, 3: verbose, 4: all))
edits:
fixes #3547 (probably fixes it, fixed some data races)
## Checklist
- [x] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [x] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [x] Considered possible null pointers and out of bounds array indexing
- [x] Changed no physics that affect existing maps
- [x] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck ) (optional)
Co-authored-by: Jupeyy <jupjopjap@gmail.com>
Co-authored-by: Dennis Felsing <dennis@felsin9.de>
2022-03-21 14:20:54 +00:00
Chairn
4cc815711b
Added direction enumeration for the editor
2022-03-21 05:53:36 +01:00
Jupeyy
14ac5cf297
lazy load editor textures
...
improve entities texture flags
2022-03-20 18:03:33 +01:00
Robert Müller
74f87ee604
Remove unnecessary trailing semicolons after method declarations
2022-03-08 20:01:26 +01:00
Ravie
2745c1a694
Knife tool
2022-02-26 18:49:06 +01:00
Dennis Felsing
fe1b86b173
Remove the totally unsafe editor undo
...
Since it causes crashes because another thread just accesses the data.
No one has wanted to fix this, so maybe we should just remove it instead
of having clients crash in editor. I'm wondering how much effort it
would be to make this safe. Would we just have to lock for a short part
or is it basically the entire threaded undo operation that has to be
serialized? (No need for a thread then)
2022-02-07 15:57:27 +01:00
def
bc78ba57b9
Enable readability-inconsistent-declaration-parameter-name
2022-01-22 14:12:59 +01:00
bors[bot]
5ec6f0994d
Merge #4410
...
4410: Fix leak in CLayerTiles::BrushGrab (fixes #4409 ) r=Learath2 a=def-
<!-- What is the motivation for the changes of this pull request -->
## Checklist
- [x] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck ) (optional)
Co-authored-by: def <dennis@felsin9.de>
2021-12-17 23:38:19 +00:00
Robert Müller
8887a3137c
move DoClearableEditBox to CUIEx
2021-12-03 20:26:23 +01:00
Robert Müller
d948a1e41f
fix variable name
2021-12-03 20:26:21 +01:00
def
a45829f16d
Fix leak in CLayerTiles::BrushGrab ( fixes #4409 )
2021-11-29 14:29:24 +01:00
Robert Müller
053981ee4c
refactor UI scrollbars
2021-11-26 23:03:45 +01:00
Jupeyy
0d17665137
Revert "Add new mouse state"
...
This reverts commit e4cb348db2
.
2021-10-23 13:48:21 +02:00
Jupeyy
e4cb348db2
Add new mouse state
2021-10-07 16:48:25 +02:00
ChillerDragon
3eb3dcd48b
Make use of IO_MAX_PATH_LENGTH
...
Inspired by
0a7d0fee7c
2021-09-13 12:14:50 +02:00
HamidReza
3ca09259be
New Tiles & Improvements
2021-08-28 22:21:38 +04:30
HamidReza
c9018a2117
More Tiles
2021-08-28 01:50:39 +04:30
HamidReza
8b69ffef22
clang-format
2021-08-27 22:58:11 +04:30
HamidReza
8dbefa734f
Editor Improvements
...
Added possibility to write separate explanations for different entities and fixed a bug.
2021-08-27 18:36:27 +04:30
Jupeyy
a663799188
uint64 -> uint64_t, int64 -> int64_t
2021-06-24 17:19:17 +02:00
Jupeyy
b7adc5a690
Add UI Ex class to share common ui implementations
...
between menus and editor for example
2021-05-26 15:02:33 +02:00
Alexander Akulich
2790270abf
Adopt upstream refactoring: Mark several functions as 'const'
2021-02-23 18:26:16 +03:00
Alexander Akulich
c2f276cee1
Port CConfig API from the upstream (0.7.5)
...
The old (g_Config) API is kept to not break the stuff.
See commits:
de5859b371
78076761eb
2021-01-10 17:10:19 +03:00
def
7c0e2212e2
Fix ScaleFontSize with too long strings
...
Thanks to PopCorn181 for report
2020-11-08 00:02:35 +01:00
Patiga
14539a8046
Remove option to make map sounds external
...
Right now it is impossible to have a working external sound. External
sounds render unusable the moment the map is saved and given to another
player. For the mapper it seems like everything is working since the
mapper has the sound file. For anyone else it simply won't work. Since
1. there is no use for it and 2. it adds unnecessary complexity and
confusion, I propose removing it entirely.
2020-10-17 17:45:56 +02:00
bors[bot]
ce9ba5ec09
Merge #3018
...
3018: Editor: Improve usability of server settings r=Jupeyy a=def-
- Add Mod button
- Show Del button only when it makes sense
- Update command input text when clicking on an existing command
- Make command clearable
As requested by Cøke
Co-authored-by: def <dennis@felsin9.de>
2020-10-09 14:48:59 +00:00
def
ea8bee4d34
Focus command field when something changed
2020-10-09 16:40:59 +02:00
bors[bot]
cf6ace1744
Merge #3022
...
3022: Text alignment r=def- a=Jupeyy
i think the round borders create a bit of optical illusion, e.g. the "V" in edtior is only 1 pixel of, but looks like its completly left xd
i checked at few resolutions with gimp and only saw around 1 pixel margin of error, but go ahead and test yourself :D
Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-10-09 14:31:25 +00:00
Jupeyy
52911e4302
Use std::sort instead of bubble_sort
2020-10-08 08:00:01 +02:00
Jupeyy
5ebabe2ece
Text alignment
2020-10-07 04:44:35 +02:00
bors[bot]
1f7d544349
Merge #3010 #3014
...
3010: Use hours in score hud and record r=Learath2 a=def-
3014: Scale auto mapper text size (partially fixes #3013 ) r=Learath2 a=def-
Co-authored-by: def <dennis@felsin9.de>
2020-10-06 11:22:06 +00:00
def
032ae67814
Editor: Improve usability of server settings
...
- Add Mod button
- Show Del button only when it makes sense
- Update command input text when clicking on an existing command
- Make command clearable
As requested by Cøke
2020-10-05 17:16:48 +02:00
Jupeyy
50b20fb1cd
Make animations more consistent with high float values
2020-10-05 02:32:50 +02:00
def
c25aede8ea
Scale auto mapper text size (partially fixes #3013 )
2020-10-04 22:39:43 +02:00
def
3be8a592e5
Run clang-format
...
Purely automatic change. In case of conflict with this change, apply the
other change and rerun the formatting to restore it:
$ python scripts/fix_style.py
2020-09-26 21:50:15 +02:00
bors[bot]
7000987ff5
Merge #2884
...
2884: Add scrollbar to auto rules list, fixes #2514 r=def- a=edg-l
![image](https://user-images.githubusercontent.com/15859336/93710826-afde7e80-fb49-11ea-9754-c44c79d5ff94.png )
It doesn't show a scrollbar when there aren't more than 5 rules.
Co-authored-by: Edgar <git@edgarluque.com>
2020-09-24 17:01:19 +00:00
Edgar
76f3dbfe64
fix scrolling triggering zoom
2020-09-24 18:52:31 +02:00
def
ddb88c6f3b
Editor: Select game layer by default
...
Since it's the most important layer
2020-09-21 19:36:28 +02:00
Fireball
bb2be60a08
Ask for confirmation before placing border tiles ( fixes #2823 )
2020-09-20 01:42:07 +01:00
Jupeyy
a1eb5dc114
Max images(for editor, clamp for client and warning for mapconvert) ( fixes #2148 )
2020-09-19 21:22:21 +02:00
def
433881824a
Only make Esc key leave editor when no popup is open
2020-09-15 21:57:09 +02:00
Vlad
be90f3f48b
Replaced tile names.
2020-09-13 23:00:49 +03:00
Andrii
392f58ae2f
select layer under mouse pointer on right click
2020-09-02 18:11:24 +03:00
def
c0f8ad50dc
Set search field active when opening file dialog
2020-09-01 09:48:51 +02:00
def
19d9741438
Rename m_aFileDialogActivate to m_FileDialogActivate
2020-09-01 09:48:13 +02:00
def
c99d791f4b
Add warning in editor for image widths
2020-06-21 01:14:36 +02:00
Andrii
29f093841c
add switch empty slot finder button
2020-05-21 00:44:41 +02:00
Andrii
1c870a3e1b
fix some tele number picker issues
2020-05-21 00:44:41 +02:00
Andrii
0f1af41911
add binding for tele/switch/speedup/tune button
2020-05-21 00:44:41 +02:00
Learath
d2498f257c
Stateful editing
2020-02-28 18:25:27 +03:00
Learath
f679fbfbc5
Allow editing multiple tile layer props
2020-02-27 16:53:12 +03:00
Magnus Auvinen
6a6a5f00c9
more typesafty in the graphics. introduced the IGraphics::CTextureHandle
...
Edited by @ChillerDragon to fit in ddnet
(cherry picked from commit cb95e8dfe8
)
2019-11-22 18:08:37 +01:00
Learath
918003911c
Fix bug handling speedup brushes
2019-09-20 21:52:28 +03:00
heinrich5991
b90dd43118
Fix -Wdeprecated-copy from GCC9
2019-06-26 11:53:39 +02:00
Learath
6c371a9a57
Even more refactoring
2019-04-27 01:11:15 +03:00
Learath
15058330fa
Don't inherit from vector, more cleanup
2019-04-27 00:47:34 +03:00
Learath
65a17599e1
Add ColorHSVA, phase out more vec3's
2019-04-26 15:06:32 +03:00
trml
0b3f3b03b5
Rewrite of prediction code, with additional prediction
2019-04-21 16:12:20 +02:00
12pm
a1dd2e45a5
Fix non destructive drawing with hookthrough shortcut
...
Fixes #1623
2019-04-11 21:43:22 +02:00
def
94f3d97ddf
Remove unmaintained Android code ( fixes #1575 )
2019-04-10 19:40:50 +02:00
def
eda16acbca
Explain game tiles and entities in editor ( fixes #1600 )
...
- Explanations by Lady Saavik taken from https://ddnet.tw/explain/
- CCW/CW were mixed up in enum names, fixed
- Make sure that the texts fits, otherwise reduce font size
- Still need explanations for Portal tiles
2019-04-08 19:39:56 +02:00
12pm
98bfeb3e72
Notify about chat mentions in editor
2019-04-06 11:32:50 +02:00
12pm
427171bb17
Merge "Add Quad/Sound" + shortcut to add them at mouse position, add quads true to size
2019-03-28 13:41:07 +01:00
12pm
0abbba4c5d
Add non-destructive brush drawing
...
New brush draw mode that doesn't override existing tiles. Empty brush still acts as an eraser. Button and ctrl+d shortcut to toggle it.
2019-03-26 19:19:25 +01:00
12pm
dff702bd2c
Don't rotate static game tiles and fix switch rotation
...
Should be handy for mapping.
Can be disabled by activating unused tiles (don't think it's worth a separate toggle and if you want to do it, you're doing something unusal)
2019-03-23 01:11:32 +01:00
def
6f9cfd5af1
Increase MAX_PATH_LENGTH to support our own downloadedmaps names
2019-03-12 18:43:03 +01:00
Dennis Felsing
40591c2f8b
Remove save group/layer button ( fixes #1475 )
2019-03-11 22:58:18 +01:00
12pm
2daafdaad5
Disable unused tiles only for DDNet entities
2019-02-08 04:04:41 +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
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
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
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
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
2e36ad67bb
Allow choosing game layer entities for different gametypes, closes #1283
2018-10-01 23:05:36 +02: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
f79bf5d03b
selecting multiple quads
2018-08-13 11:11:56 +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
def
6793acafc4
Allow longer server settings in editor
2018-04-27 21:36:29 +02:00
def
bd1653a91b
Editor: Fix debug client crash
2018-04-04 21:41:14 +02:00
yangfl
1620fc9b0f
Fix typo
2018-02-07 16:10:40 +08:00
heinrich5991
22be1be389
Fix and rename the CEditor::ExtractName
function
...
Fixes #846 .
2017-08-30 13:59:42 +02:00
HMH
476d57c5c5
Also cleanup CEditorMap on destruction
2017-07-21 20:02:46 +02:00
def
2bd6316ce7
Add code for fixing old maps by removing unused tiles
2017-06-11 19:53:55 +02:00
necropotame
b8e4e5beea
Fix style in several places
2017-03-22 19:45:14 +01:00
Learath2
09552a6d9f
Get rid of trailing whitespaces
2017-02-21 19:11:43 +03:00
BannZay
c658411f15
Load Current Map button added
2016-08-23 14:29:53 +03:00
BannZay
52d8efdfde
editor searchBar added
2016-08-21 03:06:01 +03:00
def
af250dd74e
Fix colors in tele number selection
2016-07-26 20:28:30 +02:00
Andrew
a624db90b4
editeable proptype_int_step
2016-06-02 14:50:06 +03:00
def
d2f5714042
Sort file names case-insensitively
2016-05-15 00:06:32 +02:00
def
ff747953b4
Make envelopes unsynchronized by default and explain the setting better ( fixes #479 )
2016-05-14 00:42:40 +02:00
Tim Schumacher
aeea3777a3
show button to mapper when placing unused tiles
2016-05-01 18:12:20 +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
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
timgame
ba60cf509a
use index 5 for a shortcut hookthrough tile
2015-11-15 00:00:43 +01:00
SushiTee
7bd0f276d4
saving server settings within the map and loading them on init
2015-08-27 12:51:24 +02:00
BeaR
ff3c4f22b4
Add hex value edit field for quad point color
2015-08-20 12:51:30 +02:00
BeaR
a4cfc10898
Implement an HSV picker for color of quad points
2015-08-17 20:14:23 +02:00
def
ce1d615041
Add "Save copy" button so that filename is not changed
2015-07-26 12:05:14 +02:00
timgame
6264bb73f3
fixed envelope button color
2015-07-25 00:04:12 +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
BeaR
c3689658b4
Fix editor sound replacing
2014-11-09 14:58:28 +01:00
BeaR
655c2466b9
Start adding a sound envelope
2014-10-18 18:41:54 +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
5df94f772f
Add support for sound sources
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
def
6cecffe67c
Fix editor input on Android
2014-09-29 13:13:56 +02:00
def
a5ec9e3240
Show current quad when pressing space in editor
2014-08-21 00:56:35 +02:00
def
6adb99608e
Editor feature: Add possibility to set how far to shift layer
2014-06-01 01:32:54 +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
f2dccafd4e
Preview when loading PNGs in editor
2014-03-28 22:47:57 +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
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
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
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
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
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
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
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
de4a95c5d2
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
2011-08-20 06:50:06 +02:00
oy
f36cc57bdd
fixed last commit
2011-08-15 20:12:31 +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
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
Choupom
84e5c53432
added color envelope feature for tilemaps
2011-07-20 22:04:13 +02:00
SushiTee
f7a9e80163
added possibility to collapse groups by double clicking them
2011-07-15 01:03:22 +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
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
ca6e129da6
fixed size of characters in editor's tileselection screen on zoom. Closes #665
2011-05-05 01:50:23 +02:00
Choupom
0c6f187e3b
renamed editor files
2011-05-03 18:45:42 +02:00