Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 21:51:35 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
95 Commits 15 Branches 59 Tags 2.7 GiB
4f65f31826
Commit Graph

95 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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