Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 13:43:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,938 Commits 15 Branches 59 Tags 2.5 GiB
5a69a663c7
Commit Graph

8938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
5a69a663c7 Merge pull request #10864 from Noshyaar/pr-beginning 
Fix typo 'begining' to 'beginning'

[ci skip]
 2017-09-01 21:29:40 +02:00
Rémi Verschelde
39621bf681 Fix AnimationTreePlayer bogus argument name 
Regression from 6fa6149517.
 2017-09-01 21:29:00 +02:00
Rémi Verschelde
90a944e856 Merge pull request #10865 from neikeq/woah 
etc: Append -std=gnu++11 to CCFLAGS instead of CXXFLAGS

[ci skip]
 2017-09-01 21:25:05 +02:00
Ignacio Etcheverry
6209b72b07 Merge pull request #10862 from neikeq/fix-defvals-methodinfo 
Fixes reversed order of default arguments in MethodInfo
 2017-09-01 21:19:58 +02:00
Juan Linietsky
6fa6149517 Fix some argument ordering, closes #10010 2017-09-01 15:01:17 -03:00
Juan Linietsky
5f8df8bc11 Fix detectin of existing file being a dir in new script creation, closes #9958 2017-09-01 14:25:01 -03:00
Ignacio Etcheverry
2f79c84ff5 etc: Append -std=gnu++11 to CCFLAGS instead of CXXFLAGS 
This way it can override the -std flags passed to scons.
 2017-09-01 18:51:50 +02:00
Juan Linietsky
8f30c52a37 Removed ontop property, added a material rendering priority system. Fixes #9935, closes #10135 2017-09-01 13:01:08 -03:00
Poommetee Ketson
69ccae3d99 Fix typo 'begining' to 'beginning' 2017-09-01 22:54:57 +07:00
Ignacio Etcheverry
27ca7e7313 Fixes reversed order of default arguments in MethodInfo 2017-09-01 16:33:16 +02:00
Rémi Verschelde
6e9e25b41d Merge pull request #10861 from Noshyaar/pr-header 
Fix files header

[ci skip]
 2017-09-01 16:14:37 +02:00
Poommetee Ketson
ed606ded52 Fix files header 2017-09-01 21:07:55 +07:00
Rémi Verschelde
1e0fc4dc4e Merge pull request #10318 from endragor/ordered-hash-map 
Implement OrderedHashMap
 2017-09-01 13:09:30 +02:00
Rémi Verschelde
7c76e0c8c3 Merge pull request #10853 from leezh/pcre_html5_fix 
Disabled PCRE-JIT in HTML5. Fixes #10834

[ci skip]
 2017-09-01 12:46:41 +02:00
Zher Huei Lee
566c0f675a Disabled PCRE-JIT in HTML5. Fixes #10834 2017-09-01 18:33:04 +08:00
Rémi Verschelde
dafcd06bd1 Merge pull request #10848 from hpvb/fix-has-method-on-script 
Has_method is already provided by Object

[ci skip]
 2017-09-01 09:38:45 +02:00
Hein-Pieter van Braam
2ea5d33358 Has_method is already provided by Object 
c812c17633 introduces some extra gdscript bindings for signal discovery
and adds a binding for has_method() to Script objects. This method is
already provided by the ancestor Object.

This fixes the startup message:
ERROR: bind_methodfi: Class Script already has a method has_method
   At: core/class_db.cpp:1178.
 2017-09-01 09:04:08 +02:00
Rémi Verschelde
bf5b02cb71 Merge pull request #10832 from Paulb23/auto_indent_setting 
Added setting to toggle auto indent.
 2017-09-01 08:14:47 +02:00
Rémi Verschelde
4536c608f2 Merge pull request #10821 from rtroncoso/fix-import-defaults 
Fix import dock "Set as default" actions
 2017-09-01 08:14:28 +02:00
Rémi Verschelde
51ae90d789 Merge pull request #10841 from djrm/pr_update_builtin_types 
Updated Editor Built-In types.
 2017-09-01 08:08:42 +02:00
Rémi Verschelde
25bfd49792 Merge pull request #10840 from rtroncoso/fix-reimporter-defaults-load 
Fix importer not applying default settings
 2017-09-01 08:05:41 +02:00
