maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1202 commits 10 branches 35 tags 1.1 GiB
Commit graph

384 commits

Author SHA1 Message Date
Juan Linietsky
09489e3a78 lot of work on 2D lighting and isometric maps 
added a new demo, isometric_light that does full isometric sorting,
lights, shadows, etc.
 2015-03-09 02:34:56 -03:00
theuserbl
31e6c6ca8f Changed *_scene() to *_tree() 
Changed _enter_scene and _exit_scene() to _enter_tree() and _exit_tree() in the time-example, because the *_scene no longer work.
 2015-03-05 23:05:30 +01: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
Mariano Javier Suligoy
63006f6f6f Register CheckBox class to create it using editor. 2015-03-02 22:12:51 -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
Mariano Javier Suligoy
e8e9f100e5 Add CheckBox control with theme edition and radio icon avaible. 2015-03-01 11:23:05 -03:00
cheece
1444946006 COLLADA load normals from morph target 
if the file has normals use them!
 2015-02-24 20:13:21 -04:30
Carl Olsson
41686d5fdd Merge branch 'master' of https://github.com/okamstudio/godot into snapping2 2015-02-22 07:38:06 +10:00
Juan Linietsky
1d7337ba10 Merge pull request #1369 from not-surt/tile_rotation 
Tile Rotation
 2015-02-21 15:37:02 -03:00
Carl Olsson
402db5bd79 Renamed "snap to offset" to "snap relative". Better conveys meaning. 2015-02-20 22:21:59 +10:00
Nathan Warden
c6a87d3a50 Changed the tooltip message for instancing a scene. 
- Old wording was misleading as it gave the impression that you could select any node from another scene.
- New wording matches the functionality that you instance the entire scene as a single node.
 2015-02-19 11:15:13 -05:00
ElectricSolstice
0e1f34b49d Changed code to remove gcc -Wparentheses warnings. 2015-02-16 18:58:41 -08:00
Felix Laurie von Massenbach
56402900ff View > Settings isn't a check item. 2015-02-17 02:51:17 +00:00
reduz
2bea642583 -Some more work on 2D Lights (NOT FUNCTIONAL YET!) 2015-02-16 14:45:11 -03:00
Carl Olsson
196185d0be Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	scene/2d/tile_map.cpp
 2015-02-15 18:21:35 +10:00
Carl Olsson
e2c8aecb3d Better 2D Snapping 
Consolidated duplicate snapping functions into CanvasItemEditor.
Allow non-square grids.
Add grid origin offsets.
Allow seperate toggling of grid display.
Add rotation snapping.
Add offset snapping.
 2015-02-15 18:00:55 +10:00
Juan Linietsky
7ebb224ec1 Merge pull request #1362 from not-surt/tile_map_body_mode 
Added body mode property for TileMap as kinematic body
 2015-02-14 19:25:35 -03:00
Juan Linietsky
c5f509f238 New Navigation & Pathfinding support for 2D 
-Added Navigation & NavigationPolygon nodes
-Added corresponding visual editor
-New pathfinding algorithm is modern and fast!
-Similar API to 3D Pathfinding (more coherent)
 2015-02-14 12:10:15 -03:00
Carl Olsson
9d182e93a3 Added body mode property to TileMap to select between static and kinematic physics bodies. Kinematic allow use of TileMaps for moving platforms for example. 
Updated 2D Platformer demo to use kinematic TileMaps for moving platforms, in doing so discovered that the tileset was messed up and not converting properly, so fixed that too.
And in order to fix the tileset I need to activate snapping for collision polygon vertices.
 2015-02-13 20:49:21 +10:00
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
7f88df73be Merge pull request #1346 from Nulifier/import-plugin 
Added the ability to add and remove editor import plugins.
 2015-02-11 07:07:59 -03:00
Jeffrey Steward
6e54fa3d47 Added get_gui_base to the EditorNode class to allow for import plugins to create centered Popups. 
This is the function used by all the built-in import plugins. Without this, the only alternative is to add it to the EditorNode itself which messes up auto-centering and sizing.
 2015-02-10 11:17:48 -07:00
