Commit graph

23170 commits

Author SHA1 Message Date
reduz
98a970585a Merge pull request #150 from marynate/PR-export-physics-sleep-threshold
Export linear/angular velocity sleep threshold to project settings
2014-02-28 14:55:02 -02:00
reduz
219818075f Merge pull request #147 from vinzenz/string-improvements
begins_with string version fix
2014-02-28 14:53:01 -02:00
reduz
b657d2df90 Merge pull request #151 from marynate/PR-fix-line-edit-bind-select
Fix LineEdit select method binding
2014-02-28 14:50:50 -02:00
reduz
78e9ced558 Merge pull request #152 from marynate/PR-ux-property-field-auto-select
Auto select custom property value field when pop up
2014-02-28 14:50:30 -02:00
marynate
8fb19e5843 Auto select custom property value field when pop up, user can start typing to change value right away. 2014-02-27 22:19:30 +08:00
marynate
3985660ca4 Fix LineEdit select method binding 2014-02-27 22:17:40 +08:00
marynate
9593e9ddae Export linear/angular velocity sleep threshold;Change default linear velocity sleep threshold to 0.1;Fixed type treshold 2014-02-27 17:28:40 +08:00
Juan Linietsky
a65edb4caa Merge branch 'master' of https://github.com/okamstudio/godot 2014-02-26 14:26:19 -03:00
Juan Linietsky
768fc7ec81 fixie 2014-02-26 14:25:42 -03:00
Vinzenz Feenstra
6178971873 Adding unit tests for begins_with
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-26 16:18:05 +01:00
Vinzenz Feenstra
bfa38b5166 Fix string version of begins_with
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-26 15:47:22 +01:00
okamstudio
a9aae3000f Merge pull request #133 from vinzenz/master
More fixes to the build system
2014-02-26 11:18:44 -02:00
okamstudio
47cf3fcec6 Merge pull request #136 from marynate/PR-fix-scenedock-instance-btn
Instance button of SceneDock now working
2014-02-26 11:18:30 -02:00
okamstudio
a9d299f688 Merge pull request #137 from marynate/PR-expose-f-key-to-center-sel
Add F key to center 3d viewport to selected node
2014-02-26 11:18:06 -02:00
Juan Linietsky
a919683228 Merge branch 'master' of https://github.com/okamstudio/godot 2014-02-26 10:14:42 -03:00
Juan Linietsky
fbcc81362c Merge branch 'freebsd-cleanup' of https://github.com/robmessick/godot into robmessick-freebsd-cleanup 2014-02-26 10:13:35 -03:00
okamstudio
4f65f31826 Merge pull request #141 from vinzenz/texture-import-plugin-typo
Typo in 'Atlas Texture' import menu entry
2014-02-26 11:11:12 -02:00
okamstudio
f09a1cca07 Merge pull request #144 from C4NCER/master
move away from deprecated Options class and update .gitignore
2014-02-26 11:10:53 -02:00
Juan Linietsky
ed6d9463d2 -Added ATITC texture support
-Fixed bug of some tabs showing wrong names
-Exported properties for viewport
2014-02-26 10:08:17 -03:00
Juan Linietsky
b2ce682f6e -scripts are converted to bytecode on export
-fix bug in doc where touchscreen events were not documented
2014-02-25 09:31:47 -03:00
C4NCER
68fa537c3e add logo.h to .gitignore 2014-02-25 21:38:38 +13:00
C4NCER
942f14747b Switch from using deprecated Options class to Variables 2014-02-25 19:33:09 +13:00
Juan Linietsky
06e358199f fixie readme 2014-02-24 09:58:52 -03:00
Juan Linietsky
4b07eb8deb -moved script to modules 2014-02-24 09:53:33 -03:00
Vinzenz Feenstra
af59a1b633 Typo in 'Atlas Texture' import menu entry
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-24 12:16:40 +01:00
Rob Messick
b7386de590 Unused comparison causes error on clang. Suspect this was a typo. 2014-02-23 12:42:34 -08:00
Rob Messick
026566f872 ifdef out body of probe_joystick and process_joysticks on freebsd until a working implementation is completed 2014-02-23 12:21:31 -08:00
Rob Messick
fd03693df1 Only include linux/joystick.h on linux 2014-02-23 12:20:27 -08:00
Rob Messick
0109fb4295 alloca() lives in stdlib.h on FreeBSD 2014-02-23 12:18:11 -08:00
Juan Linietsky
51609ffc04 -fixed bug importing skeletons 2014-02-23 10:35:05 -03:00
Juan Linietsky
6c27ac58b8 -Fix for parsing XML header 2014-02-23 09:43:28 -03:00
Juan Linietsky
c45daa5604 ho 2014-02-23 09:22:21 -03:00
marynate
93878992de Add F key to center 3d viewport to selected node 2014-02-23 17:17:48 +08:00
marynate
cca806143e Instance button of SceneDock now working 2014-02-23 17:12:36 +08:00
Juan Linietsky
810d673e23 Merge branch 'master' of https://github.com/okamstudio/godot 2014-02-22 20:29:07 -03:00
Juan Linietsky
7ca29bfaa7 -added kinematic body
-added kinematic body demos
2014-02-22 20:28:19 -03:00
Vinzenz Feenstra
abbba50b32 Fix for 64Bit builds with VC from command line
Previously builds for 64 Bit targets on the x64 Native Tools Command
Prompt failed while trying to link the 64Bit build godot objects with
32Bit vc libraries. This was due to wrong library directories.

