godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,159 Commits 15 Branches 59 Tags 2.2 GiB
d148a03848
Commit Graph

1159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan Linietsky
d148a03848 -Fixes bug in ShaderGraph material, when uniform property is not used, fixes #1634 and #1610 2015-04-09 00:29:21 -03:00
Juan Linietsky
e18c6ef63b -Better Collada now keeps mesh names properly from blender, makes the "overwrite existing, keep materials" import mode work properly. 2015-04-08 01:46:55 -03:00
Juan Linietsky
b016f3898b fixed re-import of scene when new nodes are added, fixes #1620 2015-04-08 01:11:50 -03:00
Juan Linietsky
3b35bcc955 -fix resolver erase query to avoid running out of slots, fixes #1621 2015-04-07 22:45:33 -03:00
Juan Linietsky
54ed432913 fix crash when deleting shader from material, fixes #1631 2015-04-07 22:30:36 -03:00
Juan Linietsky
7852be816a fixed shader graph length node, fixes #1632 2015-04-07 22:22:46 -03:00
Juan Linietsky
6227058098 added assert to disassembly, fixes #1641 2015-04-07 21:48:03 -03:00
Juan Linietsky
963845eea9 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-07 21:21:06 -03:00
Juan Linietsky
22997294fa -Concatenating arrays keeps the shared property if any of the arrays is shared. Fixes #1646 2015-04-07 21:18:46 -03:00
Juan Linietsky
ef222aea89 Merge pull request #836 from adolson/new-default-project-icon 
new default project icon
 2015-04-07 20:25:33 -03:00
Juan Linietsky
b135cdbf05 Merge pull request #1531 from vkbsb/h5_canvas_polygon_fix 
H5 canvas polygon fix
 2015-04-07 20:22:58 -03:00
Juan Linietsky
e336306e91 Merge pull request #1554 from NateWardawg/inspectorupdate 
Camel casing being capitalized only happens in the inspector now.
 2015-04-07 20:22:09 -03:00
Juan Linietsky
219fce737c Merge pull request #1564 from Faless/area_combine-1 
Implement combine mode for area
 2015-04-07 20:21:11 -03:00
Juan Linietsky
8619cb64ba Merge pull request #1567 from sanikoyes/Pr-GDScript-seed-get-inst 
Pr-GDScript-seed-get-inst
 2015-04-07 20:19:07 -03:00
Juan Linietsky
b989498004 Merge pull request #1568 from sanikoyes/Pr-missing-WM_RBUTTONDBLCLK 
Pr-missing-WM_RBUTTONDBLCLK
 2015-04-07 20:17:32 -03:00
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
b307ee79a1 Merge pull request #1574 from UsernameIsAReservedWord/fix_3d_spot_attenuation 
fixes_3d_spot_attenuation
 2015-04-07 20:16:00 -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
7b75658bb2 Merge pull request #1585 from UsernameIsAReservedWord/add_is_queued_for_deletion_in_objects 
add : bool Object.is_queued_for_deletion()
 2015-04-07 20:14:51 -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
8f07919a5f Merge pull request #1597 from UsernameIsAReservedWord/add_scons_custom_extra_suffix 
add scons extra suffix option
 2015-04-07 20:12:58 -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
49ca7b5f12 Merge pull request #1609 from TheoXD/_fix_crash_in_viewport_picking 
Fixed crash in viewport object picking.
 2015-04-07 20:12:19 -03:00
Juan Linietsky
7978245784 Merge pull request #1614 from hurikhan/pr_parameter_names 
wm api -- set screen parameter names for gdscript
 2015-04-07 20:11:53 -03:00
Juan Linietsky
b60d41bb5d Merge pull request #1627 from Martho42/patch-1 
Fixes issue #1604 (accelerometer malfunctioning on some devices)
 2015-04-07 20:11:35 -03:00
Juan Linietsky
888dfcb02e Merge pull request #1639 from UsernameIsAReservedWord/fix_printraw 
PR : fixes printraw to make it actually print raw
 2015-04-07 20:09:42 -03:00
Juan Linietsky
b36e41cb71 Added a PVRTC encoder for iOS 2015-04-06 21:48:20 -03:00
yg2f
fcbf473d0d fix printraw to make it actually print raw 2015-04-06 13:57:31 +02:00
Martho42
7a2698bb44 Fixes the accelerometer 
Resolves the issue of the accelerometer behaving differently across devices with landscape as default and devices with portrait as default.
 2015-04-04 17:03:56 -07:00
hurikhan
af368b7e1a set screen parameter names for gdscript 2015-04-03 15:00:55 -04:00
Juan Linietsky
5d99e15e43 fix shadow issue with lights in mix mode, i think fixes #1611 2015-04-03 14:36:10 -03:00
Franklin Sobrinho
f77349a4c2 Better fix 2015-04-03 10:28:30 -03:00
TheoXD
68c2a959dd Bullet shower demo crashed because of dynamic casting in the code for object picking. Making sure the object has an ID greater than 0 before typecasting solves it. 2015-04-03 14:42:05 +02:00
Juan Linietsky
9fa1698c74 Changes to Light 
-=-=-=-=-=-=-=-=

-Changed material unshaded property for an enum, which supports light-only shading
-Added a "Mix" shading mode, useful for using lights as masks
-Added energy parameter to Light2D
 2015-04-03 01:43:37 -03:00
Franklin Sobrinho
aa929bc1f1 fix_issue_#1594 2015-04-02 15:32:37 -03:00
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