aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/not-surt/godot into snapping2Carl Olsson2015-03-23429-1145/+8255
|\ | | | | | | | | | | Conflicts: tools/editor/plugins/canvas_item_editor_plugin.cpp tools/editor/plugins/canvas_item_editor_plugin.h
| * fix area center of gravityJuan Linietsky2015-03-222-2/+2
| |
| * Merge pull request #1487 from hurikhan/x11-window-managementJuan Linietsky2015-03-2213-51/+883
| |\ | | | | | | X11 window management
| | * removed up, down, left, right keys from the demo.hurikhan2015-03-082-12/+0
| | | | | | | | | | | | were used before for fast multiscreen setup testing.
| | * fix introduced bughurikhan2015-03-081-1/+1
| | |
| | * fixing a typo in the demohurikhan2015-03-081-0/+0
| | |
| | * added Label_MouseGrab_KeyInfohurikhan2015-03-082-0/+3
| | |
| | * Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-03-08101-837/+4746
| | |\
| | * | Renamed EXPERIMENTAL_WM_API to NEW_WM_APIhurikhan2015-02-156-15/+15
| | | |
| | * | Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-02-1548-242/+4915
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-02-1237-160/+1390
| | |\ \ \
| | * | | | cleanup + MouseGrabhurikhan2015-02-124-47/+35
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-01-236-1/+180
| | |\ \ \ \
| | * | | | | * Cleanup for PRhurikhan2015-01-226-120/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Demo shows a Dialog with not implemented methods at startup
| | * | | | | * observer scene for the demohurikhan2015-01-223-0/+176
| | | | | | |
| | * | | | | * fix compilation without scons experimental_wm_api=yeshurikhan2015-01-224-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extended the demo with an addional MouseGrab Test
| | * | | | | Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-01-2213-41/+163
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-01-202-0/+26
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-01-1913-11/+1266
| | |\ \ \ \ \ \ \
| | * | | | | | | | * multi_screen testing + bugfixeshurikhan2015-01-184-25/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ALT-TAB is working * tested on Ubuntu 14.10 Unity + LXDE * minor cleanup
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-01-17205-448/+888
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | * cleanup window state handlinghurikhan2015-01-173-43/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * first attemps in handling ALT+TABa (WIP)
| | * | | | | | | | | Make it set_minimized() + set_maximized() work in both worlds: Unity and LXDEhurikhan2015-01-171-4/+22
| | | | | | | | | | |
| | * | | | | | | | | added the following methods:hurikhan2015-01-177-18/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * set_minimized(bool) * bool is_minimized() * set_maximized(bool) * bool is_maximized()
| | * | | | | | | | | fixing the warnings in os_x11.cpphurikhan2015-01-161-12/+12
| | | | | | | | | | |
| | * | | | | | | | | rearrange the demohurikhan2015-01-162-3/+1
| | | | | | | | | | |
| | * | | | | | | | | WIP -- set_resizable() + is_resizable addedhurikhan2015-01-157-18/+91
| | | | | | | | | | |
| | * | | | | | | | | demo window set to resizeable (need a bugfix her)hurikhan2015-01-141-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'x11-window-management' of https://github.com/hurikhan/godot ↵hurikhan2015-01-141-3/+6
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into x11-window-management
| | | * | | | | | | | | Update README.mdMSC2015-01-141-3/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan2015-01-1434-77/+1032
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: platform/x11/detect.py
| | * | | | | | | | | | don't start demo in fullscreen modehurikhan2015-01-141-1/+2
| | | | | | | | | | | |
| | * | | | | | | | | | minor cleanuphurikhan2015-01-142-12/+18
| | | | | | | | | | | |
| | * | | | | | | | | | get_screen() + set_screen() addedhurikhan2015-01-148-24/+109
| | | | | | | | | | | |
| | * | | | | | | | | | Using Xinerama extension for getting screen infohurikhan2015-01-133-15/+35
| | | | | | | | | | | |
| | * | | | | | | | | | get_screen_position() addedhurikhan2015-01-137-3/+28
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into x11-window-managementhurikhan2015-01-1316-41/+195
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | introduced the scons experimental_wm_api switch:hurikhan2015-01-136-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ================================================ Usage: scons p=x11 experimental_wm_api=yes
| | * | | | | | | | | | | Merge branch 'master' into x11-window-managementhurikhan2015-01-1227-254/+677
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into x11-window-managementhurikhan2015-01-111-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Update README.mdhurikhan2015-01-111-0/+18
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Demo misc/window_management addedhurikhan2015-01-115-0/+45
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | get_screen_size() addedhurikhan2015-01-115-0/+16
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | get_screen_count() addedhurikhan2015-01-115-0/+15
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | get_window_size() + set_window_size() addedhurikhan2015-01-115-4/+33
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | get_window_position() + set_window_position() addedhurikhan2015-01-116-39/+74
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into x11-fullscreenhurikhan2015-01-1140-7722/+1146
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | First attempt of restoring the window at the old positionhurikhan2015-01-113-14/+38
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Make fullscreen-switching is working with LXDE/Openboxhurikhan2015-01-102-48/+46
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | API change to set_fullscreen(enabled,screen)hurikhan2015-01-105-10/+10
| | | | | | | | | | | | | | | |