maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1787 commits 10 branches 35 tags 1.1 GiB
Commit graph

1787 commits

This branch
This branch
All branches
Author SHA1 Message Date
Juan Linietsky 13d2710fed Merge pull request #2474 from masoudbh3/android-armeabi-v7a 
Fix android build script
 2015-10-17 10:20:47 -03:00
Juan Linietsky 4a6bd7844a Merge pull request #2484 from firefly2442/add-physics-commandline-help 
add missing physics unit test to --help listing in main.cpp
 2015-10-17 10:12:56 -03:00
Juan Linietsky 4a8bc25f18 Merge pull request #2485 from masoudbh3/fix-x11-editor-boot-splash 
Fix X11 Editor Boot Splash (Maximized Boot Splash)
 2015-10-17 10:12:34 -03:00
Juan Linietsky 5a14b89c32 Merge pull request #2488 from slapin/remove-unimplemented-exporter-option 
Remove of use_exclude_ctrl_bones option
 2015-10-17 10:11:55 -03:00
Juan Linietsky e1e04c1dd5 Merge pull request #2497 from vnen/fix-2490 
Make dict2inst set internal members of instance
 2015-10-17 10:11:11 -03:00
Juan Linietsky 1028ab9d81 Merge pull request #2520 from bojidar-bg/patch-3 
Add missing \n to world_wrap.
 2015-10-17 10:07:08 -03:00
Juan Linietsky 5cc145904a Merge pull request #2522 from ricpelo/master 
Disable filters for tilemap in 2D Platformer demo
 2015-10-17 10:06:27 -03:00
Juan Linietsky 99a3c1aaa1 Merge pull request #2531 from bojidar-bg/patch-4 
Fix parameters of funcRef::call_func
 2015-10-17 10:06:03 -03:00
Juan Linietsky f4e93a5137 Merge pull request #2549 from shackra/docdump-openproj 
Documentation Converter from XML to Open Project wiki markup format
 2015-10-17 10:05:31 -03:00
Juan Linietsky e64874fe20 Merge pull request #2555 from jackmakesthings/class-reference-formatting 
Readability improvements for the in-game class reference
 2015-10-17 10:04:51 -03:00
Juan Linietsky f11fdb611e Merge pull request #2556 from volzhs/fix_miss_bind_findnode 
fix miss bind for Node::find_node
 2015-10-17 10:02:43 -03:00
Juan Linietsky 0b5ac93875 Merge pull request #2569 from TheHX/issue_2567 
Fix bug in EditorPlugin::add_custom_control
 2015-10-17 09:49:00 -03:00
Juan Linietsky 652a01f16f Merge pull request #2572 from leezh/clipping-fix 
nested clipping of canvas items now works
 2015-10-17 09:48:38 -03:00
Juan Linietsky f259f9cbc3 Merge pull request #2584 from buresu/fix-parentheses-equality-warnings 
[OSX Clang] Fix parentheses-equality warnings
 2015-10-17 09:48:06 -03:00
Juan Linietsky a871fc9112 Merge pull request #2587 from eska014/fix-area2d-mask-matching 
Fix Area/Area2D mask matching
 2015-10-17 09:47:27 -03:00
Juan Linietsky b3d34bcef4 Merge pull request #2589 from eska014/add-raycast2d-type_mask 
Add type mask customization to RayCast2D
 2015-10-17 09:45:52 -03:00
Juan Linietsky 426909e26b Merge pull request #2594 from Biliogadafr/PinSoftness 
Expose softness parameter of pin joint to the editor.
 2015-10-17 09:45:16 -03:00
Juan Linietsky 782444d366 Merge pull request #2602 from sanikoyes/Pr-REUSE_ADDR_WIN32 
Pr-REUSE_ADDR_WIN32
 2015-10-17 09:44:07 -03:00
Juan Linietsky 7e2c798aa1 Merge pull request #2607 from StraToN/doc-update 
GraphEdit and GraphNode documentation
 2015-10-17 09:43:44 -03:00
Juan Linietsky eb607b39df Merge pull request #2608 from didier-v/OSX_get_locale 
Added specific get_locale to OSX platform
 2015-10-17 09:43:14 -03:00
