Commit graph

1059 commits

Author SHA1 Message Date
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
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
Juan Linietsky
ffa556aeea Merge pull request #1402 from ElectricSolstice/editor_match_fix
Fixed issue #1377 about script editor parenthesis matching.
2015-03-22 15:02:15 -03:00
Juan Linietsky
da7698073f Merge pull request #1407 from NateWardawg/documentation
Updated the internal documention for the GDScript class.
2015-03-22 15:02:00 -03:00
Juan Linietsky
f6e537b08f Merge pull request #1432 from UsernameIsAReservedWord/fixes_platform_windows_detect_py
Fixes platform/windows/detect.py
2015-03-22 15:01:27 -03:00
Juan Linietsky
68c3e82f7a Merge pull request #1433 from cheece/patch-1
COLLADA load morph target normals
2015-03-22 15:01:01 -03:00
Juan Linietsky
ca30c87019 Merge pull request #1438 from Spooner/fix_isometric_demo
Fix isometric demo
2015-03-22 14:59:58 -03:00
Juan Linietsky
3aed92e5b1 Merge pull request #1450 from theuserbl/master
Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
2015-03-22 14:58:42 -03:00
Juan Linietsky
c2d975582c Merge pull request #1446 from UsernameIsAReservedWord/fixes_kinematicbody_move_crash
should fixes #1284 (KinematicBody .move() crash)
2015-03-22 14:56:30 -03:00
Juan Linietsky
6d813c81b8 Merge pull request #1460 from MarianoGnu/master
Create Checkbox class with support for Radio Buttons
2015-03-22 14:55:36 -03:00
Juan Linietsky
a8f55d11d3 Merge pull request #1480 from theuserbl/patch-2
Changed *_scene() to *_tree() in the time-example
2015-03-22 14:54:06 -03:00
Juan Linietsky
3a96937e93 Merge pull request #1512 from the-mech/master
[Fix] make_dir_recursive on Windows
2015-03-22 14:53:10 -03:00
Juan Linietsky
4069dc7891 Merge pull request #1521 from codx/master
Fix for InputEvent::set_as_action
2015-03-22 14:48:54 -03:00
Juan Linietsky
47efcff8bb Merge pull request #1535 from rollenrolm/hidden_files
New option to show/hide hidden files
2015-03-22 14:46:09 -03:00
Juan Linietsky
1aaaee99e9 Merge pull request #1537 from rollenrolm/issue_#931
Fix issue #931: display current view name into editor's 3d scene viewpor...
2015-03-22 14:44:29 -03:00
Juan Linietsky
230739c762 Merge pull request #1538 from rollenrolm/issue_#1484
Fix for Issue #1484: Don't strip whitespace on line comment
2015-03-22 14:42:53 -03:00
Juan Linietsky
8c91dadff7 minor comments 2015-03-22 13:01:34 -03:00
Juan Linietsky
1e4841dc52 drag & drop demo (GUI) 2015-03-22 12:52:47 -03:00
Juan Linietsky
78694d8542 gui in 3D demo now uses area for input 2015-03-22 11:52:07 -03:00
Juan Linietsky
92ab362afa avoid function naming conflict on light scale 2015-03-22 10:39:32 -03:00
Juan Linietsky
a93e33f5c8 added spatial and node2d helper methods
to perform operations such as translaiton, rotation, etc directly on
nodes.
2015-03-22 10:33:58 -03:00
Juan Linietsky
dac2017dee fixes/cleans up
-input now correctly works when using viewport scaling
-added function to get areas/bodies in given point
-added function to get space state directly from world
2015-03-22 09:40:26 -03:00
rollenrolm
cde55bee91 Fix for Issue #1484: Don't strip whitespace on line comment 2015-03-22 10:25:18 +01:00
Juan Linietsky
c6c72a3c37 input events on Area2D is now supported
also added a demo showing how this works
2015-03-22 01:46:18 -03:00
rollenrolm
4d30bb7241 Fix issue #931: display current view name into editor's 3d scene viewports 2015-03-21 21:47:21 +01:00
rollenrolm
db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00
Juan Linietsky
40496dd76a signed distance field fonts demo 2015-03-21 10:15:30 -03:00
Juan Linietsky
acc6f3b285 signed distance field font support 2015-03-21 00:43:33 -03:00
Juan Linietsky
90a84b4ddb wip distance field font import
font import may not work if using distance field, this is WIP
2015-03-20 00:26:01 -03:00
Juan Linietsky
9dd0d8277d add overlap test function, remove a semicolon 2015-03-18 21:03:11 -03:00
Juan Linietsky
4cac1e0cb6 add functions to test overlap with another body or area 2015-03-17 09:25:35 -03:00
Juan Linietsky
a969e2e6f1 Area2D can now detect overlap with other areas
this should make everything simpler, specially for newcomers to Godot
2015-03-17 00:45:25 -03:00
Juan Linietsky
53e1694e1e New option to send canvas to render buffer
allows to use 3D environment effects for post processing such as Glow,
Bloom, HDR, etc. in 2D.
2015-03-16 01:14:59 -03:00
Alex Bonfim
2d4cad7057 Fix for InputEvent::set_as_action 2015-03-15 23:17:48 -03:00
Juan Linietsky
5b54361daf Merge pull request #1518 from argylelabcoat/patch-1
Update file_access_windows.cpp for mingw cross-compile
2015-03-15 11:56:38 -03:00
Matthew Hughes
1200689245 Update file_access_windows.cpp for mingw cross-compile
Cross compiling on linux failed on this file. Changing case of the windows.h and shlwapi.h allows mingw to find these headers but setting WINVER 0x0500 is needed for the compiler to find ReplaceFileW
2015-03-15 09:43:13 -05:00
Roman Nekrassow
e646fc5b5d [Fix] make_dir_recursive on Windows
function normally tries to create c: which isn't possible, because the access is denied, handling ERROR_ACCESS_DENIED as ERR_ALREADY_EXISTS lets the function skip the creation of c: .
2015-03-14 12:35:18 +01:00
Juan Linietsky
51b8102f14 Merge pull request #1510 from sanikoyes/Pr-fix-particles2d-bind
Pr-fix-particles2d-bind
2015-03-13 23:46:30 -03:00
sanikoyes
7cdd3c86c4 Add missing particles_2d macro bind 2015-03-14 10:40:58 +08:00
Juan Linietsky
0d3b2ea1fd Merge pull request #1504 from marynate/PR-fix-backbuffer-compile
Fix compile error in back_buffer_copy.h
2015-03-12 08:27:21 -03:00
marynate
86eedaec21 Fix compile error in back_buffer_copy.h 2015-03-12 14:23:36 +08:00
Juan Linietsky
650e13f3cd back buffer copy node, to improve on texscreen()
back buffer copy node and respective demo
2015-03-12 01:05:50 -03:00
Juan Linietsky
9f88a40e9f simple shader effects library for 2D
ready to use in any project
2015-03-11 01:44:52 -03:00
Juan Linietsky
a6f96f46b7 small optimizations to isometric light demo
should work faster, and even faster if exported.. as textures have been
optimized.
2015-03-10 21:05:49 -03:00