Commit graph

368 commits

Author SHA1 Message Date
Juan Linietsky
d1567636f4 Merge pull request #1569 from sanikoyes/Pr-sort-sample-library
Pr-sort-sample-library
2015-04-07 20:17:16 -03:00
Juan Linietsky
5ed2600279 Merge pull request #1580 from UsernameIsAReservedWord/fixes_help_background_color_theme
fixes #332 : makes EditorHelp uses EditorSettings bg color
2015-04-07 20:15:06 -03:00
Juan Linietsky
b1bf4fcef2 Merge pull request #1591 from MostafaHassan/pr_FixCrashInVisualShader
(Fix crash) in visual shader for curve remap node
2015-04-07 20:14:10 -03:00
Juan Linietsky
9c1fef866f Merge pull request #1602 from TheHX/fix_issue_#1594
Fix Issue #1594
2015-04-07 20:12:39 -03:00
Juan Linietsky
b36e41cb71 Added a PVRTC encoder for iOS 2015-04-06 21:48:20 -03:00
Franklin Sobrinho
f77349a4c2 Better fix 2015-04-03 10:28:30 -03:00
Franklin Sobrinho
aa929bc1f1 fix_issue_#1594 2015-04-02 15:32:37 -03:00
Juan Linietsky
1572238adb merging okam changes 2015-04-02 07:22:17 -03:00
mostafahassan
78d734873d Fixed crash when trying to add keypoints and deleting them while holding mouse button down. 2015-03-31 22:49:11 +02:00
mostafahassan
3d4cc27bad New node will be added to root node if nothing is selected 2015-03-31 20:26:38 +02:00
yg2f
303ce0ea32 makes_editorhelp_uses_editor_settings_bg_color
This fixes issue #332 by using the "text_editor/background_color" editor
setting as background color for the EditorHelp.
2015-03-26 15:45:53 +01:00
sanikoyes
1515de217e Sort sample lists by name(more readable) 2015-03-25 10:57:35 +08:00
Juan Linietsky
92905075d3 crash bug solved, fixes #1560 2015-03-23 13:44:03 -03:00
Juan Linietsky
7ad7f2f6a9 android fixes, please test
(can' t build android atm)
2015-03-23 11:31:23 -03:00
Carl Olsson
b9bd83e178 Merge branch 'master' of https://github.com/not-surt/godot into snapping2 2015-03-23 08:31:54 +10:00
Carl Olsson
817f9debe7 Add iostream include to collada plugin and change to light occluder to use canvas item snap function. 2015-03-23 08:24:52 +10:00
Carl Olsson
fb2cdfe7ed Merge branch 'master' of https://github.com/not-surt/godot into snapping2
Conflicts:
	tools/editor/plugins/canvas_item_editor_plugin.cpp
	tools/editor/plugins/canvas_item_editor_plugin.h
2015-03-23 08:19:20 +10:00
Juan Linietsky
23e13ce3c2 fixes to new window management API
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
2015-03-22 19:00:50 -03:00
Juan Linietsky
c16276b414 Merge pull request #1378 from erbridge/settings_not_checkbox
Make View > Settings a non check item
2015-03-22 15:06:01 -03:00
Juan Linietsky
f706e3e5d1 Merge pull request #1380 from ElectricSolstice/wparentheses_removal
Changed code to remove gcc -Wparentheses warnings.
2015-03-22 15:05:47 -03:00
Juan Linietsky
68c3e82f7a Merge pull request #1433 from cheece/patch-1
COLLADA load morph target normals
2015-03-22 15:01:01 -03:00
Juan Linietsky
6d813c81b8 Merge pull request #1460 from MarianoGnu/master
Create Checkbox class with support for Radio Buttons
2015-03-22 14:55:36 -03:00
Juan Linietsky
a8f55d11d3 Merge pull request #1480 from theuserbl/patch-2
Changed *_scene() to *_tree() in the time-example
2015-03-22 14:54:06 -03:00
Juan Linietsky
47efcff8bb Merge pull request #1535 from rollenrolm/hidden_files
New option to show/hide hidden files
2015-03-22 14:46:09 -03:00
Juan Linietsky
1aaaee99e9 Merge pull request #1537 from rollenrolm/issue_#931
Fix issue #931: display current view name into editor's 3d scene viewpor...
2015-03-22 14:44:29 -03:00
rollenrolm
cde55bee91 Fix for Issue #1484: Don't strip whitespace on line comment 2015-03-22 10:25:18 +01:00
rollenrolm
4d30bb7241 Fix issue #931: display current view name into editor's 3d scene viewports 2015-03-21 21:47:21 +01:00
rollenrolm
db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00
Juan Linietsky
acc6f3b285 signed distance field font support 2015-03-21 00:43:33 -03:00
Juan Linietsky
90a84b4ddb wip distance field font import
font import may not work if using distance field, this is WIP
2015-03-20 00:26:01 -03:00
Juan Linietsky
a969e2e6f1 Area2D can now detect overlap with other areas
this should make everything simpler, specially for newcomers to Godot
2015-03-17 00:45:25 -03:00
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
650e13f3cd back buffer copy node, to improve on texscreen()
back buffer copy node and respective demo
2015-03-12 01:05:50 -03:00
Juan Linietsky
57380f9aba increase minimum range in property editor a bit 2015-03-10 09:53:22 -03:00
Juan Linietsky
91744e9ed3 New Demo, Screen Space Shaders
-Fixes to screen space shaders.
-Fixes to isometric light demo.
2015-03-10 00:53:50 -03:00
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