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

553 commits

Author SHA1 Message Date
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
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