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

398 commits

Author SHA1 Message Date
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
Juan Linietsky
6b2a27bbe5 shadow atlas allocation (work in progress) 2016-10-31 08:47:46 -03: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
Rémi Verschelde
f5818c8e63 Merge pull request #6812 from RandomShaper/get-visualserver-clear-color 
Add/expose VisualServer::get_default_clear_color()
 2016-10-22 12:52:40 +02:00
Juan Linietsky
cb34b70df1 More scene work, can display a skybox 2016-10-21 07:27:13 -03:00
Juan Linietsky
4428115916 Everything returning to normal in 3D, still a long way to go 
-implemented the scene part of visual server and rasterizer, objects without lighting and material are rendererd only
 2016-10-19 11:14:41 -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
Pedro J. Estébanez
753ba67d65 Add/expose VisualServer::get_default_clear_color() 2016-10-13 11:24:55 +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
Ignacio Etcheverry
fea1fb0925 Merge pull request #6761 from neikeq/pr-missing-defval 
Bindings: Fix missing default value
 2016-10-09 23:58:58 +02:00
Ignacio Etcheverry
068b58b3ce Bindings: Fix missing default value 2016-10-09 23:51:08 +02:00
Rémi Verschelde
1c6058a5bc Merge pull request #6691 from Faless/expose_more_physics 
Expose more 2D/3D physics options in project settings (#5029)
 2016-10-09 14:08:50 +02:00
Rémi Verschelde
74917d7037 Merge pull request #6627 from seijihariki/fix_crash_collider_overlap 
Fix for crash when finding intersection on colliders that overlap
 2016-10-09 14:04:22 +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
Ariel Manzur
1f9e16119f bind method canvas_item_set_sort_children_by_y 2016-10-05 03:48:54 -03:00
Juan Linietsky
cf5778e51a -Added ViewportContainer, this is the only way to make viewports show up in GUI now 
-2D editing now seems to work
-Added some functions and refactoring to Viewport
 2016-10-05 01:26:35 -03:00
Juan Linietsky
a6e9dc6153 make editor update by tracking changes in visualserverraster 2016-10-03 23:46:24 -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
Victor Seiji Hariki
e5edd50d62 Now ignoring remaining collision shapes. 2016-09-26 23:40:06 -03:00
Ignacio Etcheverry
1c50dfdf6c Merge pull request #6557 from anneomcl/master 
Fix for #6158
 2016-09-20 09:28:26 +02:00
anneomcl
aa5ade834c Fix for #6158. Converting Vector2 to Size2 for scaling functions. 2016-09-19 23:31:45 -07: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
fc61eb37ce Merge pull request #5920 from 29jm/fix-warnings 
Fix some more warnings
 2016-09-10 12:21:02 -03:00
Juan Linietsky
c5b7385110 Merge pull request #6250 from Ovnuniarchos/CursorHotspot 
Mouse hotspot is now honored.
 2016-09-10 12:07:08 -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
5fc084c28e -Fixed issue in Kinematicbody2D 2016-09-01 12:03:55 -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
Rémi Verschelde
ce7e2ae4f4 draw_line: Properly bind antialiased argument 2016-08-31 08:57:21 +02:00
Juan Linietsky
fb4d6d1db0 More visual script improvements 
-Added anti-aliasing on lines
-Improved draw performance enormously
-Removed sequence ports for most nodes, current visual scripts will likely be broken now. Sorry!
 2016-08-30 23:46:41 -03:00
Ovnuniarchos
8fcd92c38a Mouse hotspot is not honored. 2016-08-23 07:57:04 +02:00
Johan Manuel
046f94d3ac Remove some unused variables 2016-08-13 13:21:35 +02:00
Johan Manuel
a2b8ef6d51 Fix some warnings 2016-07-25 16:46:26 +02:00
Alex Piola
ffdd9f16dd Fix for incorrect velocity report due to a typo. 
Closes #5854
 2016-07-24 12:53:07 +02:00
Rémi Verschelde
3725114a16 Merge pull request #5383 from Ovnuniarchos/OptimizeOneWay 
Optimized one-way collision loops.
 2016-07-18 16:37:50 +02:00
Juan Linietsky
0e6e0ed0e5 Merge pull request #5533 from Hinsbart/cursor_atex 
Can use AtlasTextures as custom mouse cursor.
 2016-07-10 12:41:57 -03: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
Andreas Haas
91add16300 Can use AtlasTextures as custom mouse cursor. 
fixes #3957
 2016-07-03 19:36:12 +02:00
Ovnuniarchos
b09b449615 Optimized one way collision loops. 2016-06-24 08:43:23 +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
Juan Linietsky
4b05181397 Fixed a stupid bug with segment-segment collision in SAT physics, closes #4801 , closes #4984 2016-06-18 18:32:10 -03:00
Juan Linietsky
b4b80625d1 Change hash grid in 2D physics to contemplate large objects as separate cases, to avoid huge memory and performance penalty. Fixes #4662 2016-06-18 17:21: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
80727b6896 Drop empty .cpp files for header-only classes 
Part of #5272
 2016-06-18 20:00:08 +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
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
3b5f1afb5c Fixed fractional offset not being reset in ringbuffer resamples, closes #4764 
Probably fixes other streamplayer issues too.
 2016-06-17 20:38:10 -03:00
Juan Linietsky
64b4253dbf changed visual server free() to free_rid() like in the other servers. Fixes #4917 2016-06-13 22:12:56 -03:00
Ovnuniarchos
471ab4e6ff Documented many Physics2D* classes 2016-06-12 20:24:19 +02:00
Geequlim
fdf914e53e Add texture region support for stylebox render 2016-06-05 00:45:53 +08: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
Carter Anderson
7df5249779 Remove noisy print 2016-05-23 22:56:32 -07:00
Juan Linietsky
d3495b128a -Improve resource previews 
-Also fixed draw_texture_rect() tile parameter
 2016-05-23 17:11:49 -03:00
Juan Linietsky
eacb8f04c4 Merge remote-tracking branch 'origin/master' 2016-05-21 22:34:55 -03:00
Juan Linietsky
a75f896338 First version of Profiler 
It is now possible to profile GDScript as well as some parts of Godot
internals.
 2016-05-21 21:18:16 -03:00
Hubert Jarosz
33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02: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
Juan Linietsky
89d87294db ability to shrink all images x2 on load 
this is for extreme cases when running on devices with very low video
memory, so you can still retain compatibility.
 2016-05-04 12:37:07 -03:00
Ignacio Etcheverry
1e752c0120 Fix wrong return and argument types in documentation 2016-05-04 15:35:09 +02:00
Josh Grams
a7b4127481 RigidBody2D (add_force, set_inertia): new methods. 2016-04-26 08:15:15 -04:00
Josh Grams
ffaced87a6 RigidBody2D: rename apply_impulse(pos) to offset. 2016-04-24 04:36:51 -04:00
Josh Grams
f7d31cec38 RigidBody2D: add and bind get_inertia() method. 
You can't set this value very well, since it's automatically computed
from the mass and the collision shapes. But since the values are higher
than many people might suspect, so being able to read it helps estimate
the amount of torque you might need to apply.
 2016-04-20 20:49:37 -04:00
Rémi Verschelde
e07266f6c1 Merge pull request #4273 from bojidar-bg/add-layers-and-masks-to-3d 
Port collision and layer masks to 3D
 2016-04-12 13:17:26 +02:00
Marc Gilleron
d239e6bc0e Fixed #4163 (intersect_shape crashes on results limit) 2016-04-12 02:18:41 +02:00
Bojidar Marinov
f7c3d6329c Port collision and layer masks to 3D, fixes #1759 
Raycasts now have type_mask and layer_mask. Areas - collision_mask and layer_mask. PhysicsBodies needed only collision_mask.
 2016-04-09 22:11:12 +03: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
Saracen
24bc7d8db7 Fix 'FLAG_RECEIVE_SHADOWS' flag for GeometryInstances so that turning it off now correctly disables shadows from affecting the instance. 2016-03-12 16:51:17 +00:00
Rémi Verschelde
aaad24e6fb Merge pull request #3865 from Marqin/coverity 
[Coverity] fixed 11 of 537 potential bugs found by Coverity
 2016-03-10 16:15:49 +01:00
Rémi Verschelde
b5f873c9d1 Merge pull request #3999 from neikeq/issues_3650_3990 
Fix crash when resizing ConcavePolygonShape2D segments
 2016-03-10 06:29:20 +01:00
Ignacio Etcheverry
3fc16d4025 Fix crash when resizing ConcavePolygonShape2D segments 2016-03-09 19:52:15 +01:00
Hubert Jarosz
7b07bcaf44
fix six possible "divide by zero" 2016-03-09 00:18:23 +01:00
Hubert Jarosz
4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
Saracen
7fecebd8a8 Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only. 
Conflicts:
	servers/visual/visual_server_raster.h
 2016-03-07 23:14:14 +00:00
Nuno Donato
2d1de83434 refix particles3d issue, bringing down the amount limit to 1024 2016-02-16 08:56:31 +00:00
Nuno Donato
b3fadd66c8 * raised the max amount of particles to match the max number allowed in the inspector (prevents crash) 2016-02-12 11:45:26 +00:00
Saracen
de5281c398 Ability to colourize baked lighting in real time. 2016-02-06 18:03:20 +00:00
Juan Linietsky
6d63dda72b Merge pull request #3534 from Biliogadafr/pickable2d 
Physics2D: Allow to use 'intersect_point' with not 'Pickable' objects
 2016-02-03 08:56:49 -03:00
Rémi Verschelde
7439947e13 Merge pull request #3518 from Ovnuniarchos/3DSoundServerBadReg 
Variables SpatialSoundServer and SS pointed to SpatialSound2DServer.
 2016-02-01 11:07:34 +01:00
Biliogadafr
e8c5b41dd8 Physics2D: Allow to use 'intersect_point' with objects which is not 'pickable' 2016-02-01 04:30:16 +03:00
Ariel Manzur
0cd8c054a2 thread renaming 2016-01-31 20:23:24 -03:00
Ovnuniarchos
51dfd4a4b5 Variables SpatialSoundServer and SS pointed to SpatialSound2DServer. 2016-01-30 10:36:58 +01:00
Juan Linietsky
d01f55a78e Merge pull request #2698 from Faless/add_area_fix 
Fix bug in Body(2D)SW::add_area
 2016-01-23 23:07:23 -03:00
Ovnuniarchos
8ed13c4df4 set_signed_data now works correctly on pcm8 samples. 2016-01-21 14:40:58 +01:00
Juan Linietsky
cb9dfd5d28 avoid crash with empty concavepolygonshape, fixes #3169 2016-01-10 17:25:20 -03:00
Juan Linietsky
1aaf507ffb change intersect_ray function to discriminate pickable objects, fixes #3203 2016-01-10 15:54:57 -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
606729fa2d physics state properly returns contact metadata, closes #1979 2016-01-03 20:23:44 -03:00
Juan Linietsky
27c47e09a1 skip the first integration in physics bodies, fixes #2213 2016-01-02 13:28:18 -03:00
Juan Linietsky
0ed864d876 properly removing unprocessed objects from physics islands fixes one way platforms for rigidbodies, closes #2345 2016-01-01 12:13:17 -03: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
7879efc50b Make both lights and occluders stop working if hidden, fixes #2437 2016-01-01 10:45:24 -03:00
Juan Linietsky
1e65c3c701 remove error print in area collision, should be a valid situation, closes #2463 2015-12-31 11:15:49 -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
Rémi Verschelde
d1caf2f037 Remove bogus argument in body_get_node 2015-12-28 01:32:12 +01:00
Rémi Verschelde
46eebac3ae Remove bogus argument in sample_get_description 
Copy-paste mistake from the setter most likely.
 2015-12-28 01:18:37 +01:00
Juan Linietsky
acc9db1695 Merge pull request #3071 from Ovnuniarchos/NewAreaCombiners 
New and corrected area override modes.
 2015-12-22 10:57:39 -03:00
Ariel Manzur
83f2084cb8 testing patch for aligned reads by webp in javascript 2015-12-22 09:19:12 -03:00
Ariel Manzur
1bc91848e3 thread 2015-12-21 10:58:51 -03:00
Juan Linietsky
9bf7adfc1f -another approach to solving the deadlock problem :| 2015-12-21 10:51:27 -03:00
Juan Linietsky
3fe740dac6 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-21 10:26:04 -03:00
Juan Linietsky
49a19f85b8 -different attempt to avod deadlock problem 2015-12-21 10:25:46 -03:00
Ariel Manzur
d4ed043968 too early to rename thread 2015-12-21 09:38:44 -03:00
Ariel Manzur
0576e1e28f Merge branch 'master' of https://github.com/godotengine/godot 2015-12-21 09:17:15 -03:00
Ariel Manzur
72a6b137ba audio threads 2015-12-21 09:01:40 -03:00
Ariel Manzur
5e0f43d051 naming the audio thread from within itself 2015-12-18 03:41:44 -03:00
Ariel Manzur
10298b9534 thread set name 2015-12-17 06:24:27 -03:00
Juan Linietsky
f2183a5e09 replaced :var by :Variant in documentation, fixes #2897 2015-12-14 08:28:01 -03:00
Ovnuniarchos
89efebbf56 New and corrected are override modes. 2015-12-14 02:56:49 +01:00
Juan Linietsky
428984ec0c -New mask mode for lights, makes using masks MUCH easier. 2015-12-08 20:25:08 -03:00
Juan Linietsky
38ab47d2f9 Merge pull request #2865 from hurikhan/pr_fix_2791 
Added additional token checks for the shader if..else.. statement.
 2015-12-08 17:09:58 -03:00
Juan Linietsky
ff936c6b2e Merge pull request #2868 from akien-mga/pr-fix-can-move-to 
Fix can_move_to and rename it for more clarity
 2015-12-08 17:09:47 -03:00
Ovnuniarchos
43b2c9c7a4 Areas now calculate their dampenings the same way as their gravity. 2015-12-08 18:45:14 +01:00
Rémi Verschelde
9457211f8f Fix wrong index being used to populate r_results 
Regression from f33d9da.
 2015-12-04 09:31:01 +01: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
Fabio Alessandrelli
1231c795de Fix Body (and Body2D) add_area / remove_area when area have multiple shapes 2015-12-02 11:30:48 +01:00
Andrea Chua
67a1c3f136 Bug Fix #2541: Shader language function validation logic 
ensures that it finds the correct function to validate.
 2015-11-27 21:27:06 +08:00
Rémi Verschelde
aa30e01f26 Merge pull request #2752 from SaracenOne/shadow_color 
New shader feature: change the colour of shadows on a per-material basis
 2015-11-23 11:40:52 +01:00
Rémi Verschelde
2674565cf6 Merge pull request #1931 from Faless/audio_free_rid 
Expose AudioServer::free(RID rid) as AudioServer.free_rid(RID rid)
 2015-11-23 00:22:15 +01:00
Rémi Verschelde
f33d9dab5b Fix can_move_to and rename it for more clarity 
Fixes #2416.
The KinematicBody::can_move_to function was likely designed for two behaviours:
 - discrete: check if the body can "teleport" to the destination
 - continuous: check if the direct path to the destination is valid
The continuous behaviour was however not implemented, and the discrete behaviour was broken too due to a wrong call to intersect_shape.

The discrete behaviour has thus been fixed and the function renamed to can_teleport_to for more clarity.
 2015-11-22 14:14:07 +01:00
hurikhan
49f4ec2b71 Added additional token checks for the shader if..else.. statement. Fixes issue #2791. 2015-11-22 13:49:58 +08:00
Juan Linietsky
d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -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
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
e82afd9c50 Merge pull request #2629 from firefly2442/float-to-bool 
float to bool variable type, fixes: #2478
 2015-11-18 19:17:29 -03:00
Juan Linietsky
e8435cc721 Merge pull request #2632 from firefly2442/duplicate-inherited-vars 
remove child variable that is duplicated from parent class
 2015-11-18 19:16:35 -03:00
Juan Linietsky
61c4c5795f -support for stereo ima-adpcm sample compression & playback 
-support for converting samples to ima-adpcm upon export
 2015-11-09 00:49:18 -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
Fabio Alessandrelli
203f069329 Expose AudioServer::free(RID rid) as AudioServer::free_rid(RID rid) 
to avoid script error due to collision with Object method free
 2015-11-02 17:54:33 +01: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
Juan Linietsky
281d6fac1e -some fixes to audio 2015-11-01 01:55:22 -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
firefly2442
bb68dc5210 remove child variable that is duplicated from parent class 2015-10-18 21:45:27 -05:00
firefly2442
4621d30d1b float to bool variable type, fixes: #2478 2015-10-18 19:49:30 -05:00
Juan Linietsky
63033aa646 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 10:30:08 -03:00
Juan Linietsky
ab22203791 misc cleanup 2015-10-17 10:29:54 -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
652a01f16f Merge pull request #2572 from leezh/clipping-fix 
nested clipping of canvas items now works
 2015-10-17 09:48:38 -03:00
Juan Linietsky
a871fc9112 Merge pull request #2587 from eska014/fix-area2d-mask-matching 
Fix Area/Area2D mask matching
 2015-10-17 09:47:27 -03:00
Juan Linietsky
426909e26b Merge pull request #2594 from Biliogadafr/PinSoftness 
Expose softness parameter of pin joint to the editor.
 2015-10-17 09:45:16 -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
Biliogadafr
2ffc90d8b4 Expose softness parameter of pin joint to the editor. 2015-10-10 23:28:05 +03:00
eska
375a7a727f Fix 3D Area mask matching 2015-10-10 02:33:26 +02:00
eska
13ff4bde65 Fix Area2D type mask matching 2015-10-09 21:54:16 +02:00
reduz
aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
reduz
3514a87b37 fixed uninitialized memory issues in audio code 2015-10-08 14:50:18 -03:00
Zher Huei Lee
7f001a2c76 nested clipping of canvas items now works 2015-10-05 11:50:16 +01:00