asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13254 commits 1 branch 0 tags 2.2 GiB
Commit graph

789 commits

Author SHA1 Message Date
Rémi Verschelde
debeee56f7 Fix typos in source code using codespell 
From https://github.com/lucasdemarchi/codespell
 2017-03-24 21:45:31 +01:00
volzhs
56af1a3790 Cache DynamicFont resource for Android 2017-03-24 16:18:35 +09:00
Pedro J. Estébanez
3b36df3730 Fix redundant connections saved in sub-inheritance 2017-03-15 11:46:45 +01:00
Rémi Verschelde
a45e6f67d5 Merge pull request #7981 from RandomShaper/position-for-2d-shaders 
Map POSITION to gl_FragCoord.xy for 2D shaders
 2017-03-13 11:01:14 +01:00
Pedro J. Estébanez
383dea5796 Fix node duplication in scene sub-inheritance 2017-03-09 01:19:40 +01:00
Pedro J. Estébanez
5ff0924a93 Map POSITION to gl_FragCoord.xy for 2D shaders 2017-03-08 02:07:59 +01:00
Rémi Verschelde
5dbf1809c6 A Whole New World (clang-format edition) 
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
 2017-03-05 16:44:50 +01:00
Rémi Verschelde
e1c1d7d1d7 Add a bunch of missing Godot headers in own files 2017-03-05 15:47:28 +01:00
Ray Koopa
e07aa5deb8 Added functionality for resizable dialogs. 2017-03-01 23:40:10 +01:00
Thaer Razeq
f50488a361 Various fixes detected using PVS-Studio static analyzer. 
- Add FIXME tags comments to some unfixed potential bugs
- Remove some checks (always false: unsigned never < 0)
- Fix some if statements based on reviews.
- Bunch of missing `else` statements
 2017-02-28 07:52:02 -06:00
Ray Koopa
5cf063ca9d Add disabled tabs 2017-02-27 19:07:50 +01:00
Juan Linietsky
de0045cf1b -renamed globals.h to global_config.cpp (this seems to have caused a few modified files) 
-.pck and .zip exporting redone, seems to be working..
 2017-02-21 00:06:30 -03:00
Hein-Pieter van Braam
b696beea65 Correct hash behavior for floating point numbers 
This fixes HashMap where a key or part of a key is a floating point
number. To fix this the following has been done:

* HashMap now takes an extra template argument Comparator. This class
gets used to compare keys. The default Comperator now works correctly
for common types and floating point numbets.

* Variant implements ::hash_compare() now. This function implements
nan-safe comparison for all types with components that contain floating
point numbers.

* Variant now has a VariantComparator which uses Variant::hash_compare()
safely compare floating point components of variant's types.

* The hash functions for floating point numbers will now normalize NaN
values so that all floating point numbers that are NaN hash to the same
value.

C++ module writers that want to use HashMap internally in their modules
can now also safeguard against this crash by defining their on
Comperator class that safely compares their types.

GDScript users, or writers of modules that don't use HashMap internally
in their modules don't need to do anything.

This fixes #7354 and fixes #6947.
 2017-02-16 18:44:29 +01:00
Juan Linietsky
903a3aa5f0 a ton of bug fixes to the renderer 2017-02-16 08:55:43 -03:00
Juan Linietsky
da11d6d9e8 Many fixes to make exported scenes work better, still buggy. 2017-02-15 08:34:02 -03:00
Hein-Pieter van Braam
411ee71b4d Rename the _MD macro to D_METHOD 
This new name also makes its purpose a little clearer

This is a step towards fixing #56
 2017-02-13 12:50:02 +01:00
Hein-Pieter van Braam
0f687f0ccb Remove use of _SCS from ADD_METHOD 
This saves typing and is a step towards fixing #56
 2017-02-13 10:37:47 +01:00
Rémi Verschelde
117a83fcb9 Merge pull request #7352 from Zylann/polyline 
Polyline
 2017-02-12 23:30:04 +01:00
Juan Linietsky
6f2e16306a Several bugfixes, improving the import workflow 2017-02-06 00:38:39 -03:00
Juan Linietsky
a02933bb3c wav file importing! 2017-02-02 22:51:58 -03:00
Juan Linietsky
2cd2ca7bbc Lot of work in new importer, importing textures now works. 2017-02-01 09:46:36 -03:00
Juan Linietsky
4c28f35b2c Merge pull request #7002 from RandomShaper/vcs-friendliness 
Greater VCS friendliness
 2017-01-25 14:52:40 -03:00
