godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,204 Commits 15 Branches 59 Tags 2.2 GiB
83864514f9
Commit Graph

691 Commits

Author SHA1 Message Date
Franklin Sobrinho
41ae83e415 Fixed small inconsistencies with the text format 2016-01-24 18:38:37 -03:00
Juan Linietsky
72d1f2ef30 Merge pull request #3437 from vnen/fix-3149 
Change default video mode for X11
 2016-01-24 17:44:26 -03:00
reduz
341f8e6d2b -remved p_peer is null error messages, fixes #1150 2016-01-24 16:59:39 -03:00
George Marques
f4a39692b9 Change default window size for desktop 
Fix #3149
 2016-01-24 17:52:33 -02:00
Juan Linietsky
c247f5ad61 Removed get() function from many variant typed arrays, fixes #2135 2016-01-24 01:00:42 -03:00
Juan Linietsky
a74138a0dc -Some changes to how scenes and scripts are overriden in scene instance and inheritance 
-Fixes #3127 and also properly fixes #2958
 2016-01-23 21:42:15 -03:00
Juan Linietsky
c9580965ea -Remote deploy now uses FS over USB on Android, super fast! 2016-01-20 00:29:34 -03:00
volzhs
fb2bf78591 Add ability to set "keep screen on" for android 2016-01-16 20:57:34 +09:00
Juan Linietsky
4248c84e20 -Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201 2016-01-14 11:06:20 -03:00
Tolga Cakir
f2beb66c65 Fix typo 2016-01-13 00:06:38 +01:00
punto-
7393e40452 Merge pull request #3272 from Hinsbart/joy-binding 
Add some joystick functions to input. Enables manipulation of mapping…
 2016-01-12 03:59:19 -03:00
Liangdi
bed76b3856 Fix xml opt with XML_ENABLE macro 2016-01-12 00:40:32 +08:00
Ariel Manzur
3db379376f made headers case insensitive 2016-01-11 07:49:05 -03:00
Rémi Verschelde
e2fb8b7042 Merge pull request #3297 from AlexHolly/comment-some-print_lines 
comment some print_lines
 2016-01-11 11:32:09 +01:00
Juan Linietsky
725b61bb6c properly handle typed array constructors in VariantParser, closes #3054 2016-01-10 23:22:48 -03:00
Juan Linietsky
a120c66f98 -Removed OS.get_system_time_msec(), this is undoable on Windows and also unusable from GDscript due to precision. 
-Added, instead an OS.get_system_time_secs(), which is 32 bits friendly, fixes #3143
 2016-01-10 18:24:55 -03:00
Juan Linietsky
52e53d4513 -Added a new mode, WRITE_READ to File, to recover compatibility with old projects but also achieve desired functionality. Closes #3272 2016-01-10 15:15:04 -03:00
Juan Linietsky
4fdab4f555 added a new function to escape properly json, fixes #3282 2016-01-10 15:01:06 -03:00
Juan Linietsky
cc34e0dee9 Make sure variant parser actually writes floats when float property is requested, closes #3301 2016-01-10 11:51:05 -03:00
Juan Linietsky
6c8cf30697 -fix stray file left open when parsing configuration, closes #3299 2016-01-10 10:00:58 -03:00
Juan Linietsky
f5a3c1ccde make sure file is closed if something fails 2016-01-10 09:59:14 -03:00
Alexander Holland
151e9600aa comment some print_lines 2016-01-09 23:53:34 +01:00
Juan Linietsky
292e8bf0ab fix issues related to StringArray parsing 2016-01-08 21:09:13 -03:00
Juan Linietsky
176afb2feb -Use simpler methods for parsing simple tags, fixes #3274 2016-01-08 19:03:17 -03:00
hondres
c632c13c66 Add some joystick functions to input. Enables manipulation of mappings at runtime 2016-01-08 00:40:41 +01:00
Juan Linietsky
b6388e6001 added ':' support to VariantParser, given it' s used by export.cfg 2016-01-07 09:16:11 -03:00
Juan Linietsky
4e367a4b7b -fix bugs related to parsing config files with new variantparser, closes #3248 closes #3207 2016-01-07 09:07:18 -03:00
mrezai
5bf25e46be Fix config file parser bug that cause showing project name as "Unnamed Project" 2016-01-06 12:10:38 +03:30
Juan Linietsky
3d0bd1a3f3 -make signals throw an error when target method is not found, fixes #2036 
-removed 4 arguments limit for emit_signal() from script
-remvoed 4 arguments limit for call_deferred() from script
 2016-01-04 09:35:21 -03:00
