6dd1a21fb7
Merge remote-tracking branch 'upstream/master' into x11-window-management
2015-01-22 00:12:53 +09:00
6f93e6812e
Merge branch 'master' of https://github.com/okamstudio/godot
2015-01-21 12:03:29 +03:00
c6eabbbec5
fixed world vertex issues in canvas item shader
2015-01-21 00:57:37 -03:00
14ade5500f
Fixed bug in 3D material
...
textures that failed to load should now load again properly
2015-01-20 23:58:47 -03:00
da0d4e4dea
Fixes to texscreen, fixes to white testcube
2015-01-20 22:31:32 -03:00
11c1756257
Visual Shader Editing for 2D
...
Editing 2D shaders with visual editor seems to work now.
2015-01-20 20:36:25 -03:00
c5080e23b8
Merge remote-tracking branch 'upstream/master' into x11-window-management
2015-01-20 23:39:53 +09:00
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
79af805710
Merge pull request #1280 from sanikoyes/Pr-InputEvent-Fix
...
Pr-InputEvent-Fix
2015-01-20 09:44:09 -03:00
75be78b370
Fix filter options not works in render target texture
2015-01-20 20:01:58 +08:00
317c496f5c
Add InputEvent::ACTION get/set support for variant
...
Add action_press/action_release method bind
2015-01-20 20:01:02 +08:00
92cc7b840e
Fixed a bug where a user could add a cyclical dependency, causing a crash.
2015-01-19 15:47:50 -05:00
a8b318871c
Prep for tile transpose transform.
2015-01-19 23:07:25 +10:00
d878b3205a
Merge remote-tracking branch 'upstream/master' into x11-window-management
2015-01-19 21:46:03 +09:00
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
e0c0aef615
Merge branch 'master' of https://github.com/okamstudio/godot
2015-01-18 09:52:10 -03:00
6f3c09047e
-intentional breakage of shader graph to fix issues, existing graphs will be broken, sorry :(
2015-01-18 09:51:11 -03:00
a4f40ec3be
Fix whitespace on previous commit
...
Choose tabs or spaces, not both!
2015-01-17 23:06:20 -08:00
fa62125e05
Modifiers are unset on events for the modifier key itself
...
This patch removes modifiers when processing key events for the
particular modifier key. For example, previously a Shift keypress
would register as a Shift + Shift modifier event.
This would cause issues when a modifier key as the action key in
the input map, because unpresses of the modifier key don't match as
matching inputs for that action. E.g. if Shift is used as an action,
the stored action event is Shift + Shift modifier (as indicated
in the editor as "Shift + Shift". The unpress event does not have the
Shift modifier set, so the event of unpressing Shift + no modifier
doesn't match the action which has the modifier set.
This patch removes the shift modifier on just pressing the Shift
key down, so the action event is registered as just Shift with
no modifier (as indicated in the editor as "Shift"), which matches
the unpress event.
2015-01-17 22:40:01 -08:00
eac0de398f
ignore and remove .fscache files. closes #1249
2015-01-17 14:19:57 -05:00
5a4ef1c2cc
fixes
2015-01-17 14:05:26 -05:00
2b22aba39e
Merge pull request #1250 from marynate/PR-fix-mingw-win-build
...
Fix mingw windows build error
2015-01-17 15:41:25 -03:00
9f61a4881e
Fix mingw windows build error
2015-01-18 02:08:26 +08:00
dfb5a1d5e1
* multi_screen testing + bugfixes
...
* ALT-TAB is working
* tested on Ubuntu 14.10 Unity + LXDE
* minor cleanup
2015-01-18 00:28:04 +09:00
fa38e9b838
Merge branch 'master' of github.com:okamstudio/godot
2015-01-17 18:27:08 +03:00
dee27ce991
Merge remote-tracking branch 'upstream/master' into x11-window-management
2015-01-17 22:19:57 +09:00
91faf8e218
Merge pull request #1138 from sanikoyes/Pr-tween-call-deferred
...
Pr-tween-call-deferred
2015-01-17 09:58:57 -03:00
7a1307f96a
Merge pull request #1172 from UsernameIsAReservedWord/fix_environment_ressource_interface_to_handle_cubemap_ressource
...
fix_environment_ressource_cubemap_support, complete PR #1170
2015-01-17 09:56:20 -03:00
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
7ac7956baf
Merge pull request #1188 from hurikhan/scons_colored
...
Scons colored
2015-01-17 09:47:02 -03:00
938c6d0df3
Merge pull request #1204 from marynate/PR-new-default-theme
...
new default theme
2015-01-17 09:45:19 -03:00
8075512bc5
Merge pull request #1206 from ScyDev/feature/polygonpathfinder_demo
...
- how to use PolygonPathFinder from GD Script
2015-01-17 09:44:49 -03:00
cce0d50516
Merge pull request #1217 from sanikoyes/Pr-canvas-shader-disable-3d
...
Pr-canvas-shader-disable-3d
2015-01-17 09:44:22 -03:00
8df47f59d5
Merge pull request #1221 from wvdschel/patch-1
...
Cleaned up formatting in gd_compiler.h
2015-01-17 09:43:34 -03:00
07e63c3dc1
Merge pull request #1223 from NateWardawg/master
...
1: File path in save dialog automatically appended with correct extension if not manually added by the user. 2: Removed .bin as default extension for Linux exports as it causes problems for common file managers.
2015-01-17 09:43:00 -03:00
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
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
bf4f439ae1
Merge pull request #1230 from ndee85/export_manager_additions
...
Export Manager Fixes
2015-01-17 09:41:24 -03:00
53b952f351
Merge pull request #1231 from quabug/commit
...
Fix bug in curve.cpp
2015-01-17 09:40:51 -03:00
06738f9286
Merge pull request #1244 from not-surt/master
...
Wrapped CellOp generation code in a function and added TileMap tile picking
2015-01-17 09:32:40 -03:00
f1dc00e380
* cleanup window state handling
...
* first attemps in handling ALT+TABa (WIP)
2015-01-17 19:43:12 +09:00
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
2fd9292b12
Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)."
2015-01-16 23:17:12 -05:00
3e7d475b59
Merge pull request #1241 from the-mech/master
...
added nvidia optimus enablement Issue #1120
2015-01-16 23:02:13 -03:00
726d379775
added nvidia optimus enablement
2015-01-17 02:48:35 +01:00
6185949f6a
Make it set_minimized() + set_maximized() work in both worlds: Unity and LXDE
2015-01-17 02:36:07 +09:00
716971655e
added the following methods:
...
* set_minimized(bool)
* bool is_minimized()
* set_maximized(bool)
* bool is_maximized()
2015-01-17 00:18:45 +09:00
cac555dc78
When overwriting a file with an auto added extension the file name is now set correctly.
2015-01-16 07:48:28 -05:00
341ea429db
remove useless code
2015-01-16 15:16:58 +08:00
5823f90c53
fix bug
...
running into infinite loop if distance between two adjacent points in curve are too short.
2015-01-16 15:16:41 +08:00
hurikhan
Anton Yabchinskiy
Juan Linietsky
Nathan Warden
Juan Linietsky
sanikoyes
Carl Olsson
Manuel Lagang
Dana Olson
marynate
the_mech
quabug