| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | improve reporting of error in wrong inheritance for autoload script | Juan Linietsky | 2016-01-13 | 2 | -4/+5 |
| | | |||||
| * | attempt another fix | Juan Linietsky | 2016-01-13 | 1 | -1/+11 |
| | | |||||
| * | Reworked how autoloads are load to make sure identifiers always exist, ↵ | Juan Linietsky | 2016-01-13 | 2 | -1/+24 |
| | | | | | please check if this resolves bug #3156 | ||||
| * | Properly fix tab scrolling, fixes #3128, fixes #3314 | Juan Linietsky | 2016-01-13 | 3 | -245/+95 |
| | | |||||
| * | Merge branch 'master' of https://github.com/godotengine/godot | Juan Linietsky | 2016-01-12 | 3 | -17/+30 |
| |\ | |||||
| | * | Merge pull request #3310 from eska014/export-zip | Rémi Verschelde | 2016-01-12 | 2 | -12/+25 |
| | |\ | | | | | | | Replace export pack mode "Copy" with "Exec+Zip" | ||||
| | | * | Replace export pack mode "Copy" with "Exec+Zip" | eska | 2016-01-10 | 2 | -12/+25 |
| | | | | | | | | | | | | | | | | - Make "Bundle" a separate option - Change pack mode property hint to be more expressive | ||||
| | * | | loading unaligned pbm | Ariel Manzur | 2016-01-12 | 1 | -5/+5 |
| | | | | |||||
| * | | | Fix situation where TSCN format might crash, closes #3062 | Juan Linietsky | 2016-01-12 | 2 | -7/+14 |
| |/ / | |||||
| * | | -Properly lock and and warn about switching off contact monitoring, fixes #3041 | Juan Linietsky | 2016-01-12 | 5 | -6/+53 |
| | | | |||||
| * | | small hack to make collisionobjects work with replace, fixes #2992 | Juan Linietsky | 2016-01-12 | 1 | -0/+5 |
| | | | |||||
| * | | Merge pull request #3272 from Hinsbart/joy-binding | punto- | 2016-01-12 | 11 | -24/+226 |
| |\ \ | | | | | | | Add some joystick functions to input. Enables manipulation of mapping… | ||||
| | * | | Add some joystick functions to input. Enables manipulation of mappings at ↵ | hondres | 2016-01-08 | 11 | -24/+226 |
| | | | | | | | | | | | | | runtime | ||||
| * | | | Merge pull request #3323 from mrezai/fix-3321 | Rémi Verschelde | 2016-01-12 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | Fix crash on android 6.0.1, fixes #3321 | ||||
| | * | | | Fix crash on android 6.0.1, fixes #3321 | mrezai | 2016-01-12 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #3320 from neikeq/ed_layouts_default | Rémi Verschelde | 2016-01-11 | 2 | -31/+33 |
| |\ \ \ | | | | | | | | | Allow to override the default editor layout | ||||
| | * | | | Allow to override the default editor layout | Ignacio Etcheverry | 2016-01-11 | 2 | -31/+33 |
| | | | | | |||||
| * | | | | Merge pull request #3316 from Liangdi/master | Rémi Verschelde | 2016-01-11 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | Fix xml opt with XML_ENABLED macro | ||||
| | * | | | | Fix xml opt with XML_ENABLE macro | Liangdi | 2016-01-12 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #3319 from akien-mga/pr-copyright-2016 | Rémi Verschelde | 2016-01-11 | 42 | -43/+43 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Update copyright in remaining files + prints in the UI | ||||
| | * | | | | Update copyright in remaining files + prints in the UI | Rémi Verschelde | 2016-01-11 | 42 | -43/+43 |
| |/ / / / | |||||
| * | | | | Update bitmap_loader_pnm.cpp | punto- | 2016-01-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix issue loading binary pbm | Juan Linietsky | 2016-01-11 | 1 | -2/+5 |
| |/ / / | |||||
| * | | | Merge pull request #3308 from neikeq/keep_xform_settings | Rémi Verschelde | 2016-01-11 | 1 | -25/+47 |
| |\ \ \ | | | | | | | | | Remember Transform menu settings for the Spatial Editor | ||||
| | * | | | Remove unnecessary fail conditions when loading SpatialEditor state | Ignacio Etcheverry | 2016-01-11 | 1 | -27/+21 |
| | | | | | |||||
| | * | | | Remember Transform menu settings for the Spatial Editor | Ignacio Etcheverry | 2016-01-11 | 1 | -0/+28 |
| | | | | | |||||
| * | | | | Merge pull request #3230 from touilleMan/issue-55 | Rémi Verschelde | 2016-01-11 | 8 | -19/+10 |
| |\ \ \ \ | | | | | | | | | | | Remove unnecessary null pointer checks | ||||
| | * | | | | Remove unnecessary null pointer checks | Emmanuel Leblond | 2016-01-04 | 8 | -19/+10 |
| | | | | | | |||||
| * | | | | | Merge pull request #3257 from TheHX/pr-range-properties | Rémi Verschelde | 2016-01-11 | 2 | -10/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix error caused by dragging a Range property | ||||
| | * | | | | | Fix error caused by dragging a Range property | Franklin Sobrinho | 2016-01-06 | 2 | -10/+10 |
| | | | | | | | |||||
| * | | | | | | made headers case insensitive | Ariel Manzur | 2016-01-11 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3276 from TheHX/pr-quick-open | Rémi Verschelde | 2016-01-11 | 4 | -15/+50 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Quick open now can open multiple scenes and scripts | ||||
| | * | | | | | | Quick open now can open multiple scenes and scripts | Franklin Sobrinho | 2016-01-08 | 4 | -15/+50 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3297 from AlexHolly/comment-some-print_lines | Rémi Verschelde | 2016-01-11 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | comment some print_lines | ||||
| | * | | | | | | | comment some print_lines | Alexander Holland | 2016-01-09 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3309 from MarianoGnu/bug_fixing3 | Rémi Verschelde | 2016-01-11 | 2 | -7/+58 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make SpriteRegionEditor remember state when switching scenes (fixes #3245) | ||||
| | * | | | | | | | | Make SpriteRegionEditor remember state beatwhen setions (fixes #3245) | MarianoGNU | 2016-01-10 | 2 | -7/+58 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3302 from MarianoGnu/bug_fixing2 | Rémi Verschelde | 2016-01-11 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Allow to paste resources in inspector when text_hint indicates multip… | ||||
| | * | | | | | | | | | Allow to paste resources in inspector when text_hint indicates multiple types | MarianoGNU | 2016-01-10 | 1 | -1/+11 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3303 from TheHX/pr-script-editor | Rémi Verschelde | 2016-01-11 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix script highlighting for classes that begin with "_" | ||||
| | * | | | | | | | | | Fix script highlighting for classes that begin with "_" | Franklin Sobrinho | 2016-01-10 | 1 | -1/+5 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3304 from eska014/fbsd-alsa | Rémi Verschelde | 2016-01-11 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Give FreeBSD a chance to enable ALSA | ||||
| | * | | | | | | | | | Enable ALSA driver in non-linux X11 when available | eska | 2016-01-10 | 1 | -1/+5 |
| | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3300 from MarianoGnu/bug_fixing | Rémi Verschelde | 2016-01-11 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix: TouchScreenButton should stop propagating action when button is … | ||||
| | * | | | | | | | | | fix: TouchScreenButton should stop propagating action when button is removed ↵ | MarianoGNU | 2016-01-10 | 1 | -0/+4 |
| | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | from scene | ||||
| * | | | | | | | | | properly handle typed array constructors in VariantParser, closes #3054 | Juan Linietsky | 2016-01-10 | 1 | -2/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | -Make Akien happy, fixes #3068 | Juan Linietsky | 2016-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (seems I wrote all the code, then forgot to use the enum...) | ||||
| * | | | | | | | | | It seems everyone misses the polygon decomposer output, fixes #3069 | Juan Linietsky | 2016-01-10 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | -Make a rare corner case where disabling/reenabling mipmaps causes invalid ↵ | Juan Linietsky | 2016-01-10 | 5 | -2/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture state. Fixes #3102 | ||||
| * | | | | | | | | | make msvc 64bits build again, fixes #3098 | Juan Linietsky | 2016-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled assembly for msvc 64 bits, as it is not supported | ||||