Juan Linietsky
0e71d49ef4 -Fix crash at exit due to unnecesary check in command queue, fixes #2034 
-Fix memory corruption due to using wrong singleton in multithreaded physics, fixes #2760
 2016-01-04 00:00:33 -03:00
Juan Linietsky
7a931b4d3a Fixed the decimals function, it can't be perfect but it should be good enough. Closes #1955 2016-01-03 19:18:47 -03:00
Juan Linietsky
e8fbf39f88 -Replaced tinyjpg for jpgd (public domain), fixes progressive encoded jpgs and speeds up. Closes #2040 
-Removed support of loading BitMap as image, now it must be load as a pnm, also closes #2040
 2016-01-03 17:14:28 -03:00
Juan Linietsky
1597082c85 -Ability to roll-back script-exported properties to their default value on the script, closes #2128 2016-01-02 20:17:31 -03:00
Juan Linietsky
32a6120a5c fixed string operator[], which was broken. Closes #2202 2016-01-02 14:58:27 -03:00
Juan Linietsky
757b8c4206 -Restore mouse on X11 when debugger break happens, closes #2232 2016-01-02 12:58:59 -03:00
Juan Linietsky
432e2e7769 proper joy axis support as actions, can be configured and inquired, fixes #2317 2016-01-02 09:37:16 -03:00
hondres
83baa05915 bind trigger constants 2016-01-02 04:23:39 +01:00
hondres
117ae93cf1 Analog values for gamepad triggers, using axes 6 & 7 2016-01-02 03:34:32 +01:00
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
Juan Linietsky
9acab32daa new file dialog! 
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
 2015-06-06 09:44:38 -03:00
est31
c5338fd6c4 Add OS.get_time_zone_info function 
The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.
 2015-06-06 05:57:33 +02:00
est31
803069886e Add utc param to get_time and get_date methods 
If utc == false, we return the local time, like before.
Otherwise, we return UTC time.
utc defaults to false to not break behaviour.
 2015-06-06 05:55:28 +02:00
est31
f83f96cb44 Add String.to_utf8() and String.to_ascii() 2015-06-04 01:48:52 +02:00
Juan Linietsky
ab99671bb8 -fixes to navigation, so edge-merging is more flexible on conflict 
-add tab support to richtextlabel
-some click fixes to audio stream resampled
-ability to import largetextures (dialog)
 2015-06-01 19:42:34 -03:00
Kevin Choi
6813a1f1e1 Merge pull request #2 from okamstudio/master 
pull
 2015-05-31 01:37:56 -04:00
Juan Linietsky
d5348eebdc work in progress, resource previews 2015-05-31 02:00:18 -03:00
Juan Linietsky
57a78ec06b added conversion from int, string to color 
fixes #1971
 2015-05-27 10:56:57 -03:00
Juan Linietsky
9df77d2765 ability to run 2D physics in a thread 
also, 2D physics is now thread safe too.
see physics_2d/thread_model
 2015-05-26 01:06:05 -03:00
Ariel Manzur
3826b66a6e opening data.pcz 2015-05-25 22:42:54 -03:00
Ariel Manzur
c85a526a21 fixed support for zip packages 2015-05-25 22:35:00 -03:00
Kevin Choi
ec93668f8d Merge pull request #1 from okamstudio/master 
improved animation editor
 2015-05-25 00:54:24 -04:00
Juan Linietsky
f36e7dcb40 improved animation editor 
-same-value link keys
-new layout
-forward, backwards playback
-integrated curve/property editor
-auto increment sprite frame after insert
-copy & paste animation resoucres
 2015-05-25 01:47:02 -03:00
choikwa
b210f52f4a fix typo error in Color::invert 2015-05-24 19:07:26 -04:00
Juan Linietsky
1e50677594 fixes on sample importing 2015-05-19 23:37:04 -03:00
Juan Linietsky
221443c5a2 more fixes 
-only refuse to load an older file if version major is different, fixes
#1944
-fix drive letter default value, fixes #1939
 2015-05-19 21:36:35 -03:00
Juan Linietsky
f220183e40 fix a crash situation when starting a thread and other small fixes 2015-05-18 12:45:53 -03:00
Juan Linietsky
5900e7f589 fix a compile error 2015-05-18 11:14:02 -03:00
Juan Linietsky
e323cc0505 -Rename unexisting by nonexistant, closes #1940 
-Added function to retrieve list of actions fron InputMap
 2015-05-18 10:20:54 -03:00
Juan Linietsky
e72717e373 properly save external resources, fixes #1924 
added API to get scancode names to OS
 2015-05-17 13:15:23 -03:00
