Commit Graph

503 Commits

Author SHA1 Message Date
Ignacio Etcheverry 3de30bf01d Added default value param to ConfigFile.get_value() 2016-01-01 21:12:54 +01:00
Juan Linietsky 199a29b353 Merge pull request #3184 from vnen/update-copyright-2016
Update copyright to 2016 in headers
2016-01-01 11:03:29 -03:00
George Marques 5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
Juan Linietsky 810f049edf introspection of signals and signal connections from GDScript was not working, fixes #2325 2016-01-01 10:28:15 -03:00
Juan Linietsky 37f2222dd7 -Added Color8(r8,g8,b8,a8) function as well as .r8,.g8,.b8,.a8 members to Color, to deal with colors in the 0-255 range. Closes #2345 2015-12-31 18:26:49 -03:00
Juan Linietsky 6b1849d29b make json sub-dictionaries shared, fixes #2381 2015-12-31 17:56:51 -03:00
Juan Linietsky bc2b1696e6 suport old-style engine.cfg colors in VariantParser, fixes #3176 2015-12-31 14:30:50 -03:00
Juan Linietsky 586e482a98 -Fix parsing of comments in VariantParser, fixes #3175 2015-12-31 10:25:21 -03:00
Juan Linietsky b60a3e7202 -Changed var2str and str2var in GDScript to use VariantWriter and VariantParser
-It is now finally possible to parse back a variant from text!
2015-12-31 00:54:00 -03:00
Juan Linietsky 335c52ba03 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-31 00:33:07 -03:00
Juan Linietsky fd836cad27 -Ensure .tscn and .tres always save in a deterministic way, fixes #2495
-Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed
-Created a VariantWriter helper to unify all variant to text writing
-Moved SceneFormatText writing to VariantWriter
-Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 00:31:00 -03:00
reduz 555ad5f8b7 removed wron return types, fixes #2483
removed console, which was obsolete and unused sine long long ago
2015-12-29 18:46:21 -03:00
reduz 101fe4b845 remove an extra line 2015-12-29 14:58:16 -03:00
reduz 77b5b4f4df removed some prints 2015-12-29 12:56:58 -03:00
reduz 496cb49771 Fix proper ordering of project settings properties, also fixes inability to change order of autoloads 2015-12-28 18:04:22 -03:00
reduz e0d21d2158 Ability to set autoloads as singleton global variables 2015-12-28 15:59:20 -03:00
Rémi Verschelde d4993b74fc Add missing argument names in GDScript bindings
All classes were reviewed apart from VisualServer for which no argument name is documented at all.
While doing this review, I found quite a few bugs that were fixed either in earlier commits or this one (mostly documentation bugs though, i.e. some arguments were listed at the wrong place).
2015-12-28 02:13:05 +01:00
punto- 33e5c3181d Merge pull request #3101 from Hinsbart/remapping-new
Better gamepad support
2015-12-20 11:08:04 -03:00
Ariel Manzur b989d4f887 thread can't rename itself on initialization :( 2015-12-18 09:48:39 -03:00
Ariel Manzur f25812794d thread renaming by core_bind 2015-12-18 03:06:51 -03:00
hondres af633c7941 Better gamepad support 2015-12-18 06:12:53 +01:00
Ariel Manzur 10298b9534 thread set name 2015-12-17 06:24:27 -03:00
Juan Linietsky a1142225bf -split view of property editor and editor settings 2015-12-15 23:39:36 -03:00
Ignacio Etcheverry 577bbcc6b3 Forbid renaming input presets 2015-12-14 22:36:53 +01:00
Juan Linietsky 1312df7fdc implement point cloud function using convex hull for ConvexPolygonShape2D, fixes #2848 2015-12-14 09:06:53 -03:00
Juan Linietsky f2183a5e09 replaced :var by :Variant in documentation, fixes #2897 2015-12-14 08:28:01 -03:00
Juan Linietsky 7f96f0603e -scenes are properly reloaded when a dependency changes, fixes #2896
(it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-13 20:39:01 -03:00
Juan Linietsky 7c39ebd05c -hash dictionaries properly instead of using pointer, fixes #2880 2015-12-13 15:20:58 -03:00
Juan Linietsky 39f345a9ae -deprecated pcz, replaced by just zip. Closes #2879 2015-12-13 14:15:55 -03:00
Juan Linietsky 95a469ad28 added binary API to StreamPeer, fixes #2863 2015-12-13 12:53:29 -03:00
Juan Linietsky 9f75dd086e no more time error, fixes #2892 2015-12-12 19:21:43 -03:00
Juan Linietsky 6316f8941c variant parser was not parsing rect2 properly, fixes #2948 2015-12-12 17:10:43 -03:00
Juan Linietsky cc7880fba5 -added windowed mode with -w, fixes #3020
-changed default windowed resolution to 1280x720
2015-12-12 12:06:53 -03:00
Juan Linietsky 9a7ff65751 make popup emit index when id is not defined 2015-12-12 09:07:43 -03:00
Juan Linietsky b191e740d2 add pop_back/pop_front/push_back/push_front to array, to make it according to doc, fixes #3040 2015-12-12 08:27:30 -03:00
Rémi Verschelde 6221570f53 Merge pull request #3039 from TheHX/pr-in-operator
Fix "in" operator, make it use evaluate() instead of operator==
2015-12-11 15:15:01 +01:00
Franklin Sobrinho 6a34ab201a Fix "in" operator, make it use evaluate() instead of operator== 2015-12-11 10:29:55 -03:00
Franklin Sobrinho e4dce93520 Fix error message when using is_connected with a script signal 2015-12-11 07:53:40 -03:00
Juan Linietsky aadced2f72 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-09 09:10:00 -03:00
Juan Linietsky 6bc6b8fcf2 -ability to change scripts in external editor and still have properties reloaded in godot UI, fixes #3003 2015-12-09 09:08:41 -03:00
romulox_x 2cc8340594 updated aes256 implementation to newer version from upstream. Also uses faster lookup table implemetation. 2015-12-08 16:13:06 -08:00
Juan Linietsky 176916524d Merge pull request #2841 from akien-mga/pr-ustring-snprintf
Cleanup calls to _snprintf in ustring
2015-12-08 17:17:49 -03:00
Juan Linietsky eff81965af Merge pull request #2956 from est31/add_system_wide_export_path
Add way to look for templates at system wide level too
2015-12-08 17:04:24 -03:00
Juan Linietsky a6ac1fcd94 Merge pull request #2983 from koalefant/vector_ptr
Vector<>::_ptr is now typed and points to the beginning of the array rather than refcounting block
2015-12-08 17:02:13 -03:00
Juan Linietsky 7ba484bc74 some fixes
-fix compilation on tres/tscn on MSVC
-fixed theora playback performance, closes #3004
2015-12-06 20:22:45 -03:00
Franklin Sobrinho 3c4b0236cb Add constructor for Image built-in type 2015-12-06 09:12:14 -03:00
Juan Linietsky fe2a9bc746 optional streaming from thread for Theora 2015-12-05 23:16:41 -03:00
Juan Linietsky 200b7bb87c -Display on animation editor which keys are invalid and which tracks are unresolved
-Added a tool to clean up unresolved tracks and unused keys
2015-12-05 14:18:22 -03:00
koalefant c7b730c655 Vector<>::_ptr is now typed and points to the beginning of array rather than reference count block 2015-12-04 05:58:56 +01:00
est31 e1d02e4831 Make the setting unix-only.
For this, put the detection into the OS class and its subclass.
2015-11-30 02:35:59 +01:00
Juan Linietsky 68aaa0f813 Merge branch 'master' of https://github.com/godotengine/godot 2015-11-28 20:57:23 -03:00
Juan Linietsky 7aa39b7cae -Fixed bug with scene inheritance, should work again
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-28 20:56:14 -03:00
admix bc998c9195 fixed crash when creating new object with wrong number of arguments 2015-11-28 17:30:59 +01:00
Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	main/main.cpp
2015-11-24 10:52:41 -03:00
Juan Linietsky ccd40f76e8 -work in progress resourceparser and .tscn parser. Still non-functional
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
est31 a23e29ab36 Correct retvals of String::to_ascii() and String::to_utf8()
Both return RawArray, not String.

My fault from commit f83f96cb44.
2015-11-24 05:11:39 +01:00
Rémi Verschelde a961347d8c Fix return type of Matrix32 member vars
Thanks to @bojidar-bg for localising the issue.
2015-11-23 19:08:54 +01:00
Rémi Verschelde 74e0c76216 Merge pull request #2788 from masoudbh3/pck-file-name
Load binaryname.pck
2015-11-23 09:59:48 +01:00
Rémi Verschelde 5a35bb903d Merge pull request #1820 from guilhermefelipecgs/master
Remove duplicated filter, Fix #1795
2015-11-23 00:22:35 +01:00
masoud bh 6277fe3078 add priority to load binaryname.pck 2015-11-20 12:47:55 +03:30
masoud bh 6f718228d4 Load binaryname.pck
if not found data.pck search for binaryname.pck in linux and windows
2015-11-20 12:47:55 +03:30
Rémi Verschelde f7e4c4e359 Fix call to _snprintf on GCC
Was a regression from ddbf2ff.
This commit also introduce a "#define snprintf _snprintf", so the rest of the file was simplified to make use of this
instead of distinguishing between snprintf and _snprintf in the various functions.
2015-11-20 00:30:35 +01:00
Juan Linietsky 2769da7744 compile fixes 2015-11-19 20:24:43 -03:00
Ariel Manzur ddbf2ffd1d fix compile error in some msvc version (snprintf not found) 2015-11-19 18:09:57 -03:00
Juan Linietsky fd5ee87c24 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	platform/windows/export/export.h
2015-11-19 10:44:13 -03:00
Juan Linietsky d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -03:00
Aren Villanueva 5c7e9e7e63 Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser to break.
Documentation for HTTPClient.
Added a query_string_from_dict method to HTTPClient to create a x-www-form-urlencoded valid query string for GET and POST messages.
String now has http_escape() and http_unescape() methods to help facilitate the above query_string_from_dict method.
2015-11-19 22:01:42 +11:00
Juan Linietsky 0168947084 Merge pull request #2518 from masoudbh3/godot-icons
Add icon to exe file in windows export
2015-11-19 00:08:47 -03:00
Juan Linietsky 0c3386b2ed Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
Juan Linietsky 63e84e1824 Merge pull request #2798 from bojidar-bg/patch-6
Change handling of invalid JSON escape sequences.
2015-11-18 19:41:46 -03:00
Juan Linietsky f738906519 Merge pull request #2737 from akien-mga/type-specific-error-output
Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
2015-11-18 18:58:22 -03:00
Juan Linietsky 5dcfdb3435 Merge pull request #2749 from TheHX/fix_string_content_test
Fix String content test
2015-11-18 18:55:01 -03:00
Bojidar Marinov f59a1fd50d Change handling of invalid JSON escape sequences.
Instead of reporting an error, just ignore the first backslash and continue.
Fixes #2521
2015-11-16 17:05:39 +02:00
Franklin Sobrinho 541812e999 Implement Quat multiply operator, and xform method 2015-11-11 11:30:55 -03:00
Rémi Verschelde 6334895088 Display error type (error, warning, script error) in OS::print_error
Previously all types of errors would be shown as ERROR, thus making for example warnings (WARN_PRINT) somewhat aggressive.
ERROR is displayed in red, WARNING in yellow and SCRIPT ERROR in magenta (though the latter does not seem used so far).
Fixes #1127.
2015-11-10 18:29:34 +01:00
masoud bh 24f3f43457 Add icon to exe file in windows export
add version_info and icon sections in "export to windows platform".
add version_info and icon to godot exe file (editor & template exe).
fix an problem in image class.
change all default icons to android export icon (a little more rounded).
create an python script for convert file to cpp byte array for use in
'splash.h'.
2015-11-09 02:23:58 +03:30
Franklin Sobrinho d5fbd1d262 Fix String content test 2015-11-06 18:52:15 -03:00
Rémi Verschelde 399b1b0474 Cosmetic fixes to SCons buildsystem
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
Juan Linietsky d123c89c58 -fixed a quite serious scene corruption bug when saving that has been around for months.
good thing no one ran into it :P
2015-10-21 23:57:43 -03:00
Juan Linietsky 35959f9c5a -fixes to ring buffer (fixes network error)
-fixes to invalid disabling of commands on scene tree dock
2015-10-21 16:52:43 -03:00
Juan Linietsky b59c86f6f9 -Ability to debug video memory usage
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
Juan Linietsky 1db523d0bb Merge pull request #2274 from MarianoGnu/master
Improve Visual Shader Editor responsiveness
2015-10-17 15:31:23 -03:00
Juan Linietsky 253d34b937 Merge pull request #2256 from sheepandshepherd/list-edits
List::move_before updates front/back pointers, fixes #2255
2015-10-17 12:10:42 -03:00
Juan Linietsky 0bc6a8894c Merge pull request #2266 from MrGreenTea/master
added floor() and ceil() to Vector3
2015-10-17 12:10:32 -03:00
Juan Linietsky b217e1417a Merge pull request #2479 from firefly2442/cppcheck-unusedvars
ran cppcheck, found unused variables
2015-10-17 10:25:36 -03:00
Juan Linietsky 1028ab9d81 Merge pull request #2520 from bojidar-bg/patch-3
Add missing \n to world_wrap.
2015-10-17 10:07:08 -03:00
Juan Linietsky 99a3c1aaa1 Merge pull request #2531 from bojidar-bg/patch-4
Fix parameters of funcRef::call_func
2015-10-17 10:06:03 -03:00
Juan Linietsky f259f9cbc3 Merge pull request #2584 from buresu/fix-parentheses-equality-warnings
[OSX Clang] Fix parentheses-equality warnings
2015-10-17 09:48:06 -03:00
MarianoGNU a5ebb52500 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
2015-10-16 23:21:39 -03:00
reduz 17a90ddc08 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	scene/resources/packed_scene.h
2015-10-16 19:13:09 -03:00
Juan Linietsky 79e5ced7e6 -A little More control about pixel snapping in 2D 2015-10-13 15:53:34 -03:00
reduz 6b20ee4324 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-10 09:09:59 -03:00
reduz 422929e87f Large improvements on scene packing and management
-Ability to edit and keep changes of instanced scenes and sub-scenes
-Ability to inherit from other scenes
2015-10-10 09:09:09 -03:00
近藤 直人 bbca86577d fix parentheses-equality warnings of osx clang 2015-10-09 21:39:50 +09:00
reduz aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
Juan Linietsky e055247b17 -Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing)
-Added ability for exporter to shrink images to non-integer values. Helps if you want to convert your game artwork from 1080->720 or similar
2015-10-01 16:25:36 -03:00
Rémi Verschelde 1e147c4945 Fix some copy-paste mistakes in linear/db volume functions 2015-09-26 21:06:12 +02:00
Bojidar Marinov a0dffc2942 Update mi.name 2015-09-25 18:51:04 +03:00
Bojidar Marinov 721d9a58c7 Removed a badly listed parameter from funcRef::call_func... 2015-09-25 18:41:42 +03:00
Juan Linietsky 9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky 82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Bojidar Marinov d9583f8a72 Add missing \n to world_wrap. Close #2516
The issue was that world_wrap would skip over newlines, without adding them to the output.
2015-09-24 10:17:06 +03:00
Bojidar Marinov ca11b2fa4b Fix _xml_unescape, as suggested by @reduz 2015-09-23 21:40:24 +03:00
Bojidar Marinov a7f0846a6b Flip &lt; and &gt; in String::xml_escape. Close #2511
Before > referred to &lt; and < to &gt;, which is incorrect...
2015-09-23 21:33:31 +03:00
Juan Linietsky ce6fefced8 Properly implement OS.alert() from script, and use xmessage on X11 2015-09-21 09:39:46 -03:00
firefly2442 afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
Juan Linietsky b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
Mariano Javier Suligoy c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
2015-08-30 02:48:45 -03:00
Mariano Javier Suligoy ea448cb779 Edit default values. WARNING!!!
Do not merge these changes, default values are not compiled into shaders yet!
2015-08-29 21:09:11 -03:00
Juan Linietsky b4acd18f32 -display/emulate_touchscreen now really emulates a touchscreen
-icons to show node menus
2015-08-29 17:16:11 -03:00
Juan Linietsky b0be30d9ef make sure array is created if not existing, as noted by Guilherme Felipe 2015-08-25 23:09:41 -03:00
Juan Linietsky d50921b550 Show documentation for properties on hover.
This works if the property has been documented (about half are at this point)
2015-08-25 23:00:11 -03:00
Juan Linietsky 4b40f9228b Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-23 20:22:08 -03:00
Juan Linietsky 07e9741425 **WARNING BEFORE PULLING**
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)

