Commit graph

3292 commits

Author SHA1 Message Date
Rémi Verschelde
26342b34aa Merge pull request #3898 from volzhs/fix-android-gradle
fix gradle build on windows
2016-03-02 07:18:22 +01:00
volzhs
d6cc887627 fix gradle build on windows 2016-03-02 12:15:39 +09:00
Rémi Verschelde
d0c95ec191 Merge pull request #3894 from akien-mga/pr-revert-3814
Revert "Merge pull request #3814 from est31/iterators_for_for"
2016-03-01 19:05:00 +01:00
Rémi Verschelde
002ff3cc9a Revert "Merge pull request #3814 from est31/iterators_for_for"
This reverts commit adf5056889, reversing
changes made to ee2bc87c0e.
2016-03-01 18:09:48 +01:00
Rémi Verschelde
46bfcd3507 Merge pull request #3858 from JoshuaGrams/blend3
AnimationTreePlayer (Blend3): process all inputs.
2016-03-01 14:02:11 +01:00
Rémi Verschelde
c26f753ffe Merge pull request #3757 from JoshuaGrams/animation-tree-blending
AnimationTreePlayer: blend value tracks (intended to close #2299)
2016-03-01 14:01:27 +01:00
Josh Grams
391ce81c5e AnimationTreePlayer: blend value tracks (closes #2299)
Variant:
- zero() sets a Variant to the appropriate type of zero value
- blend() blends part of one Variant on top of another.
2016-03-01 07:37:36 -05:00
Rémi Verschelde
a12c63ef9e Quick fixes to tween documentation formatting
Maybe the reST parser should be improved instead though ;)
2016-03-01 08:37:35 +01:00
Rémi Verschelde
c0382a1731 Merge pull request #3880 from Hinsbart/joy_names
use joystick name from mapping-db if available
2016-02-29 17:38:55 +01:00
hinsbart
0022af9647 use joystick name from mapping-db if available 2016-02-29 16:48:19 +01:00
Juan Linietsky
210d332def -wip on addon editor
-fixes instantiable subclasses not working, as reported in #3871
2016-02-29 09:57:38 -03:00
Rémi Verschelde
445d38b728 Merge pull request #3875 from est31/master
Fix crash with release mode
2016-02-29 07:29:57 +01:00
est31
0b24a13fa0 Fix bug with nearest_power_of_2_templated
We have to shift log(num of bits) many times not num of bytes many.
2016-02-29 06:51:19 +01:00
Juan Linietsky
640443be6a Merge pull request #3864 from leezh/editorplugin_extras
Adds EditorPlugin::remove_control_from_bottom_panel()
2016-02-28 23:11:37 -03:00
Ariel Manzur
96b60c281f deleted files added accidentally 2016-02-28 20:39:29 -03:00
Rémi Verschelde
f740d0ced3 Merge pull request #3693 from SaracenOne/hardware_skinning_fix
Fixed hardware-accelerated skinning support.
2016-02-28 23:01:56 +01:00
Rémi Verschelde
adf5056889 Merge pull request #3814 from est31/iterators_for_for
Add Iterators and use them for for
2016-02-28 23:00:57 +01:00
est31
5f66692395 Use xrange for common "for i in range(...)" use case
Make the parser eliminate a wasteful allocation and initialisation
of a possibly large array.
2016-02-28 22:47:48 +01:00
est31
f81153eb69 Add xrange builtin function
Also update classes.xml in order to document xrange
2016-02-28 22:47:48 +01:00
sheepandshepherd
bc87ce6236 Add RangeIterator class for loops 2016-02-28 22:47:41 +01:00
Rémi Verschelde
ee2bc87c0e Merge pull request #3863 from bojidar-bg/PR-document-tween
Document Tween class
2016-02-28 22:29:37 +01:00
Zher Huei Lee
3546403af2 Updated the docs for EditorPlugin
One thing to note is that visibilty of the bottom panel items are automatically
managed by the buttons along the bottom.
2016-02-28 20:09:15 +00:00
Bojidar Marinov
49e1cc6fa9 Document Tween class 2016-02-28 22:04:01 +02:00
Zher Huei Lee
d8ac5cff57 Adds EditorPlugin::remove_control_from_bottom_panel()
Also renames `add_control_to_bottom_dock` to
`add_control_to_bottom_panel` so that it would be clear that the
removal functions are different too.
2016-02-28 19:58:17 +00:00
Rémi Verschelde
eb5f9ed89b Remove grey capsule on official logo
It had been added by a contributor without prior discussion
with the rest of the team, but the grey capsule did not look
so good. Closes #3848.

Also renamed godot_{icon,logo} to just {icon,logo}.
2016-02-28 16:52:45 +01:00
Josh Grams
b79351aa45 AnimationTreePlayer (Blend3): process all inputs.
Always call _process_node on all three inputs so that looped animations
don't get out of sync.
2016-02-28 06:55:53 -05:00
Juan Linietsky
6fc1c3a4d1 Completed the support for plugins! It is not possible to add plugins.
Not all APIs are provided yet, please request whathever you are missing.
Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings.
Have fun!
2016-02-27 23:12:27 -03:00
Rémi Verschelde
a97c1ca8f9 screen_shaders: convert demo images to JPG 2016-02-27 20:54:21 +01:00
Rémi Verschelde
2fd177b2a5 normalmap demo: convert images to JPG
To make the demos lighter
2016-02-27 20:54:21 +01:00
Rémi Verschelde
0f087755cc Remove Noto Sans font from translation demo (heavy!) 2016-02-27 20:54:21 +01:00
Ariel Manzur
30d0ca9766 added [presets] to ._sc_ and "android/shutdown_adb_on_exit" to editor_settings 2016-02-27 12:11:40 -03:00
Juan Linietsky
08e0e64a19 fix transform localization event in mouse motion 2016-02-27 09:47:39 -03:00
Juan Linietsky
2a7fdb23b3 First attempt at making a more useful EditorPlugin API. Still undocumented, but feedback welcome! 2016-02-27 00:32:51 -03:00
Rémi Verschelde
7d8b7df19d Merge pull request #3830 from w84death/patch-1
OUYA gamepad mappings fix
2016-02-25 18:02:00 +01:00
Krzysztof Jankowski
6b6ce35e78 OUYA gamepad mappings fix
Fix gamepad mappings for OUYA revision 4
2016-02-25 17:24:57 +01:00
Ariel Manzur
89b4c76e0c theora on server build 2016-02-25 09:44:21 -03:00
Ariel Manzur
ea751724a2 adds -pm and -project_manager command line options to start project manager
fixes bug where the user has an engine.cfg on the executable directory so it runs the game instead of opening the project manager
2016-02-25 03:02:09 -03:00
Rémi Verschelde
c91b1daad8 Merge pull request #3824 from StraToN/fix-close-button
Fixed closing a scene tab when it was not the CURRENT tab. Fixes #3810
2016-02-24 23:37:47 +01:00
Julian Murgia - StraToN
5d5b7f2120 Fixed closing a scene tab when it was not the CURRENT tab. Fixes #3810 2016-02-24 22:07:46 +01:00
punto-
f2a567d925 Merge pull request #3819 from Hinsbart/fix_dpad
x11: fix joysticks not recognizing some buttons
2016-02-24 08:52:05 -03:00
hinsbart
1e54fd142b x11: fix joysticks not recognizing some buttons
dpad on x360 pads with kernel < 4.3 is working now
2016-02-24 12:18:30 +01:00
Rémi Verschelde
3d58d5d5f2 Merge pull request #3817 from wass3r/typo-fixes
applied some typo fixes. see godotengine/godot-docs#18
2016-02-24 08:59:12 +01:00
David
00d3c657de applied some typo fixes. see godotengine/godot-docs#18 2016-02-24 01:53:44 -06:00
Rémi Verschelde
0ab681b9cd Merge pull request #3816 from adolson/more_js_maps_2
added more Android gamepad mappings
2016-02-24 07:42:59 +01:00
Dana Olson
7efb45e0db added more Android gamepad mappings 2016-02-24 00:40:27 -05:00
Saracen
fe49ac19df Fixed hardware-accelerated skinning support. 2016-02-24 02:16:20 +00:00
Rémi Verschelde
c8071dfce8 Merge pull request #3812 from est31/master
Fix typo in error
2016-02-24 00:15:53 +01:00
est31
cea8e97c11 Fix typo in error 2016-02-24 00:08:53 +01:00
Rémi Verschelde
32e1a56cd3 Merge pull request #3771 from est31/fix_memalloc
Fix allocation bug
2016-02-23 22:12:25 +01:00
Rémi Verschelde
3b18a90ca3 Merge pull request #3809 from adolson/jsmaps2
added a couple more Linux mappings, tweaked Ouya Linux mapping
2016-02-23 18:27:01 +01:00