Juan Linietsky
adb709aa91 -Integers and Float should interpolate on animation, maybe fixes #1891, please test 2015-05-16 18:16:11 -03:00
Juan Linietsky
40c0e1993a Fixes problem parsing config files using ConfigFile 2015-05-12 09:12:18 -03:00
Juan Linietsky
bcb184766f -shadergraph now saved when on external file and modified, fixes #1832 2015-05-11 21:36:29 -03:00
Juan Linietsky
9b692b174b -convert to subscene keeps signal connections, fixes #1863 2015-05-10 15:45:33 -03:00
Juan Linietsky
7c4a35496a Merge pull request #1844 from daltomi/SIGSEGV 
Fix segment violation MINIZIP_ENABLED
 2015-05-07 20:03:25 -03:00
Juan Linietsky
c99813dc38 Merge pull request #1826 from eehrich/master 
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
 2015-05-07 20:02:54 -03:00
Daniel T. Borelli
93095014fd Fix segment violation MINIZIP_ENABLED 2015-05-06 20:37:25 -03:00
ehriche
897a1aade5 optional formal changes 2015-05-06 01:22:31 +02:00
Guilherme Felipe
734d539a7d Change the order of the filter 2015-05-05 15:34:40 -03:00
Guilherme Felipe
6e98b05837 Remove duplicated filter, Fix #1795 2015-05-05 14:16:59 -03:00
Juan Linietsky
bc3c14a76b Made type-checking for arguments less trict between bool, int real. Fixes #1816 2015-05-05 09:53:37 -03:00
Juan Linietsky
a6e6c5b878 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-04 18:32:18 -03:00
Juan Linietsky
2d396fb710 -More strict argument type-checking, will make many bugs visible, fixes #1809 
-added NOTIFICATION_INSTANCED
 2015-05-04 18:30:57 -03:00
Juan Linietsky
2a02d3f96f fix font import path on windows, closes #1675 2015-05-04 15:06:41 -03:00
Juan Linietsky
6f8bd89931 -invalidated string -> int automatic conversion, fixes #1788 2015-05-04 11:17:11 -03:00
Juan Linietsky
a76709d240 -vec3 uniforms should now work, fixes #1773 2015-05-04 10:17:24 -03:00
Juan Linietsky
9b01f5954a solve invalid pointer, fixes #1793 2015-05-04 00:55:21 -03:00
Juan Linietsky
c631d597ad Merge pull request #1792 from swenner/static_analysis_fixes 
Static analysis fixes
 2015-05-03 22:53:30 -03:00
Juan Linietsky
913cb443fc Merge pull request #1798 from ricpelo/ricpelo-patch-1 
Missing return statement
 2015-05-03 22:52:42 -03:00
Juan Linietsky
04fb3402c5 -Make sure properties are exported the way they should in xml, fixes #1799 2015-05-03 20:31:50 -03:00
Ricardo Pérez
256a9fd1df Missing return statement 2015-05-03 22:09:42 +02:00
Simon Wenner
a0e985c6c1 removed unnecessary semicolons 2015-05-03 01:48:20 +02:00
Simon Wenner
2830f85b05 fixed uninitialized variable (cppcheck) 2015-05-03 01:45:55 +02:00
Juan Linietsky
1e422941c8 -Fixed android export options (screen sizes, orientation should work) 
-added functions to get mouse position in CanvasItem
 2015-05-01 21:13:20 -03:00
Juan Linietsky
ee8f8add4e -removed get_mouse_pos from Input, as it only caused problems 2015-05-01 12:19:24 -03:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
est31
b2b5143678 Sort xml files, so order is constant 
Makes xml format work better with version control systems.
 2015-05-01 03:41:45 +02:00
romulox_x
79c36ea5f7 fixed ColorArray constructor when taking array as parameter 2015-04-27 14:45:54 -07:00
Juan Linietsky
3203a03414 Fixed bug in array comparison, fixes #1712 2015-04-26 12:12:53 -03:00
Juan Linietsky
1f8e3117dd Ability to convert from nodes or other non resource with a get_rid() function to a rid 2015-04-24 20:45:07 -03:00
Juan Linietsky
7006fe3cc4 Corrected rectangle intersection, fixes #1731 2015-04-24 16:08:05 -03:00
Juan Linietsky
66c71c21df resolved some cases wehre built-in doc is not properlt generated, fixes #1719 2015-04-22 00:25:13 -03:00
Juan Linietsky
59154cccf9 -Changed Godot exit to be clean. 
-Added more debug information on memory cleanliness on exit (if run with -v)
-Fixed several memory leaks, fixes #1731, fixes #755
 2015-04-20 19:38:02 -03:00
