Juan Linietsky
84d7a559e5
Merge branch 'master' of https://github.com/godotengine/godot
2016-01-22 19:17:24 -03:00
Rémi Verschelde
ed3c73408b
Merge pull request #3412 from Hinsbart/add_mapping
...
add gamepad mapping (ps4 pad, html5/win/firefox)
2016-01-22 23:06:54 +01:00
hondres
1ad6ca0a81
add mappings and increase max number of buttons
2016-01-22 22:56:05 +01:00
Juan Linietsky
9d571d8eac
-Fix viewport converting the scren in grayness, fixes #3406
2016-01-22 18:54:43 -03:00
Rémi Verschelde
14c1d7fef0
Merge pull request #3408 from neikeq/issue_1123_fix
...
EditorNode: Ignore unhandled input if there is a dialog visible
2016-01-22 00:12:56 +01:00
Ignacio Etcheverry
88fd782060
EditorNode: Ignore unhandled input if there is a dialog visible
2016-01-21 23:51:06 +01:00
Rémi Verschelde
23be1d8639
Merge pull request #3407 from TheHX/pr-issue-1717
...
Tree and PropertyEditor confirm value change on focus loss
2016-01-21 19:33:50 +01:00
Franklin Sobrinho
06cafeac0a
Tree and PropertyEditor confirm value change on focus loss
2016-01-21 13:03:06 -03:00
Rémi Verschelde
68cc789c2a
Merge pull request #3404 from Ovnuniarchos/SetSignedData
...
set_signed_data now works correctly on pcm8 samples.
2016-01-21 14:45:10 +01:00
Ovnuniarchos
8ed13c4df4
set_signed_data now works correctly on pcm8 samples.
2016-01-21 14:40:58 +01:00
Rémi Verschelde
432e7bf839
Merge pull request #3403 from neikeq/spinbox_hold_imp
...
Fix and improved Spinbox behaviour
2016-01-21 14:18:58 +01:00
Ignacio Etcheverry
bd6f7a411c
Fix wrong local mouse pos when holding spinbox and improve behaviour
2016-01-21 14:09:30 +01:00
Rémi Verschelde
5f2f6ace27
Merge pull request #3398 from Ovnuniarchos/DocSound
...
Some low-level audio documentation.
2016-01-21 07:12:31 +01:00
punto-
8d057a6e48
Merge pull request #3400 from Hinsbart/html5-gamepad
...
html5 gamepad support
2016-01-20 22:55:20 -03:00
Hinsbart
77858b66d3
html5 gamepad support
2016-01-21 02:30:24 +01:00
Ovnuniarchos
37ee43fd5a
Documented AudioServserSW, EventPlayer and EventStream*. Corrections on AudioServer and Sample.
2016-01-21 01:17:17 +01:00
eska014
fcae3fb3ba
Merge pull request #3397 from eska014/web-export-flex-status
...
Center status display per flexbox in web export
2016-01-20 21:39:12 +01:00
eska
42b57154f0
Center status display in web export per flexbox
...
- Fix mouse button press events not arriving in canvas
- Fix right mouse button click on canvas opening context menu
2016-01-20 21:33:44 +01:00
Rémi Verschelde
1103e9970a
Merge pull request #3396 from includeLuka/master
...
Fixed wrong variable names
2016-01-20 18:06:25 +01:00
Luka
d3332a574e
Fixed wrong variable names
2016-01-20 17:48:53 +01:00
Rémi Verschelde
6e1b689b47
Merge pull request #3394 from godotengine/wider-script-panel
...
Wider initial size of the panel with scripts
2016-01-20 16:18:34 +01:00
kubecz3k
e80d7d2a91
Wider initial size of the panel with scripts
...
I believe it's size is now exactly the same how it was before commit that allowed to hide script panel entirely.
I assume previously it was 140 wide because of 70px of minimal size + 70px of offset, so now when minimal size is 0 the offset need to be 140.
2016-01-20 13:01:27 +01:00
Juan Linietsky
e7eb332799
fix export bug
2016-01-20 07:43:05 -03:00
Rémi Verschelde
55ab7d1d1c
Merge pull request #3392 from Hinsbart/html5-gamepad
...
fix string conversion in javascript export
2016-01-20 10:08:13 +01:00
hondres
c4578453fa
fix string conversion in javascript export
2016-01-20 08:59:14 +01:00
Rémi Verschelde
f2a397375e
Merge pull request #3381 from MarianoGnu/graph_zoom
...
Add zoom to GraphEdit
2016-01-20 08:00:28 +01:00
Rémi Verschelde
f3f74cf9ae
Merge pull request #3391 from eska014/web-export-page
...
Overhaul web export page
2016-01-20 07:57:07 +01:00
Rémi Verschelde
a6b7e8c24e
Merge pull request #3390 from Hinsbart/duplicate_fix
...
duplicate groups and signals
2016-01-20 07:25:34 +01:00
Juan Linietsky
c9580965ea
-Remote deploy now uses FS over USB on Android, super fast!
2016-01-20 00:29:34 -03:00
eska
696643ce18
Revamp web export page
2016-01-20 03:41:39 +01:00
Juan Linietsky
891e31b139
-Some fixes to drag and drop and canvas offset for GUI that were introduced after rewrite
2016-01-19 20:28:20 -03:00
hondres
4c753f60b1
duplicate groups and signals
2016-01-20 00:08:04 +01:00
Rémi Verschelde
d67df42cc8
Merge pull request #2180 from sketchyfun/SketchyFun
...
Billboards were displayed upside down when drawn to a render texture
2016-01-19 22:25:40 +01:00
Rémi Verschelde
e128355527
Merge pull request #3382 from Hinsbart/atlas_preview
...
thumbnail preview for AtlasTextures
2016-01-19 14:52:34 +01:00
Rémi Verschelde
1584aea71e
Merge pull request #3385 from godotengine/pr-fix-3384
...
Fix build with tools=no
2016-01-19 10:46:08 +01:00
Rémi Verschelde
5d84589e42
Fix build with tools=no
...
Fixes #3384 .
2016-01-19 10:45:12 +01:00
hondres
4cca09921d
thumbnail preview for AtlasTextures
2016-01-19 04:27:27 +01:00
MarianoGNU
76ee2035b6
Add a slider to handle zoom
2016-01-18 22:10:44 -03:00
MarianoGNU
c2aaeaaf5a
Add zoom to GraphEdit
...
Also fix some responsiveness issues:
-Box selection no longer visible when connecting.
-Allow cancel connection with mouse's right button.
2016-01-18 20:41:37 -03:00
Juan Linietsky
d1bb868a19
-fixed bug related to mouse cursor changes, fixes #3366
2016-01-18 19:49:54 -03:00
Rémi Verschelde
ebb5d6bb48
Merge pull request #3377 from volzhs/fix_keep_screen_on_ios
...
missed rename "keep_screen_on" for ios
2016-01-18 18:19:13 +01:00
volzhs
c937fd5be6
missed rename "keep_screen_on" for ios
2016-01-19 01:58:51 +09:00
Rémi Verschelde
765ffc983e
Merge pull request #3370 from Ovnuniarchos/NewShadeOpOnCenter
...
New shader nodes are now created under (more or less) the cursor.
2016-01-18 16:21:27 +01:00
Ovnuniarchos
ded1acc33e
New shader nodes are now created under (more or less) the cursor.
2016-01-18 16:02:42 +01:00
Rémi Verschelde
1469508174
Merge pull request #3364 from Max-Might/master
...
Haiku: fix build and add resource file
2016-01-18 14:51:01 +01:00
Rémi Verschelde
4481e8af5c
Merge pull request #3358 from neikeq/issue_1123
...
F5 hotkey to refresh FileDialog/EditorFileDialog
2016-01-18 14:46:17 +01:00
Rémi Verschelde
246c799c9b
Merge pull request #3345 from TheHX/pr-function-keyword
...
Removed GDScript "function" keyword
2016-01-18 14:45:35 +01:00
Rémi Verschelde
7e20c86ac7
Merge pull request #3360 from volzhs/keep-screen-on-5
...
Add ability to set "keep screen on" for android & iOS. fixes #2428
2016-01-18 14:44:49 +01:00
Rémi Verschelde
c0b9634235
Merge pull request #2854 from MarianoGnu/color_picker
...
new ColorPicker
2016-01-18 13:52:51 +01:00
Juan Linietsky
4290a25bd5
small fix
2016-01-17 22:27:56 -03:00