Commit graph

676 commits

Author SHA1 Message Date
Anton Yabchinskiy
4ab1bcde35 Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
	drivers/SCsub
	platform/x11/detect.py
	platform/x11/os_x11.h
2014-12-23 23:44:07 +03:00
Juan Linietsky
530d717a67 -fix get_as_text ( ) 2014-12-21 12:12:59 -03:00
Juan Linietsky
78e7777cf5 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	modules/gdscript/gd_editor.cpp

Improved code completion for InputEvent (shows members by type)
2014-12-21 11:46:28 -03:00
Juan Linietsky
f7f197c409 -ability to set default textures in shader (needed for visual shader editing)
-work in progress new graph system (will replace current one)
-crash fix in s3m loader (out of bounds acess)
-fixed vbox overriding of separation (fixes empty line between section tabs)
2014-12-21 11:42:44 -03:00
Juan Linietsky
e7c1137d92 Merge pull request from romulox-x/pathFinderBugs
fixed bugs in polygon_path_finder for finding nearest points
2014-12-20 21:39:46 -02:00
romulox_x
8ff61b4d0e fixed bugs in polygon_path_finder for finding nearest points 2014-12-20 15:28:08 -08:00
Juan Linietsky
a36a774897 Fixes
-=-=-=

-Added missing quaternion constructor
-code completion fixes
-winrt fixes
2014-12-20 15:30:06 -03:00
Juan Linietsky
9783f6fc96 Merge branch 'master' of https://github.com/okamstudio/godot 2014-12-20 12:32:32 -03:00
Juan Linietsky
cf0a419efa WIP work on graph nodes and editing 2014-12-20 12:32:14 -03:00
Juan Linietsky
7dbc19f32d Merge pull request from sanikoyes/Pr-tween-fix
Pr-tween-fix
2014-12-19 11:59:26 -02:00
Juan Linietsky
f2417b7a59 Merge pull request from astillich/pulseaudio
PulseAudio backend
2014-12-19 10:57:08 -02:00
Alexander Stillich
f2843209a5 Implemented PulseAudio backend and fixed audio driver selection on X11 2014-12-19 13:44:34 +01:00
sanikoyes
64f77aa8f3 1.Change interpolate_callback:p_times_in_sec argument before p_callback argument(more readable)
2.NodePath replace to instance_ID(can control object doe's not in scene tree)
3.Change interpolate types from Node to Object, can control more types(etc script class object)
4.Add pending_update counter, avoid insert/remove interpolates-list while traversal it
2014-12-19 17:13:20 +08:00
Juan Linietsky
04362defe7 Merge pull request from adolson/toggle-comment-shortcut-fix
change shortcut for toggle-comment to Ctrl+K
2014-12-18 09:58:13 -02:00
Juan Linietsky
35b0b3bc1d Merge pull request from TheoXD/_tree_multiselect_move
Selected node(s) can now be moved up and down in scene tree dock.
2014-12-18 03:13:55 -02:00
Juan Linietsky
36414e91c9 Merge pull request from sanikoyes/Pr-crash-in-scrip-init
Fix crash when gd-script _init fail
2014-12-18 02:54:50 -02:00
TheoXD
b3d8a72be9 Small clean-up.. 2014-12-18 05:52:27 +01:00
sanikoyes
4ccdbde845 Fix crash when gd-script _init fail 2014-12-18 12:50:47 +08:00
TheoXD
f27282e087 Restricted to same parent, seem to work better now. 2014-12-18 05:46:03 +01:00
Juan Linietsky
9f5bbfc322 -improved completion options for InputEvent, shows all event types now 2014-12-18 00:56:33 -03:00
TheoXD
4bf86bdd43 Selected node(s) can now be moved up and down in scene tree dock. 2014-12-18 03:38:24 +01:00
Dana Olson
1a6628f5a3 change shortcut for toggle-comment to Ctrl+K 2014-12-17 15:57:39 -05:00
Juan Linietsky
bed3b7f092 Merge branch 'master' of https://github.com/okamstudio/godot 2014-12-17 10:51:45 -03:00
Juan Linietsky
92f28a5028 oops, C++11 makes me screw up 2014-12-17 10:45:02 -03:00
Juan Linietsky
0c3f14087c Merge pull request from orbitcowboy/master
xml_parser: check array length index before accessing the array.
2014-12-17 10:18:08 -02:00
Juan Linietsky
8347e008c2 -removed annoying pragma 2014-12-17 09:14:25 -03:00
Juan Linietsky
c8b2a5f64a -added brace matching to go with the new code completion 2014-12-17 01:53:34 -03:00
Juan Linietsky
fd4648c081 -fixed crash reported by n-pigeon 2014-12-16 23:46:55 -03:00
Juan Linietsky
2dd302ff90 -fix compilation issue
-fix missing built-ins in completion
-fix parse error
2014-12-16 23:17:35 -03:00
Juan Linietsky
d55f95e0d2 Merge branch 'master' of https://github.com/okamstudio/godot 2014-12-16 22:33:35 -03:00
Juan Linietsky
bcf27feb98 New Code Completion
-=-=-=-=-=-=-=-=-=-

-Massive improvement to code completion
-Argument hinting for functions

If you manage to out-smart the code-completion in a situation where completion
should be possible to guess, let me know.

 Please enter the commit message for your changes. Lines starting
2014-12-16 22:31:57 -03:00
orbitcowboy
378fb0bace xml_parser: check array length index before accessing the array. 2014-12-16 21:16:48 +01:00
Juan Linietsky
1664cd6710 Merge pull request from UsernameIsAReservedWord/fix-demo-3d-mousepick
fix demo 3d mousepick test
2014-12-16 12:55:14 -02:00
yg2f
ef02ef2867 fix demo 3d mousepick test
add the missing camera parameter to the _input_event()
2014-12-16 15:17:29 +01:00
Juan Linietsky
99cf6c0dc4 Update README.md 2014-12-15 22:41:50 -03:00
Juan Linietsky
7eb5d049c2 version bump to stable 2014-12-15 15:49:18 -03:00
Juan Linietsky
089d7fa171 Small batch of fixes
-=-=-=-=-=-=-=-=-=-=
-Fixed looping error in AudioStreamResampled
-winrt port progress
-fixes in material in ambient light
2014-12-15 15:42:58 -03:00
Anton Yabchinskiy
ff755f93eb Merge branch 'master' of http://github.com/okamstudio/godot 2014-12-09 17:51:14 +03:00
Juan Linietsky
be4e40e90a compilation fix 2014-12-08 16:09:29 -03:00
Juan Linietsky
3aed5de7a9 version update for rc2 2014-12-08 15:51:27 -03:00
Juan Linietsky
6851f9bfae Small Fixes
-=-=-=-=-=-

-Bug in navmesh demo fixed
-Bug in variant
-Better Collada Exporter supports proper names of exported shapekeys
2014-12-08 15:47:45 -03:00
Juan Linietsky
9df8d5f616 Merge pull request from quabug/commit
Add move_child_notify method in Node class
2014-12-08 16:46:51 -02:00
Juan Linietsky
0114ac2192 Merge pull request from marynate/PR-tween-demo-icon
Add missing icon.png to tween demo
2014-12-08 16:45:15 -02:00
Juan Linietsky
811dabb645 Merge pull request from marynate/PR-fix-isim-build
Update ios simulator build config file
2014-12-08 16:45:02 -02:00
Juan Linietsky
ac83dc8f3c Merge pull request from adolson/confirm-insert-track
remove old unused pref, added new confirm insert track
2014-12-08 16:44:36 -02:00
Dana Olson
dc694f49b8 remove old unused pref, added new confirm insert track 2014-12-08 04:35:06 -05:00
marynate
88f58c5c26 Update ios simulator build config file to build under new ios SDK 2014-12-08 13:58:39 +08:00
marynate
45c9e169d9 Add missing icon.png to tween demo 2014-12-08 13:21:05 +08:00
Juan Linietsky
10b371516b More Fixes
-=-=-=-=-=

-Bug in saving multinline text in xml fixed. 
-typo in android export fixed. 
2014-12-07 11:33:57 -03:00
Juan Linietsky
da91ca7164 Merge pull request from adolson/alt-arrows-editor-fix
Alt+arrows editor undo/redo fix
2014-12-07 11:25:00 -02:00