Commit graph

37827 commits

Author SHA1 Message Date
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
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
okamstudio
4d5ec64a9d Merge pull request #110 from vinzenz/108-fix
Fix for Issue #108
2014-02-20 13:06:52 -02:00
Juan Linietsky
51c55b237b wtf 2014-02-19 18:09:52 -03:00
Olafur Haukur Flygenring
c78a06536e Merge remote-tracking branch 'upstream/master' 2014-02-19 20:52:07 +00:00
marynate
6f0ba52be2 Stop tracking platform/server/logo.h for it will be autogenerated 2014-02-19 23:51:08 +08:00
Juan Linietsky
449bc14fb4 Merge branch 'master' of https://github.com/okamstudio/godot 2014-02-19 12:01:31 -03: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
Terseus
b6583909a9 Fix #113 editor_settings.xml corruption
In the `parse_tag` method of the `class ResourceInteractiveLoaderXML`,
the class responsible of loading the editor_settings.xml file, the
properties' values are loaded directly into an `String` object but the
file contents are always UTF-8, which leads to garbage in the XML file
when saved.

This patch reads the properties' values in a `CharString` and translate
them to UTF-8.
2014-02-18 21:37:58 +01:00
reduz
2bfbf89781 Merge pull request #111 from vinzenz/obsolete-editor-plugin-removal
Removal of obsolete editor plugins Fixes #64
2014-02-18 18:18:11 -02:00
reduz
f0e6ed1c26 Merge pull request #118 from Terseus/fix-19_non-ascii-paths
Fix #19 Can't open project (with non-ASCII path)
2014-02-18 18:17:25 -02:00
reduz
df189aa583 Merge pull request #115 from marynate/PR-open-pm-in-editor
Able to open project manager inside editor (Scene->Project Manager)
2014-02-18 15:36:50 -02:00
Terseus
666aeac713 Fix #19 Can't open project (with non-ASCII path)
In `class OS_Unix` the arguments in the `execute` method are converted
to UTF-8, but in the `main` program's method they're inserted into a
wide-char `Vector` before translating them from UTF-8 and thus the
non-ASCII characters are lost.

This fix converts the `argv` elements to UTF-8 using `String::utf8`
before inserting them in the `Vector`.
2014-02-18 14:37:22 +01:00
Olafur Haukur Flygenring
ec448845e2 Added function "get_tiles_ids" to TreeSet. 2014-02-18 09:49:34 +00:00
marynate
3550a18fa2 Able to open project manager inside editor (Scene->Project Manager)
Remove unnecessary include of project_manager.h
2014-02-18 13:09:31 +08:00
Vinzenz Feenstra
dba66e0286 Removal of obsolete editor plugins Fixes #64
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-17 22:44:05 +01:00
Vinzenz Feenstra
339f332892 Fix for Issue #108
Entering a somethign in the 'Path field' triggers the
`_path_changed` signal being triggered.
This in turn calls Globals::localize_path(const String& p_path) with the
currently entered string.
localize_path then is replacing backslashes with slashes and calls
afterwards `String::simplify_path`

String::simplify_path is checking wheter a string starts with:

- res://
- local://
- user://

If any of those is true it removes this section.

However, if any of the first letters of those are matching begins_with
returns true, which is wrong. It should only return true if the whole
string is matched at the beginning.

This caused the whole desaster and lead localize_path into an endless loop
because out of `u` suddenly became user:// which it then tried again to
localize and so on.

This fix, fixes the root of the problem which is begins_with which should
not return true if not the whole search string was matched.

Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-17 21:54:26 +01:00
Vinzenz Feenstra
518722438f tools/editor/project_export: tree_vb already has a parent
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-17 20:49:48 +01: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
Nr7
1b6a16f8e6 Fixed two incorrect bindings in Physics2DServer 2014-02-17 16:11:20 +02:00
okamstudio
891b2bdb4f Merge pull request #94 from marynate/PR-Fixed_Issue_93
Fixed #93 Build error with latest commit
2014-02-16 08:38:44 -02:00
marynate
408aeeafee Fixed #93 Build error with latest commit 2014-02-16 15:54:09 +08: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
marynate
2dac11d044 More gitignore 2014-02-15 22:57:40 +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
reduz
b0870e487c Merge pull request #77 from vinzenz/shaderlang-test-crash-fix
Fixed crash bug in the shaderlang test
2014-02-14 18:59:06 -02:00
reduz
89f96213aa Merge pull request #69 from vinzenz/icon-issue
x11: Set icon issue fix
2014-02-14 18:54:51 -02:00
Vinzenz Feenstra
96bc0c9f15 Fixed crash bug in the shaderlang test
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-14 20:51:55 +01:00
rrockru
a17d76e60b Fixed build issue on linux (missing webp include path).
Tested on ArchLinux.
2014-02-14 18:45:20 +04: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
reduz
c12a8e922f Merge pull request #62 from vinzenz/ccflags-handling
Fix CCFLAGS handling
2014-02-14 03:30:51 -02:00
reduz
e0b4ea2731 Merge pull request #59 from marynate/master
Add .gitignore to ignore autogenerated files in source repository
2014-02-14 03:28:39 -02:00
reduz
6a5980e16a Merge pull request #23 from thetron/master
Fixed typo in undefined main_scene alert
2014-02-14 03:26:59 -02:00
Vinzenz Feenstra
8b3fecb43d Fix CCFLAGS handling
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-13 22:15:18 +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
marynate
6afd1fd2cb Add .gitignore to ignore autogenerated files in source repository 2014-02-13 23:41:54 +08:00
okamstudio
4ff524b5c9 Merge pull request #7 from fdb/font-import-typo
Fix typo in font import plugin.
2014-02-13 12:11:07 -02: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