Kostadin Damyanov
7998197ff1
Merge remote-tracking branch 'upstream/master'
2016-01-15 22:43:54 +02:00
Rémi Verschelde
3c6dd5749d
Merge pull request #3204 from neikeq/fix_3153
...
Consider texture offset when rotating tiles
2016-01-15 16:53:16 +01:00
Rémi Verschelde
d64a9526cd
Merge pull request #2928 from akien-mga/pr-subscene-icon-in-dock
...
Moved subscene creation from scene menu to an icon on the scene dock
2016-01-15 14:34:39 +01:00
Rémi Verschelde
bd968ce2f8
Merge pull request #3324 from TheHX/pr-property-editor
...
Better search for SectionedPropertyEditor, added "All" section
2016-01-15 14:01:55 +01:00
Rémi Verschelde
1fc96e2dca
Merge pull request #3329 from SaracenOne/color_ramp_fix
...
Color Ramp Editor Plugin Fix
2016-01-15 13:54:04 +01:00
Rémi Verschelde
d4a2409334
Merge pull request #3338 from godotengine/kubecz3k-patch-1
...
Ability to hide panel with scripts
2016-01-15 13:52:29 +01:00
Rémi Verschelde
bbeac36cb5
Merge pull request #3356 from neikeq/qwe_dialog
...
Spatial/Canvas Editor: Ignore unhandled input if there is a dialog
2016-01-15 12:17:06 +01:00
Ignacio Etcheverry
e187762c2d
Spatial/Canvas Editor: Ignore unhandled input if there is a dialog
2016-01-15 11:37:45 +01:00
Rémi Verschelde
698b338bc8
Merge pull request #3351 from neikeq/issue_3348
...
Fix LineEdit not capturing text input events
2016-01-14 16:36:31 +01:00
Ignacio Etcheverry
ccbf8b42f4
Fix LineEdit not capturing text input events
2016-01-14 16:26:22 +01:00
Juan Linietsky
d222229149
properly export sample compression type option
2016-01-14 11:50:24 -03:00
Juan Linietsky
4248c84e20
-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201
2016-01-14 11:06:20 -03:00
Juan Linietsky
e2be837520
sample convert option was not being saved
2016-01-14 09:09:35 -03:00
Rémi Verschelde
0860f3c196
Merge pull request #3346 from SaracenOne/quaternion_uniform_assignment
...
Quaternion uniform assignment.
2016-01-14 09:17:36 +01:00
Rémi Verschelde
0afec85720
Merge pull request #3331 from tolga9009/fix-typo
...
Fix typo
2016-01-14 09:16:50 +01:00
Saracen
1cc5ccba1b
Allows vec4 shader uniforms to be set by quaternion variant type.
2016-01-13 22:09:07 +00:00
Rémi Verschelde
0d180b8719
Merge pull request #3343 from akien-mga/pr-type-check-autoload
...
Fix wrong type check for autoload
2016-01-13 20:43:26 +01:00
Rémi Verschelde
a44e9ebfa4
Fix wrong type check for autoload
...
Regression from c633a29
. Fixes #3342
2016-01-13 20:42:39 +01:00
kubecz3k
ca0a6c4d59
Ability to hide panel with scripts
...
Minimal horizontal size for panel with scripts was = 70, changed it to 0.
It's especially helpful if someone is working on a laptop, or just don't like to have anything on the left side of the screen.
Video that shows how it's working after the change: https://www.youtube.com/watch?v=Y_o4pOpjyhY&feature=youtu.be
2016-01-13 16:47:10 +01:00
Juan Linietsky
c633a29a39
improve reporting of error in wrong inheritance for autoload script
2016-01-13 09:42:03 -03:00
Juan Linietsky
96317566c2
attempt another fix
2016-01-13 09:10:20 -03:00
Juan Linietsky
5fca2bd4bc
Reworked how autoloads are load to make sure identifiers always exist, please check if this resolves bug #3156
2016-01-13 08:27:14 -03:00
Juan Linietsky
c4cee22510
Properly fix tab scrolling, fixes #3128 , fixes #3314
2016-01-13 07:39:31 -03:00
Tolga Cakir
f2beb66c65
Fix typo
2016-01-13 00:06:38 +01:00
Saracen
0b1f395e7d
Fixed color ramp editor plugin to allow editing color ramps while in the spatial editor.
2016-01-12 20:13:45 +00:00
Franklin Sobrinho
94a60f408a
Better search for SectionedPropertyEditor, added "All" section
2016-01-12 09:40:35 -03:00
Juan Linietsky
e47c584d77
Merge branch 'master' of https://github.com/godotengine/godot
2016-01-12 07:08:32 -03:00
Juan Linietsky
f2ae6f87a4
Fix situation where TSCN format might crash, closes #3062
2016-01-12 07:07:36 -03:00
Rémi Verschelde
f3383ded64
Merge pull request #3310 from eska014/export-zip
...
Replace export pack mode "Copy" with "Exec+Zip"
2016-01-12 10:48:57 +01:00
Ariel Manzur
761b08ec8f
loading unaligned pbm
2016-01-12 06:24:47 -03:00
Juan Linietsky
a625f7d073
-Properly lock and and warn about switching off contact monitoring, fixes #3041
2016-01-12 06:14:15 -03:00
Juan Linietsky
eab1e5b596
small hack to make collisionobjects work with replace, fixes #2992
2016-01-12 05:54:45 -03:00
punto-
7393e40452
Merge pull request #3272 from Hinsbart/joy-binding
...
Add some joystick functions to input. Enables manipulation of mapping…
2016-01-12 03:59:19 -03:00
Rémi Verschelde
8cb013a1bf
Merge pull request #3323 from mrezai/fix-3321
...
Fix crash on android 6.0.1, fixes #3321
2016-01-12 07:37:28 +01:00
mrezai
4cb14ae7d6
Fix crash on android 6.0.1, fixes #3321
2016-01-12 09:57:56 +03:30
Rémi Verschelde
0b4c088089
Merge pull request #3320 from neikeq/ed_layouts_default
...
Allow to override the default editor layout
2016-01-11 23:55:36 +01:00
Ignacio Etcheverry
60adf21bc6
Allow to override the default editor layout
2016-01-11 23:51:45 +01:00
Rémi Verschelde
1b0c408a1b
Merge pull request #3316 from Liangdi/master
...
Fix xml opt with XML_ENABLED macro
2016-01-11 23:34:44 +01:00
Rémi Verschelde
a77b786683
Merge pull request #3319 from akien-mga/pr-copyright-2016
...
Update copyright in remaining files + prints in the UI
2016-01-11 21:36:15 +01:00
Rémi Verschelde
1f1c3038c2
Update copyright in remaining files + prints in the UI
2016-01-11 21:34:22 +01:00
Liangdi
bed76b3856
Fix xml opt with XML_ENABLE macro
2016-01-12 00:40:32 +08:00
punto-
4a5db60843
Update bitmap_loader_pnm.cpp
2016-01-11 11:55:20 -03:00
Juan Linietsky
9e8f647440
fix issue loading binary pbm
2016-01-11 11:44:53 -03:00
Rémi Verschelde
e212058841
Merge pull request #3308 from neikeq/keep_xform_settings
...
Remember Transform menu settings for the Spatial Editor
2016-01-11 14:53:35 +01:00
Ignacio Etcheverry
aa9c2e68c6
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 14:43:37 +01:00
Ignacio Etcheverry
f25897527e
Remember Transform menu settings for the Spatial Editor
2016-01-11 14:00:25 +01:00
Rémi Verschelde
7f82c8d7c5
Merge pull request #3230 from touilleMan/issue-55
...
Remove unnecessary null pointer checks
2016-01-11 12:00:44 +01:00
Rémi Verschelde
cbdcd99b85
Merge pull request #3257 from TheHX/pr-range-properties
...
Fix error caused by dragging a Range property
2016-01-11 11:50:50 +01:00
Ariel Manzur
3db379376f
made headers case insensitive
2016-01-11 07:49:05 -03:00
Rémi Verschelde
cbab728049
Merge pull request #3276 from TheHX/pr-quick-open
...
Quick open now can open multiple scenes and scripts
2016-01-11 11:42:13 +01:00