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

11475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
48d0336882
Merge pull request #14358 from RandomShaper/fix-vscript 
Fix function arg count not considered in VisualScript
 2017-12-09 14:18:26 +01:00
Rémi Verschelde
faa1d23cb7
Merge pull request #14420 from MattUV/fold-shortcut 
Modify shortcuts and menus to fold/unfold code
 2017-12-09 13:31:30 +01:00
Rémi Verschelde
a8ee9a6116
Merge pull request #14434 from Smjert/fix/13447/vsync 
Fixes vsync setting ignored when using a separate thread for rendering
 2017-12-09 13:21:36 +01:00
Rémi Verschelde
181ad1b051
Merge pull request #14443 from akien-mga/rcedit-wine 
Windows export: Use WINE to run rcedit on non-Windows host
 2017-12-09 13:17:02 +01:00
Rémi Verschelde
25b36f18d3
Merge pull request #12756 from Stratos695/master 
Allowing double-axis lock in RigidBody & KinematicBody (Fixes #12500)
 2017-12-09 13:01:41 +01:00
Rémi Verschelde
ae012f2381 Windows export: Use WINE to run rcedit on non-Windows host 
WINE can be either run from a provided path ("export/windows/wine"),
or looked up in the system PATH.

Fixes #14441.
 2017-12-09 11:42:08 +01:00
Rémi Verschelde
3fd1c0c76b
Merge pull request #14437 from vnen/rcedit 
Call rcedit on export for Windows desktop
 2017-12-09 10:48:19 +01:00
Rémi Verschelde
b3fbc4c956
Merge pull request #14438 from hoelzl/pr-ignore-natvis-files 
Ignore Visual Studio '*.natvis' files

[ci skip]
 2017-12-09 10:12:30 +01:00
Rémi Verschelde
3302a324a4
Merge pull request #14436 from sersoong/master-fixbugs 
Restored two items in filesystemdock menu
 2017-12-09 10:08:34 +01:00
Rémi Verschelde
43300bdcc2
Merge pull request #14432 from rminderhoud/sort_custom 
Added example for Array sort_custom function

[ci skip]
 2017-12-09 10:03:43 +01:00
Matthias Hoelzl
15af68ce60 Ignore Visual Studio '*.natvis' files 2017-12-09 05:25:49 +01:00
George Marques
78a7241911
Call rcedit on export for Windows desktop 
- Add an editor setting to read the rcedit path.
- Add settings to the export preset with icon and other exe information
(version, name, copyright, etc.)
 2017-12-09 01:31:10 -02:00
sersoong
3cdcf02d1e Restored two items in filesystemdock menu 2017-12-09 10:38:16 +08:00
Stefano Bonicatti
c067cf2c6a Fixes vsync setting ignored when using a separate thread for rendering 
Setting the vsync in the main thread, after the rendering thread starts
and takes the OpenGL context fails, so we need to do that before.
Also, for some reason, the main thread cannot make current the context
anymore.

Fixes #13447
 2017-12-09 01:43:23 +01:00
Ralph Minderhoud
9ab59343f4 Added example for Array sort_custom function 2017-12-08 18:06:45 -06:00
Rémi Verschelde
b8afafa226
Merge pull request #14384 from willnationsdev/docs-api-fix 
[DOCS] AnimationPlayer prop API fixed
 2017-12-09 00:47:20 +01:00
Rémi Verschelde
015cfc592d
Merge pull request #14421 from PJB3005/17-12-08-fix_tilemap_occluder_offset 
Fixes TileMap occluder offsets.
 2017-12-09 00:36:40 +01:00
Rémi Verschelde
2c6af835a1
Merge pull request #14423 from PJB3005/17-12-08-fix-ocludder-typo 
Fix TileSet::AutotileData::ocludder_map typo
 2017-12-08 20:51:37 +01:00
PJB3005
0221cac2fc Fix TileSet::AutotileData::ocludder_map typo 2017-12-08 20:38:36 +01:00
PJB3005
cea5078ebe Fixes TileMap occluder offsets. 
This is NOT related to #14388!

This fixes a graphical bug where the light occluders used by tilemaps weren't getting offset anymore, this they'd be positioned incorrectly.

I tried on all 3 tilemap positioning modes and it seemed to work on every one.
 2017-12-08 20:14:06 +01:00
MattUV
e669ca2576 Modify shortcuts and menus to fold/unfold code 
Fix #13180
As the same shortcut cannot be assigned to two actions, I removed the ability to fold (fold_line()) or unfold (unfold_line()) via menu (still possible by code), and there is a single fold/unfold action (toggle_fold_line()).

The new default shortcut is now Alt+F
 2017-12-08 19:21:48 +01:00
Juan Linietsky
146bdf031d
Merge pull request #14412 from hpvb/fix-thekla-atlas-build 
Fix thekla_atlas build
 2017-12-08 12:22:02 -03:00
Hein-Pieter van Braam
a974464629 Fix thekla_atlas build 
clang doesn't like c++ versions being supplied to build c source files.
 2017-12-08 16:18:36 +01:00
Juan Linietsky
372b79b0d3
Merge pull request #14409 from hpvb/import-thekla-atlas 
Import thekla_atlas
 2017-12-08 11:58:37 -03:00
Hein-Pieter van Braam
bf05309af7 Import thekla_atlas 
As requested by reduz, an import of thekla_atlas into thirdparty/
 2017-12-08 15:47:15 +01:00
Juan Linietsky
8c78ccb027 After a lot of trial and error, i think rim lighting implementation is now perfect, closes #13986 2017-12-08 11:09:03 -03:00
Rémi Verschelde
b3b4727dff
Merge pull request #14014 from kosz78/scroll-container-fix 
Fix scroll enabled in case of content fit in scroll container
 2017-12-08 08:28:29 +01:00
Rémi Verschelde
28b317966f
Merge pull request #14397 from YeldhamDev/localization_tab 
Removed style override inside the Localization tab in the Project Settings
 2017-12-08 08:26:32 +01:00
Rémi Verschelde
793a741f9c
Merge pull request #14396 from MattUV/fix-templates-link 
Fix Manage Export Templates link
 2017-12-08 08:02:19 +01:00
Rémi Verschelde
bb49357ed7
Merge pull request #13981 from Paulb23/line_highlight_and_code_folding_color 
Changed current line draw order and added code folding colour
 2017-12-08 07:56:49 +01:00
Chris Bradfield
d055031c73
Merge pull request #14395 from willnationsdev/docs2 
[DOCS] CanvasItem(Material)/Layer, ClassDB, and CollisionObject(2D)
 2017-12-07 20:16:15 -08:00
Chris Bradfield
6f764d3f0a
Merge pull request #14385 from NathanWarden/raycast_docs 
[DOCS] Finished off the RayCast documentation.
 2017-12-07 20:13:12 -08:00
Will Nations
a9c9499c73 [DOCS] CanvasItem/Material/Layer, ClassDB, CollisionObject(2D) 2017-12-07 22:12:01 -06:00
Nathan Warden
331427f55e Finished off the RayCast documentation. 2017-12-07 19:19:51 -05:00
Michael Alexsander Silva Dias
f482ed0853 Removed style override inside the Localization tab in the Project Settings. 2017-12-07 21:49:44 -02:00
MattUV
93231819c2 Fix Manage Export Templates link 
In some cases, the link to download export templates was missing.
Fixes #14391
 2017-12-08 00:46:03 +01:00
Juan Linietsky
dcab01618a Fixed is_playing funtion (was reporting wrong), closes #13928 
Made error reporting to opcode_set in gdscript a bit clearer
 2017-12-07 18:14:39 -03:00
Juan Linietsky
8717afbfe1 Added small bit of bias depending on lenght for contact shadows, fixes #12726 2017-12-07 16:19:35 -03:00
Paulb23
48ad133cf9 Changed current line draw order and added code folding color 2017-12-07 19:17:43 +00:00
Juan Linietsky
209cb3830c Exposed EditorSceneImporter to script. Added APIs to use intermediate converters more easily. 2017-12-07 15:44:20 -03:00
Will Nations
2d07fe2920 [DOCS] AnimationPlayer prop API fixed 2017-12-07 11:19:21 -06:00
Juan Linietsky
6527f2e684 Implement orbit velocity in particles (this is for 2D only, like in 2.1), closes #12764 
Fixed tangential velocity (was broken)
 2017-12-07 13:18:22 -03:00
George Marques
cac5aa498f
Merge pull request #14348 from waldson/feature-set-main-screen-plugin-icon 
Add method on EditorPlugin to set main screen plugins icons
 2017-12-07 13:16:47 -02:00
Juan Linietsky
dd892a327d Added some clean up in camera/viewport management. Fixes #12279, Fixes #12774 2017-12-07 12:13:20 -03:00
Juan Linietsky
5614902611 ability to keep user tracks when importing animations, closes #12801 2017-12-07 10:19:35 -03:00
Rémi Verschelde
fbd270bfa8
Merge pull request #14356 from volzhs/ios-delegate-master 
use application:didFinishLaunchingWithOptions: instead of application…
 2017-12-07 09:33:34 +01:00
Rémi Verschelde
96dbf19093
Merge pull request #14332 from akien-mga/clang-format 
Update style for clang-format 5.0.0, new min required version
 2017-12-07 09:18:11 +01:00
Rémi Verschelde
5e19fac987
Merge pull request #14368 from sersoong/master-addoaandscript 
Add uppercase and lowercase to rightclickmenu in scripteditor
 2017-12-07 09:17:49 +01:00
sersoong
94adf24798 Add uppercase and lowercase to rightclickmenu in scripteditor 2017-12-07 16:09:02 +08:00
Rémi Verschelde
624a2b08f3 doc: Sync classref after a496dd4d, removing NOEDITOR properties from doc 2017-12-07 08:29:38 +01:00