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

1889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
firefly2442
afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
Juan Linietsky
889d21e004 Merge pull request #2352 from xodene/patch-6/script-file-new 
Add "New" script button to Script Editor Popup Menu
 2015-09-16 09:55:10 -03:00
masoud bh
9d540afd1c android remove "gen" folder from git. 2015-09-16 16:28:01 +04:30
masoud bh
867c95223d Fix android build script 
some fixes for android build script.
remove armv6,x86 options and add "android_arch" option for select
compiler architecture (armv7,armv6,x86)(default armv7).
add architecture suffix for output files and you can compile for several
architecture simultaneously.
example:
libgodot.android.opt.debug.armv7.so
libgodot.android.opt.debug.armv7.neon.so
libgodot.android.opt.debug.armv6.so
libgodot.android.opt.debug.x86.so
now we can enable/disable neon on armv7 with "android_neon" option
(default enable).
add "NDK_TARGET_X86" option for select toolchain to use for the NDK x86
(default x86-4.8).
change inputs model for "ndk_platform" option (default android-15).
fix armv7 ccflags.

with this patch, must put libgodot_android.so file in specific
architecture folder:

armv7 (default): <android-java>/libs/armeabi-v7a/
armv6: <android-java>/libs/armeabi/
x86: <android-java>/libs/x86/
 2015-09-16 16:14:38 +04:30
reduz
a2f2d7610a Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-15 22:18:41 -03:00
reduz
2580ca01e6 Ability to keep collisionshapes and collisionpolygons when running the game. 
Works for 2D and 3D
These are still just helpers in case you want to animate them or access them
directly.
Modifying the real shapes is still done via CollisionObject and CollisionObject2D APIs
But an API was added so you can query which shapes from CollisionObject correspond to which CollisionShape.

Have Fun!
 2015-09-15 22:07:03 -03:00
Juan Linietsky
1931d228fa Merge pull request #2469 from vnen/fix-2418 
Set AnimationEditor UndoRedo reference on creation, Fix #2418
 2015-09-14 01:02:36 -03:00
George Marques
1add3b3dac
Set AnimationEditor UndoRedo reference on creation 
Fix #2418
 2015-09-13 16:21:09 -03:00
Juan Linietsky
4773c19e60 Merge pull request #2467 from romulox-x/iphoneSplash 
server build error fixed
 2015-09-12 23:19:12 -03:00
romulox_x
e5730c1c7c fixed server breaking error in previous splash screen commit 2015-09-12 19:15:02 -07:00
Juan Linietsky
89a901c4b6 Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-12 10:56:13 -03:00
Juan Linietsky
a88f67821c HTML5 exporter seems to be fully functional 
-user:// filesystem implemented
-default template page could look prettier, help appreciated
 2015-09-12 10:54:47 -03:00
Juan Linietsky
943714c015 Merge pull request #2461 from romulox-x/iphoneSplash 
fixed iOS splash screen
 2015-09-12 00:17:24 -03:00
Juan Linietsky
56c907ad04 fix to builtin freetype defines on linux 2015-09-10 22:15:00 -03:00
Juan Linietsky
751202768c fix to freetype detection 2015-09-10 21:40:34 -03:00
Juan Linietsky
682578f3b3 more c++ include references removed 2015-09-10 20:53:31 -03:00
Juan Linietsky
c7426717d3 Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 20:31:34 -03:00
Juan Linietsky
83b69f8fef remotion of some c++ includes to avoid dependency on libstdc++ 2015-09-10 20:30:46 -03:00
steve
b0e5031f1f ios now displays splash screen between launch image and main scene, instead of a black screen 2015-09-10 15:01:02 -07:00
Juan Linietsky
59e1ad2773 disabling theora for now (will be re-written, re-enabled later) 2015-09-10 13:27:15 -03:00
Juan Linietsky
fad1faddae Removing locatime so this function compiles again. 
I don't think it has any practical use anyway.
 2015-09-10 13:10:23 -03:00
Juan Linietsky
3013a83f2f Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 00:12:05 -03:00
Juan Linietsky
0fb7b5aa0c HTML5 exporter Improvements 
-Better template handling
-Voice support
-Stream support
 2015-09-10 00:10:54 -03:00
