Commit Graph

186 Commits

Author SHA1 Message Date
Juan Linietsky 53e1694e1e New option to send canvas to render buffer
allows to use 3D environment effects for post processing such as Glow,
Bloom, HDR, etc. in 2D.
2015-03-16 01:14:59 -03: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
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
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
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
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
the_mech 726d379775 added nvidia optimus enablement 2015-01-17 02:48:35 +01:00
Nathan Warden c2ffdb05d4 Set the default Linux extension to nothing. 2015-01-15 13:00:33 -05: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 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
Juan Linietsky 66afddb3e8 -Initial (untested) implementation of 2D shaders. Probably broken, will be fixed later.
-fixed issue of opacity not working
2015-01-11 11:43:31 -03:00
Juan Linietsky d30f4e52f6 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-10 17:37:56 -03:00
Juan Linietsky 8997084831 2D Rewrite Step [1]
-=-=-=-=-=-=-=-=-=-

-Moved drawing code to a single function that takes linked list (should make it easier to optimize in the future).
-Implemented Z ordering of 2D nodes. Node2D and those that inherit have a visibility/Z property that affects drawing order (besides the tree order)
-Removed OpenGL ES 1.x support. Good riddance!
2015-01-10 17:35:26 -03:00
Rhody Lugo 08cfad00dd Create the test string to detect kb layouts directly from the unicode chars 2015-01-08 10:31:10 -04:30
Rhody Lugo d046bd88ad OS X: Add keyboard layout detection and fix build 2015-01-08 02:56:27 -04:30
Juan Linietsky 1ff0d5c4e5 -attempt to be friendlier on non english keyboards 2015-01-04 22:39:21 -03:00
Juan Linietsky ddf7457894 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-03 16:53:39 -03:00
Juan Linietsky fbdd925d9b -Work in progress visual shader editor *DOES NOT WORK YET* 2015-01-03 16:52:37 -03:00
Juan Linietsky 6b5b95bb4e -added new code completion guess locations, closes #1032
-moved commandline fix to mingw-only, should fix #1064
2015-01-03 13:03:13 -03:00
Juan Linietsky fbfb87ec4f -accelerometer precission changed to "GAME" (#1015) 2015-01-02 14:34:57 -03:00
sanikoyes 3108517406 Reduce android build size(-fvisibility=hidden)
Fix gridmap link error when disable_3d=Yes
2014-12-25 13:05:57 +08:00
Juan Linietsky 78e7777cf5 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	modules/gdscript/gd_editor.cpp

Improved code completion for InputEvent (shows members by type)
2014-12-21 11:46:28 -03:00
Juan Linietsky f7f197c409 -ability to set default textures in shader (needed for visual shader editing)
-work in progress new graph system (will replace current one)
-crash fix in s3m loader (out of bounds acess)
-fixed vbox overriding of separation (fixes empty line between section tabs)
2014-12-21 11:42:44 -03:00
Juan Linietsky a36a774897 Fixes
-=-=-=

-Added missing quaternion constructor
-code completion fixes
-winrt fixes
2014-12-20 15:30:06 -03:00
Alexander Stillich f2843209a5 Implemented PulseAudio backend and fixed audio driver selection on X11 2014-12-19 13:44:34 +01:00
Juan Linietsky d55f95e0d2 Merge branch 'master' of https://github.com/okamstudio/godot 2014-12-16 22:33:35 -03:00
Juan Linietsky bcf27feb98 New Code Completion
-=-=-=-=-=-=-=-=-=-

-Massive improvement to code completion
-Argument hinting for functions

If you manage to out-smart the code-completion in a situation where completion
should be possible to guess, let me know.

 Please enter the commit message for your changes. Lines starting
2014-12-16 22:31:57 -03:00
Juan Linietsky 089d7fa171 Small batch of fixes
-=-=-=-=-=-=-=-=-=-=
-Fixed looping error in AudioStreamResampled
-winrt port progress
-fixes in material in ambient light
2014-12-15 15:42:58 -03:00
marynate 88f58c5c26 Update ios simulator build config file to build under new ios SDK 2014-12-08 13:58:39 +08:00
Juan Linietsky 10b371516b More Fixes
-=-=-=-=-=

-Bug in saving multinline text in xml fixed. #925
-typo in android export fixed. #930
2014-12-07 11:33:57 -03:00