Commit Graph

3248 Commits

Author SHA1 Message Date
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
Juan Linietsky 31a4762fea Merge pull request #3435 from neikeq/output_focus_steal
Fix Output panel annoying focus steal
2016-01-25 00:30:14 -03:00
Juan Linietsky 16b8b97472 Combies driver split and spawn fix, closes #3265 2016-01-25 00:25:32 -03:00
Juan Linietsky caddcca4f4 -Many fixes to windows build system with Mingw on Windows. Fixes #2690 2016-01-25 00:21:04 -03:00
Juan Linietsky caff4000a2 Merge pull request #3441 from Hinsbart/preload-constants
can preload constants
2016-01-24 20:10:47 -03:00
Juan Linietsky 75537c661f Merge pull request #3434 from TheHX/pr-tscn-dependency
Fix .tscn not raising dependency error
2016-01-24 20:07:23 -03:00
hondres 56ce58d57c can preload constants 2016-01-24 23:45:11 +01:00
Franklin Sobrinho 1cfe20562d Fix .tscn not raising dependency error 2016-01-24 19:05:32 -03:00
Franklin Sobrinho 41ae83e415 Fixed small inconsistencies with the text format 2016-01-24 18:38:37 -03:00
Juan Linietsky 72d1f2ef30 Merge pull request #3437 from vnen/fix-3149
Change default video mode for X11
2016-01-24 17:44:26 -03:00
reduz 48d2b7f4be avoid crash when scaling tilemap too much, fixes #266 2016-01-24 17:22:17 -03:00
reduz 341f8e6d2b -remved p_peer is null error messages, fixes #1150 2016-01-24 16:59:39 -03:00
George Marques f4a39692b9 Change default window size for desktop
Fix #3149
2016-01-24 17:52:33 -02:00
reduz 45b2fe7e8b Merge branch 'master' of https://github.com/okamstudio/godot 2016-01-24 16:42:53 -03:00
reduz e997c0d242 -avoid allowing selection of canvasitems inside a viewport, fixes #1383 2016-01-24 16:41:50 -03:00
Juan Linietsky 021fc47434 Merge pull request #3431 from TheHX/pr-tscn-groups
Fix .tscn format not loading groups
2016-01-24 15:34:44 -03:00
hondres 285bcac224 can use fallback mapping on all platforms 2016-01-24 18:01:37 +01:00
Ignacio Etcheverry dd197cd6d3 Removed debugger X (hide) button 2016-01-24 16:44:59 +01:00
Ignacio Etcheverry a3e4914355 Fix Output panel annoying focus steal 2016-01-24 16:26:03 +01:00
Juan Linietsky 35a28f3442 -Take in consideration canvas layers for GUI input 2016-01-24 10:57:42 -03:00
Franklin Sobrinho d0de508ff3 Groups Editor: Clear LineEdit after creating a new group 2016-01-24 10:51:42 -03:00
Franklin Sobrinho 2493cb1e26 Fix .tscn format not loading groups 2016-01-24 10:32:46 -03:00