Commit Graph

5334 Commits

Author SHA1 Message Date
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
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
5dcfdb3435 Merge pull request #2749 from TheHX/fix_string_content_test
Fix String content test
2015-11-18 18:55:01 -03:00
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
541812e999 Implement Quat multiply operator, and xform method 2015-11-11 11:30:55 -03:00
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
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
d5fbd1d262 Fix String content test 2015-11-06 18:52:15 -03:00
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
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
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
b59c86f6f9 -Ability to debug video memory usage
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
1db523d0bb Merge pull request #2274 from MarianoGnu/master
Improve Visual Shader Editor responsiveness
2015-10-17 15:31:23 -03:00
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
0bc6a8894c Merge pull request #2266 from MrGreenTea/master
added floor() and ceil() to Vector3
2015-10-17 12:10:32 -03:00
b217e1417a Merge pull request #2479 from firefly2442/cppcheck-unusedvars
ran cppcheck, found unused variables
2015-10-17 10:25:36 -03:00
1028ab9d81 Merge pull request #2520 from bojidar-bg/patch-3
Add missing \n to world_wrap.
2015-10-17 10:07:08 -03:00
99a3c1aaa1 Merge pull request #2531 from bojidar-bg/patch-4
Fix parameters of funcRef::call_func
2015-10-17 10:06:03 -03:00
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
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
17a90ddc08 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	scene/resources/packed_scene.h
2015-10-16 19:13:09 -03:00
79e5ced7e6 -A little More control about pixel snapping in 2D 2015-10-13 15:53:34 -03:00
6b20ee4324 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-10 09:09:59 -03:00
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
aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
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
1e147c4945 Fix some copy-paste mistakes in linear/db volume functions 2015-09-26 21:06:12 +02:00
a0dffc2942 Update mi.name 2015-09-25 18:51:04 +03:00
721d9a58c7 Removed a badly listed parameter from funcRef::call_func... 2015-09-25 18:41:42 +03:00
9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
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
ca11b2fa4b Fix _xml_unescape, as suggested by @reduz 2015-09-23 21:40:24 +03:00
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
ce6fefced8 Properly implement OS.alert() from script, and use xmessage on X11 2015-09-21 09:39:46 -03:00
afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
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
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
b4acd18f32 -display/emulate_touchscreen now really emulates a touchscreen
-icons to show node menus
2015-08-29 17:16:11 -03:00
b0be30d9ef make sure array is created if not existing, as noted by Guilherme Felipe 2015-08-25 23:09:41 -03:00
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
4b40f9228b Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-23 20:22:08 -03:00
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
6f9a084ac8 Add OS.get_system_time_msec 2015-08-06 10:29:33 -07:00
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
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
09a2de9916 added bindings for screen rotation in OS 2015-08-04 18:09:51 -03:00