Jeffrey Steward
13dc6f53ca Added the ability to add and remove editor import plugins. 2015-02-09 23:36:16 -07:00
Juan Linietsky
80d0117b83 Merge pull request #1174 from adolson/autoreload-edited-scripts 
add option to automatically reload changed scripts
 2015-02-09 21:35:52 -03:00
Juan Linietsky
a1ff40100e Merge pull request #1243 from NateWardawg/ChangeRunSceneToRunProject 
Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)."
 2015-02-09 21:32:20 -03:00
Juan Linietsky
63a4faac3a Merge pull request #1271 from NateWardawg/NestedSceneFix 
Pr - Fixed a bug where a user could add a cyclical dependency, causing a crash.
 2015-02-09 21:24:58 -03:00
Juan Linietsky
d45a227e25 Merge pull request #1303 from erbridge/revert_menu_item 
Add a revert menu item
 2015-02-09 21:21:48 -03:00
Segey Lapin
2c8cc632d2 io_scene_dae: fixed invalid variable name 2015-02-04 04:40:09 +03:00
Carl Olsson
afa13bf868 Forgot to update tile transform buttons when picking tiles. 2015-02-03 19:51:21 +10:00
Carl Olsson
52700563bc Finish GUI for tile transform. 2015-02-02 22:28:10 +10: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
Felix Laurie von Massenbach
5e1e78b257 Show a confirmation for the revert action. 2015-01-27 00:00:07 +00:00
Felix Laurie von Massenbach
ce488e1f93 Move the Revert Scene menu item to be less intrusive. 2015-01-26 23:51:13 +00:00
Felix Laurie von Massenbach
977b190a2d Add a revert menu item. 2015-01-25 00:14:06 +00:00
Juan Linietsky
c6eabbbec5 fixed world vertex issues in canvas item shader 2015-01-21 00:57:37 -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
Nathan Warden
0e8987abaf Fixed a bug where if a scene hadn't been saved it would find a cyclical dependency. 2015-01-20 09:05:22 -05:00
Nathan Warden
92cc7b840e Fixed a bug where a user could add a cyclical dependency, causing a crash. 2015-01-19 15:47:50 -05: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
Dana Olson
5a4ef1c2cc fixes 2015-01-17 14:05:26 -05:00
Juan Linietsky
cdf3c5b0eb Merge pull request #1181 from adolson/duplicate-node-naming-prefs 
fix naming of duplicated nodes, closes #1161
 2015-01-17 09:48:11 -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
be7d8a182c Merge pull request #1225 from marynate/PR-script-editor-close-tab 
Only show Close Tab confirmation when script has unsaved change
 2015-01-17 09:42:06 -03:00
Juan Linietsky
9ce885ccd8 Merge pull request #1227 from marynate/PR-editor-line-color 
Add current_line_color editor setting for script and shader editor
 2015-01-17 09:41:47 -03:00
Juan Linietsky
bf4f439ae1 Merge pull request #1230 from ndee85/export_manager_additions 
Export Manager Fixes
 2015-01-17 09:41:24 -03:00
Carl Olsson
9bfb08830b Wrapped duplicated CellOp generation code in a function and added TileMap tile picking with Ctrl+LMB. 2015-01-17 16:48:21 +10:00
Nathan Warden
2fd9292b12 Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)." 2015-01-16 23:17:12 -05:00
Andreas Esau
904770fb91 Export Manager Fixes 
- fixed a bug where it could happen that objects did not get exported
- fixed some script errors
- added the feature to export particle dupliobjects. Now you can add objects with the particle system and get them directly exported.
 2015-01-15 22:22:12 +01:00
marynate
d0055a751b Add current_line_color ediotr setting for script and shader editor 2015-01-15 16:59:07 +08:00
marynate
d2a0f86d9f Only show Close Tab confirmation when script has unsaved change;Update Close Tab message to emphasize the fact script will be saved when closing tab;Stop dumping 'applying code' message to console 2015-01-15 15:55:18 +08:00
Ralf Hölzemer
6983cb80ea More desaturated icons 2015-01-15 13:29:57 +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
Juan Linietsky
250188e1aa Merge pull request #1215 from Qwertie-/PR-GUI 
Fixed typo in error message
 2015-01-14 08:25:18 -03:00
