Commit graph

118 commits

Author SHA1 Message Date
Anton Yabchinskiy
6f93e6812e Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-21 12:03:29 +03:00
Juan Linietsky
c6eabbbec5 fixed world vertex issues in canvas item shader 2015-01-21 00:57:37 -03:00
Juan Linietsky
14ade5500f Fixed bug in 3D material
textures that failed to load should now load again properly
2015-01-20 23:58:47 -03:00
Juan Linietsky
da0d4e4dea Fixes to texscreen, fixes to white testcube 2015-01-20 22:31:32 -03:00
Juan Linietsky
11c1756257 Visual Shader Editing for 2D
Editing 2D shaders with visual editor seems to work now.
2015-01-20 20:36:25 -03:00
Juan Linietsky
a0511ed59a Color Ramp and Curve Map added to visual shader editing.
Added Color Ramp and Curve Map to shader nodes.
Fixed an issue that crashed Godot Editor right when opened.
2015-01-19 02:39:58 -03:00
Anton Yabchinskiy
d6998995b5 Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
	platform/x11/detect.py
2015-01-14 23:17:15 +03:00
sanikoyes
ffe53061cd Add missing shader function: refract 2015-01-14 00:28:18 +08:00
Juan Linietsky
2ef5a342e3 -begin work on unidirectional collision detection
-fixed performance issue in new 2D engine
-texscreen() working in shader 2D
2015-01-13 10:49:26 -03:00
Juan Linietsky
30d3658110 -fixed issue with shader not being reset on layers, closes #1199
-ability for shader to use parent shader and params, closes #1198
2015-01-12 20:44:02 -03:00
Juan Linietsky
544ce2a1db -Initial working(?) implementation of shaders for 2D. Lighting still not there though.
Check for reference:
https://github.com/okamstudio/godot/wiki/shader
2015-01-12 10:19:09 -03:00
reduz
f3dc51fc69 2D shader progress 2015-01-11 20:52:42 -03: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
Anton Yabchinskiy
b6c5cb1064 Merge branch 'master' of github.com:okamstudio/godot 2015-01-10 22:29:17 +03:00
Dana Olson
88591af4ac fix saving texture flags to *.png.flags file, closes #399 2015-01-10 02:37:00 -05:00
Rhody Lugo
d046bd88ad OS X: Add keyboard layout detection and fix build 2015-01-08 02:56:27 -04:30
Juan Linietsky
78f4b93703 Fixes to GraphEdit:
-Working area is bigger now, solves #1148
-Using Position now works, fixes #1141
-RGB ops now work, fixes #1139
-Missing bindings to GraphEdit and GraphNode added
-Shader Graph Editor Shows errors on cyclic links and missing connections
2015-01-08 00:41:34 -03:00
Juan Linietsky
7a0e4c822c -Visual Shader Editing Finished, PLEASE TEST! 2015-01-07 01:45:46 -03:00
Anton Yabchinskiy
a7875c586a Merge branch 'master' of github.com:okamstudio/godot 2015-01-05 23:56:24 +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
cef3bd026f -fixed issue with denormals in half precission, closes #1073
-added h_offset and v_offset to 3D Camera, should allow to do the same as in #1102
2015-01-03 11:06:53 -03:00
Juan Linietsky
d722537154 -proper minimum size computation for TabContainer 2015-01-02 22:34:22 -03:00
Juan Linietsky
7a5a4d135e Merge pull request #998 from sanikoyes/Pr-fix-gles2-canvas_draw_polygon
Fix RasterizerGLES2::canvas_draw_polygon can't work correct at some devi...
2015-01-02 18:07:49 -03:00
Anton Yabchinskiy
4ab1bcde35 Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
	drivers/SCsub
	platform/x11/detect.py
	platform/x11/os_x11.h
2014-12-23 23:44:07 +03: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
sanikoyes
0b7a5b8425 Fix RasterizerGLES2::canvas_draw_polygon can't work correct at some devices(like Sumsung Note2)
in some devices, gpu doe's not support uint(32bit) indies
2014-12-19 13:08:48 +08: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
Anton Yabchinskiy
ff755f93eb Merge branch 'master' of http://github.com/okamstudio/godot 2014-12-09 17:51:14 +03:00
Juan Linietsky
c79be979d4 Batch of Bugfixes
-=-=-=-=-=-=-=-=-

-Fixed Export UV XForm (should work now). #923
-Fixed enforcement of limits in property editor. #919
-Fixed long-standing bug of export editings in script inheritance. #914, #859, #756
-Fixed horrible error reporting in shader language. #912
-Added kinematic collision with plane (please test well). #911
-Fixed double animation track insert when using 2D rigs. #904
-VKey updates offset parameter in sprite edition. #901
-Do not allow anymore a script to preload itself. (does not fix #899, but narrows it down)
-Avoid connection editor from overriding selected text. #897
-Fixed timer autostart. #876
-Fixed collision layers in 3D physics. #872
-Improved operators in shader #857
-Fixed ambient lighting bug #834
-Avoid editor from processing gamepad input #813
-Added not keyword #752

Please test!
2014-12-07 02:04:20 -03:00
Anton Yabchinskiy
c29239a6f9 Add missing check for AO_ENABLED in audio_driver_ao.cpp 2014-11-28 17:09:22 +03:00
Anton Yabchinskiy
3e09c09915 Update the list of authors in libao driver sources 2014-11-24 15:56:02 +03:00
Anton Yabchinskiy
298f6be9bf Include cstring header for memset() 2014-11-22 17:54:41 +03:00
Anton Yabchinskiy
29be6da54a Cast samples_in to samples_out with reinterpret_cast<int16_t*> 2014-11-22 17:54:00 +03:00
Anton Yabchinskiy
4a3e240732 samples_in is an instance variable, prefix it with ad-> 2014-11-22 17:52:00 +03:00
Anton Yabchinskiy
e60c41be9f Fix syntax error in call to ao_play() 2014-11-22 17:49:51 +03:00
Anton Yabchinskiy
e58731ee01 Set libao sample format to 16 bits
Some plugins don't support 32 bit samples.
2014-11-22 17:37:27 +03:00
Anton Yabchinskiy
ba6d83f3e1 Check return value of ao_play() 2014-11-22 13:38:11 +03:00
Anton Yabchinskiy
f9db628d17 Write audio samples to libao device 2014-11-22 13:38:11 +03:00
Anton Yabchinskiy
4c8bfecc43 Change 0 to NULL for ao_open_live() and device
It's NULL in other places.
2014-11-22 13:38:11 +03:00
Anton Yabchinskiy
3c2e35ada9 Minor code formatting fixes in ao driver 2014-11-22 13:38:11 +03:00
Anton Yabchinskiy
2f92e2a67a Open/close libao audio device 2014-11-22 13:38:11 +03:00