Juan Linietsky
7e1afeafd4 Audio bus editing is COMPLETE! 2017-01-25 14:31:52 -03:00
Juan Linietsky
0aa7242624 WIP new AudioServer, with buses, effects, etc. 2017-01-21 19:01:00 -03:00
Juan Linietsky
ee0f53df52 Merge pull request #7528 from tagcup/real_t_float_fixes 
Use real_t rather than float or double in generic functions (core/mat…
 2017-01-20 19:24:49 -03:00
Ferenc Arn
81d9fe44df Use property convention introduced in b085c4 (_ rather than / as separator). 
Fixes #7476.
 2017-01-18 18:56:27 -06:00
Ferenc Arn
6f4f9aa6de Overloaded basic math funcs (double and float variants). Use real_t rather than float or double in generic functions (core/math) whenever possible. 
Also inlined some more math functions.
 2017-01-16 13:36:33 -06:00
Pedro J. Estébanez
7dbb1c0571 Improve .tscn VCS 
Serialize dictionaries adding newlines between key-value pairs
Serialize group lists also with newlines in between
Serialize string properties escaping only " and \ (needed for a good diff experience with built-in scripts and shaders)

Bonus:
Make AnimationPlayer serialize its blend times always sorted so their order is predictable in the .tscn file.

This PR is back-compat; won't break the load of existing files.
 2017-01-16 18:03:51 +01:00
Rémi Verschelde
f44ee891be Style: Fix statements ending with ';;' 2017-01-16 08:49:52 +01:00
Rémi Verschelde
40323407df Style: No break before list brace 
clang-format does not handle that well *at all*.

For the reference, found the relevant pieces of code with:
`ag "=[ "$'\t'"]?"$'\n'"[ "$'\t'"]?{" --ignore=thirdparty`
 2017-01-16 08:48:24 +01:00
Juan Linietsky
b400c69cd4 Oops! Audio engine has vanished :D 2017-01-15 16:07:51 -03:00
Juan Linietsky
5dde810aa5 no more errors related to missing GlobalConfig::Get (or so I hope) 2017-01-14 21:57:22 -03:00
Marc Gilleron
e2fba10b95 Added Line2D node that draws a polygon-based line 
It supports unlimited width, color gradient, texture and some geometry
options for joints and caps. Also transparency without artifacts
(provided that line joints aren't too sharp).
 2017-01-15 00:44:46 +01:00
Juan Linietsky
94609305a0 Merge pull request #6519 from RandomShaper/enhance-tileset 
Add modulate (color) to TileSet tiles
 2017-01-14 16:52:16 -03:00
Juan Linietsky
dcb95ec147 removed duplicated functions in class hierarchy that were bound more than once 
added a check to detect this case in the future
 2017-01-14 11:10:42 -03:00
Rémi Verschelde
93ab45b6b5 Style: Fix whole-line commented code 
They do not play well with clang-format which aligns the `//` part
with the rest of the code block, thus producing badly indented commented code.
 2017-01-14 14:52:23 +01:00
Rémi Verschelde
7b9f2d9929 Finish renaming *Frame GUI classes to *Rect 
ReferenceFrame had been overlooked, and the cpp files still used the old
names. Also ripgrep'ed it all to find some forgotten references.
 2017-01-14 10:52:54 +01:00
Juan Linietsky
d9d77291bc rename String.extension() -> String.get_extension() / String.basename() -> String.get_basename() 2017-01-14 00:51:09 -03:00
Juan Linietsky
35b404ba08 Unify naming of blendshape / morphtarget into just "Blend Shape" 2017-01-12 08:34:00 -03:00
Juan Linietsky
bc26f90581 Type renames: 
Matrix32 -> Transform2D
	Matrix3 -> Basis
	AABB -> Rect3
	RawArray -> PoolByteArray
	IntArray -> PoolIntArray
	FloatArray -> PoolFloatArray
	Vector2Array -> PoolVector2Array
	Vector3Array -> PoolVector3Array
	ColorArray -> PoolColorArray
 2017-01-11 00:52:51 -03:00
BastiaanOlij
bf990b0822 Few small fixes so tools=no and target=release compiles 2017-01-10 21:42:14 +11:00
Juan Linietsky
a503f8aadc Groundbreaking!! Godot resources can now be flagged to be local to the scene being edited! 
This means that each time this scene is instanced, the resource will be unique!
As such, thanks to this, the following features were implemented:
-ButtonGroup is no longer a control, it's now a resource local to the scene
-ViewportTexture can be created from the editor and set to any object, making ViewportSprite and other kind of nodes obsolete!
 2017-01-10 01:07:03 -03:00
Juan Linietsky
a168cd7a23 Add clamp and wrap loop modes for animation tracks. 2017-01-09 00:41:16 -03:00
Juan Linietsky
2ab83e1abb Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector 2017-01-07 18:26:38 -03:00
Juan Linietsky
495d059a74 Merge branch 'master' of https://github.com/godotengine/godot 2017-01-05 09:18:03 -03:00
Juan Linietsky
0f7af4ea51 -Changed most project settings in the engine, so they have major and minor categories. 
-Changed SectionedPropertyEditor to support this
-Renamed Globals singleton to GlobalConfig, makes more sense.
-Changed the logic behind persisten global settings, instead of the persist checkbox, a revert button is now available
 2017-01-05 09:16:00 -03:00
Juan Linietsky
d8e54b1e26 Merge pull request #7431 from MarianoGnu/gles3 
Fix Color Picker
 2017-01-04 20:28:28 -03:00
Juan Linietsky
b085c40edf -Conversion of most properties to a simpler syntax, easier to use by script 
-Modified help to display properties

GDScript can still not make use of them, though.
 2017-01-04 01:16:14 -03:00
Juan Linietsky
3fae505128 Begin modifying properties to make them more friendly to script and doc. 2017-01-03 00:38:16 -03:00
Juan Linietsky
118eed485e ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant. 
All usages of "type" to refer to classes were renamed to "class"
ClassDB has been exposed to GDScript.
OBJ_TYPE() macro is now GDCLASS()
 2017-01-02 23:03:46 -03:00
Rémi Verschelde
3f3f5a5359 Merge remote-tracking branch 'origin/gles3' into gles3-on-master 
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
 2017-01-02 21:52:26 +01:00
Juan Linietsky
741e038671 Add a metallic mode 2017-01-02 00:01:55 -03:00
Juan Linietsky
c2a217c350 WIP particle system 
Ability to enable and change MSAA settings
Ability to change VCT quality
Ability to enable/disable HDR rendering
 2017-01-01 22:16:52 -03:00
Rémi Verschelde
c7bc44d5ad Welcome in 2017, dear changelog reader! 
That year should bring the long-awaited OpenGL ES 3.0 compatible renderer
with state-of-the-art rendering techniques tuned to work as low as middle
end handheld devices - without compromising with the possibilities given
for higher end desktop games of course. Great times ahead for the Godot
community and the gamers that will play our games!
 2017-01-01 22:03:33 +01:00
reduz
0d4abf2aa3 fixed a horrible bug on Windows AMD, scenes saved until now in this branch 
are no longer valid :(
 2016-12-24 16:23:30 -03:00
Juan Linietsky
075fde7f26 work in progress global illumination 2016-12-20 00:21:07 -03:00
Juan Linietsky
22a90e8f2a DOF blur, near and far fields.. 2016-12-10 01:13:20 -03:00
Juan Linietsky
18ebd22000 Multi stage glow with light bleeding from HDR 2016-12-08 09:48:38 -03:00
Juan Linietsky
8534ced22d Tonemapping and Auto Exposure support 2016-12-07 17:49:52 -03:00
Juan Linietsky
a299c3ebf1 Support for SSAO 2016-12-04 12:45:30 -03:00
Andreas Haas
e741da869a
Curve2D/3D: Add clear_points method. 
Adds a method to the Curve2D and Curve3D classes to easily clear the curve.
So you don't have to remove each point manually.
 2016-12-03 21:35:59 +01:00
Juan Linietsky
27a46d78ec Subsurface scattering material param is now working! 2016-12-02 22:23:16 -03:00
Pedro J. Estébanez
86789c7071 Add modulate (color) to TileSet tiles 2016-11-30 14:33:39 +01:00
Juan Linietsky
a47c78aed1 Screen space reflection effect 2016-11-29 19:55:12 -03:00
Juan Linietsky
a732708b9d Blend shapes using transform feedback (GPU) 2016-11-24 20:46:55 -03:00
Juan Linietsky
943d27f46d Instancing is working! (hooray) 2016-11-22 01:26:56 -03:00
Juan Linietsky
a2505542ff Huge amount of improvement in the material system. Materials should be 
a lot more complete and usable now.
 2016-11-20 22:49:53 -03:00
Juan Linietsky
c39d2b3f42 working reflection probes!! 2016-11-19 13:23:37 -03:00
Zher Huei Lee
191fdc873e Reused Button styleboxes for ButtonArray 
Plus other tweaks to make it look more similar to a VBoxContainer of
Buttons.
 2016-11-19 22:07:12 +08:00
Juan Linietsky
cacf9ebb7f all light types and shadows are working, pending a lot of clean-up 2016-11-09 23:55:06 -03:00
Paulb23
0e2c15e91a Made background and symbol color follow the color API 2016-11-06 13:50:23 +00:00
Rémi Verschelde
f34151ff0f style: Various other PEP8 fixes in Python files 
Done with `autopep8 --select=E7`, fixes:

- E701 - Put colon-separated compound statement on separate lines.
- E702 - Put semicolon-separated compound statement on separate lines.
- E703 - Put semicolon-separated compound statement on separate lines.
- E711 - Fix comparison with None.
- E712 - Fix (trivial case of) comparison with boolean.
- E713 - Fix (trivial case of) non-membership check.
- E721 - Fix various deprecated code (via lib2to3).
 2016-11-01 00:35:16 +01:00
Rémi Verschelde
817dd7ccbb style: Fix PEP8 blank lines issues in Python files 
Done with `autopep8 --select=E3,W3`, fixes:

- E301 - Add missing blank line.
- E302 - Add missing 2 blank lines.
- E303 - Remove extra blank lines.
- E304 - Remove blank line following function decorator.
- E309 - Add missing blank line.
- W391 - Remove trailing blank lines.
 2016-11-01 00:35:16 +01:00
Rémi Verschelde
d4c17700aa style: Fix PEP8 whitespace issues in Python files 
Done with `autopep8 --select=E2,W2`, fixes:

- E201 - Remove extraneous whitespace.
- E202 - Remove extraneous whitespace.
- E203 - Remove extraneous whitespace.
- E211 - Remove extraneous whitespace.
- E221 - Fix extraneous whitespace around keywords.
- E222 - Fix extraneous whitespace around keywords.
- E223 - Fix extraneous whitespace around keywords.
- E224 - Remove extraneous whitespace around operator.
- E225 - Fix missing whitespace around operator.
- E226 - Fix missing whitespace around operator.
- E227 - Fix missing whitespace around operator.
- E228 - Fix missing whitespace around operator.
- E231 - Add missing whitespace.
- E231 - Fix various deprecated code (via lib2to3).
- E241 - Fix extraneous whitespace around keywords.
- E242 - Remove extraneous whitespace around operator.
- E251 - Remove whitespace around parameter '=' sign.
- E261 - Fix spacing after comment hash.
- E262 - Fix spacing after comment hash.
- E265 - Format block comments.
- E271 - Fix extraneous whitespace around keywords.
- E272 - Fix extraneous whitespace around keywords.
- E273 - Fix extraneous whitespace around keywords.
- E274 - Fix extraneous whitespace around keywords.
- W291 - Remove trailing whitespace.
- W293 - Remove trailing whitespace.
 2016-11-01 00:35:16 +01:00
Rémi Verschelde
97c8508f5e style: Start applying PEP8 to Python files, indentation issues 
Done with `autopep8 --select=E1`, fixes:

- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.
 2016-11-01 00:33:51 +01:00
Juan Linietsky
d6567010bf -Many many fixes 
-Gizmos work again
 2016-10-29 20:48:09 -03:00
Juan Linietsky
53d8f2b1ec PBR more or less working, still working on bringing gizmos back 2016-10-27 11:50:26 -03:00
Juan Linietsky
cb34b70df1 More scene work, can display a skybox 2016-10-21 07:27:13 -03:00
Mariano Suligoy
6d38f79dc5 Fix Color Picker 
Replace shaders with procedurally generated controls
 2016-10-19 19:43:49 -03:00
Rémi Verschelde
fc8ccd5b8c SCsub: Add python shebang as a hint for syntax highlighting 
Also switch existing shebangs to "better" /usr/bin/env python.
 2016-10-17 20:10:46 +02:00
Juan Linietsky
1527cf8c0d 2D Shaders are working again using the new syntax, though all is buggy in general 2016-10-10 18:31:01 -03:00
Pawel Kowal
d3a8087659 Fix #5959, contrasting texture for toggled button 2016-10-10 13:54:48 +02:00
Juan Linietsky
850eaf7ed7 -the new shader language seems to work 
-shader editor plugin can edit shaders
-code completion in shader editor plugin
 2016-10-07 11:31:18 -03:00
Juan Linietsky
22d83bc9f6 Begining of GLES3 renderer: 
-Most 2D drawing is implemented
-Missing shaders
-Missing all 3D
-Editor needs to be set on update always to be used, otherwise it does not refresh
-Large parts of editor not working
 2016-10-03 21:35:16 +02:00
Fabio Alessandrelli
1d09c27ba4 Expose more 2D/3D physics options in project settings 2016-10-03 14:40:47 +02:00
Rémi Verschelde
03ee749989 Merge pull request #6529 from pkowal1982/scrolltree 
Add scrolling to Tree control in Drag and Drop mode
 2016-10-03 11:44:32 +02:00
Pawel Kowal
9e5aaa27bc Add scrolling to Tree control in Drag and Drop mode 2016-09-17 21:29:55 +02:00
Rémi Verschelde
80861b7d59 Merge pull request #6414 from RandomShaper/improve-shader-shadow 
Expose additional light/shadow properties to canvas item shaders
 2016-09-17 18:34:22 +02:00
Juan Linietsky
8bcb6a290c -Added VeryLowDPI and MidDPI modes to Godot editor. 
-Improved HiDPI detection (requires resolution of > 2000 in X axis)
 2016-09-13 11:05:47 -03:00
Pedro J. Estébanez
0960887625 Expose light shadow color to canvas item shaders 2016-09-07 01:52:54 +02:00
Juan Linietsky
b780679302 -Added focus to comment node 
-Make comment node not grab focus on main area
 2016-09-02 12:03:49 -03:00
Juan Linietsky
fc70824f7c More improvements to visual script.. 
fixed a bug of not saving when sub-nodes changed.
 2016-08-31 17:58:51 -03:00
Juan Linietsky
9c6175db11 More visual script work 
-Block switches to 2d/3d editor if editing visual script
-Added cast node in flow control
-Added ability to do RPC in visual script
-Comment nodes
-Fix bug with inverted cable in connecting backwards
-Copy and paste nodes, including from different scripts
 2016-08-25 17:45:20 -03:00
Juan Linietsky
231c72b5eb prettier connections for graph edit 2016-08-23 10:15:47 -03:00
Daniel J. Ramirez
287b6d0e04 Some new icons for visual script and graphs 2016-08-08 17:23:31 -05:00
Juan Linietsky
9890c1d2ca Likely with bugs and with some features are missing, as well as profiler support, but VisualScript should be more or less done! 2016-08-06 19:00:54 -03:00
Juan Linietsky
259418f827 VisualScript can now execute visual scripts, but there is no debugger or profiler yet. 2016-08-05 22:48:00 -03:00
Juan Linietsky
6ed5d48d0c Concluded base visual scripting! can edit but not run though. 2016-08-04 00:05:35 -03:00
Juan Linietsky
3d1d190dcd Merge branch 'master' of https://github.com/godotengine/godot 2016-08-02 19:11:47 -03:00
Juan Linietsky
ad313097eb WIP visual scripting, not working yet but you can check out stuff 2016-08-02 19:11:05 -03:00
Zher Huei Lee
0de7860511 DynamicFont caches now accounts for texture flags 
CacheID added for future-proofing
 2016-08-02 15:36:11 +01:00
Zher Huei Lee
af6ef01c69 Added extra spacing support for DynamicFont 
Side effect is that label min-size will now take into account
kerning.
 2016-08-02 11:05:20 +01:00
Zher Huei Lee
7b165e8ac2 Added texture mipmaps and filtering to DynamicFont 2016-08-02 08:01:51 +01:00
Rémi Verschelde
08ba6086be World2D: Fix typo in default_density deprecation check 2016-07-28 19:03:32 +02:00
Juan Linietsky
bafcabb157 Merge pull request #5832 from Algrin6/patch-1 
Fixes defects in Curve2D and Curve3D
 2016-07-24 11:44:42 -03:00
Saracen
f86b698765 SurfaceTool add_index method exposed to scripts. 2016-07-22 04:52:41 +01:00
Juan Linietsky
124e3591a5 Some optimizations and limits for extreme zoom in and out in editor, fixes #5820 2016-07-21 10:11:53 -03:00
volzhs
dd7b1021f6 Remove "SMOOTH BEGIN?" message 2016-07-21 17:34:58 +09:00
Algrin6
2b60884659 Fix curve bug 2016-07-21 02:14:58 +03:00
Juan Linietsky
0988970c1f Fixed properly not save signals that already exist in their base scenes, closes #5656 2016-07-19 21:26:12 -03:00
Juan Linietsky
9de33e18f1 WIP bugfix for existing connections 2016-07-19 20:20:28 -03:00
Rémi Verschelde
525fb01fd2 Revert "Homogeinize resource formats loaders/savers" 
The text format definition needs to stay in `scene/` as it relies
on other scene components, and `core/` must stay self-contained.

This reverts commits a5e27503fd
and 1492fd8460.
 2016-07-19 18:15:01 +02:00
Juan Linietsky
7a4d67ae71 Property convert images to RGBA before applying hq2x, fixes #5168 2016-07-18 18:30:30 -03:00
Juan Linietsky
f10bd217a2 properly fixed notificaitons for theme changed, closes #5774 2016-07-18 16:41:59 -03:00
Juan Linietsky
254d79a560 Add a function to notify font users that the font changed. Closes #5774 2016-07-18 10:00:26 -03:00
Rémi Verschelde
be563a1663 Merge pull request #5757 from Razzlegames/blendIndexFix 
Could not use pre multiply alpha for material in editor
 2016-07-18 00:54:38 +02:00
Rémi Verschelde
3183834c5d Merge pull request #5657 from Paulb23/block_caret 
Added block caret to TextEdit
 2016-07-18 00:44:45 +02:00
Kyle Luce
4e69bc3bff Could not use pre multiply alpha for material in editor 
- 3 was hard coded, I just changed to 4. Unfortunately this will break every time
  a blend mode is added
 2016-07-17 11:09:47 -07:00
Juan Linietsky
24d86e33a6 Merge pull request #5467 from RandomShaper/enhance-tidy-extensions 
Enhance/tidy file extensions management
 2016-07-16 09:28:49 -03:00
Paulb23
54f720ac06 Added block caret to TextEdit 2016-07-12 16:07:17 +01:00
Paulb23
12e3bb1f01 Removed duplicate color 2016-07-11 15:40:04 +01:00
Paulb23
cc133c9289 Expose colors to theme 2016-07-11 14:57:32 +01:00
Juan Linietsky
49b288d331 Add function to get the list of samples, closes #5561 2016-07-10 13:00:42 -03:00
Rémi Verschelde
3a70d4a072 Merge pull request #5589 from akien-mga/pr-unused-var 
Removing some more unused vars and dead code
 2016-07-09 14:33:30 +02:00
Rémi Verschelde
a15de80942 classref: Fix arg name for is_action_pressed/released 
Also position TEXTURE_SPHERE constant properly.
 2016-07-08 23:40:43 +02:00
Rémi Verschelde
f40f360a2c Remove unused variables (fourth pass) + dead code 
Also fix a potential regression from 3fcb9b1ec1.
 2016-07-08 16:47:55 +02:00
Juan Linietsky
b391306828 Make both signals be ordered and samplelibrary items too, fixes scenes changing for git, closes #5289 2016-06-30 18:43:47 -03:00
Pedro J. Estébanez
a5e27503fd Homogeinize resource formats loaders/savers 2016-06-28 18:27:12 +02:00
Juan Linietsky
519fce94e9 Remove error when getting dependencies from tscn files in some cases, closes #3897 2016-06-28 12:35:11 -03:00
Juan Linietsky
8e1c0f287d Fixed bug in instance state ordering, closes #3904 2016-06-28 09:47:03 -03:00
Juan Linietsky
efdcf205d2 Make most resources (save for packedscenes and scripts) reload if they change on disk. Closes #4059. 2016-06-27 13:17:20 -03:00
Rémi Verschelde
da034f324a Revert "Added toggle for loop interpolation based on adolson's code" 
This reverts commits 8884b8f519
bd5c8f2aa0
and 5cb31f6d5b.

<reduz> Akien, I understand the need for the second loop mode, but I think
the current UI is pretty confusing. I think this should be changed for an
enum, both there and in the animation.. otherwise we should revert it
[...]
<reduz> alternatively this could be added per track, which I think should
make it a little less confusing

Reopens #959..
 2016-06-26 23:45:18 +02:00
Rémi Verschelde
b02d67be30 Merge pull request #5307 from MarianoGnu/master 
TextureRegion improvements
 2016-06-26 09:43:45 +02:00
Rémi Verschelde
e4c5a16a2c Merge pull request #5397 from djrm/gizmos_fix 
Added high resolution icons for the Gizmos
 2016-06-25 10:28:58 +02:00
Daniel J. Ramirez
b8190fbef6 Added high resolution icons for the Gizmos, fixes #1638 2016-06-24 22:42:42 -05:00
Rémi Verschelde
001294ed35 Merge pull request #5386 from Paulb23/code_completion_color_theme 
Exposed code completion colors to the text edit theme
 2016-06-24 21:19:30 +02:00
Paulb23
b643d9af6f Exposed code completion colors to the text edit theme 2016-06-24 16:33:29 +01:00
Rémi Verschelde
0a72f9ccb8 Merge pull request #5362 from J08nY/png 
libpng: New version 1.6.27
 2016-06-23 07:40:03 +02:00
Juan Linietsky
d6225b1e00 Improved binding system (ObjectTypeDB::bind_method) to be friendlier to statically typed languages, should help in the Mono integration. 
Disabled by default.
 2016-06-22 23:13:41 -03:00
J08nY
0ab05b09e4
Fixed iCCp chunk in pngs 
neccesary for libpng 1.6.27 to work silently
 2016-06-22 21:13:29 +02:00
Rémi Verschelde
87cb3629f2 Merge pull request #5344 from Paulb23/code_completion_colors 
Code completion box colors
 2016-06-22 07:51:33 +02:00
Paulb23
45f0dec55c Added code completion existing color setting 2016-06-21 17:34:38 +01:00
Paulb23
706895a922 Added code completion selected color setting 2016-06-21 17:21:55 +01:00
J08nY
bd5c8f2aa0
Animation: Fix property loop_interpolation 
fixes #5317
 2016-06-21 14:11:26 +02:00
Juan Linietsky
6872139300 Add quotes to .tscn keys, solves #4366 2016-06-20 18:41:59 -03:00
Juan Linietsky
6bdd17f07c Fix error storing path for children of instanced nodes in .tscn, fixes #4320 fixes #4579 fixes #4580 2016-06-20 17:09:53 -03:00
MarianoGNU
79c500bee1 Modify margins with mouse input 2016-06-20 17:06:19 -03:00
Juan Linietsky
0db02f26b6 -Added options for scene import plugin to keep materials and user-added tracks to animations, please test! closes #4425 2016-06-20 00:20:30 -03:00
George Marques
5cb31f6d5b
Replace 'or'/'and' keywords 
Some compilers do not like this.
 2016-06-19 12:36:50 -03:00
Rémi Verschelde
c7b425ed9c Merge pull request #5259 from neikeq/pr-textedit-zoom 
TextEdit: Change font size with Ctrl+Mouse Wheel Up/Down
 2016-06-19 13:04:20 +02:00
Rémi Verschelde
40944ddffb Merge pull request #5085 from RandomShaper/remove-unreachable-code 
Remove found dead code
 2016-06-19 12:45:36 +02:00
Rémi Verschelde
3520902194 Merge pull request #4724 from Cybolic/optional-loop-interpolation 
Added toggle for loop interpolation based on adolson's code
 2016-06-19 12:30:22 +02:00
Juan Linietsky
7c20c386c5 -Added trigger mode to tracks, useful for properties that work as triggers, such as playing a sample, an animation, etc. 
-Better interpolation of discrete tracks, fixes #4417
 2016-06-19 01:43:02 -03:00
Juan Linietsky
0bbb0d0caa DynamicFontData can be built-in (will still link to a ttf though), closes #4600 2016-06-18 19:03:53 -03:00
Rémi Verschelde
c3bf11d4d4 Drop fully commented-out files 
Part of #5272
 2016-06-18 20:23:49 +02:00
Rémi Verschelde
b7dbf9207a Drop empty files that are not used anywhere 
Part of #5272
 2016-06-18 19:46:30 +02:00
Ignacio Etcheverry
bc9f9b1c6a TextEdit: Change font size with Ctrl+Mouse Wheel Up/Down 2016-06-18 18:47:11 +02:00
Rémi Verschelde
a7fc04626a Add missing license headers in our source files (#5255) 
Also removes a couple wrong Godot headers from third-party source files.
 2016-06-18 14:46:12 +02:00
Juan Linietsky
55b83157e7 Keep track of when fonts change, so theme or controls that use fonts as overrides get properly updated. 
closes #4622 , probably closes many other issues too
 2016-06-17 16:01:30 -03:00
Juan Linietsky
9f2f8c9130 fixes compilation error on visual studio, closes #5249 2016-06-17 10:34:44 -03:00
Juan Linietsky
f0d9245ecf -added missing .inc files 
-Made it possible to change the editor theme
-Added two options to theme editor plugin to create empty template themes and editor themes
-Make sure that saved themes to .tres keep the null theme fields, to make it easier to keep those when saving/loading the theme
 2016-06-17 01:13:23 -03:00
Juan Linietsky
816b3fa94d It is now possible to set a default custom theme, whether you want a hidpi default theme, or just use a custom font for the default theme 2016-06-16 20:05:22 -03:00
UgisBrekis
d97e46ffb6 Adds the ability to draw parent-children relationship lines in scene tree editor 
Can be turned on/off in editor settings + line color change available as
well
 2016-06-15 18:10:19 +01:00
Daniel J. Ramirez
131cd1399c Added some theme icons and its sources 2016-06-14 21:40:24 -05:00
Juan Linietsky
944c7e2603 fix crash when clearing dynamicfontdata, closes #4877 2016-06-13 22:24:11 -03:00
Juan Linietsky
28034190a9 Merge pull request #5176 from marcelofg55/master 
Fixed overloaded virtual functions with const vs none warning
 2016-06-13 15:45:13 -03:00
Juan Linietsky
f0abda999e resolve numerical error when comparing instancing an inheritance to avoid saving changed properties when they didn't, closes 4759 2016-06-12 19:33:07 -03:00
Juan Linietsky
c1056a9bfb Fixed ancient bug that prevented proper theme editing, closes #4924 2016-06-12 15:31:38 -03:00
marcelofg55
3787856563 Fixed overloaded virtual functions with const vs none warning 2016-06-12 13:31:22 -03:00
Pedro J. Estébanez
3df26825b4 Remove found dead code 2016-06-07 13:46:31 +02:00
Juan Linietsky
be830d10c2 Merge pull request #5026 from Geequlim/patch9frame-extension 
Enhanced Patch9Frame
 2016-06-06 20:15:33 -03:00
Saracen
1dab0aab7c Bitmask import plugin 2016-06-05 19:14:39 +01:00
Geequlim
5894060abb Enhanced StyleBoxTexture: 
Add texture region support for StyleBoxTexture.
  Quick region(texture region and scale region) selection for StyleBoxTexture with TextureRegionEditorPlugin.
 2016-06-05 00:45:53 +08:00
Geequlim
fdf914e53e Add texture region support for stylebox render 2016-06-05 00:45:53 +08:00
Rémi Verschelde
a068152ba0 Physics2D: Rename default_density to default_linear_damp 
Also adds a proper deprecating warning and tries to do some porting automatically.
Supersedes #4109.
 2016-06-04 14:05:53 +02:00
Juan Linietsky
33bb0491f8 Merge pull request #4952 from sanikoyes/Pr-fix-stb-font-prop 
fix stb font property names
 2016-06-01 10:33:28 -03:00
Juan Linietsky
df139f57b3 Some cleanup to GDScript 
separated GDFunction (VM) from GDScript in two different files
 2016-05-31 22:33:43 -03:00
sanikoyes
21bcf4a8aa fix stb font property names 2016-05-31 21:23:51 +08:00
Juan Linietsky
4d6d6fcbfc Merge remote-tracking branch 'origin/master' 2016-05-30 19:53:19 -03:00
Juan Linietsky
0eb6c644b2 changed font system to use fallbacks 
this way more than 64k characters can be used
 2016-05-30 19:41:32 -03:00
Juan Linietsky
9b1f8230ec -Some fixes to OSX retina scaling for window functions 
-Implemented HiDPI detection and support for Godot Editor!
 2016-05-30 00:28:29 -03:00
Juan Linietsky
3e8eb396d7 Finalized DynamicFont implementation 
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
 2016-05-29 11:37:52 -03:00
Juan Linietsky
8be2fabbe5 Changed import workflow 
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
 2016-05-27 14:19:11 -03:00
Paulb23
6dd538a7ae Fixed caret color not changing though properties 2016-05-24 15:21:34 +01:00
Hubert Jarosz
33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02:00
Christian Dannie Storgaard
8884b8f519 Added toggle for loop interpolation based on adolson's code 2016-05-20 13:13:32 +03:00
Juan Linietsky
c195c0df6b -Added configuration warning system for nodes 
-Added a new "add" and "instance" buttons for scene tree
-Added a vformat() function to ease translation work
 2016-05-17 18:28:44 -03:00
Juan Linietsky
da7a9aae27 Merge pull request #4096 from neikeq/pr-margin-cont-imp 
MarginContainer improvements
 2016-05-13 13:13:12 -03:00
Juan Linietsky
d7318f6965 -begun implementing drag & drop editor wide 
-filesystem dock dnd support
-property list dnd support
-scene tree dnd support
 2016-05-11 11:59:03 -03:00
Rémi Verschelde
99e31e1005 Merge pull request #4547 from neikeq/pr-wrong-debug-methods 
Fix wrong return and argument types in documentation
 2016-05-05 09:27:14 +02:00
Ignacio Etcheverry
1e752c0120 Fix wrong return and argument types in documentation 2016-05-04 15:35:09 +02:00
sanikoyes
c824781e98 Fix crash in dynamic font 2016-05-03 17:25:33 +08:00
Juan Linietsky
5bb7cef836 Support for dynamic fonts (TTF) 
Added support for DynamicFont, which can load a TTF of any size to use
as a font. No import required.
 2016-05-01 23:13:06 -03:00
Juan Linietsky
0fa588a830 move Font to BitmapFont 
so we can add DynamicFont later..
 2016-04-28 22:21:36 -03:00
Aren Villanueva
d75856146c Adds a remove class item option in the theme editor. 
I've also added a get_stylebox_types helper function to the theme class in order to figure out exactly what types are available to a theme.
 2016-04-21 11:58:53 +10:00
Rémi Verschelde
c0ec7e933a Merge pull request #4302 from Anarchid/gridmap-navmesh 
Navmesh support for GridMaps
 2016-04-20 21:12:35 +02:00
Anarchid
73ca831848 Implement GridMap support for navigation meshes 2016-04-20 21:19:05 +03:00
Bojidar Marinov
325a02e4af Add a add_triangle_fan method to SurfaceTool 
Closes #4298
 2016-04-18 20:33:54 +03:00
Hearto Lazor
08b93da28a Fixed curve baking, now always start at origin point 2016-04-15 00:13:17 -03:00
Ignacio Etcheverry
d38454b967 MarginContainer: Add top, right and bottom margins 2016-03-21 00:53:47 +01:00
Rémi Verschelde
aec4f57f95 Merge pull request #3528 from SaracenOne/baked_light_realtime_colourize 
Ability to colourize baked lighting in real time.
 2016-03-15 10:22:09 +01:00
Franklin Sobrinho
5ee67ba498 Automatically create input node when creating a ShaderGraph 2016-03-14 15:24:12 -03:00
Juan Linietsky
8b1dcbfe4d -Made editor support SSL certs by default (embedded them) 
-Made asset sharing support https
-Many fixes to HTTPRequest
-Added an asset installer dialog
-Visual cleanups to asset sharing tab
-Fixed some issues in ScrollContainer, hope it does not break things
-Asset sharing tab is not visible (hidden on purpose) for now.
 2016-03-12 10:46:38 -03:00
Hubert Jarosz
4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
Juan Linietsky
5a9b18b665 -Work on addon editor plugin (disabled by default) 
-New HTTPRequest node, to make HTTP requests simpler.
 2016-03-04 11:10:48 -03:00
eska
104e008b56 Fix missing dependency resolver in Windows 2016-02-21 22:51:19 +01:00
Juan Linietsky
b91b89cf60 Add support for placeholders in tscn, which was missing. Closes #3652 2016-02-21 11:18:31 -03:00
Juan Linietsky
61f03c98c8 -Added missing functions to the doc, fixes #3583 2016-02-09 16:58:03 -03:00
Juan Linietsky
595de75641 -Allow renaming root node of inherited scene 2016-02-09 16:30:50 -03:00
Juan Linietsky
34c022a0a2 -Cleaned up GraphEdit, also fixes #3568 2016-02-08 16:28:12 -03:00
Juan Linietsky
9109e41a20 Property handle rotated controls in 2D editor, fixes #3613 2016-02-08 11:29:32 -03:00
Saracen
de5281c398 Ability to colourize baked lighting in real time. 2016-02-06 18:03:20 +00:00
Juan Linietsky
857edbea1c -make animationplayer thinner, also toolbuttons too. fixes #3526 2016-02-02 18:22:37 -03:00
Juan Linietsky
8341038bbe -Increment resources total in scene format text, fixes #3506 2016-01-29 08:51:51 -03:00
Rémi Verschelde
6ceb1c3a9f Merge pull request #3440 from TheHX/issue-2946 
Fixed small inconsistencies with the text format
 2016-01-25 10:58:50 +01:00
Juan Linietsky
75537c661f Merge pull request #3434 from TheHX/pr-tscn-dependency 
Fix .tscn not raising dependency error
 2016-01-24 20:07:23 -03:00
Franklin Sobrinho
1cfe20562d Fix .tscn not raising dependency error 2016-01-24 19:05:32 -03:00
Franklin Sobrinho
41ae83e415 Fixed small inconsistencies with the text format 2016-01-24 18:38:37 -03:00
Franklin Sobrinho
2493cb1e26 Fix .tscn format not loading groups 2016-01-24 10:32:46 -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
0c6ffcf7b0 -Added ability to remap dependencies in tscn (forgot to do it..), fixes #3368 2016-01-23 14:09:55 -03:00
Juan Linietsky
d59733bd67 -Ability to retrieve state data from PackedScene, closes #3413 2016-01-23 12:01:42 -03:00
MarianoGNU
ad2387f0be Add presets. 
Also fix some bugs.

Fix a crash and a minor bug
 2016-01-15 17:23:19 -03:00
MarianoGNU
1f3d6824c8 Move shaders to default theme and add shader_override related methods to Control class 2016-01-15 17:23:19 -03:00
MarianoGNU
dc7755ffcd Add a visual editor to color picker. 2016-01-15 17:23:19 -03: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
Juan Linietsky
f2ae6f87a4 Fix situation where TSCN format might crash, closes #3062 2016-01-12 07:07:36 -03:00
Rémi Verschelde
c8849c0b79 Merge pull request #3136 from MarianoGnu/bug_fixing 
Fix RGBA Uniform autogeneration in ShaderGraph
 2016-01-06 21:10:48 +01:00
Franklin Sobrinho
69240aa243 Fix .tscn format not loading signal binds 2016-01-06 08:56:06 -03:00
Rémi Verschelde
52e18accf2 Merge pull request #3159 from neikeq/tab_close_icon 
Add tab close icon to the default theme
 2016-01-06 11:58:52 +01: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
757b8c4206 -Restore mouse on X11 when debugger break happens, closes #2232 2016-01-02 12:58:59 -03:00
George Marques
5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02: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
Ignacio Etcheverry
563c761c8c Add tab close icon to the default theme 2015-12-29 12:09:41 +01: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
Rémi Verschelde
fe46b2ac0c Fix wrong getters in ShaderGraph 2015-12-28 01:42:22 +01:00
Juan Linietsky
4dba503fc3 Merge pull request #3140 from neikeq/fix_refresh_icon 
Add reload icon to FileDialog's default theme
 2015-12-26 15:37:00 -03:00
Ignacio Etcheverry
84c5585afe Added reload icon to FileDialog's default theme 2015-12-26 19:15:22 +01:00
MarianoGNU
df5c92c66e Fix RGBA Uniform autogeneration in ShaderGraph (fixes #2606) 2015-12-26 10:44:54 -03:00
reduz
13964f59c1 -Added table support to RichTextLabel 
-Made help more readable, closes #2851
 2015-12-26 10:25:17 -03:00
Juan Linietsky
83e0e97214 -implement arrows on tabs, when too many tabs are present, fixes #2806 2015-12-14 10:24:28 -03: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
97fe073f33 Merge pull request #2933 from TheHX/pr-shader-loader 
Fix shader loading, making possible load .shd and .sgp from editor
 2015-12-12 17:36:52 -03:00
Juan Linietsky
101049518a -force exporting of original script exported variables on overriden scripts 
-this works around the problem of scripts being reloaded and their properties lost
-fixes #2958
 2015-12-12 16:46:25 -03:00
Juan Linietsky
e2e6f3ec00 added proper functions to ColorRamp, fixes #3034 2015-12-12 09:45:17 -03:00
Juan Linietsky
46497c4508 added fallbacks proprty to fonts 2015-12-10 23:02:40 -03:00
Franklin Sobrinho
afb41b283c Fix tscn format not being recongnized by EditorFileSystem 2015-12-09 13:56:14 -03:00
Juan Linietsky
35fa048af5 missing pngs 2015-12-04 10:22:45 -03:00
Juan Linietsky
4b1f0afb01 -several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device. 2015-12-02 11:15:48 -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
Franklin Sobrinho
1138103c63 Fix shader loading, making possible load .shd and .sgp from editor 2015-11-27 21:11:20 -03: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
Saracen
dd00452997 Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color 
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
 2015-11-18 23:18:10 +00: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
3337191d5a Merge pull request #2709 from eska014/fix-default-menubutton-styleboxes 
Fix default StyleBoxes of MenuButton
 2015-11-18 19:43:02 -03:00
Juan Linietsky
f0aeb036d1 Merge pull request #2715 from SaracenOne/shader_fix_and_enhancement 
Write to 4-dimensional position access and shader graph code generation fix.
 2015-11-18 19:36:47 -03:00
Juan Linietsky
326781f4c9 Merge pull request #2636 from TheHX/fixed_material 
Bind missing FixedMaterial constants, fixes #2628
 2015-11-18 19:14:48 -03:00
Juan Linietsky
a8f18e1bae Merge pull request #2639 from MarianoGnu/origin 
Fix ButtonGroup broken layout
 2015-11-18 19:14:25 -03:00
Juan Linietsky
c0170d3891 Merge pull request #2695 from eska014/add-default-angular-damp 
Set World2D default angular damp per global `physics_2d/default_angular_damp`
 2015-11-18 19:01:49 -03:00
Ovnuniarchos
0b05739a8b *Polygon2D now updates on any modification in its point array. ShapeLine2D has now an editor. 2015-11-18 19:20:50 +01:00
Juan Linietsky
b08312b30c -Fixed default theme a little 
-Added option to group help pages, fixes #2805
 2015-11-18 09:20:46 -03:00
Juan Linietsky
081a236c67 -Merged Script and Help tabs 
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
 2015-11-17 09:46:08 -03:00
Juan Linietsky
8420c24f7f -better integration of ndee's theme 2015-11-13 20:56:44 -03:00
Saracen
c1d19ad258 New shader feature: change the colour of shadows on a per-material basis. 
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
 2015-11-08 03:54:55 +00:00
Saracen
b54d96ceba Added ability to write directly to 4-dimensional position vector from within custom vertex shader code. Bugfixes to shader graph code generation concerning xforms. 2015-11-02 16:03:31 +00: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
eska
825bc8b293 Add default focus StyleBox to MenuButton 2015-11-01 10:33:28 +01:00
eska
06e0eba402 Set World2D default angular damp per global physics_2d/default_angular_damp 2015-10-28 18:21:45 +01:00
MarianoGNU
754908844a Merge branch 'master' of https://github.com/okamstudio/godot into posta 2015-10-24 11:55:00 -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
d241b2ec1b -work in progress implementation of NDEE's theme It's NOT DONE YET 2015-10-20 23:54:24 -03:00
MarianoGNU
6df7d92379 Fix ButtonGroup broken layout 2015-10-19 17:46:13 -03:00
Franklin Sobrinho
1e36f36357 Bind missing FixedMaterial constants, fixes #2628 2015-10-19 08:03:29 -03:00
Juan Linietsky
7d8f187c33 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 15:49:27 -03:00
Juan Linietsky
85a611d1cd -fixes disability to remove instanced nodes when reopening scene. Fixes #2610 2015-10-17 15:48:42 -03:00
MarianoGNU
25324aa506 Fix crash when using a Scalar Uniform node to GraphShader 2015-10-17 15:27:36 -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
reduz
078a474135 -fixes and more fixes to new scene system, seems stable now.. 
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
 2015-10-16 19:11:23 -03:00
Juan Linietsky
b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	platform/windows/detect.py
 2015-10-13 01:19:32 -03:00
Juan Linietsky
52e756752e ability to change audio track in theora video 2015-10-13 01:17:54 -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
Juan Linietsky
c858515785 Fixed theora playback. Removed theoraplayer. 
Still need to get proper audio output latency in some platforms.
 2015-09-26 14:50:42 -03:00
eska
ab3b0c82c8 Add missing return so Visual Studio compiles 2015-09-22 05:59:10 +02:00
Juan Linietsky
83d9a692be Ability to visually debug geometry visually: 
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
 2015-09-20 13:03:46 -03:00
Juan Linietsky
9741374617 Rewrite of the AudioStream API 
-Fixes long-standing issues regarding to playing a single stream multiple times simultanteously
-Fixes wrong-looping, starting, caching, etc. Issues resulting from bad original design
-Allows more interesting kinds of streams (stream graphs with streams inside streams!) in the future
 2015-09-09 18:50:52 -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
a19a653e2c Compile shaders using default values. 2015-08-30 02:44:49 -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
Mariano Javier Suligoy
54291c655d Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-24 21:33:00 -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
Mariano Javier Suligoy
c88038228a Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-03 17:28:33 -03:00
Juan Linietsky
07c99e11f5 QOL, script buttons in scene tabs 2015-07-26 10:44:35 -03:00
Mariano Javier Suligoy
add0105c4e Little fix: don't create an empty undo/redo command when trying to add a second Input GraphNode 2015-07-25 22:05:45 -03:00
Mariano Javier Suligoy
5ffd818fb1 Duplicate GraphNode(s) [Control+D] 2015-07-25 21:16:07 -03:00
Mariano Javier Suligoy
2a43778793 Fix tab indent 2015-07-20 22:15:06 -03:00
Mariano Javier Suligoy
bdd12744fe Select and move multiple nodes at once 2015-07-19 01:48:46 -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
romulox_x
acb5cdb574 forgot to add mirroredrepeat flag to flags file. fixed. 2015-06-25 15:41:12 -07:00
romulox_x
85e49d4e75 added support for mirrored repeat texture wrapping 2015-06-25 14:51:21 -07:00
Juan Linietsky
25470dd3a0 Merge pull request #2058 from volzhs/create_from_fnt 
add bind method for create_from_fnt (load fnt made by BMFont)
 2015-06-22 23:57:54 -03: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
Juan Linietsky
9a58960d28 some editor window changes 
-ability to make dock position configurable, and it gets saved
-editor starts maximized default
 2015-06-13 22:12:53 -03:00
volzhs
9bee9e7498 add bind method for create_from_fnt (load fnt made by BMFont) 2015-06-10 02:25:34 +09:00
volzhs
5ffa3f4ff0 add bind method for create_from_fnt (load fnt made by BMFont) 2015-06-10 02:23:47 +09:00
Juan Linietsky
7590f3db21 grid container supports separate h and v spacing 
closes #2049
 2015-06-08 10:36:26 -03:00
Juan Linietsky
143265d4cb Merge pull request #1973 from Biliogadafr/ColorRamp 
Replace color phases with color ramp for Particles2D. (need some review/guidance)
 2015-06-07 00:26:35 -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
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
Juan Linietsky
d5348eebdc work in progress, resource previews 2015-05-31 02:00:18 -03:00
Biliogadafr
dc1940d3e8 Inline get_color_at_offset(). Delete unnecessary check. 2015-05-28 00:11:54 +03:00
Biliogadafr
3f975965e9 Add get_color_at_offset(). Ensure correct points order. 2015-05-26 22:17:54 +03:00
Biliogadafr
df9d48d9b5 Replace color phases with color ramp for Particles2D. 2015-05-24 21:18:52 +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
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
f4caddbc23 -corrected frac() and hyperbolic sin,cos,tan when running on PC (GLSL120), fixes #1775 2015-05-04 10:53:54 -03:00
Juan Linietsky
a76709d240 -vec3 uniforms should now work, fixes #1773 2015-05-04 10:17:24 -03:00
Juan Linietsky
4b6225586c Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-04 00:53:52 -03:00
Juan Linietsky
e7aa37fe75 improved kinematic motion, improved demos for kinematic motion 2015-05-03 22:37:10 -03:00
Nathan Warden
6212946927 Fixed some items caught in cppcheck 2015-05-02 12:17:59 -05:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Juan Linietsky
21939ce08b -some cleanups 
-added tesselation function to curve and curve2d
 2015-04-30 10:06:18 -03:00
Juan Linietsky
0adca0a7c9 -made normalmaps easier in 2D, fixes #1467 2015-04-27 08:11:54 -03:00
Juan Linietsky
93ce7d92c1 -Many fixes and demo for RichTexLabel 
-Proper ability to edit BBCode in RTL.
 2015-04-21 16:01:58 -03:00
Juan Linietsky
fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Juan Linietsky
61ab20a0bb fixed UV2 source in shader graph, closes #1633 2015-04-12 19:36:35 -03:00
Juan Linietsky
d148a03848 -Fixes bug in ShaderGraph material, when uniform property is not used, fixes #1634 and #1610 2015-04-09 00:29:21 -03:00
Juan Linietsky
54ed432913 fix crash when deleting shader from material, fixes #1631 2015-04-07 22:30:36 -03:00
Juan Linietsky
7852be816a fixed shader graph length node, fixes #1632 2015-04-07 22:22:46 -03:00
Juan Linietsky
68e42f53ba Beta1 Attempt #1 
-=-==-=-=-=-=-=-

-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
 2015-04-02 12:59:23 -03:00
Juan Linietsky
6d813c81b8 Merge pull request #1460 from MarianoGnu/master 
Create Checkbox class with support for Radio Buttons
 2015-03-22 14:55:36 -03:00
Juan Linietsky
dac2017dee fixes/cleans up 
-input now correctly works when using viewport scaling
-added function to get areas/bodies in given point
-added function to get space state directly from world
 2015-03-22 09:40:26 -03:00
Juan Linietsky
c6c72a3c37 input events on Area2D is now supported 
also added a demo showing how this works
 2015-03-22 01:46:18 -03:00
Juan Linietsky
acc6f3b285 signed distance field font support 2015-03-21 00:43:33 -03:00
Juan Linietsky
53e1694e1e New option to send canvas to render buffer 
allows to use 3D environment effects for post processing such as Glow,
Bloom, HDR, etc. in 2D.
 2015-03-16 01:14:59 -03:00
Juan Linietsky
a6f96f46b7 small optimizations to isometric light demo 
should work faster, and even faster if exported.. as textures have been
optimized.
 2015-03-10 21:05:49 -03:00
Juan Linietsky
09489e3a78 lot of work on 2D lighting and isometric maps 
added a new demo, isometric_light that does full isometric sorting,
lights, shadows, etc.
 2015-03-09 02:34:56 -03:00
Mariano Javier Suligoy
205ed6c9f5 Improve mechanism and fix radio icon rendering. 2015-03-01 16:45:13 -03:00
Mariano Javier Suligoy
e8e9f100e5 Add CheckBox control with theme edition and radio icon avaible. 2015-03-01 11:23:05 -03:00
Carl Olsson
573ae5dd92 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	demos/2d/polygon_path_finder_demo/.fscache
 2015-02-11 21:15:49 +10:00
Juan Linietsky
b4e1c1d717 Merge pull request #1327 from romulox-x/polygonPathFinderClosestPoint 
changed PolygonPathFinder::get_closest_point to return the closest posit...
 2015-02-11 07:12:15 -03:00
Juan Linietsky
1d54c2dd1c added missing set_shader_param functions 
also added code completion hint for shader params
 2015-02-11 06:51:20 -03:00
Juan Linietsky
d22b256f08 customizable content margin in styleboxes 2015-02-10 23:53:04 -03:00
Juan Linietsky
3b4fd0f24d Merge pull request #1170 from UsernameIsAReservedWord/fix_cubemap_ressource_editor 
fixes cubemap ressource editor bug, fixes issue #908
 2015-02-09 21:37:01 -03:00
Carl Olsson
ee44664b2a Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-02 21:34:47 +10:00
Carl Olsson
c5bf43f6eb Working TileMap tile transpose transform. 2015-02-02 21:27:48 +10:00
romulox_x
8db3c0a4db changed PolygonPathFinder::get_closest_point to return the closest position inside, rather then the closest vertex 2015-02-01 09:23:31 -08:00
Juan Linietsky
67d357191f begin work on lighting system for 2D 
nothing functional yet, just experimenting with API
 2015-01-22 11:07:16 -03:00
Juan Linietsky
da0d4e4dea Fixes to texscreen, fixes to white testcube 2015-01-20 22:31:32 -03:00
Juan Linietsky
11c1756257 Visual Shader Editing for 2D 
Editing 2D shaders with visual editor seems to work now.
 2015-01-20 20:36:25 -03:00
Juan Linietsky
a0511ed59a Color Ramp and Curve Map added to visual shader editing. 
Added Color Ramp and Curve Map to shader nodes.
Fixed an issue that crashed Godot Editor right when opened.
 2015-01-19 02:39:58 -03:00
Juan Linietsky
6f3c09047e -intentional breakage of shader graph to fix issues, existing graphs will be broken, sorry :( 2015-01-18 09:51:11 -03:00
Juan Linietsky
7a1307f96a Merge pull request #1172 from UsernameIsAReservedWord/fix_environment_ressource_interface_to_handle_cubemap_ressource 
fix_environment_ressource_cubemap_support, complete PR #1170
 2015-01-17 09:56:20 -03:00
Juan Linietsky
938c6d0df3 Merge pull request #1204 from marynate/PR-new-default-theme 
new default theme
 2015-01-17 09:45:19 -03:00
quabug
341ea429db remove useless code 2015-01-16 15:16:58 +08:00
quabug
5823f90c53 fix bug 
running into infinite loop if distance between two adjacent points in curve are too short.
 2015-01-16 15:16:41 +08:00
marynate
7c430d52e9 Restore checkbutton margin to origin value, fixed issue in code search dialog 2015-01-15 13:30:00 +08:00
marynate
2ca8b2683e Minor code formatting 2015-01-15 13:30:00 +08:00
Ralf Hölzemer
7f20b864cd Tweak Button margins & small fix for ToolButton 2015-01-15 13:29:59 +08:00
Ralf Hölzemer
e7893b404e fix background alpha in dropdown arrows 2015-01-15 13:29:58 +08:00
Ralf Hölzemer
5fc787abd8 Fixed the progressbar to only require 16px in height 2015-01-15 13:29:58 +08:00
Ralf Hölzemer
d8f453cb39 Missing files and Tab changes 2015-01-15 13:29:56 +08:00
Ralf Hölzemer
df41418677 More Theme fixes 
- some color tweaks
- many margin fixes
- overall nicer look

Conflicts:
	scene/resources/default_theme/default_theme.cpp
 2015-01-15 13:29:56 +08:00
Ralf Hölzemer
4b70bc1f35 Fix visual glitch in Progressbar 2015-01-15 13:29:55 +08:00
Ralf Hölzemer
ae70108883 New iteration of the theme 
- try to implement ndee's mockup from the forum
- new color palette
- get rid of most gradients

probably needs some more tweaks
 2015-01-15 13:29:54 +08:00
Ralf Hölzemer
7b9f5e65c9 New neutral default theme 
- desaturated UI elements to grey
- desaturated all near-white icons to grey
- changed some hardcoded colors
 2015-01-15 13:29:53 +08:00
Juan Linietsky
04af74596d -fix shader param names broken issue on code completion 
-fix z order issue in new 2D engine
 2015-01-14 09:05:33 -03:00
Juan Linietsky
66afddb3e8 -Initial (untested) implementation of 2D shaders. Probably broken, will be fixed later. 
-fixed issue of opacity not working
 2015-01-11 11:43:31 -03:00
Juan Linietsky
8997084831 2D Rewrite Step [1] 
-=-=-=-=-=-=-=-=-=-

-Moved drawing code to a single function that takes linked list (should make it easier to optimize in the future).
-Implemented Z ordering of 2D nodes. Node2D and those that inherit have a visibility/Z property that affects drawing order (besides the tree order)
-Removed OpenGL ES 1.x support. Good riddance!
 2015-01-10 17:35:26 -03:00
yg2f
75c3090e9f fix_environment_ressource_cubemap_support 
this fix goes hands in hands with #1170.
Cubemap ressources can be loaded and created into an Environment
ressource.
 2015-01-10 15:50:27 +01:00
yg2f
5e3a4c13da fixes cubemap ressource editor bug 
this fixes the cubemap ressource editor bug described in issue #908.

some other littles fixes will be required to allow the Environment
ressource to create and load Cubemap Ressources more easily
 2015-01-10 15:11:44 +01:00
Juan Linietsky
78f4b93703 Fixes to GraphEdit: 
-Working area is bigger now, solves #1148
-Using Position now works, fixes #1141
-RGB ops now work, fixes #1139
-Missing bindings to GraphEdit and GraphNode added
-Shader Graph Editor Shows errors on cyclic links and missing connections
 2015-01-08 00:41:34 -03:00
Juan Linietsky
3f1dd9c57f -Fixed matrix and vec+scalar multiplication issues, fixes #1143 2015-01-07 20:29:05 -03:00
Juan Linietsky
1659f82e7e -changed type of C component of vec interp, fixes #1144 2015-01-07 19:48:38 -03:00
Juan Linietsky
978769cdf1 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-07 01:46:28 -03:00
Juan Linietsky
7a0e4c822c -Visual Shader Editing Finished, PLEASE TEST! 2015-01-07 01:45:46 -03:00
UsernameIsAReservedWord
996d93f972 fixes CurveXD::interpolatef() 
fixes Curve2D::interpolatef() and Curve3D::interpolatef() methods
 2015-01-06 15:31:41 +01:00
Juan Linietsky
b51f645711 Changes to 2D physics engine 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=

-Removed "density" property
-Added instead more flexible "angular damp" and "linear damp"
-Added ability to override angular and linear damp in rigidbody
-Added gravity scale option rigidbody

Test well and iron out bugs, when it works the same will be moved to 3D
 2015-01-05 18:37:12 -03:00
Juan Linietsky
a8bcb96ad4 -Fix shortcuts for OSX code completion, fixes #1111 
-Fixed how translation fallbacks works, fixes #1011
 2015-01-04 11:03:31 -03:00
Juan Linietsky
fbdd925d9b -Work in progress visual shader editor *DOES NOT WORK YET* 2015-01-03 16:52:37 -03:00
Juan Linietsky
78e7777cf5 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	modules/gdscript/gd_editor.cpp

Improved code completion for InputEvent (shows members by type)
 2014-12-21 11:46:28 -03:00
Juan Linietsky
f7f197c409 -ability to set default textures in shader (needed for visual shader editing) 
-work in progress new graph system (will replace current one)
-crash fix in s3m loader (out of bounds acess)
-fixed vbox overriding of separation (fixes empty line between section tabs)
 2014-12-21 11:42:44 -03:00
romulox_x
8ff61b4d0e fixed bugs in polygon_path_finder for finding nearest points 2014-12-20 15:28:08 -08:00
Juan Linietsky
cf0a419efa WIP work on graph nodes and editing 2014-12-20 12:32:14 -03:00
Juan Linietsky
c8b2a5f64a -added brace matching to go with the new code completion 2014-12-17 01:53:34 -03:00
Juan Linietsky
d55f95e0d2 Merge branch 'master' of https://github.com/okamstudio/godot 2014-12-16 22:33:35 -03:00
Juan Linietsky
bcf27feb98 New Code Completion 
-=-=-=-=-=-=-=-=-=-

-Massive improvement to code completion
-Argument hinting for functions

If you manage to out-smart the code-completion in a situation where completion
should be possible to guess, let me know.

 Please enter the commit message for your changes. Lines starting
 2014-12-16 22:31:57 -03:00
Juan Linietsky
089d7fa171 Small batch of fixes 
-=-=-=-=-=-=-=-=-=-=
-Fixed looping error in AudioStreamResampled
-winrt port progress
-fixes in material in ambient light
 2014-12-15 15:42:58 -03:00
Juan Linietsky
5eb546e04b Merge pull request #867 from adolson/circleshape2d-radius-increment 
add sane radius increment to CircleShape2D
 2014-12-01 21:44:14 -02:00
Juan Linietsky
6dd8768811 3D Import Import & UDP 
-=-=-=-=-=-=-=-=-=-=-

-Animation Import filter support
-Animation Clip import support
-Animation Optimizer Fixes, Improvements and Visibile Options
-Extremely Experimental UDP support.
 2014-11-12 11:23:23 -03:00
Dana Olson
dae2f4c96f add sane radius increment 2014-11-08 03:30:49 -05:00