Commit Graph

59249 Commits

Author SHA1 Message Date
Juan Linietsky 0a717ffee2 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	modules/multiscript/register_types.cpp
	platform/android/java/src/com/android/godot/GodotLib.java
2014-03-13 23:14:35 -03:00
Juan Linietsky 31ce3c5fd0 -fix bug in cache for atlas import/export
-fix some menus
-fixed bug in out transition curves
-detect and remove file:/// in collada
-remove multiscript for now
-remove dependencies on mouse in OS, moved to Input
-avoid fscache from screwing up (fix might make it slower, but it works)
-funcref was missing, it's there now
2014-03-13 22:57:24 -03:00
sanikoyes 14bbdcb139 fix enter key 2014-03-13 18:31:30 +08:00
sanikoyes 51429bd8d6 fix android can't input unicode characters
fix hide soft keyboard by press 'back' button,
 then click current focus text edit/line edit control,
 soft keyboard won't show again

add features:
  press enter key with line edit control will hide soft keyboard
2014-03-13 16:58:03 +08:00
reduz 81757d2e97 Merge pull request #168 from mogemimi/fix/empty-body
Fix if statement with empty body.
2014-03-12 08:58:14 -07:00
reduz 188a892195 Merge pull request #169 from bibby/makedoc
Closes bb-code tags, allowing make_doc.sh to finish
2014-03-12 08:58:00 -07:00
reduz bb7f586842 Merge pull request #170 from mutantgames/master.fork
Solved bug to select external editor url
2014-03-12 08:56:39 -07:00
reduz 3dcfdc057c Merge pull request #175 from MysticTreeGames/master
Engine build improvements
2014-03-12 08:53:59 -07:00
reduz 30aaca25d6 Merge pull request #187 from marynate/PR-fix-windows-utf8
Fixed bug: Godot wont start in windows when inside non-ascii directory
2014-03-12 08:47:10 -07:00
reduz 777c045bfc Merge pull request #189 from sanikoyes/hotfix-ime
Merging!
2014-03-12 08:45:07 -07:00
reduz c7a03a0648 Merge pull request #188 from marynate/PR-fix-compression-return
Fix Compression bug: wrong premature return.
2014-03-12 08:37:14 -07:00
reduz cbcba776c1 Merge pull request #192 from sanikoyes/hotfix-android-text-input
fix android input doe's not work(line edit/text edit)
2014-03-12 08:36:04 -07:00
sanikoyes cf9d97018f fix android input doe's not work(line edit/text edit) 2014-03-12 20:41:09 +08:00
sanikoyes 4927acd7ad export a unicode font may crash because chunks out of range...
set MemoryPoolDynamicStatic::MAX_CHUNKS to 65536
2014-03-11 13:57:59 +08:00
sanikoyes 87fd153215 fixed editor NodePath property 2014-03-11 13:38:30 +08:00
sanikoyes cde48d0c9c fix gdscript path parse error 2014-03-11 13:30:33 +08:00
sanikoyes 101112d6fd fix-multi-char-ime-input-chinese 2014-03-11 13:21:18 +08:00
marynate 1be5d6f665 Fix Compression bug: wrong premature return. 2014-03-11 13:18:57 +08:00
marynate f7cef6d617 remove unnecessary error check when converting ascii to unicode 2014-03-11 13:09:24 +08:00
marynate 0552b76475 Convert windows main entry arguments to UTF8; Set locale to system default for locale-awared console output;
memery clearnup
2014-03-11 13:09:09 +08:00
Moritz Wundke caa1586480 Adding CodeLite hidden folder to .gitignore 2014-03-08 20:46:04 +01:00
Moritz Wundke 5634da9934 Adding CodeLite and KDE files to .gitignore 2014-03-08 20:44:18 +01:00
Moritz Wundke f1b1a38af9 Do not set number of jobs if already specified 2014-03-08 18:50:24 +01:00
Moritz Wundke 1fd08ad1ac Fixed typo 2014-03-07 20:31:17 +01:00
Moritz Wundke 12a3989cd7 Speed build time up by 6 using multiple jobs
Adding aggresive build mode that spawns num_core+1 jobs. This speeds up
build time by 6. On my 8 core machine I'm down from 6m:16s to 1m:34s.
2014-03-07 20:20:06 +01:00
Moritz Wundke 76b1d421f6 Addinf basic makefile to support many C/C++ IDEs out there
Make file is configured by default to act identically as a default SCons
build. Baseic actions such as all and clean will be supported by default
by quite all IDE for building and rebuilding. Additionaly you can
configure your targets for release, debug or profile mode.
2014-03-06 20:46:15 +01:00
sasori 3ba00567c5 Solved bug to select external editor url
https://github.com/okamstudio/godot/issues/145
2014-03-05 18:52:57 +01:00
bibby 141b313595 Closes bb-code tags, allowing make_doc.sh to finish 2014-03-05 07:53:33 -08:00
mogemimi 9d463a8914 Fix if statement with empty body. 2014-03-05 23:09:41 +09:00
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