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

7657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
177aff0aaf Merge pull request #9347 from bojidar-bg/7312-quick-input-edit 
Allow input mappings to be edited
 2017-06-26 23:00:55 +02:00
Rémi Verschelde
e65f444726 Merge pull request #9385 from toger5/theme_item_list 
margins for item list
 2017-06-26 22:56:38 +02:00
Rémi Verschelde
f2bc0cc966 Merge pull request #9370 from bojidar-bg/c-9318-oneway-tilemaps 
Add one-way collisions and individual shape offsets for tilesets
 2017-06-26 22:47:26 +02:00
Rémi Verschelde
f7b77e5b76 Merge pull request #9318 from bojidar-bg/readd-normal-tilemap 
Add normal map to tilemaps and tilesets
 2017-06-26 22:47:11 +02:00
toger5
5374145afa margins for item list 
- without margins there are too little gaps on the left and the selecting looks weird
 - also changed the styles for selected and focus so they both have the same size
 2017-06-26 13:45:36 -07:00
Rémi Verschelde
8ca690bbd7 Merge pull request #9401 from godotengine/revert-9400-revert-9379-regex_bind_fix 
Revert "Revert "Fixed RegEx::search missing return type hint""
 2017-06-26 22:38:22 +02:00
Rémi Verschelde
a50fb2f729 Revert "Revert "Fixed RegEx::search missing return type hint"" 2017-06-26 22:38:11 +02:00
Juan Linietsky
682a6de8e1 Merge pull request #9400 from godotengine/revert-9379-regex_bind_fix 
Revert "Fixed RegEx::search missing return type hint"
 2017-06-26 17:36:50 -03:00
Juan Linietsky
340c0ba0a0 Revert "Fixed RegEx::search missing return type hint" 2017-06-26 17:36:42 -03:00
Rémi Verschelde
5590dd7fb4 Merge pull request #9378 from nunodonato/selectimport 
Update import dock when editing a resource from the inspector
 2017-06-26 22:34:37 +02:00
Rémi Verschelde
0db10b9992 Merge pull request #9379 from leezh/regex_bind_fix 
Fixed RegEx::search missing return type hint
 2017-06-26 22:33:16 +02:00
Rémi Verschelde
4b85b66339 Merge pull request #9393 from leezh/regex_capture_fixes 
RegEx fixes #9382
 2017-06-26 22:23:32 +02:00
Zher Huei Lee
f01ce3276e Fixed inverted group thrown off by quantifiers 2017-06-26 15:25:10 +08:00
Rémi Verschelde
36548a3fa5 gitignore: Remove pre-.gen filenames 
@Noshyaar was right to remove them in the first place,
we need users with local clones to clean them up to prevent
older .cpp files from being including by globbing.
 2017-06-26 09:17:19 +02:00
dotquixote
23f10c31de ConeTwistJoint: Initialize 'm_angularOnly'. 2017-06-26 09:17:19 +02:00
Zher Huei Lee
382db0898e Fixes RegEx capture grabbing too much #9382 
Incorrect behaviour was caused when next->test was throwing off the
results.
 2017-06-26 15:16:33 +08:00
Rémi Verschelde
03bfa47636 Merge pull request #9384 from toger5/tree_bgcolor_draw_order 
tree fix drawing order for header and removed indentation for custom bg colours
 2017-06-26 09:08:51 +02:00
Rémi Verschelde
c9c3db3206 Merge pull request #9383 from toger5/theme_margin_tree_fix 
style box margins for Inspector and list.
 2017-06-26 09:08:09 +02:00
toger5
3d89893cb8 style box margins for Inspector and list. 2017-06-25 17:21:12 -07:00
toger5
b941931c95 tree fix drawing order for header + 
- the collapse arrow gets drawn after the background so its not hidden underneath anymore
 - custom_bg_color no offset anymore
 2017-06-25 17:12:36 -07:00
Juan Linietsky
8caa21a4a9 Merge pull request #9381 from godotengine/revert-9350-x11-ime 
Revert "Workaround for IME on Linux."
 2017-06-25 20:10:19 -03:00
Juan Linietsky
e79e135841 Revert "Workaround for IME on Linux." 2017-06-25 20:09:16 -03:00
Nuno Donato
41029c71d2 Update import dock when editing a resource from the inspector 2017-06-25 23:12:34 +01:00
Juan Linietsky
d41978eb63 Usability improvements for folding. Unfortunately SpatialMaterial broke compatibility. 2017-06-25 18:57:28 -03:00
Zher Huei Lee
1e1b2d22ad Fixed RegEx::search missing return type hint 2017-06-26 05:52:56 +08:00
Juan Linietsky
760cdbe1a3 -Added folding to property editor, persistent on objects it edits 
-Some changes to tree to support this properly
 2017-06-25 17:31:22 -03:00