Daniel J. Ramirez
f1214041c6 Updated Editor Built-In types. 2017-08-31 21:15:30 -05:00
Juan Linietsky
77ec304966 Fix special case where KinematicBody fails one way collisions by adding exclusion lists, closes #9729 2017-08-31 22:55:01 -03:00
Rodrigo Troncoso
cdc6b41663 Fix importer not applying saved default settings on load 2017-08-31 20:19:57 -03:00
Juan Linietsky
d39e79e7ec Fix issues regarding reload of resources in imported scenes. Closes #10017 2017-08-31 18:57:44 -03:00
Thomas Herzog
909c1fd120 Merge pull request #10837 from touilleMan/fix-godot_string_find_last-name 
Correct GDnative's godot_string_find_last method name
 2017-08-31 23:27:28 +02:00
Emmanuel Leblond
6151adfe8c
Correct GDnative's godot_string_find_last method name 2017-08-31 23:24:26 +02:00
Rémi Verschelde
e8eb88c643 Merge pull request #10831 from Noshyaar/pr-inertia 
Fix typo 'inetria' to 'inertia'

[ci skip]
 2017-08-31 20:43:04 +02:00
Paulb23
d586b98a20 Added setting to toggle auto indent 2017-08-31 19:42:47 +01:00
Poommetee Ketson
e5aec72bae Fix typo 'inetria' to 'inertia' 2017-09-01 01:32:29 +07:00
Rémi Verschelde
a717083235 Merge pull request #10791 from tuga3d/indent-glitch-attempt-2 
second attempt on fixing the indent glitch.
 2017-08-31 19:26:07 +02:00
Rémi Verschelde
4722593448 Merge pull request #10816 from toger5/style_box_texture_set_fill 
unified draw_center naming for (9patch,StyleBoxes)
 2017-08-31 19:16:07 +02:00
Rémi Verschelde
849d2e3462 Merge pull request #10825 from toger5/fix_import_svg_scale 
updated import settings loader to 'svg/scale' fixes: #10815
 2017-08-31 18:56:27 +02:00
toger5
3b6a65b1e4 updated import settings loader to 'svg/scale' fixes: #10815 2017-08-31 18:52:07 +02:00
Rémi Verschelde
c12a1dc53e Merge pull request #10823 from toger5/fix_VSlider_focus_non_existent 
changed-"HSlider" -> "VSlider" for focus style fixes #728
 2017-08-31 18:19:45 +02:00
toger5
afc66f2f90 changed-"HSlider" -> "VSlider" for focus style fixes #728 2017-08-31 18:02:38 +02:00
Rémi Verschelde
8cb5036b9a Merge pull request #10820 from toger5/imoporter_dock_update_label 
fixed update import label in importer dock
 2017-08-31 17:05:04 +02:00
Rodrigo Troncoso
00a3ef44da Fix import dock defaults: Set as default actions 2017-08-31 11:59:59 -03:00
Rémi Verschelde
5fac1406fd Merge pull request #10818 from Jellonator/master 
Fixed incorrect KinematicBody::_move normal return
 2017-08-31 16:59:01 +02:00
toger5
85cc4e823e fixed update import label in importer dock 2017-08-31 16:58:43 +02:00
James Beedie
6fc5d1cd37 Fixed return of KinematicBody::_move 
Fixed incorrect normal
Added missing collider velocity
 2017-08-31 10:46:21 -04:00
Juan Linietsky
5653477a30 Exposed new ClearMode function to Viewport clases, closes #9995 2017-08-31 11:15:10 -03:00
Rémi Verschelde
d57ba499cb Merge pull request #10814 from volzhs/editor-fonts-master 
Replace editor font to NotoSans and update source code pro font
 2017-08-31 16:05:26 +02:00
toger5
2aa735757a unified draw_center naming for (9patch,StyleBoxes) 
- filled -> draw_center
 - is_draw_center -> is_draw_center_enabled
 - get_draw_center -> is_draw_center_enabled
 2017-08-31 15:25:24 +02:00
Juan Linietsky
caf1447bef Contributors missing in project manager title 2017-08-31 09:50:35 -03:00
volzhs
a4a4f6dada Replace editor font to NotoSans for Latin, Arabic, Hebrew, Thai 2017-08-31 21:49:48 +09:00
Juan Linietsky
9ff19951e2 Fixed problem with non triplanar UV2 mode as described in issue. Closes #9979 2017-08-31 09:44:37 -03:00
volzhs
f031b111dd Update source code pro font to 2.030 2017-08-31 21:31:46 +09:00
Rémi Verschelde
41e1bbd30c Merge pull request #10811 from godotengine/revert-10590-fix-10589 
Revert "Fix shader function calls being assignable"
 2017-08-31 14:20:29 +02:00
Rémi Verschelde
6dd6e05662 Revert "Fix shader function calls being assignable" 2017-08-31 14:19:27 +02:00