Commit Graph

3619 Commits

Author SHA1 Message Date
hondres 8e76c13dd7 don't install libevdev-dev for travis build 2016-01-29 15:42:59 +01:00
Juan Linietsky 8341038bbe -Increment resources total in scene format text, fixes #3506 2016-01-29 08:51:51 -03:00
Ariel Manzur 593b01b709 audio crash 2016-01-29 07:18:53 -03:00
tmt 2447c3171f File: Added delimiter to get_csv_line 2016-01-28 23:20:18 +01:00
Rémi Verschelde 4e199a4a07 Merge pull request #3500 from Hinsbart/dpad-inputmap
fix dpad left/right not showing correctly in project settings
2016-01-28 21:14:16 +01:00
hondres 54d53e0a78 fix dpad left/right not showing correctly in project settings 2016-01-28 20:53:15 +01:00
hondres 11e4c128ac x11: use different strings for WM_CLASS depending on context 2016-01-27 21:53:37 +01:00
Rémi Verschelde 0c7e7e2c28 Merge pull request #3470 from MarianoGnu/master
Get color constructor from ColorPicker
2016-01-27 19:08:22 +01:00
Rémi Verschelde 9a2dd3ebbb Merge pull request #3490 from TheHX/issue-3453
Fix input passing to script editor even if not visible
2016-01-27 18:10:25 +01:00
Franklin Sobrinho d6adb9b9c2 Fix input passing to script editor even if not visible 2016-01-27 13:56:05 -03:00
Rémi Verschelde 9e2736b984 Merge pull request #3485 from TheHX/issue-3465
Fix animation toolbar
2016-01-27 17:29:55 +01:00
Rémi Verschelde 928156652c Merge pull request #3487 from TheHX/issue-3461
Fix Tree Slider disappearing when clicking on it
2016-01-27 17:28:07 +01:00
Franklin Sobrinho 05a85894da Fix Tree Slider disappearing when clicking on it 2016-01-27 12:24:49 -03:00
Franklin Sobrinho 9f5d537993 Fix animation toolbar 2016-01-27 11:10:51 -03:00
Rémi Verschelde 5fc5882b42 Merge pull request #3484 from akien-mga/pr-travis-badge
Add travis-ci badge to show the status of master
2016-01-27 15:08:47 +01:00
Rémi Verschelde 050caee122 Add travis-ci badge to show the status of master 2016-01-27 14:24:55 +01:00
Hondres e7b6e3f20b use fallback mapping from list 2016-01-27 12:18:34 +01:00
Juan Linietsky 1d99e71d94 defer project export filesystem update if not visible 2016-01-27 07:23:51 -03:00
punto- 93bef9b9b1 Merge pull request #3471 from Hinsbart/remove_libevdev
remove dependancy on libevdev
2016-01-27 04:32:27 -03:00
George Marques 1c76e50384 Merge pull request #3475 from vnen/fix-3473
Remove strand debug print, fix #3473
2016-01-26 22:42:34 -02:00
George Marques 38c557114b Remove strand debug print, fix #3473 2016-01-26 22:39:20 -02:00
George Marques f1da0d5ffc Merge pull request #3474 from vnen/restore-theora-opt
Revert "make msvc 64bits build again"
2016-01-26 22:30:36 -02:00
George Marques 82b24bea6f Revert "make msvc 64bits build again, fixes #3098"
This reverts commit b21ce6cecb.
2016-01-26 22:26:04 -02:00
MarianoGNU c927409f25 Get color constructor from ColorPicker 2016-01-26 19:10:56 -03:00
hondres 29353808f0 remove dependancy on libevdev 2016-01-26 23:04:57 +01:00
Rémi Verschelde 600411b433 Merge pull request #3467 from MarianoGnu/master
Focus and select line edit every time color is changed. Fixes #2586
2016-01-26 21:48:53 +01:00
Rémi Verschelde 9cafd47ed8 Merge pull request #1453 from adolson/remove-inspector-headings
remove column titles in property inspector
2016-01-26 21:29:02 +01:00
Rémi Verschelde 8e70f59346 Merge pull request #3462 from TheHX/pr-issue-3353
Fix wrong position of LineEdit in Scene editor
2016-01-26 21:27:20 +01:00
MarianoGNU 5d3fb49826 Focus and select line edit every time color is changed. Fixes #2586 2016-01-26 17:24:58 -03:00
Franklin Sobrinho 66eb28b945 Fix wrong position of LineEdit in Scene editor 2016-01-26 16:03:28 -03:00
Rémi Verschelde ba4f9d1be3 Merge pull request #3459 from est31/master
Add gradle files to gitignore
2016-01-26 17:54:24 +01:00
est31 f0b3bf6a1b Add gradle files to gitignore 2016-01-26 17:54:09 +01:00
Rémi Verschelde 62a574dad9 Merge pull request #3458 from TheHX/pr-issue-3457
Fix crash when renaming nodes using focus loss
2016-01-26 17:35:39 +01:00
Franklin Sobrinho 081df6e8ba Fix crash when renaming nodes using focus loss 2016-01-26 13:25:04 -03:00
Rémi Verschelde e5c5f58085 Merge pull request #3454 from Hinsbart/joydemo
small cosmetic change to joystick demo (handle joy_connection_changed)
2016-01-26 15:22:11 +01:00
hondres 31d441f409 update joystick demo with joy_connection_changed handling 2016-01-26 14:33:12 +01:00
punto- 1c900b130b Merge pull request #3450 from Hinsbart/clear-joy-state
clear joystick state on disconnection
2016-01-26 09:21:28 -03:00
hondres 4d17eca504 clear joystick state on disconnection 2016-01-26 04:40:04 +01:00
Rémi Verschelde e4cb104e6d Merge pull request #3449 from akien-mga/documentation-update
Sync API reference with current code
2016-01-26 00:22:39 +01:00
Rémi Verschelde ac3aa29c24 Sync API reference with current code 2016-01-26 00:19:47 +01:00
Rémi Verschelde 7af864f467 Merge pull request #3445 from akien-mga/master
Add missing return for typeof() MethodInfo
2016-01-26 00:03:33 +01:00
Juan Linietsky 0be3c3084a bump to beta 2016-01-25 19:46:12 -03:00
Juan Linietsky 094f0767d8 -Fix input bug on window ordering due to foretting to sort root items 2016-01-25 10:39:55 -03:00
Juan Linietsky 5245adcf81 Merge branch 'master' of https://github.com/godotengine/godot 2016-01-25 10:30:47 -03:00
Juan Linietsky 07e7909480 -Changed how popups work in Viewport to make them a lot less invasive to the scene tree 2016-01-25 10:30:03 -03:00
Rémi Verschelde 87517c564b Merge pull request #3436 from neikeq/rm_dbg_x
Removed debugger X (hide) button
2016-01-25 11:02:26 +01:00
Rémi Verschelde 6eb616087d Merge pull request #3432 from TheHX/pr-groups-editor
Groups Editor: Clear LineEdit after creating a new group
2016-01-25 10:59:27 +01:00
Rémi Verschelde f2e5b0f5fb Merge pull request #3422 from Hinsbart/fixjoydoc
replace InputEvent references with GlobalScope in joystick doc
2016-01-25 10:59:13 +01:00
Rémi Verschelde 6ceb1c3a9f Merge pull request #3440 from TheHX/issue-2946
Fixed small inconsistencies with the text format
2016-01-25 10:58:50 +01:00
Rémi Verschelde e38b797c97 Add missing return for typeof() MethodInfo 2016-01-25 10:55:50 +01:00