Since there are the environment variables INCLUDE and LIB which are
containing the correct paths this patch uses those now to fix the linking
issue.

Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-22 13:40:10 +01:00
Vinzenz Feenstra
8706fc85ef Fix handling for CFLAGS and LINKFLAGS like for CCFLAGS
Previously CFLAGS and LINKFLAGS were passed as a single
quoted argument to the compiler or linker. This patch splits the
paramters.

Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-22 13:34:40 +01:00
okamstudio
0f3556b486 Merge pull request #132 from samsaga2/master
Removed OF
2014-02-21 08:10:51 -02:00
Victor M
7eb0cf4ece Removed OF 2014-02-21 08:46:47 +01:00
Juan Linietsky
b62ec387f3 Merge branch 'master' of https://github.com/okamstudio/godot 2014-02-20 23:02:47 -03:00
Juan Linietsky
f2a068984c -run script in editor
-add search docs dialog that returns places string was found
-added flash
2014-02-20 23:01:44 -03:00
okamstudio
287a6347e6 Merge pull request #74 from rrockru/master
Fixed build issue on linux (missing webp include path).
2014-02-20 23:56:27 -02:00
okamstudio
06eb1a3681 Merge pull request #88 from marynate/PR-More_gitignore
More gitignore
2014-02-20 23:55:36 -02:00
okamstudio
0c44adc51f Merge pull request #89 from marynate/PR-Fix_iOS_Simulator_Build
Fix iOS Simulator Build
2014-02-20 23:55:22 -02:00
okamstudio
fb69076ef0 Merge pull request #104 from Nr7/master
Fixed two incorrect bindings in Physics2DServer
2014-02-20 23:54:58 -02:00
okamstudio
d23bd1250c Merge pull request #107 from bscranton/master
Windows StreamPeerWinsock::set_nodelay implementation
2014-02-20 23:54:45 -02:00
okamstudio
da3c7931b7 Merge pull request #109 from vinzenz/project-export
tools/editor/project_export: tree_vb already has a parent
2014-02-20 23:54:24 -02:00
okamstudio
b98da14f0f Merge pull request #116 from olifly/master
Added function "get_tiles_ids" to TreeSet.
2014-02-20 23:40:26 -02:00
okamstudio
70a9647d2d Merge pull request #123 from Terseus/fix-113_editor-settings-xml-corruption
Fix #113 editor_settings.xml corruption
2014-02-20 23:39:56 -02:00