Summary of Changes

-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
2015-08-23 20:15:56 -03:00
Maximillian 6f9a084ac8 Add OS.get_system_time_msec 2015-08-06 10:29:33 -07:00
Juan Linietsky 9d185ccc30 -Merged the file server with the live editing and remote debug
-It is now really easy to deploy an android build with debug, and debug it
2015-08-06 02:37:40 -03:00
Juan Linietsky 8280bb0de0 more debugger fixes
-setting/clearing breakpoints during run-time now works
-multi-line strings resulted in wrong line numbers in bytecode, fixed
2015-08-04 20:17:39 -03:00
Juan Linietsky 09a2de9916 added bindings for screen rotation in OS 2015-08-04 18:09:51 -03:00
Juan Linietsky d1da2c2995 error debugger
shows the list of errors that happened during running the game, traces
can be analyzed
2015-08-04 09:47:32 -03:00
Juan Linietsky cbee679bd7 live debug fixes
removing node in live debugging fixed
2015-08-02 20:28:10 -03:00
Juan Linietsky 59961c9914 Live edit WORK IN PROGRESS
1) press the heart while the game is running
2) select a scene to live edit from the opened scenes
3) edit/add/remove nodes or resources, change their properties, etc.
4) watch changes reflected in running game, in all places this scene is
edited
5) It's not perfect obviously, but the aim of it is to try to reflect
your changes as best as possible in the running game.
2015-08-02 12:30:01 -03:00
punto- 922356b903 adding some base64 marshalls 2015-07-28 12:50:52 +02:00
MrGreenTea ec11762006 added floor() and ceil() to Vector3 2015-07-15 01:59:35 +02:00
sheepandshepherd db440a2a58 Fix List::move_before for front and back elements 2015-07-10 21:33:44 +02:00
Juan Linietsky b4d5f7e154 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-30 11:59:33 -03:00
Juan Linietsky 4613a3f2c0 small fixes 2015-06-30 11:59:00 -03:00
Juan Linietsky 55b34e05b3 -some changes by okam 2015-06-30 11:28:43 -03:00
Juan Linietsky 95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources.
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
2015-06-29 00:29:49 -03:00
Juan Linietsky a67486a39e improved get_node(), connect(), etc code completion.
-properly completes text arguments
-includes the "/root" autoloads
2015-06-26 01:14:49 -03:00
Juan Linietsky 48f1d02da4 added ability to define signals in script
closes #2175
2015-06-24 13:29:45 -03:00
Jaguar e6fb0cf970 Added helper methods to InputEvent 2015-06-23 16:24:48 -04:00
Juan Linietsky 3abb54871f Merge pull request #2072 from jrimclean/master
Interpolation for affine transformations/Bound rot/pos Matrix32 constructor
2015-06-22 23:57:10 -03:00
Juan Linietsky 0805e83e59 small in place fixes 2015-06-22 23:44:13 -03:00
Juan Linietsky 29e644c20a Merge pull request #2144 from Krzycho666/UndoRedo_fix
added GDscript bidings for UndoRedo class
2015-06-22 23:42:13 -03:00
krzycho fafcc52d1c added some missing biddings 2015-06-22 14:42:52 +02:00
Juan Linietsky e9bbb97acc Multiple scene editing *POTENTIALLY UNSTABLE*
-ability to edit multiple scenes at the same time
-resource internal IDs are now persistent, this makes multiple scene
editing possible but maaaaay result in file corruption bugs (tested and
could not find anything but possibility exists because core code
changed, report immediately if you find this).
-properly save settings, layout, etc when edited
-script editing is independent from scene editing now
-show a yellow box when a script belongs to the scene
2015-06-22 00:04:15 -03:00
krzycho d65455185a - added GDscript bidings for UndoRedo class mechanizm
- registered UndoRedo
2015-06-21 22:23:09 +02:00
Juan Linietsky 8228fea02f missing changes 2015-06-14 02:13:47 -03:00
Juan Linietsky 4e46143499 some optimizations in godot memory handling 2015-06-12 18:27:48 -03:00
James McLean 2e6d3b7fad Changed floats to 'real_t'. 2015-06-11 21:37:54 -04:00
James McLean c2181285eb Changed 'scale' to 'scale_basis' in 'interpolate_with'. 2015-06-11 13:44:04 -04:00
James McLean b19ed63eb6 Implemented interpolation for affine transformations (Matrix32::interpolate_with) 2015-06-11 10:43:48 -04:00
James McLean bb659fa875 Added rot/pos constructor for Matrix32 variant. 2015-06-09 10:55:23 -04:00
James McLean 45b453169a Fixed get_packet/put_packet bindings in PacketPeer. 2015-06-08 13:18:18 -04:00
Juan Linietsky 8d61817293 Merge pull request #2037 from est31/use-local-win
Time zone support
2015-06-07 00:32:29 -03:00
Juan Linietsky efbe877005 Merge pull request #2029 from est31/rawarray
Add String.to_utf8() and String.to_ascii()
2015-06-07 00:30:37 -03:00
Juan Linietsky e4434fe70e Merge pull request #1977 from choikwa/master
fix typo error in Color::invert, fixes #1967
2015-06-07 00:28:50 -03:00
Juan Linietsky b524b40fdc -fixed many memory initialization issues
-fixed deadlock on previews thread
-fixed compilation errors on unix
2015-06-06 22:06:58 -03:00
Juan Linietsky 6974823288 Merge remote-tracking branch 'origin/master'
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
2015-06-06 10:12:09 -03:00