summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-24Re-sort Area array during integration stepFabio Alessandrelli
2015-03-24Implement combine mode for areaFabio Alessandrelli
2015-03-24Use Vector for storing areasFabio Alessandrelli
2015-03-24Merge pull request #1565 from romulox-x/osx_wm_fixJuan Linietsky
fixed build error on OSX from new WM code
2015-03-23fixed build error on OSX from new WM codesteve
2015-03-23Merge pull request #1563 from romulox-x/ios_wm_fixesJuan Linietsky
fixed iphone build with new window management changes
2015-03-23fixed iphone build with new window manamenet changessteve
2015-03-23window managements functions workJuan Linietsky
but still side-functions, all API needs to be migrated to them
2015-03-23oops, fucntion was there twiceJuan Linietsky
2015-03-23small android fixJuan Linietsky
2015-03-23crash bug solved, fixes #1560Juan Linietsky
2015-03-23android fixes, please testJuan Linietsky
(can' t build android atm)
2015-03-23Merge pull request #1367 from not-surt/snapping2Juan Linietsky
Better 2D Snapping
2015-03-23Merge branch 'master' into snapping2Carl Olsson
2015-03-23Merge pull request #1549 from rollenrolm/new_api_x11_fixesJuan Linietsky
New API: build fixes for x11
2015-03-23Merge pull request #1552 from hurikhan/wm_demo_fixJuan Linietsky
new_wm_api -- window_management-demo fix
2015-03-23adjust the window_management demo to the new function nameshurikhan
2015-03-23New API: build fixes for x11rollenrolm
2015-03-23Merge branch 'master' of https://github.com/not-surt/godot into snapping2Carl Olsson
2015-03-23Add iostream include to collada plugin and change to light occluder to use ↵Carl Olsson
canvas item snap function.
2015-03-23Merge branch 'master' of https://github.com/not-surt/godot into snapping2Carl Olsson
Conflicts: tools/editor/plugins/canvas_item_editor_plugin.cpp tools/editor/plugins/canvas_item_editor_plugin.h
2015-03-22Merge pull request #1542 from jotson/wmclassJuan Linietsky
Reverted change to classHint
2015-03-22Merge pull request #1545 from okamstudio/revert-1401-inspectorupdateJuan Linietsky
Revert "Camelcased script variables will now capitalize in the inspector...
2015-03-22Revert "Camelcased script variables will now capitalize in the inspector."Juan Linietsky
2015-03-22fixes to new window management APIJuan Linietsky
-needs testing on Linux -needs testing on Windows -NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
2015-03-22Reverted change to classHintJohn Watson
Using `char wmclass[] = "Godot"` causes `xprop` to report the following for WM_CLASS: `WM_CLASS(STRING) = "\200\326\322\365\377\177", "\200\326\322\365\377\177"` This makes the Unity window manager fail to connect the running app with the icon on the launcher.
2015-03-22fix area center of gravityJuan Linietsky
2015-03-22Merge pull request #1487 from hurikhan/x11-window-managementJuan Linietsky
X11 window management
2015-03-22Merge pull request #1331 from fry-/masterJuan Linietsky
Add 2D fog of war demo
2015-03-22Merge pull request #1378 from erbridge/settings_not_checkboxJuan Linietsky
Make View > Settings a non check item
2015-03-22Merge pull request #1380 from ElectricSolstice/wparentheses_removalJuan Linietsky
Changed code to remove gcc -Wparentheses warnings.
2015-03-22Merge pull request #1396 from Spooner/fix_sprintf_errorsJuan Linietsky
Fix sprintf errors
2015-03-22Merge pull request #1401 from NateWardawg/inspectorupdateJuan Linietsky
Camelcased script variables will now capitalize in the inspector.
2015-03-22Merge pull request #1402 from ElectricSolstice/editor_match_fixJuan Linietsky
Fixed issue #1377 about script editor parenthesis matching.
2015-03-22Merge pull request #1407 from NateWardawg/documentationJuan Linietsky
Updated the internal documention for the GDScript class.
2015-03-22Merge pull request #1432 from ↵Juan Linietsky
UsernameIsAReservedWord/fixes_platform_windows_detect_py Fixes platform/windows/detect.py
2015-03-22Merge pull request #1433 from cheece/patch-1Juan Linietsky
COLLADA load morph target normals
2015-03-22Merge pull request #1438 from Spooner/fix_isometric_demoJuan Linietsky
Fix isometric demo
2015-03-22Merge pull request #1450 from theuserbl/masterJuan Linietsky
Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
2015-03-22Merge pull request #1446 from ↵Juan Linietsky
UsernameIsAReservedWord/fixes_kinematicbody_move_crash should fixes #1284 (KinematicBody .move() crash)
2015-03-22Merge pull request #1460 from MarianoGnu/masterJuan Linietsky
Create Checkbox class with support for Radio Buttons
2015-03-22Merge pull request #1480 from theuserbl/patch-2Juan Linietsky
Changed *_scene() to *_tree() in the time-example
2015-03-22Merge pull request #1512 from the-mech/masterJuan Linietsky
[Fix] make_dir_recursive on Windows
2015-03-22Merge pull request #1521 from codx/masterJuan Linietsky
Fix for InputEvent::set_as_action
2015-03-22Merge pull request #1535 from rollenrolm/hidden_filesJuan Linietsky
New option to show/hide hidden files
2015-03-22Merge pull request #1537 from rollenrolm/issue_#931Juan Linietsky
Fix issue #931: display current view name into editor's 3d scene viewpor...
2015-03-22Merge pull request #1538 from rollenrolm/issue_#1484Juan Linietsky
Fix for Issue #1484: Don't strip whitespace on line comment
2015-03-22minor commentsJuan Linietsky
2015-03-22drag & drop demo (GUI)Juan Linietsky
2015-03-22gui in 3D demo now uses area for inputJuan Linietsky