maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2829 commits 10 branches 35 tags 1.1 GiB
Commit graph

2829 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Rémi Verschelde e2fb8b7042 Merge pull request #3297 from AlexHolly/comment-some-print_lines 
comment some print_lines
 2016-01-11 11:32:09 +01:00
Rémi Verschelde 7055d38c30 Merge pull request #3309 from MarianoGnu/bug_fixing3 
Make SpriteRegionEditor remember state when switching scenes (fixes #3245)
 2016-01-11 11:28:03 +01:00
Rémi Verschelde a8a09f6180 Merge pull request #3302 from MarianoGnu/bug_fixing2 
Allow to paste resources in inspector when text_hint indicates multip…
 2016-01-11 08:53:35 +01:00
Rémi Verschelde 373af4f620 Merge pull request #3303 from TheHX/pr-script-editor 
Fix script highlighting for classes that begin with "_"
 2016-01-11 08:52:12 +01:00
Rémi Verschelde 4c090313bc Merge pull request #3304 from eska014/fbsd-alsa 
Give FreeBSD a chance to enable ALSA
 2016-01-11 08:50:15 +01:00
Rémi Verschelde 90e5fba1c1 Merge pull request #3300 from MarianoGnu/bug_fixing 
fix: TouchScreenButton should stop propagating action when button is …
 2016-01-11 08:47:37 +01:00
Juan Linietsky 725b61bb6c properly handle typed array constructors in VariantParser, closes #3054 2016-01-10 23:22:48 -03:00
Juan Linietsky 1a9c3a134d -Make Akien happy, fixes #3068 
(seems I wrote all the code, then forgot to use the enum...)
 2016-01-10 23:13:02 -03:00
Juan Linietsky d7015613b1 It seems everyone misses the polygon decomposer output, fixes #3069 2016-01-10 23:09:05 -03:00
Juan Linietsky 6eb742d49f -Make a rare corner case where disabling/reenabling mipmaps causes invalid texture state. Fixes #3102 2016-01-10 21:45:58 -03:00
Juan Linietsky b21ce6cecb make msvc 64bits build again, fixes #3098 
disabled assembly for msvc 64 bits, as it is not supported
 2016-01-10 21:26:34 -03:00
eska 31778e7853 Replace export pack mode "Copy" with "Exec+Zip" 
- Make "Bundle" a separate option
- Change pack mode property hint to be more expressive
 2016-01-10 23:28:14 +01:00
MarianoGNU fd14c73e67 Make SpriteRegionEditor remember state beatwhen setions (fixes #3245) 2016-01-10 19:02:32 -03:00
Juan Linietsky a120c66f98 -Removed OS.get_system_time_msec(), this is undoable on Windows and also unusable from GDscript due to precision. 
-Added, instead an OS.get_system_time_secs(), which is 32 bits friendly, fixes #3143
 2016-01-10 18:24:55 -03:00