Juan Linietsky
b66b86b05e -Fixed post-import script-reload buf, fixes #1683 2015-04-18 19:06:58 -03:00
Juan Linietsky
a5cbfbbcbb -fixed relative path saving to file, fixes #1694 2015-04-18 16:33:31 -03:00
Juan Linietsky
4661a6e126 -try to avoid errors when path using ".." is present in script include, fixes #1703 2015-04-18 16:17:33 -03:00
Juan Linietsky
fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Juan Linietsky
6b3cd13c8d -fix vector rotation, fixes #1705 2015-04-18 14:19:33 -03:00
Juan Linietsky
28304bc330 -Changed the cubic interpolator, improves situation with PathFollow in #1659 2015-04-13 09:47:03 -03:00
Juan Linietsky
8fa4f1cf82 -Made sure that "free" function appears in documentation and code completion, fixes #1664 2015-04-12 22:22:44 -03:00
Juan Linietsky
3e20391bf6 -Changed bootsplash option to use a file, fixes #1539 
-Added OS.get_splash_tick_msec() to query when splash appeared
 2015-04-12 17:55:01 -03:00
Juan Linietsky
2dfa1279ea improved save path error messages for scene, textures and audio, fixes #1514 2015-04-12 16:45:59 -03:00
Juan Linietsky
3b35bcc955 -fix resolver erase query to avoid running out of slots, fixes #1621 2015-04-07 22:45:33 -03:00
Juan Linietsky
963845eea9 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-07 21:21:06 -03:00
Juan Linietsky
22997294fa -Concatenating arrays keeps the shared property if any of the arrays is shared. Fixes #1646 2015-04-07 21:18:46 -03:00
Juan Linietsky
e336306e91 Merge pull request #1554 from NateWardawg/inspectorupdate 
Camel casing being capitalized only happens in the inspector now.
 2015-04-07 20:22:09 -03:00
Juan Linietsky
219fce737c Merge pull request #1564 from Faless/area_combine-1 
Implement combine mode for area
 2015-04-07 20:21:11 -03:00
Juan Linietsky
7b75658bb2 Merge pull request #1585 from UsernameIsAReservedWord/add_is_queued_for_deletion_in_objects 
add : bool Object.is_queued_for_deletion()
 2015-04-07 20:14:51 -03:00
Juan Linietsky
7978245784 Merge pull request #1614 from hurikhan/pr_parameter_names 
wm api -- set screen parameter names for gdscript
 2015-04-07 20:11:53 -03:00
Juan Linietsky
b36e41cb71 Added a PVRTC encoder for iOS 2015-04-06 21:48:20 -03:00
hurikhan
af368b7e1a set screen parameter names for gdscript 2015-04-03 15:00:55 -04:00
Juan Linietsky
1572238adb merging okam changes 2015-04-02 07:22:17 -03:00
UsernameIsAReservedWord
9cca88eb92 Update object.h 2015-03-28 18:42:01 +01:00
yg2f
3c67e22c3d add : bool Object.is_queued_for_deletion() 
`object.is_queued_for_deletion()` return true if the object was
`object.queue_free()` or `SceneTree.queue_delete(object)`.
 2015-03-28 18:34:28 +01:00
Fabio Alessandrelli
4b3b5eba86 Use Vector for storing areas 2015-03-24 18:46:26 +00:00
Nathan Warden
21eb3b2a83 Camel casing being capitalized only happens in the inspector now. 2015-03-23 00:08:07 -05:00
Juan Linietsky
0dcca688d2 Revert "Camelcased script variables will now capitalize in the inspector." 2015-03-22 19:06:13 -03:00
Juan Linietsky
23e13ce3c2 fixes to new window management API 
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
 2015-03-22 19:00:50 -03:00
Juan Linietsky
15bee515e6 Merge pull request #1487 from hurikhan/x11-window-management 
X11 window management
 2015-03-22 15:10:50 -03:00
Juan Linietsky
f706e3e5d1 Merge pull request #1380 from ElectricSolstice/wparentheses_removal 
Changed code to remove gcc -Wparentheses warnings.
 2015-03-22 15:05:47 -03:00
Juan Linietsky
0302ea5b82 Merge pull request #1396 from Spooner/fix_sprintf_errors 
Fix sprintf errors
 2015-03-22 15:03:32 -03:00