Bojidar Marinov
207feb2f87
Add one-way collisions and individual shape offsets for tilesets 
As requested in #9318
Accidentially fixes #2231 as well
 2017-06-25 21:47:30 +03:00
Rémi Verschelde
826784d965 Merge pull request #9357 from GodotExplorer/pr-fix-string-copy_from 
Fix crash with String::copy_from with NULL string parameter
 2017-06-25 16:17:42 +02:00
geequlim
4b2a44054a Fix crash with String copy from with NULL string parameter 2017-06-25 21:57:06 +08:00
Rémi Verschelde
e5d890c23a i18n: Update template and sync translations 2017-06-25 14:19:51 +02:00
Rémi Verschelde
d9813ba826 i18n: Sync translations with Weblate 
Adds Finnish translation.
 2017-06-25 14:16:14 +02:00
Bojidar Marinov
8804c24d82
Allow input mappings to be edited 
Closes #7312
 2017-06-25 14:35:34 +03:00
Rémi Verschelde
515c714225 Merge pull request #9361 from RameshRavone/patch-1 
Fixes method bind (Curve)
 2017-06-25 13:09:37 +02:00
Ramesh Ravone
c6e295c399 Fixes method bind 2017-06-25 16:35:39 +05:30
Juan Linietsky
83ae9a5e28 Ability to restart particle system with a function call 2017-06-25 08:01:50 -03:00
Rémi Verschelde
87fd71244b Merge pull request #9334 from Noshyaar/pr-genh 
BuildSystem: generated files have .gen.extension
 2017-06-25 11:08:36 +02:00
Rémi Verschelde
8efd835009 Merge pull request #9348 from bojidar-bg/9299-save-device-ids 
Make the InputEvent device property get saved
 2017-06-25 10:55:03 +02:00
Rémi Verschelde
1b9f31dc15 Merge pull request #9350 from sowfelicity/x11-ime 
Workaround for IME on Linux.
 2017-06-25 10:48:27 +02:00
Rémi Verschelde
41bbf106e6 Merge pull request #9349 from volzhs/freetype-2.8 
Update freetype to 2.8
 2017-06-25 10:42:04 +02:00
volzhs
0f8cc0fa5b Update freetype to 2.8 2017-06-25 10:41:12 +09:00
Poommetee Ketson
e3998528e0 BuildSystem: generated files have .gen.extension 2017-06-25 07:55:01 +07:00
Jia Wang
41029eb1f0 Workaround for IME on Linux(fixes #29 #7106): 
Workaround for supporting input method frameworks like SCIM,
    IBus, Fcitx, etc.

    The locale is set when the application starts.

    Workaround for input when the input context within the specified
    input method is not available.
 2017-06-25 08:17:56 +08:00
Rémi Verschelde
a2e4b80ff5 Merge pull request #9345 from nunodonato/animproperties 
Update some property names for animation keys.
 2017-06-24 23:52:31 +02:00
Rémi Verschelde
9c186a754f Merge pull request #8783 from bojidar-bg/fix-range-loop-type 
Fix for..in range() resulting in floats instead of ints
 2017-06-24 23:39:55 +02:00
Juan Linietsky
898d8fd557 Merge pull request #9353 from Zylann/gradient_refactor 
GradientTexture now uses a Gradient
 2017-06-24 18:13:56 -03:00
Rémi Verschelde
68891baa1b Merge pull request #9281 from Zylann/fix_freelook_keyboard 
Fixed freelook conflict with text inputs
 2017-06-24 23:06:04 +02:00
Rémi Verschelde
44c7210387 Merge pull request #9249 from Noshyaar/pr-colorpick 
ColorPicker: fix DPI, hue & color update issues
 2017-06-24 23:02:02 +02:00
Marc Gilleron
2bb1638b0a GradientTexture now uses a Gradient 
- Added gradient property
- Deleted duplicate code
 2017-06-24 21:50:44 +02:00
Juan Linietsky
78468906ab Merge pull request #9352 from dumitru-stama/blitmaskfor30 
Added 'blit_rect_mask' for 3.0 too
 2017-06-24 13:07:23 -03:00
dumitru-stama
9ce0538ab3 Added 'blit_rect_mask' for 3.0 too 2017-06-24 08:53:54 -07:00