Commit graph

216 commits

Author SHA1 Message Date
hurikhan 87be945d49 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-03-08 15:10:48 +08:00
Juan Linietsky 2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
2015-03-03 14:41:36 -03:00
Juan Linietsky 4d2198110b merges from okam repo 2015-03-03 14:39:13 -03:00
Juan Linietsky 440cc5e4b6 Merge pull request #1437 from Hinsbart/fix_win_joy
fix get joystick name from registry on some systems
2015-03-02 01:00:56 -03:00
Juan Linietsky a1f715a4da support for 2D shadow casters
Added support for 2D shadow casters.

*DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a
CanvasItem and pull this, you will lose them. Shaders now work through a
2D material system similar to 3D. If you don't want to lose the 2D
shader code, save the shader as a .shd, then create a material in
CanvasItem and re-assign the shader.
2015-03-02 00:54:43 -03:00
Hinsbart 9229d9d1bb fix get joystick name from registry on some systems 2015-02-25 16:33:08 +01:00
Juan Linietsky 5ef3f7392f support for light and normal mapping in 2D 2015-02-18 19:40:02 -03:00
greay ef565b9778 fix for “no viable conversion from 'NSPoint' (aka '_NSPoint') to 'CGPoint'” build error on OS X 2015-02-17 19:19:29 -08:00
hurikhan f5d2e1f42c Renamed EXPERIMENTAL_WM_API to NEW_WM_API 2015-02-15 18:26:49 +08:00
hurikhan ee81d4b359 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-15 17:49:34 +08:00
Juan Linietsky 2185c018f6 begin new serialization framework
also got rid of STL dependency on triangulator
2015-02-15 01:21:26 -03:00
Juan Linietsky d2f86cc09b fixes to mouse warp
-can warp now from viewport and control, in their respective coordinate
systems
-warp is now local to the window on Windows and OSX.

IF YOU RUN OSX, PLEASE TEST THIS! And make sure it works!, new code is
in OS_OSX::warp_mouse_pos. I don't have OSX so i can't test!
2015-02-14 19:22:06 -03:00
hurikhan a13e180052 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-12 15:58:29 +01:00
hurikhan df7d26ff5b cleanup + MouseGrab 2015-02-12 15:58:00 +01:00
Hinsbart 97e46194f4 fix get_joy_name() on windows 2015-02-12 04:17:29 +01:00
Rhody Lugo d67e866788 add support for CADisplayLink 2015-02-10 22:10:10 -04:30
Juan Linietsky f53b27dca3 Merge pull request #1300 from umxprime/fix/ios-init-crash
Fix init crash on iPad 1st gen device with iOS 5.1.1
2015-02-09 21:38:43 -03:00
Juan Linietsky b1ec72a799 Merge pull request #1299 from umxprime/fix/isim-sdk-path
Fix iOS Simulator SDK path for isim platform.
2015-02-09 21:38:38 -03:00
Juan Linietsky 3b3829e002 Merge pull request #1259 from laganojunior/feature/fix_modifier_key_unpress
Modifiers are unset on events for the modifier key itself
2015-02-09 21:31:39 -03:00
sambler 8baa00a6e4 Adjust x11/detect.py
Test if clang is defined in CC/CXX/LD - this allows a specific version of clang to be defined
move appending -DTYPED_METHOD_BIND to keep clang options together
move sanitize option out of use_llvm test, gcc48+ also supports sanitize=address
2015-01-27 20:40:17 +10:30
Maxime CHAPELET f9d63a7683 Fix init crash on iPad 1st gen device with iOS 5.1.1 2015-01-23 11:27:53 +01:00
Maxime CHAPELET f7b00960dd Fix iOS Simulator SDK path for isim platform. 2015-01-22 22:19:45 +01:00
hurikhan 94d94a0855 * fix compilation without scons experimental_wm_api=yes
* Extended the demo with an addional MouseGrab Test
2015-01-22 01:14:50 +09:00
hurikhan d878b3205a Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-19 21:46:03 +09:00
Manuel Lagang a4f40ec3be Fix whitespace on previous commit
Choose tabs or spaces, not both!
2015-01-17 23:06:20 -08:00
Manuel Lagang fa62125e05 Modifiers are unset on events for the modifier key itself
This patch removes modifiers when processing key events for the
particular modifier key. For example, previously a Shift keypress
would register as a Shift + Shift modifier event.

