Commit graph

11273 commits

Author SHA1 Message Date
Juan Linietsky
f24fca70ab Merge pull request #1336 from slapin/exporter2
io_scene_dae: fixed invalid variable name
2015-02-09 21:09:17 -03:00
Segey Lapin
2c8cc632d2 io_scene_dae: fixed invalid variable name 2015-02-04 04:40:09 +03:00
Carl Olsson
afa13bf868 Forgot to update tile transform buttons when picking tiles. 2015-02-03 19:51:21 +10:00
fry-
c21227a636 added preview picture 2015-02-02 23:29:19 +01:00
fry-
2db55ef6fc added a demo for 2D fog of war 2015-02-02 23:08:57 +01:00
Carl Olsson
52700563bc Finish GUI for tile transform. 2015-02-02 22:28:10 +10:00
Carl Olsson
ee44664b2a Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-02 21:34:47 +10:00
Carl Olsson
c5bf43f6eb Working TileMap tile transpose transform. 2015-02-02 21:27:48 +10:00
Bil Bas (Spooner)
2c1a3dfed6 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf 2015-02-01 20:29:11 +00:00
Bil Bas (Spooner)
af7c8bdf23 Completed more complex formatting. 2015-02-01 20:18:38 +00:00
Bil Bas (Spooner)
6306254d37 Completed implementing standard formatting. 2015-02-01 18:42:36 +00:00
romulox_x
8db3c0a4db changed PolygonPathFinder::get_closest_point to return the closest position inside, rather then the closest vertex 2015-02-01 09:23:31 -08:00
jaromirhribal
79e330c33e fixed math in Camera::project_position 2015-01-31 18:02:49 +01:00
sambler
8baa00a6e4 Adjust x11/detect.py
Test if clang is defined in CC/CXX/LD - this allows a specific version of clang to be defined
move appending -DTYPED_METHOD_BIND to keep clang options together
move sanitize option out of use_llvm test, gcc48+ also supports sanitize=address
2015-01-27 20:40:17 +10:30
sambler
73ca870c81 fix build on freebsd
Add some needed includes
Provide freebsd variation of get_executable_path
Provide variation of execv so that either full path
or appname to be found within $PATH can be used
2015-01-27 19:31:37 +10:30
Felix Laurie von Massenbach
5e1e78b257 Show a confirmation for the revert action. 2015-01-27 00:00:07 +00:00
Felix Laurie von Massenbach
ce488e1f93 Move the Revert Scene menu item to be less intrusive. 2015-01-26 23:51:13 +00:00
Felix Laurie von Massenbach
977b190a2d Add a revert menu item. 2015-01-25 00:14:06 +00:00
Maxime CHAPELET
f9d63a7683 Fix init crash on iPad 1st gen device with iOS 5.1.1 2015-01-23 11:27:53 +01:00
Maxime CHAPELET
f7b00960dd Fix iOS Simulator SDK path for isim platform. 2015-01-22 22:19:45 +01:00
Anton Yabchinskiy
920ad8181f Merge branch 'master' of github.com:okamstudio/godot 2015-01-22 20:34:11 +03:00
hurikhan
f9489b7ff4 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-23 00:19:40 +09:00
Juan Linietsky
67d357191f begin work on lighting system for 2D
nothing functional yet, just experimenting with API
2015-01-22 11:07:16 -03:00
hurikhan
03c453ac7d * Cleanup for PR
* Demo shows a Dialog with not implemented methods at startup
2015-01-22 05:35:39 +09:00
hurikhan
2204914abf * observer scene for the demo 2015-01-22 01:54:17 +09:00
hurikhan
94d94a0855 * fix compilation without scons experimental_wm_api=yes
* Extended the demo with an addional MouseGrab Test
2015-01-22 01:14:50 +09:00
hurikhan
6dd1a21fb7 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-22 00:12:53 +09:00
Anton Yabchinskiy
6f93e6812e Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-21 12:03:29 +03:00
Juan Linietsky
c6eabbbec5 fixed world vertex issues in canvas item shader 2015-01-21 00:57:37 -03:00
Juan Linietsky
14ade5500f Fixed bug in 3D material
textures that failed to load should now load again properly
2015-01-20 23:58:47 -03:00
Juan Linietsky
da0d4e4dea Fixes to texscreen, fixes to white testcube 2015-01-20 22:31:32 -03:00
Juan Linietsky
11c1756257 Visual Shader Editing for 2D
Editing 2D shaders with visual editor seems to work now.
2015-01-20 20:36:25 -03:00
hurikhan
c5080e23b8 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-20 23:39:53 +09:00
Nathan Warden
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
Juan Linietsky
79af805710 Merge pull request #1280 from sanikoyes/Pr-InputEvent-Fix
Pr-InputEvent-Fix
2015-01-20 09:44:09 -03:00
sanikoyes
75be78b370 Fix filter options not works in render target texture 2015-01-20 20:01:58 +08:00
sanikoyes
317c496f5c Add InputEvent::ACTION get/set support for variant
Add action_press/action_release method bind
2015-01-20 20:01:02 +08:00
Nathan Warden
92cc7b840e Fixed a bug where a user could add a cyclical dependency, causing a crash. 2015-01-19 15:47:50 -05:00
Carl Olsson
a8b318871c Prep for tile transpose transform. 2015-01-19 23:07:25 +10:00
hurikhan
d878b3205a Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-19 21:46:03 +09:00
Juan Linietsky
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
Juan Linietsky
e0c0aef615 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-18 09:52:10 -03:00
Juan Linietsky
6f3c09047e -intentional breakage of shader graph to fix issues, existing graphs will be broken, sorry :( 2015-01-18 09:51:11 -03:00
Manuel Lagang
a4f40ec3be Fix whitespace on previous commit
Choose tabs or spaces, not both!
2015-01-17 23:06:20 -08:00
Manuel Lagang
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
Dana Olson
eac0de398f ignore and remove .fscache files. closes #1249 2015-01-17 14:19:57 -05:00
Dana Olson
5a4ef1c2cc fixes 2015-01-17 14:05:26 -05:00
Juan Linietsky
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
marynate
9f61a4881e Fix mingw windows build error 2015-01-18 02:08:26 +08:00
hurikhan
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