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

702 commits

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