godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,926 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

1926 Commits

Author SHA1 Message Date
Juan Linietsky c22b627ee3 Merge pull request #2362 from AlexHolly/update-scene-tab-fix 
[UI-FIX] - Update scene tabs on save
 2015-10-17 10:51:45 -03:00
Juan Linietsky 277a339cf0 Merge pull request #2365 from Mavhod/patch-1 
get_date on Linux
 2015-10-17 10:49:46 -03:00
Juan Linietsky c2515d352e Merge pull request #2369 from Max-Might/master 
Haiku: platform support
 2015-10-17 10:48:57 -03:00
Juan Linietsky c9ff40e140 Merge pull request #2380 from StraToN/tabs-buttons 
Tab close button + display policies + application on Scenes Tabs
 2015-10-17 10:46:32 -03:00
Juan Linietsky 1b5622fb9b Merge pull request #2395 from MrMormon/patch-1 
Fixed misspelled local variable for code clarity
 2015-10-17 10:45:16 -03:00
Juan Linietsky b411f8f732 Merge pull request #2402 from ERIIX/master 
Properly free enemies after death in 3d platformer demo.
 2015-10-17 10:43:17 -03:00
Juan Linietsky 40f8b1d2ea Merge pull request #2434 from cverdes/vsproj 
Ignore some extension of files created by Visual Studio 2013
 2015-10-17 10:41:42 -03:00
Juan Linietsky 63033aa646 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 10:30:08 -03:00
Juan Linietsky ab22203791 misc cleanup 2015-10-17 10:29:54 -03:00
Juan Linietsky 0d2b28377f Merge pull request #2455 from firefly2442/hide-menu-fix 
[UI fix] Hide opened menu when click on menu button
 2015-10-17 10:28:20 -03:00
Juan Linietsky 1d800a681b Merge pull request #2457 from firefly2442/doxygen-fix 
Fix absolute paths used in doxygen, ignore generated documentation in Git
 2015-10-17 10:27:35 -03:00
Juan Linietsky b217e1417a Merge pull request #2479 from firefly2442/cppcheck-unusedvars 
ran cppcheck, found unused variables
 2015-10-17 10:25:36 -03:00
Juan Linietsky 7060eaaa1b Merge pull request #2481 from firefly2442/cppcheck-arrayindexthencheck 
ran cppcheck, fixed cases where array index is used before limits check
 2015-10-17 10:23:15 -03:00
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
Kostadin Damyanov c925fbce2d Haiku: fix build 2015-10-17 15:41:01 +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
MarianoGNU a5ebb52500 Merge branch 'master' of https://github.com/okamstudio/godot 
# Solved Conflicts:
#	tools/editor/property_editor.cpp
 2015-10-16 23:21:39 -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
Kostadin Damyanov 29caf2bb5b Merge remote-tracking branch 'upstream/master' 2015-10-13 05:01:54 +03:00
firefly2442 692216b86a ran cppcheck, fixed cases where array index is used before limits check 2015-10-12 09:45:44 -05:00
Biliogadafr 2ffc90d8b4 Expose softness parameter of pin joint to the editor. 2015-10-10 23:28:05 +03:00