Commit Graph

302 Commits

Author SHA1 Message Date
Carl Olsson 6a38ab1b43 Reorder tile transforms so transpose occurs before flips. Much more intuitive for flipping transposed tiles. 2015-02-13 10:56:53 +10:00
Carl Olsson c613fb121b Moved wrapper function to TileMapEditor. 2015-02-11 21:40:50 +10:00
Carl Olsson 573ae5dd92 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	demos/2d/polygon_path_finder_demo/.fscache
2015-02-11 21:15:49 +10:00
Carl Olsson 9171f71ff5 Revert variant arg length to 5 and add 5 arg wrapper function for TileMap set_cell. 2015-02-11 21:11:14 +10:00
Juan Linietsky b4e1c1d717 Merge pull request #1327 from romulox-x/polygonPathFinderClosestPoint
changed PolygonPathFinder::get_closest_point to return the closest posit...
2015-02-11 07:12:15 -03:00
Juan Linietsky 1d54c2dd1c added missing set_shader_param functions
also added code completion hint for shader params
2015-02-11 06:51:20 -03:00
Juan Linietsky d22b256f08 customizable content margin in styleboxes 2015-02-10 23:53:04 -03:00
Juan Linietsky 3b4fd0f24d Merge pull request #1170 from UsernameIsAReservedWord/fix_cubemap_ressource_editor
fixes cubemap ressource editor bug, fixes issue #908
2015-02-09 21:37:01 -03:00
Carl Olsson ee44664b2a Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-02 21:34:47 +10:00
Carl Olsson c5bf43f6eb Working TileMap tile transpose transform. 2015-02-02 21:27:48 +10:00
romulox_x 8db3c0a4db changed PolygonPathFinder::get_closest_point to return the closest position inside, rather then the closest vertex 2015-02-01 09:23:31 -08:00
jaromirhribal 79e330c33e fixed math in Camera::project_position 2015-01-31 18:02:49 +01:00
Juan Linietsky 67d357191f begin work on lighting system for 2D
nothing functional yet, just experimenting with API
2015-01-22 11:07:16 -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
Carl Olsson a8b318871c Prep for tile transpose transform. 2015-01-19 23:07:25 +10: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
Juan Linietsky 6f3c09047e -intentional breakage of shader graph to fix issues, existing graphs will be broken, sorry :( 2015-01-18 09:51:11 -03:00
Juan Linietsky 91faf8e218 Merge pull request #1138 from sanikoyes/Pr-tween-call-deferred
Pr-tween-call-deferred
2015-01-17 09:58:57 -03:00
Juan Linietsky 7a1307f96a Merge pull request #1172 from UsernameIsAReservedWord/fix_environment_ressource_interface_to_handle_cubemap_ressource
fix_environment_ressource_cubemap_support, complete PR #1170
2015-01-17 09:56:20 -03:00
Juan Linietsky 938c6d0df3 Merge pull request #1204 from marynate/PR-new-default-theme
new default theme
2015-01-17 09:45:19 -03:00
Juan Linietsky cce0d50516 Merge pull request #1217 from sanikoyes/Pr-canvas-shader-disable-3d
Pr-canvas-shader-disable-3d
2015-01-17 09:44:22 -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
Nathan Warden cac555dc78 When overwriting a file with an auto added extension the file name is now set correctly. 2015-01-16 07:48:28 -05:00
quabug 341ea429db remove useless code 2015-01-16 15:16:58 +08:00
quabug 5823f90c53 fix bug
running into infinite loop if distance between two adjacent points in curve are too short.
2015-01-16 15:16:41 +08:00
marynate 7c430d52e9 Restore checkbutton margin to origin value, fixed issue in code search dialog 2015-01-15 13:30:00 +08:00
marynate 2ca8b2683e Minor code formatting 2015-01-15 13:30:00 +08:00
Ralf Hölzemer 7f20b864cd Tweak Button margins & small fix for ToolButton 2015-01-15 13:29:59 +08:00
Ralf Hölzemer e7893b404e fix background alpha in dropdown arrows 2015-01-15 13:29:58 +08:00
Ralf Hölzemer 5fc787abd8 Fixed the progressbar to only require 16px in height 2015-01-15 13:29:58 +08:00
Ralf Hölzemer d8f453cb39 Missing files and Tab changes 2015-01-15 13:29:56 +08:00
Ralf Hölzemer df41418677 More Theme fixes
- some color tweaks
- many margin fixes
- overall nicer look

Conflicts:
	scene/resources/default_theme/default_theme.cpp
2015-01-15 13:29:56 +08:00
Ralf Hölzemer 4b70bc1f35 Fix visual glitch in Progressbar 2015-01-15 13:29:55 +08:00
Ralf Hölzemer ae70108883 New iteration of the theme
- try to implement ndee's mockup from the forum
- new color palette
- get rid of most gradients

probably needs some more tweaks
2015-01-15 13:29:54 +08:00
Ralf Hölzemer 7b9f5e65c9 New neutral default theme
- desaturated UI elements to grey
- desaturated all near-white icons to grey
- changed some hardcoded colors
2015-01-15 13:29:53 +08:00
Nathan Warden 7d2f359a0c File path in save dialog automatically appended with correct extension if not manually added by the user. 2015-01-14 18:05:57 -05:00
Juan Linietsky 04af74596d -fix shader param names broken issue on code completion
-fix z order issue in new 2D engine
2015-01-14 09:05:33 -03:00
sanikoyes b882836184 Fix canvas shader not registered when disabled_3d=yes 2015-01-14 14:49:54 +08:00
Juan Linietsky 9012cd408e -Add support for one-way collision in 2D (only works for kinematic body so far)
-Solve drawing order bug introduced in previous commit: solves #1214
2015-01-13 21:19:11 -03: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
Juan Linietsky 869f400179 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-13 10:50:33 -03: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
marynate 3a0f665c90 Total rows of text edit was calculated wrong, fixed issue #842 2015-01-13 17:16:56 +08: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
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 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
yg2f 75c3090e9f fix_environment_ressource_cubemap_support
this fix goes hands in hands with #1170.
Cubemap ressources can be loaded and created into an Environment
ressource.
2015-01-10 15:50:27 +01:00
yg2f 5e3a4c13da fixes cubemap ressource editor bug
this fixes the cubemap ressource editor bug described in issue #908.

some other littles fixes will be required to allow the Environment
ressource to create and load Cubemap Ressources more easily
2015-01-10 15:11:44 +01:00
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 3f1dd9c57f -Fixed matrix and vec+scalar multiplication issues, fixes #1143 2015-01-07 20:29:05 -03:00
Juan Linietsky 1659f82e7e -changed type of C component of vec interp, fixes #1144 2015-01-07 19:48:38 -03:00
sanikoyes b260bfab63 Add call deferred support for Tween 2015-01-07 19:46:01 +08:00
Juan Linietsky 978769cdf1 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-07 01:46:28 -03:00
Juan Linietsky 7a0e4c822c -Visual Shader Editing Finished, PLEASE TEST! 2015-01-07 01:45:46 -03:00
UsernameIsAReservedWord 996d93f972 fixes CurveXD::interpolatef()
fixes Curve2D::interpolatef() and Curve3D::interpolatef() methods
2015-01-06 15:31:41 +01:00
Juan Linietsky b51f645711 Changes to 2D physics engine
-=-=-=-=-=-=-=-=-=-=-=-=-=-=

-Removed "density" property
-Added instead more flexible "angular damp" and "linear damp"
-Added ability to override angular and linear damp in rigidbody
-Added gravity scale option rigidbody

Test well and iron out bugs, when it works the same will be moved to 3D
2015-01-05 18:37:12 -03:00
Juan Linietsky 1ff0d5c4e5 -attempt to be friendlier on non english keyboards 2015-01-04 22:39:21 -03:00
Juan Linietsky a8bcb96ad4 -Fix shortcuts for OSX code completion, fixes #1111
-Fixed how translation fallbacks works, fixes #1011
2015-01-04 11:03:31 -03:00
Juan Linietsky f39473ae7a -Obscure bug in popups solved, fixes #1008 2015-01-03 23:27:11 -03:00
Juan Linietsky dc7ac86b79 -Completely removed EmptyControl (but added fallback), closes #1017 2015-01-03 17:24:16 -03:00
Juan Linietsky 0e1d70f637 -removed empty control 2015-01-03 16:55:07 -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 167c1027be -fixed bug on focus capture, now respets line/text edit
-when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 15:39:01 -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 85c084c770 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-03 11:09:17 -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
romulox_x c83a00c603 Changed texturebutton scale from float to Size2 2015-01-02 20:23:52 -08:00
Juan Linietsky fa7a3ac0d3 removed deadcode 2015-01-03 00:25:21 -03:00
Juan Linietsky 0df45672e7 -ability to scale and modulate texturebutton, closes #818
-fixed bug in ordering of modal subwindows, closes #1001
2015-01-03 00:23:14 -03:00
Juan Linietsky d722537154 -proper minimum size computation for TabContainer 2015-01-02 22:34:22 -03:00
Juan Linietsky 8a28af024e -fix TextEdit shift-click functionality past begin and end of selection (#1004) 2015-01-02 15:08:40 -03:00
Juan Linietsky ed8e70243f -refresh play options in property when setting samplelibrary (#1016) 2015-01-02 14:32:05 -03:00
Juan Linietsky d88e192ae4 -fix readonly issues (#1018) 2015-01-02 14:27:21 -03:00
Juan Linietsky bbaddfa70f -fixed silly bug in trigger check (#1051) 2015-01-02 13:30:59 -03:00
Juan Linietsky aa36be3c9a -typo fixed in ImmediateGeometry (#1066) 2015-01-02 13:21:07 -03:00
Juan Linietsky 2e08e11120 -fixed signal in #1075 2015-01-02 13:08:28 -03:00
Juan Linietsky aeee764971 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-02 12:55:18 -03:00
Juan Linietsky 0378e1109b -fixed NODE_OUT error in animtreeplayer #1078
-fixed randon button when editing menubutton #1079
2015-01-02 12:52:51 -03:00
marynate 61fcca7111 Add Stop pause mode implementation 2014-12-28 00:29:12 +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
romulox_x 8ff61b4d0e fixed bugs in polygon_path_finder for finding nearest points 2014-12-20 15:28:08 -08:00
Juan Linietsky a36a774897 Fixes
-=-=-=

-Added missing quaternion constructor
-code completion fixes
-winrt fixes
2014-12-20 15:30:06 -03:00
Juan Linietsky 9783f6fc96 Merge branch 'master' of https://github.com/okamstudio/godot 2014-12-20 12:32:32 -03:00
Juan Linietsky cf0a419efa WIP work on graph nodes and editing 2014-12-20 12:32:14 -03:00
sanikoyes 64f77aa8f3 1.Change interpolate_callback:p_times_in_sec argument before p_callback argument(more readable)
2.NodePath replace to instance_ID(can control object doe's not in scene tree)
3.Change interpolate types from Node to Object, can control more types(etc script class object)
4.Add pending_update counter, avoid insert/remove interpolates-list while traversal it
2014-12-19 17:13:20 +08:00
Juan Linietsky 9f5bbfc322 -improved completion options for InputEvent, shows all event types now 2014-12-18 00:56:33 -03:00
Dana Olson 1a6628f5a3 change shortcut for toggle-comment to Ctrl+K 2014-12-17 15:57:39 -05:00
Juan Linietsky c8b2a5f64a -added brace matching to go with the new code completion 2014-12-17 01:53:34 -03: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
Juan Linietsky 6851f9bfae Small Fixes
-=-=-=-=-=-

-Bug in navmesh demo fixed
-Bug in variant
-Better Collada Exporter supports proper names of exported shapekeys
2014-12-08 15:47:45 -03:00
Juan Linietsky 9df8d5f616 Merge pull request #916 from quabug/commit
Add move_child_notify method in Node class
2014-12-08 16:46:51 -02: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
Dana Olson 380f12def2 now undo/redo supported 2014-12-07 02:21:49 -05:00