Commit Graph

34129 Commits

Author SHA1 Message Date
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
Nathan Warden 21eb3b2a83 Camel casing being capitalized only happens in the inspector now. 2015-03-23 00:08:07 -05: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
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
V.VamsiKrishna 4fa71a6ee0 Removing Print statement effects perf. 2015-03-21 22:25:48 +05:30