Juan Linietsky
4e8dcc8938 Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-09 18:52:47 -03:00
Juan Linietsky
9741374617 Rewrite of the AudioStream API 
-Fixes long-standing issues regarding to playing a single stream multiple times simultanteously
-Fixes wrong-looping, starting, caching, etc. Issues resulting from bad original design
-Allows more interesting kinds of streams (stream graphs with streams inside streams!) in the future
 2015-09-09 18:50:52 -03:00
Ariel Manzur
e3e93da6b9 fixed localtime thing for ios, not tested anywhere else 2015-09-09 20:24:38 +00:00
punto-
4d900859e2 ios build with osxcross 2015-09-09 21:57:49 +02:00
Franklin Sobrinho
26a715298e Fix HScrollBar of TextEdit, closes #2355 2015-09-09 13:44:31 -03:00
firefly2442
0e60b959cd Fix absolute paths used in doxygen, ignore generated documentation in Git 2015-09-09 02:55:47 -05:00
firefly2442
930cb97c7d hide opened menu when click on menu button 2015-09-08 22:48:22 -05:00
Juan Linietsky
2d570ac657 Merge pull request #2427 from volzhs/fix-game-window-resolution 
fix game window runs only 800x600. fix #2426
 2015-09-08 09:18:57 -03:00
Zher Huei Lee
b33c288525 updated Label documentation 2015-09-08 10:41:58 +01:00
Zher Huei Lee
564f3e0302 fix minsize-related issues with Label 
- fixed end of string adding to Label minsize
 - exposed set_clip_text() and is_clipping_text() to the script side
 - text would now never stick outside its boundaries
 - label min-height is now restricted by max_lines_visible
 2015-09-08 10:17:28 +01:00
Zher Huei Lee
a0ba134643 added get_visible_characters() to Label 2015-09-07 22:56:16 +01:00
Zher Huei Lee
7c5cd0c296 reworked Label class 
- no longer inherits Range - instead, more sensible
   function names controlling lines visible
 - more accurate vertical alignment
 - percent_visible preserved even after setting new text
 2015-09-07 19:56:17 +01:00
Cesar Verdes
e8223a90e4 Ignore some extension of files created by Visual Studio 2013 2015-09-06 12:17:50 -03:00
Kostadin Damyanov
c5f574b914 Merge remote-tracking branch 'upstream/master' 2015-09-05 12:03:17 +03:00
volzhs
cf98b44d3f fix game window runs only 800x600 2015-09-05 15:47:23 +09:00
Juan Linietsky
b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky
7900d5daf2 Merge pull request #2414 from crr0004/2409-editor-freeze 
Issue #2409 Fixes editor freeze
 2015-09-02 07:55:17 -03:00
crr0004
f34c3e249b Fixes editor freeze 2015-09-02 13:56:51 +10:00
Juan Linietsky
688047a4c9 -removed resources dock, good bye old friend 2015-09-01 00:49:47 -03:00
Juan Linietsky
cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
Mariano Javier Suligoy
553edf1f25 Merge branch 'master' of https://github.com/okamstudio/godot 
# Solved Conflicts:
#	scene/gui/spin_box.cpp
#	scene/gui/tree.cpp
 2015-08-30 19:39:36 -03:00
Mariano Javier Suligoy
680402cebf Add missing icons, also make MSVC2010 happy 2015-08-30 19:37:23 -03:00
Juan Linietsky
2d8866574d Added gravity scale, and linear/angular damp override to 3D physics. 2015-08-30 18:57:17 -03:00
Juan Linietsky
cb6839c5c1 make moving up&down items from the autoload list work 2015-08-30 17:48:29 -03:00
Juan Linietsky
319cc7e3ae detect node and variable assignments in _ready, _init, etc for further code completion 2015-08-30 11:50:10 -03:00
Juan Linietsky
947b283248 -fix compile issue (pow) 
-ask user for track to call nodes when adding call track
 2015-08-30 10:10:51 -03:00
Mariano Javier Suligoy
c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot 
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
 2015-08-30 02:48:45 -03:00