Commit graph

1224 commits

Author SHA1 Message Date
Juan Linietsky
42d41a3fbc wrong function, changing.. 2015-04-02 15:03:14 -03:00
Juan Linietsky
8ea7e3e2b1 javascript build fix 2015-04-02 14:54:36 -03:00
Juan Linietsky
68e42f53ba Beta1 Attempt #1
-=-==-=-=-=-=-=-

-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
2015-04-02 12:59:23 -03:00
Juan Linietsky
1572238adb merging okam changes 2015-04-02 07:22:17 -03:00
Ariel Manzur
ebd743f7c2 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-02 01:35:12 -03:00
Ariel m
7c1d516c01 fullscreen thing 2015-04-02 01:32:02 -03:00
Juan Linietsky
ed2a24ef21 solved color depth issues on osx 2015-04-01 12:39:54 -03:00
Juan Linietsky
76c2b9d812 fix shadow attenuation 2015-04-01 12:23:13 -03:00
yg2f
7ea3482c38 add scons extra suffix option
makes it possible to add a custom extra suffix to the base filename of
all generated binary files.

example :
scons p=windows extra_suffix=yourBranchName
or
scons p=windows bits=32 extra_suffix=v20150401_1642
or
scons p=windows extra_suffix=msvc2010_git20150401
2015-04-01 17:04:41 +02:00
Juan Linietsky
3920c497b3 Option in Android export to use 32 bits buffer. 2015-03-31 19:02:40 -03:00
Juan Linietsky
33f24df786 Merge branch 'master' of https://github.com/okamstudio/godot 2015-03-31 17:57:43 -03:00
Juan Linietsky
7fc4059b13 read depth fixes 2015-03-31 17:57:16 -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
ec1aea5b3b Merge branch 'pr_PreventScriptFromExtendingItself' 2015-03-31 21:59:39 +02:00
mostafahassan
73ff3ac218 (Fix) script will not be able to extend itself 2015-03-31 21:34:50 +02:00
Juan Linietsky
4883e2e887 Merge pull request #1589 from MostafaHassan/pr_NoSelection_AddNodeToRoot
New node will be added to root node if nothing is selected
2015-03-31 15:38:50 -03:00
mostafahassan
3d4cc27bad New node will be added to root node if nothing is selected 2015-03-31 20:26:38 +02:00
Juan Linietsky
ad634876b5 fixes for light2d in androids that do not support
read depth
2015-03-31 14:59:28 -03:00
UsernameIsAReservedWord
9cca88eb92 Update object.h 2015-03-28 18:42:01 +01:00
yg2f
3c67e22c3d add : bool Object.is_queued_for_deletion()
`object.is_queued_for_deletion()` return true if the object was
`object.queue_free()` or `SceneTree.queue_delete(object)`.
2015-03-28 18:34:28 +01: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
reduz
7f8a0cddcf fixes to shader to get most new demos working on mobile 2015-03-25 22:56:35 -03:00
yg2f
103ab3bd1a fixes_3d_spot_attenuation 2015-03-25 16:27:55 +01:00
sanikoyes
97f34a1dd6 Add seed/get_inst function for GDScript
seed -> Math::seed
get_inst -> ObjectDB::get_instance
2015-03-25 11:01:12 +08:00
sanikoyes
042ead0e5d add missing WM_RBUTTONDBLCLK message 2015-03-25 10:58:22 +08:00
sanikoyes
1515de217e Sort sample lists by name(more readable) 2015-03-25 10:57:35 +08:00
Juan Linietsky
cbad0440ab 2D normal mapping and lighting simple demos 2015-03-24 16:17:49 -03:00
Fabio Alessandrelli
600bae34bd Re-sort Area array during integration step 2015-03-24 18:46:26 +00:00
Fabio Alessandrelli
18a1403fcf Implement combine mode for area 2015-03-24 18:46:26 +00:00
Fabio Alessandrelli
4b3b5eba86 Use Vector for storing areas 2015-03-24 18:46:26 +00:00
Juan Linietsky
ba194115bc Merge pull request #1565 from romulox-x/osx_wm_fix
fixed build error on OSX from new WM code
2015-03-24 09:49:03 -03:00
steve
a6f6bd85f9 fixed build error on OSX from new WM code 2015-03-23 22:07:03 -07:00
Juan Linietsky
f35315fee2 Merge pull request #1563 from romulox-x/ios_wm_fixes
fixed iphone build with new window management changes
2015-03-23 23:09:03 -03:00
steve
e3957e32de fixed iphone build with new window manamenet changes 2015-03-23 18:55:45 -07:00
Juan Linietsky
3cf9490c46 window managements functions work
but still side-functions, all API needs to be migrated to them
2015-03-23 20:47:53 -03:00
Juan Linietsky
0245d4a2b0 oops, fucntion was there twice 2015-03-23 16:12:59 -03:00
Juan Linietsky
8db3922f56 small android fix 2015-03-23 14:15:11 -03: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
Juan Linietsky
393e5605c9 Merge pull request #1367 from not-surt/snapping2
Better 2D Snapping
2015-03-23 11:02:45 -03:00
Nathan Warden
21eb3b2a83 Camel casing being capitalized only happens in the inspector now. 2015-03-23 00:08:07 -05:00
Carl Olsson
09e6e29d67 Merge branch 'master' into snapping2 2015-03-23 14:58:56 +10:00
Juan Linietsky
a12c364489 Merge pull request #1549 from rollenrolm/new_api_x11_fixes
New API: build fixes for x11
2015-03-23 01:34:32 -03:00
Juan Linietsky
a017686689 Merge pull request #1552 from hurikhan/wm_demo_fix
new_wm_api -- window_management-demo fix
2015-03-23 01:34:22 -03:00
hurikhan
001a16064f adjust the window_management demo to the new function names 2015-03-23 00:09:12 -04:00
rollenrolm
ca0b3ce1f6 New API: build fixes for x11 2015-03-23 01:31:38 +01: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
c68563aeb4 Merge pull request #1542 from jotson/wmclass
Reverted change to classHint
2015-03-22 19:18:44 -03:00