Commit graph

3577 commits

Author SHA1 Message Date
Nuno Donato
25244e9843 * fix messages when modifying on switching the active axis
(cherry picked from commit a713188388)
2016-06-25 00:37:19 +02:00
Juan Linietsky
6a83c87dda fixes wrong bool return, closes #5037
(cherry picked from commit c5a2aff6db)
2016-06-25 00:31:10 +02:00
Juan Linietsky
64ac2272ce If a resource is delete from fs dialog, but the resource is currently loaded,
clear the path of the resource. Fixes #5110

(cherry picked from commit f4ff30dff0)
2016-06-25 00:30:06 +02:00
volzhs
2998b7c486 add line spacing option to script and shader editor (#5105)
(cherry picked from commit 990956c4e0)
2016-06-25 00:29:25 +02:00
Paulb23
13d3d217b1 Fixed editor help focus issues and input propagation
(cherry picked from commit eb14373d69)
2016-06-25 00:27:49 +02:00
CowThing
a94f6108a9 Filling in documentation
Documentation for BoneAttachment, KinematicBody, ParallaxBackground,
ParallaxLayer, and TestCube

(cherry picked from commit 50de99f050)
2016-06-25 00:26:18 +02:00
Paulb23
93616e41f9 Caret blink no longer updates when hidden, issue 5100
(cherry picked from commit e260e3872c)
2016-06-25 00:26:10 +02:00
J08nY
1475f8d318 RtAudio: proper under/overflow warning
fix #5102

(cherry picked from commit 39260f9dca)
2016-06-25 00:25:50 +02:00
Rémi Verschelde
9bb6a0852b GLEW: Update to upstream version 1.13.0 (pristine)
This removes a custom redefinition of glewGetProcAddress,
which was apparently necessary for older Macs with buggy OpenGL
(see #5087).

The added source files are as provided in the upstream tarball.

(cherry picked from commit 5bed0af65e)
2016-06-25 00:24:18 +02:00
Rémi Verschelde
66ce012ca6 GLEW: Define static + enabled and includes via SCons
This allows us not to have to hack our definitions in the upstream files,
making it easier to upgrade to newer versions in the future.

For the include paths to work, the headers are moved to a GL subfolder to
match their upstream location.

(cherry picked from commit 768e925271)
2016-06-25 00:24:09 +02:00
Rémi Verschelde
64507f0085 Haiku: Do not define GLEW_ENABLED to undefine it later
Partial revert of f61eb5fd8e.

(cherry picked from commit 4c658dc523)
2016-06-25 00:24:02 +02:00
Pawel Kowal
08c9e566bf Improved Blender/Collada shadeless->unshaded import
(cherry picked from commit 101e0c9ec6)
2016-06-25 00:23:48 +02:00
Paulb23
afbc9d550f Improved breakpoint marker position, and scales with font size
(cherry picked from commit d66b034bd1)
2016-06-25 00:22:36 +02:00
J08nY
d16375d005 Classref for: ImageTexture, Image, LargeTexture
(cherry picked from commit ec96e36bc9)
2016-06-25 00:22:06 +02:00
J08nY
74d0f8b65b Exposed Image.INTERPOLATE_*
(cherry picked from commit 8a4eca8aa8)
2016-06-25 00:21:56 +02:00
Rémi Verschelde
9791d2ef6d Fix indentation issues in last commits
Ping @reduz.

(cherry picked from commit 0729c852b4)
2016-06-25 00:19:27 +02:00
Juan Linietsky
cb94271e9f properly pass events to parent controls, closes #4701
(cherry picked from commit aec5506414)
2016-06-25 00:16:35 +02:00
Juan Linietsky
bb8b57cbae -Fix small bug regarding to canvas layer detection, closes #4381
(cherry picked from commit 2b9cab25c0)
2016-06-25 00:16:08 +02:00
TheoXD
5a45b295ae fixed interactive_loader() not returning a cached scene
(cherry picked from commit 47bd1e8688)
2016-06-25 00:15:28 +02:00
Roberto
a39eaf4c66 Add missing license information (ogg/vorbis/opus)
(cherry picked from commit c0a8c4f6e4)
2016-06-25 00:12:01 +02:00
Roberto
9ac954e2a4 Add missing license information (Theora)
(cherry picked from commit 18fc2ccbe1)
2016-06-25 00:11:33 +02:00
Pedro J. Estébanez
73e455c22f Keep the default environment variables as set by SCons
(cherry picked from commit ad0af9d273)
2016-06-25 00:11:26 +02:00
Roberto
840ad26069 Add missing license information (WebP)
(cherry picked from commit f97f8971e3)
2016-06-25 00:11:05 +02:00
Roberto
b18000349e Add missing license information (MiniZip)
(cherry picked from commit 04fc62c4e3)
2016-06-25 00:10:59 +02:00
Andreas Haas
7bff33ea92 fix ui_* input events in Editor
`input/` is the category for these in globals ^^
fixes #5050

(cherry picked from commit a9779efe82)
2016-06-25 00:09:26 +02:00
Bojidar Marinov
aad9cd3e22 Document Viewport and ViewportSprite classes
(cherry picked from commit 662e0cc411)
2016-06-25 00:06:48 +02:00
Juan Linietsky
d5bed26e42 Make Input Actions config not affect the editor
(cherry picked from commit 64fd75d91a)
2016-06-25 00:05:40 +02:00
volzhs
356c35954a change invalid characters when get user data dir on Windows & Unix
Can't create user data folder when project name has ``\ / : * ? " < > |`` characters on OS_Windows & OS_Unix.
So, change it to ``-`` to be able to make folder.

fixes #4928 and it's altanative to #4986.

(cherry picked from commit 9073dc9963)
2016-06-25 00:05:00 +02:00
Rémi Verschelde
ff91f409bf Merge pull request #5224 from zaps166/2.0-fix-theora-no-audio
Fix Theora video playback without a Vorbis stream
2016-06-17 19:58:39 +02:00
Błażej Szczygieł
763b29f34e Fix Theora video playback without a Vorbis stream
- prevent audio resampler errors when number of channels is 0,
- don't check for 'audio_done' when there is no audio data.
2016-06-17 13:38:47 +02:00
Rémi Verschelde
d412cb65be Doc: Make rst files as UTF-8 2016-06-05 00:19:45 +02:00
Rémi Verschelde
da8fb5de7a classref: Sync with source 2016-06-05 00:11:15 +02:00
J08nY
845a0e2566 Added InputMap.get_actions()
get_actions() lists all actions in the InputMap.

(cherry picked from commit 1a80b2a04a)
2016-06-05 00:03:48 +02:00
marcelofg55
bed17e98c8 Right click->Quit on the godot icon will now close the application on OSX.
Fixed get_window_position that missed a return on OSX.

(cherry picked from commit 76ab7d3886)
2016-06-05 00:03:30 +02:00
Warlaan
c6ef223498 The create dialog starts collapsed now.
The original behavior can be reactivated in the editor settings.

(cherry picked from commit 987192775a)
2016-06-05 00:01:29 +02:00
J08nY
8a7c4c017f Fix typo in http_client.h
(cherry picked from commit b4fb4a131d)
2016-06-05 00:00:28 +02:00
volzhs
f22e13d24e deselect in help when click somewhere
(cherry picked from commit bf22e69822)
2016-06-05 00:00:17 +02:00
George Marques
47f8da5409 Fix Color8 constructor using wrong value range
Fix #5015

(cherry picked from commit 43dad78209)
2016-06-05 00:00:08 +02:00
J08nY
8ea940e99b Added classref for HTTPClient and HTTPRequest
(cherry picked from commit 4c5439f8cd)
2016-06-04 23:59:45 +02:00
Rémi Verschelde
f97cbdec8f Update to libpng 1.5.27
No security relevant fix as far as I can see, but the version bump
does not hurt either.

(cherry picked from commit bc25492e63)
2016-06-04 22:20:46 +02:00
Warlaan
fc15a842af Added classes' short descriptions as tooltips in the create dialog.
(cherry picked from commit fe3a68c4c2)
2016-06-04 22:20:33 +02:00
George Marques
6d45fc0717 Remove Make-related flags from Android build
They were wrongly placed, creating a file named "-fpic" instead of
applying "-fpic" to the build. This file was in .gitignore, which made it
less noticiable.

This also adds build.gradle to .gitignore.

(cherry picked from commit 408c26ce0b)
2016-06-04 22:20:02 +02:00
P-GLEZ
298be3356f StaticBody documentation
Documented StaticBody. Also corrected an error in StaticBody2D
documentation

(cherry picked from commit 35cb75220d)
2016-06-04 22:20:02 +02:00
P-GLEZ
436e968b43 classref: Area documentation
One method was missing.

(cherry picked from commit 0325944ee4)
2016-06-04 22:20:02 +02:00
Andreas Haas
2b06d7e6f7 Make Color.{rgba}8 return int instead float
According to the class doc, these should be int.
Also fixed a little bug: the setter for 'r8' changed the green value

(cherry picked from commit da3247a500)
2016-06-04 22:20:02 +02:00
P-GLEZ
79e9917367 Area Documentation
Ported the Area2D documentation into its 3D counterpart. Also fixed some
typos

(cherry picked from commit 617530832b)
2016-06-04 22:20:02 +02:00
jmintb
3efe43fb8b Switched the space shooter demo from none fixed process to fixed process
(cherry picked from commit a9d246ea6c)
2016-06-04 22:20:02 +02:00
marcelofg55
331a0aed71 Key modifiers (Ctrl, Alt, Meta and Shift) may be used as Input keys now on OSX
(cherry picked from commit bb223869e0)
2016-06-04 22:20:02 +02:00
J08nY
39773b6b9a Added classref for RigidBody, and finished classref for Resource
(cherry picked from commit 063d507a15)
2016-06-04 22:20:02 +02:00
CowThing
566d751e39 Filling in documentation
VisibilityNotifier and VisibilityEnabler (2D and 3D).

(cherry picked from commit 3ba4e6b2ac)
2016-06-04 22:20:02 +02:00