Juan Linietsky f44d15e4fc Merge pull request #2609 from eska014/export-hints 
GDScript export hints: Add float w/ ease, remove duplicate, adapt multiline to established format
 2015-10-17 09:40:46 -03:00
reduz 17a90ddc08 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	scene/resources/packed_scene.h
 2015-10-16 19:13:09 -03:00
reduz 078a474135 -fixes and more fixes to new scene system, seems stable now.. 
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
 2015-10-16 19:11:23 -03:00
eska eb9621624f Add GDScript export hint for real numbers with easing export(float, EASE) 2015-10-16 20:37:13 +02:00
Didier Vandekerckhove d48a1bd22d Added specific get_locale to OSX platform 
The default unix get_locale didn’t work. OS X requires a specific one.
 2015-10-16 19:42:26 +02:00
eska 57b2c4b0c6 Add multiline string GDScript export hint export(String, MULTILINE) 2015-10-16 18:48:54 +02:00
Julian Murgia - StraToN 2975064c4d GraphEdit and GraphNode documentation 2015-10-16 17:56:03 +02:00
eska e18c1ba05b Revert "add flag and multiline hits in GDScript" 
This reverts commit 7843ec6633.
 2015-10-16 16:18:46 +02:00
Juan Linietsky 79e5ced7e6 -A little More control about pixel snapping in 2D 2015-10-13 15:53:34 -03:00
sanikoyes 15f6991064 REUSE_ADDR under windows platform 2015-10-13 13:11:33 +08:00
Juan Linietsky b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	platform/windows/detect.py
 2015-10-13 01:19:32 -03:00
Juan Linietsky 52e756752e ability to change audio track in theora video 2015-10-13 01:17:54 -03:00
Biliogadafr 2ffc90d8b4 Expose softness parameter of pin joint to the editor. 2015-10-10 23:28:05 +03:00
reduz 6b20ee4324 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-10 09:09:59 -03:00
reduz 422929e87f Large improvements on scene packing and management 
-Ability to edit and keep changes of instanced scenes and sub-scenes
-Ability to inherit from other scenes
 2015-10-10 09:09:09 -03:00
eska 793c53122a Add type mask property to RayCast2D 2015-10-10 05:46:47 +02:00
eska 375a7a727f Fix 3D Area mask matching 2015-10-10 02:33:26 +02:00
eska 13ff4bde65 Fix Area2D type mask matching 2015-10-09 21:54:16 +02:00
近藤 直人 bbca86577d fix parentheses-equality warnings of osx clang 2015-10-09 21:39:50 +09:00
reduz aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
reduz 3514a87b37 fixed uninitialized memory issues in audio code 2015-10-08 14:50:18 -03:00
Ariel Manzur c2532bffb3 Please enter the commit message for your changes. Lines starting 
removed locks
 2015-10-08 12:59:12 -03:00
punto- a9e68df493 Merge pull request #2564 from ZuBsPaCe/opus-support-vs2013 
Fixes Visual Studio 2013 compile errors due to Opus
 2015-10-08 12:22:25 -03:00
Jorge Araya Navarro 613962d48a Minor changes: Organizing imports 2015-10-07 13:24:52 -06:00
Jorge Araya Navarro 0fb91ef95b Minor changes 2015-10-07 13:15:28 -06:00
Jorge Araya Navarro 68d005760b Internationalization implemented 
Specify which language you want the templates translate to with the
`--language` option and any choice language available. By default
English is used. When class_list.xml is translated to different language
than English this option will be useful to make the template language
match.
 2015-10-07 13:11:17 -06:00
Jorge Araya Navarro 7c843fbc04 Refactoring some strings and ordering imports 2015-10-06 19:50:55 -06:00
Zher Huei Lee 7f001a2c76 nested clipping of canvas items now works 2015-10-05 11:50:16 +01:00
Franklin Sobrinho a609a567ea Fix bug in EditorPlugin::add_custom_control, fixes #2567 2015-10-04 08:29:19 -03:00
ZuBsPaCe d99727d099 Fixes following Visual Studio 2013 compile error on windows: 
drivers\opus\celt\bands.c(555) : error C2057: expected constant expression
drivers\opus\celt\bands.c(555) : error C2466: cannot allocate an array of constant size 0
drivers\opus\celt\bands.c(555) : error C2133: 'tmp' : unknown size
 2015-10-03 00:42:40 +02:00