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

3536 Commits

Author SHA1 Message Date
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
Paulb23 7928b5fef6 Current line draws behind line numbers and breakpont gutter 
(cherry picked from commit 6ae126ef9b)
 2016-06-04 22:20:02 +02:00
Rémi Verschelde 8b8a1a0cbb Icon: Remove more grey capsules behind official logo 
(cherry picked from commit e6e878e139)
 2016-06-04 22:20:02 +02:00
Julian Murgia - StraToN 5c52f4437a Documented Light2D and LightOccluder2D 
(cherry picked from commit 9ac4b29322)
 2016-06-04 22:20:02 +02:00
Julian Murgia - StraToN e8b1744325 Documented BackBufferCopy. Need validation for the different copy modes (constants) 
(cherry picked from commit defe7f18c2)
 2016-06-04 22:20:02 +02:00
Aleksandar Danilovic 24e5755e72 Fix MS Visual Studio build settings 
NMake was not setup by the vsproj=yes compilation
parameter. After attempting other possible options,
this is the best fix for our current requirements.
Compiling via NMake is implementing an alternative
to SCons, so this fix escapes out of NMake
environment while also supporting different target
builds and IDE error list integration.

Also sets -j setting to 2 so that it's easy for
people to change it to a propper value and speed it
up a bit for those that do not.

Adds two missing .gitignore Visual Studio temp files
present in Visual Studio's .gitignore.

(cherry picked from commit ca876191e5)
 2016-06-04 22:20:02 +02:00
Rémi Verschelde 1787ec12be Editor: Fix base dir when going back to project manager 
This caused the PM to load with the parameters of the previously loaded project.
Was a regression from ea751724a2. Closes #4045.

(cherry picked from commit 6fefcfd46a)
 2016-06-04 22:20:02 +02:00
MarianoGNU c67b1888b5 Remove focus from Sprite Region Editor dialog. Fixes #4751 
(cherry picked from commit e7b7dfefd3)
 2016-06-04 22:20:02 +02:00
Paulb23 7029c96221 Added, goto next and previous breakpoint and remove all, issue 1690 
(cherry picked from commit daf0ed646f)
 2016-06-04 22:20:02 +02:00
Geequlim 178168aa8a Add spaces to macros in memory.h to make C++11 compilers happy 
(cherry picked from commit 728ce570a5)
 2016-06-04 22:20:02 +02:00
Paulb23 71487793df Fix crash when redoing backspace to clear selection 
(cherry picked from commit 4a5997ec1c)
 2016-06-04 22:20:02 +02:00
Paulb23 99c948ba56 Added breakpoint markers, issue 4750 
(cherry picked from commit 72fda444d1)
 2016-06-04 22:20:02 +02:00
Ignacio Etcheverry 211a6d01bc Debugger: show error message if description is not available 
(cherry picked from commit ea9cde8842)
 2016-06-04 22:20:02 +02:00
marcelofg55 280899ee43 Added application/fat_bits property for EditorExportPlatformOSX::EditorExportPlatformOSX 
(cherry picked from commit ba0fbe4f79)
 2016-06-04 22:20:02 +02:00
Paulb23 652f82dae8 Fixed caret color not changing though properties 
(cherry picked from commit 6dd538a7ae)
 2016-06-04 22:20:02 +02:00
Carter Anderson 6844b580f6 Remove noisy print 
(cherry picked from commit 7df5249779)
 2016-06-04 22:20:02 +02:00
Daniel J. Ramirez ef4ac86656 Modified damp ranges 
(cherry picked from commit ba0baa3ca7)
 2016-06-04 22:20:02 +02:00
Daniel J. Ramirez f346733d80 Clamped some light2D ranges 
(cherry picked from commit c9350d7897)
 2016-06-04 22:20:02 +02:00
volzhs bbf08a48df fix unexpected char: '\' error on windows 
error occurred when register additional directory for android module on windows.

### config.py ###
```
def can_build(plat):
 return plat=="android"

def configure(env):
 if (env['platform'] == 'android'):
  env.android_add_res_dir("android/res")
```

(cherry picked from commit 5eb14d3af0)
 2016-06-04 22:20:02 +02:00
volzhs 4478f8cfbb use node name as filename when save scene 
fix #4723

(cherry picked from commit 9e1ee568a6)
 2016-06-04 22:20:02 +02:00
Hugo Locurcio 5ad050be2b Change the default comment color to #676767 (#4763) 
A neutral gray color, more readable than the old brown one.
(cherry picked from commit e75701e0b5)
 2016-06-04 22:20:02 +02:00