Juan Linietsky
7436f0bb37 Merge pull request #1401 from NateWardawg/inspectorupdate 
Camelcased script variables will now capitalize in the inspector.
 2015-03-22 15:02:42 -03:00
Juan Linietsky
3aed92e5b1 Merge pull request #1450 from theuserbl/master 
Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
 2015-03-22 14:58:42 -03:00
Juan Linietsky
4069dc7891 Merge pull request #1521 from codx/master 
Fix for InputEvent::set_as_action
 2015-03-22 14:48:54 -03:00
rollenrolm
db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00
Alex Bonfim
2d4cad7057 Fix for InputEvent::set_as_action 2015-03-15 23:17:48 -03:00
hurikhan
87be945d49 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-03-08 15:10:48 +08:00
Juan Linietsky
2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
 2015-03-03 14:41:36 -03:00
Juan Linietsky
4d2198110b merges from okam repo 2015-03-03 14:39:13 -03:00
Juan Linietsky
a1f715a4da support for 2D shadow casters 
Added support for 2D shadow casters.

*DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a
CanvasItem and pull this, you will lose them. Shaders now work through a
2D material system similar to 3D. If you don't want to lose the 2D
shader code, save the shader as a .shd, then create a material in
CanvasItem and re-assign the shader.
 2015-03-02 00:54:43 -03:00
theuserbl
e2c0caf41e Update global_constants.cpp 
Making KEY_MASK_CMD usable in GDScript
 2015-02-27 11:19:55 +01:00
Nathan Warden
8f5bf2a2ef Camelcased script variables will now capitalize in the inspector. 2015-02-19 19:35:04 -05:00
Bil Bas (Spooner)
db2381de7a Correctly halt on error in sprintf parsing (fixes #1393) 2015-02-19 15:45:49 +00:00
Juan Linietsky
5ef3f7392f support for light and normal mapping in 2D 2015-02-18 19:40:02 -03:00
ElectricSolstice
0e1f34b49d Changed code to remove gcc -Wparentheses warnings. 2015-02-16 18:58:41 -08:00
Felix Laurie von Massenbach
2478935f96 Fix a shadow declaration. 2015-02-15 18:09:11 +00:00
Juan Linietsky
4333aa240c Godot UI is quick and snappy again! 
Changed linked listed sort to use auxiliary memory
this fixes user interface performance issues.
 2015-02-15 12:38:25 -03:00
Juan Linietsky
2d4cec0cb6 fix return value of slide and reflect 
closes #1311
 2015-02-15 11:26:31 -03:00
hurikhan
f5d2e1f42c Renamed EXPERIMENTAL_WM_API to NEW_WM_API 2015-02-15 18:26:49 +08:00
hurikhan
ee81d4b359 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-15 17:49:34 +08:00
Juan Linietsky
2185c018f6 begin new serialization framework 
also got rid of STL dependency on triangulator
 2015-02-15 01:21:26 -03:00
Juan Linietsky
c5f509f238 New Navigation & Pathfinding support for 2D 
-Added Navigation & NavigationPolygon nodes
-Added corresponding visual editor
-New pathfinding algorithm is modern and fast!
-Similar API to 3D Pathfinding (more coherent)
 2015-02-14 12:10:15 -03:00
hurikhan
a13e180052 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-12 15:58:29 +01:00
Juan Linietsky
78a268c2eb fixes to HTTPClient 
-small unchunked files should work properly
-blocking mode should work properly
 2015-02-11 07:57:51 -03:00
Juan Linietsky
7f88df73be Merge pull request #1346 from Nulifier/import-plugin 
Added the ability to add and remove editor import plugins.
 2015-02-11 07:07:59 -03:00
Jeffrey Steward
84be16758e Added the default arguments to the binding for ResourceImportMetadata::add_source to match the c++ version 2015-02-10 14:23:49 -07:00
Bil Bas (Spooner)
2c1a3dfed6 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf 2015-02-01 20:29:11 +00:00
Bil Bas (Spooner)
af7c8bdf23 Completed more complex formatting. 2015-02-01 20:18:38 +00:00
Bil Bas (Spooner)
6306254d37 Completed implementing standard formatting. 2015-02-01 18:42:36 +00:00
hurikhan
c5080e23b8 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-20 23:39:53 +09:00
sanikoyes
317c496f5c Add InputEvent::ACTION get/set support for variant 
Add action_press/action_release method bind
 2015-01-20 20:01:02 +08:00
hurikhan
716971655e added the following methods: 
* set_minimized(bool)
 * bool is_minimized()
 * set_maximized(bool)
 * bool is_maximized()
 2015-01-17 00:18:45 +09:00