summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-28-Fixed bug with scene inheritance, should work againJuan Linietsky
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-25Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky
Conflicts: drivers/ogg/SCsub drivers/vorbis/SCsub
2015-11-250theora compilation fixesJuan Linietsky
2015-11-25Merge pull request #2908 from neikeq/fix_editor_selectRémi Verschelde
Fix bugs caused by merged Script and Help tabs
2015-11-25Fix Class Reference request from Inspectorneikeq
2015-11-25Fix switching between 2D/3D/Scriptneikeq
2015-11-24Merge pull request #2907 from neikeq/fix_2887Rémi Verschelde
Fix Class Search dialog not showing
2015-11-24Fix Class Search dialog not showing upneikeq
2015-11-24Merge pull request #2906 from neikeq/help_last_searchRémi Verschelde
Remember last search help term
2015-11-24Remember last help searchneikeq
2015-11-24Merge pull request #2905 from akien-mga/masterRémi Verschelde
Fix indent
2015-11-24Fix indentRémi Verschelde
2015-11-24Merge pull request #2904 from akien-mga/masterRémi Verschelde
Fix build of ogg and vorbis drivers
2015-11-24Fix build of ogg and vorbis driversRémi Verschelde
Regression from ccd40f76e8975b679619eb3591eb56376e82a6b3
2015-11-24Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
Conflicts: main/main.cpp
2015-11-24-work in progress resourceparser and .tscn parser. Still non-functionalJuan Linietsky
-fixed theora so it can compile theoralib but not theora -fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24Merge pull request #2899 from godotengine/pr-typo-boot-splashRémi Verschelde
Fix typo, missing quote
2015-11-24Fix typo, missing quoteRémi Verschelde
2015-11-24Merge pull request #2876 from akien-mga/pr-boot-splash-debugRémi Verschelde
Silence too verbose boot splash debug info
2015-11-24Merge pull request #2872 from akien-mga/pr-load-main-sceneRémi Verschelde
Load main scene if defined when running editor from the command line
2015-11-24Merge pull request #2898 from est31/string_byte_format_docRémi Verschelde
Document string <-> byte conversion methods
2015-11-24Document byte conversion methods for Stringsest31
2015-11-24Correct retvals of String::to_ascii() and String::to_utf8()est31
Both return RawArray, not String. My fault from commit f83f96cb44a5c4f65c6271d0a98606b489adc488.
2015-11-24Merge pull request #2889 from akien-mga/pr-matrix32-membersRémi Verschelde
Fix return type of Matrix32 member vars
2015-11-23Merge pull request #2894 from neikeq/import_subscene_patchRémi Verschelde
Import Sub-Scene as root's child if no node is selected
2015-11-23Import Sub-Scene as root's child if no node is selectedneikeq
2015-11-23Fix return type of Matrix32 member varsRémi Verschelde
Thanks to @bojidar-bg for localising the issue.
2015-11-23Merge pull request #2882 from Brickcaster/20151123Rémi Verschelde
Added windows specific .gitignore for icon related change
2015-11-23Added windows specific fileBrickcaster
godot_res.res is showing up as a changed file when compiling for windows. Need to ignore it.
2015-11-23Merge pull request #2881 from bojidar-bg/reference-vector3-arrayRémi Verschelde
Document Vector3 and Vector3Array.
2015-11-23Document Vector3 and Vector3Array. Fix documentation of Vector2 and ↵Bojidar Marinov
Vector2Array.
2015-11-23Update doc with -doctool.Bojidar Marinov
2015-11-23Merge pull request #2870 from neikeq/submenu_pos_fixRémi Verschelde
Popup submenu position enhancement
2015-11-23Merge pull request #2752 from SaracenOne/shadow_colorRémi Verschelde
New shader feature: change the colour of shadows on a per-material basis
2015-11-23Merge pull request #2788 from masoudbh3/pck-file-nameRémi Verschelde
Load binaryname.pck
2015-11-23Merge pull request #2850 from TheHX/dialog_propertyRémi Verschelde
Add more properties to AcceptDialog
2015-11-23Merge pull request #2878 from zvodd/masterRémi Verschelde
Fix poorly formed documentation xml, text outside of tags
2015-11-23fix poorly formed documentation xml, text outside of tagszvodd
2015-11-23Silence too verbose boot splash debug infoRémi Verschelde
2015-11-23Merge pull request #993 from orbitcowboy/masterRémi Verschelde
sprite_3d.cpp: fixed buffer access out of bounds.
2015-11-23Merge pull request #1820 from guilhermefelipecgs/masterRémi Verschelde
Remove duplicated filter, Fix #1795
2015-11-23Merge pull request #1931 from Faless/audio_free_ridRémi Verschelde
Expose AudioServer::free(RID rid) as AudioServer.free_rid(RID rid)
2015-11-23Merge pull request #2871 from TheHX/property_editor_searchRémi Verschelde
Better PropertyEditor search
2015-11-23Merge pull request #2875 from akien-mga/pr-colormapRémi Verschelde
Make all demo icons 8-bit/color RGB(A)
2015-11-23Make all demo icons 8-bit/color RGB(A)Rémi Verschelde
Godot does not seem to like 8-bit colormaps. Fixes #2874.
2015-11-22Load main scene if defined when running editor from the command lineRémi Verschelde
If no main scene is defined, or if it's an empty string, the previous behaviour will still be used, i.e. launch the project manager. A small fix was also added not to maximize the window when opening the project manager via -editor (i.e. "godot" and "godot -e" will behave the same when no project is in the path). Fixes #2869.
2015-11-22Better PropertyEditor searchFranklin Sobrinho
2015-11-22Popup submenu position enhancementneikeq
2015-11-22Merge pull request #2859 from TheHX/property_editorJuan Linietsky
Implement name filter for PropertyEditor
2015-11-21Merge pull request #2862 from mikica1986vee/Godot_Tegra_3_fixJuan Linietsky
Tegra 3 fix