anatoly techtonik a5007d0e7a README.md docs are not wiki (#4770) 
(cherry picked from commit e56f05c690)
 2016-06-04 22:20:02 +02:00
est31 88e512547b README: use https links to main website 
Thanks @akien-mga for having given me the idea:
926df79a7c

(cherry picked from commit da54a4d693)
 2016-06-04 22:20:02 +02:00
est31 85018e185a README: Improve Documentation section 
The move was over three months ago, it is irritating
to still read "has been moved to".

(cherry picked from commit d3515a1ccb)
 2016-06-04 22:20:02 +02:00
Calinou 9b03b9e989 Change low processor usage mode to cap to 60 FPS rather than 40 FPS 
This results in smoother operation in the editor, without needing to
resort to the "Update Always" method which uses more resources than
needed.

(cherry picked from commit cc5a020afe)
 2016-06-04 22:20:02 +02:00
Ariel Manzur 803438d448 SCons: using 1 env for all drivers 
(cherry picked from commit 6cf2353305)
(cherry picked from commit 12bd9ee6f2)
(cherry picked from commit 4c4d79e3c9)
(cherry picked from commit dbb4c0c9b7)
 2016-06-04 22:20:02 +02:00
marcelofg55 4dc2d78d2e Added 'fat' option for bits param on scons for osx, this will produce a fat binary that contains both 32 bits and 64 bits binaries 
(cherry picked from commit eeb83982e2)
 2016-06-04 22:20:02 +02:00
Geequlim c2f48421d1 Document the FileDialog and partial OS methods 
(cherry picked from commit a92652d578)
 2016-06-04 22:20:02 +02:00
captainwasabi 08fa7a0ff1 Fix for tooltip blinking (#4713) 
Moved where active tooltips are canceled to wait until the mouse actually moves off the control.
(cherry picked from commit 4b80895082)
 2016-06-04 22:20:02 +02:00
Bojidar Marinov bea5135518 Fix a XML error with the documentation 
(cherry picked from commit d208572906)
 2016-06-04 22:20:02 +02:00
Paulb23 e95eb4b1dc Multiline duplication, issue #4661 
(cherry picked from commit 2eb4e7c103)
 2016-06-04 22:20:02 +02:00
Rémi Verschelde 01bdfa4d22 Android buildsystem: Drop obsolete NDK_TOOLCHAIN argument 
It was a duplicate of NDK_TARGET, and not used for anything.
(cherry picked from commit 5e0f0a962a)
 2016-06-04 22:20:02 +02:00
Wilhem Barbier 16d38b199a Check the save path before importing a 3D Mesh 
(cherry picked from commit f38473f65b)
 2016-06-04 22:20:02 +02:00
Rémi Verschelde 1d85dcb1fa GDScript: Fix method info for is_nan and is_inf 
As reported on https://godotengine.org/qa/4114/why-isnan-and-isinf-arent-implemented
(cherry picked from commit b58e261d41)
 2016-06-04 22:20:02 +02:00
CowThing c6e2c0f01d Filling in documentation. 
AABB, Color, Rect2, Transform, Vector2, and Vector3.

(cherry picked from commit 0749db2cf8)
 2016-06-04 22:20:02 +02:00
Paulb23 481c076feb Fixed hex notation highlighting 
(cherry picked from commit b2bf266ddc)
 2016-06-04 22:20:02 +02:00
Paulb23 86c0438f9d Member variable syntax highlighting 
(cherry picked from commit fc9f9adcb2)
 2016-06-04 22:20:02 +02:00
Bojidar Marinov d7e4fb4365 Save member information in docdata 
Closes #4609

(cherry picked from commit 4cbf74da71)
 2016-06-04 22:20:02 +02:00
volzhs a3979cc928 Add SpinBox to Lossy Quality on Image Groups 
fixes #3653

(cherry picked from commit 82600944bd)
 2016-06-04 22:20:02 +02:00
Daniel J. Ramirez 1864745e2a Documented @GlobalScope singletons and some keys 
(cherry picked from commit cb0be4adaa)
 2016-06-04 22:20:02 +02:00
Rémi Verschelde 0a64059937 Merge pull request #5021 from zaps166/2.0-last_sample_playing-fix 
SampleLibraryEditor: Initialize "is_playing" variable
 2016-06-03 20:02:46 +02:00
Błażej Szczygieł 9acb666320 SampleLibraryEditor: Initialize "is_playing" variable 
Fixes crash caused by jumping to wrong place due to uninitialized
variable.

Closes #4703
 2016-06-03 19:54:25 +02:00