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
b36e41cb71
Added a PVRTC encoder for iOS
2015-04-06 21:48:20 -03:00
Juan Linietsky
5d99e15e43
fix shadow issue with lights in mix mode, i think fixes #1611
2015-04-03 14:36:10 -03: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
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
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
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
reduz
7f8a0cddcf
fixes to shader to get most new demos working on mobile
2015-03-25 22:56:35 -03:00
Juan Linietsky
cbad0440ab
2D normal mapping and lighting simple demos
2015-03-24 16:17:49 -03: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
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
Juan Linietsky
95c18c2fad
Merge pull request #1545 from okamstudio/revert-1401-inspectorupdate
...
Revert "Camelcased script variables will now capitalize in the inspector...
2015-03-22 19:06:24 -03:00
Juan Linietsky
0dcca688d2
Revert "Camelcased script variables will now capitalize in the inspector."
2015-03-22 19:06:13 -03: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
John Watson
182c86de3f
Reverted change to classHint
...
Using `char wmclass[] = "Godot"` causes `xprop` to report the
following for WM_CLASS:
`WM_CLASS(STRING) = "\200\326\322\365\377\177", "\200\326\322\365\377\177"`
This makes the Unity window manager fail to connect the running app
with the icon on the launcher.
2015-03-22 14:05:24 -07:00
Juan Linietsky
e9f94ce8d2
fix area center of gravity
2015-03-22 15:11:36 -03:00
Juan Linietsky
15bee515e6
Merge pull request #1487 from hurikhan/x11-window-management
...
X11 window management
2015-03-22 15:10:50 -03:00
Juan Linietsky
eefcf93e55
Merge pull request #1331 from fry-/master
...
Add 2D fog of war demo
2015-03-22 15:08:21 -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
0302ea5b82
Merge pull request #1396 from Spooner/fix_sprintf_errors
...
Fix sprintf errors
2015-03-22 15:03:32 -03:00
Juan Linietsky
7436f0bb37
Merge pull request #1401 from NateWardawg/inspectorupdate
...
Camelcased script variables will now capitalize in the inspector.
2015-03-22 15:02:42 -03:00