Commit graph

191 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
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
sanikoyes
cf9d97018f fix android input doe's not work(line edit/text edit) 2014-03-12 20:41:09 +08:00
sanikoyes
101112d6fd fix-multi-char-ime-input-chinese 2014-03-11 13:21:18 +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
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
okamstudio
a9aae3000f Merge pull request #133 from vinzenz/master
More fixes to the build system
2014-02-26 11:18:44 -02: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
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
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
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
d23bd1250c Merge pull request #107 from bscranton/master
Windows StreamPeerWinsock::set_nodelay implementation
2014-02-20 23:54:45 -02:00
okamstudio
44abe6bfd7 Merge pull request #124 from kevinhartman/master
Fixed OS X retina initial videomode size
2014-02-20 23:37:01 -02:00
okamstudio
268eebe654 Merge pull request #128 from marynate/PR-stop-tracking-logo-h
Stop tracking platform/server/logo.h for it will be autogenerated
2014-02-20 23:25:10 -02:00
Juan Linietsky
51c55b237b wtf 2014-02-19 18:09:52 -03:00
marynate
6f0ba52be2 Stop tracking platform/server/logo.h for it will be autogenerated 2014-02-19 23:51:08 +08:00
Juan Linietsky
d7d65fa2f2 -improved physics ccd
-html5 exporter works again
-disable repeat on image loader by default
-can change shape offset en tileset, texture offset was broken
2014-02-19 11:57:14 -03:00
Kevin Hartman
3974a5e84d OSX current_videomode size is now initialized with correct resolution based on backing store. Fixes issue where content does not correctly fit in window on retina displays. 2014-02-18 22:48:38 -05:00
Benjamin Scranton
afcefc7a0e windows StreamPeerWinsock::set_nodelay implementation
StreamPeerWinsock::set_nodelay was a no-op.  Copied the code from the
POSIX implementation because it is also correct on Windows per
http://msdn.microsoft.com/en-us/library/windows/desktop/ms740476%28v=vs.85%29.aspx.
2014-02-17 13:24:44 -05:00
Juan Linietsky
8c1731b679 -project settings are saved when changed
-load() was in the GDScript docs but missing in the scripting-different music for platformer 2D and 3D
-fix how documentation is generated, built in doc browser should be always up to date
-copypaste, scrolling, etc in  builtin doc
-built-in scripts get saved now (though debugger may not always work on them)
-Theme can be set to controls as a property
2014-02-15 21:16:33 -03:00
marynate
2371a92fde UIApplication setStatusBarHidden:animation has been deprecated since iOS 3.2, use setStatusBarHidden:withAnimation instead. 2014-02-15 23:19:43 +08:00
marynate
d38cf2e396 Update SConstruct build scripts for iOS Simulator build 2014-02-15 23:17:23 +08:00
Juan Linietsky
9afdb3e0ad -fixed bug in Button now exporting font property
-made GUI Theme editor usable
-editor does not allow to export or create .pck in the same path as a project
-changed .pck format (lacked support for versioning so couldn't change it), previous was causing crashes and is now incompatible, just re-export.
-will not look for .pck files recursively, was causing unexpected behaviors
-fixed execution of Godot in paths with non unicode characters in Windows, OSX and Linux.
2014-02-15 02:02:41 -03:00
Vinzenz Feenstra
db3e3255a8 Addressed comments by Terseus to match the spec
size_t -> long
uint8_t -> unsigned char

Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-14 12:42:47 +01:00
Vinzenz Feenstra
bfafcb4664 x11: Set icon issue fix
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-14 11:31:41 +01:00
Juan Linietsky
b607687a31 Merge branch 'master' of https://github.com/okamstudio/godot 2014-02-13 18:06:53 -03:00
Juan Linietsky
58cda02a38 -fixed export templates not loading/exporting on Windows
-fixed TouchScreenButton with stretch2d
-fixed(?) OSX crash on startup (test!!)
-compilation fixes on windows
-CollisionPolygon editor works again
-find buttons en find dialog
-TileMap editor cleanup (removed "error", made nicer)
-viewport flicker fixed
-make .scn default extension for saving scenes
-export the rest of the network classes to gdscript
2014-02-13 18:03:28 -03:00
okamstudio
ca60bae83e Merge pull request #34 from marynate/master
Fixed build rule file for proper MSVC release build
2014-02-13 12:10:21 -02:00
marynate
5abc0bbcf6 Fixed build rule file for proper MSVC release build 2014-02-11 23:44:32 +08:00
Jeremy Williams
335d963031 Fix mouse coordinates on OS X retina displays 2014-02-10 22:27:50 -05:00
Juan Linietsky
1c7726820e fixie 2014-02-10 13:12:23 -03:00
Juan Linietsky
0b806ee0fc GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00