Commit graph

436 commits

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