Luke Picciau
b734c838db Fixed typo in message 2015-01-14 12:02:55 +10:30
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
reduz
f3dc51fc69 2D shader progress 2015-01-11 20:52:42 -03:00
BenH
fc4d6765f1 Fixes #1160 
Fixed curve handles not taking current zoom level into consideration
when being dragged
 2015-01-11 12:18:10 +00:00
Dana Olson
9bbc3f0c94 fix naming of duplicated nodes, closes #1161, adds separator character preferences 2015-01-11 00:08:32 -05:00
Dana Olson
6c4e1650fb add option to automatically reload changed scripts 2015-01-10 12:55:12 -05:00
Juan Linietsky
0a6f409323 Merge pull request #1156 from marynate/PR-fix-compile-tools-no 
Fix compile error when tools=no
 2015-01-09 08:40:07 -03:00
Dana Olson
66a2adbf4b mergable version of ndee's pull request 2015-01-09 01:36:38 -05:00
marynate
e2f5cf3ef0 Fix compile error when tools=no 2015-01-09 11:20:02 +08:00
Maximillian
5b7b817c9b Merge branch 'fix_debug_process_exited_alert' 2015-01-08 09:33:40 -07:00
Maximillian
41b3a1fea3 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-08 09:30:13 -07:00
Maximillian
f1b9994cbc Fix process being debugged has exited pop up #1128 2015-01-08 09:14:56 -07: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
Maximillian
5c5519e2c8 Merge remote-tracking branch 'upstream/master' 2015-01-07 10:23:00 -07:00
Juan Linietsky
7a0e4c822c -Visual Shader Editing Finished, PLEASE TEST! 2015-01-07 01:45:46 -03:00
Maximillian
5d86f845d7 fix little mistake that made the project run each save 2015-01-06 20:35:52 -07:00
Maximillian
cf616e5845 Prompt save dialog if running a unsaved scene. Solution for #966 2015-01-06 15:28:25 -07:00
Maximillian
d8c14af546 Fix invaild path error text in project manager when no path is entered 2015-01-06 11:46:47 -07: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
dc7ac86b79 -Completely removed EmptyControl (but added fallback), closes #1017 2015-01-03 17:24:16 -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
ffd4b22e09 -add *.flags as a filter automatically when exporting, solves #1029 2015-01-03 13:10:00 -03:00
Juan Linietsky
60afd79a6e -added a check for setget while running the game , closes #1009 
-fixed issues in tilemap editor (swap arrows not showing/hiding properly)
 2015-01-03 00:57:02 -03:00
Juan Linietsky
58a67a1e0f -fixed key insert from editor window (#976) 2015-01-02 17:31:43 -03:00
Juan Linietsky
e0bcec4fb8 -make sure selected font is applied on load (#1050) 2015-01-02 13:38:31 -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
Juan Linietsky
d34f1da861 Merge pull request #1068 from jaromirhribal/master 
Blender/Maya zoom style.
 2015-01-02 11:56:32 -03:00
Juan Linietsky
cda249c6ad Merge pull request #1069 from tommy3/typo-fix 
fixed a typo
 2015-01-02 11:56:11 -03:00
Carl Olsson
4faf47eb50 Replace TileMapEditor floating tile palette with HSplitContainer. 2014-12-29 08:37:25 +10:00
tommy3
079f1b1642 fixed a typo 2014-12-28 14:34:37 +01:00
jaromirhribal
d128ec9263 added blender/maya like zoom style 2014-12-28 14:01:08 +01:00
Juan Linietsky
04362defe7 Merge pull request #985 from adolson/toggle-comment-shortcut-fix 
change shortcut for toggle-comment to Ctrl+K
 2014-12-18 09:58:13 -02:00