This would cause issues when a modifier key as the action key in
the input map, because unpresses of the modifier key don't match as
matching inputs for that action. E.g. if Shift is used as an action,
the stored action event is Shift + Shift modifier (as indicated
in the editor as "Shift + Shift". The unpress event does not have the
Shift modifier set, so the event of unpressing Shift + no modifier
doesn't match the action which has the modifier set.

This patch removes the shift modifier on just pressing the Shift
key down, so the action event is registered as just Shift with
no modifier (as indicated in the editor as "Shift"), which matches
the unpress event.
2015-01-17 22:40:01 -08:00
marynate 9f61a4881e Fix mingw windows build error 2015-01-18 02:08:26 +08:00
hurikhan dfb5a1d5e1 * multi_screen testing + bugfixes
* ALT-TAB is working
* tested on Ubuntu 14.10 Unity + LXDE
* minor cleanup
2015-01-18 00:28:04 +09:00
hurikhan dee27ce991 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-17 22:19:57 +09:00
Juan Linietsky 7ac7956baf Merge pull request #1188 from hurikhan/scons_colored
Scons colored
2015-01-17 09:47:02 -03:00
Juan Linietsky 07e63c3dc1 Merge pull request #1223 from NateWardawg/master
1: File path in save dialog automatically appended with correct extension if not manually added by the user.  2: Removed .bin as default extension for Linux exports as it causes problems for common file managers.
2015-01-17 09:43:00 -03:00
hurikhan f1dc00e380 * cleanup window state handling
* first attemps in handling ALT+TABa (WIP)
2015-01-17 19:43:12 +09:00
the_mech 726d379775 added nvidia optimus enablement 2015-01-17 02:48:35 +01:00
hurikhan 6185949f6a Make it set_minimized() + set_maximized() work in both worlds: Unity and LXDE 2015-01-17 02:36:07 +09:00
hurikhan 716971655e added the following methods:
* set_minimized(bool)
 * bool is_minimized()
 * set_maximized(bool)
 * bool is_maximized()
2015-01-17 00:18:45 +09:00
hurikhan f1b9953d0b fixing the warnings in os_x11.cpp 2015-01-16 14:44:41 +09:00
Nathan Warden c2ffdb05d4 Set the default Linux extension to nothing. 2015-01-15 13:00:33 -05:00
hurikhan d269344bbd WIP -- set_resizable() + is_resizable added 2015-01-15 22:50:23 +09:00
hurikhan 8a30feebbe Merge remote-tracking branch 'upstream/master' into x11-window-management
Conflicts:
	platform/x11/detect.py
2015-01-14 13:31:16 +08:00
hurikhan 7222e195e5 minor cleanup 2015-01-14 13:19:27 +08:00
hurikhan 790d8ecbb9 get_screen() + set_screen() added 2015-01-14 12:02:59 +08:00
Juan Linietsky 823d7ae3b5 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-13 11:23:05 -03:00
Juan Linietsky 7c7ab30c4e fixes 2015-01-13 11:22:56 -03:00
hurikhan f55c0e9285 Using Xinerama extension for getting screen info 2015-01-13 21:01:24 +08:00
hurikhan ce7c7a862e get_screen_position() added 2015-01-13 17:25:50 +08:00
hurikhan c0d3632667 introduced the scons experimental_wm_api switch:
================================================

Usage:
    scons p=x11 experimental_wm_api=yes
2015-01-13 15:44:39 +08:00
hurikhan 928e068f71 -try fixing LLVM color diagnostic on osx 2015-01-13 12:54:23 +08:00
hurikhan 067a0d0e64 osx support for llvm coloring added 2015-01-12 14:04:25 +08:00
hurikhan f9a4e6890b SCons: colored compilation 2015-01-12 12:54:17 +08:00
hurikhan 6b6c526048 Merge branch 'master' into x11-window-management 2015-01-12 11:30:19 +08:00