mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-03 09:52:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,124 Commits 15 Branches 59 Tags 7.8 GiB
b89aec5fbe
Commit Graph

285 Commits

Author SHA1 Message Date
ZuBsPaCe
c69afe4948 Fixes following Visual Studio 2013 compile error on windows: 
audio_stream_opus.h(57) : error C2864: 'AudioStreamPlaybackOpus::osrate' : a static data member with an in-class initializer must have non-volatile const integral type

See: http://stackoverflow.com/questions/2454019/why-arent-static-const-floats-allowed
 2015-10-03 00:38:43 +02:00
George Marques
6e87314d83
Add support for Opus audio format 2015-10-02 14:25:38 -03:00
romulox_x
187c000ab5 removed unnecessary clear, which prevented root viewport from working right when told not to clear 2015-10-01 13:30:10 -07:00
Juan Linietsky
c858515785 Fixed theora playback. Removed theoraplayer. 
Still need to get proper audio output latency in some platforms.
 2015-09-26 14:50:42 -03:00
Juan Linietsky
83d9a692be Ability to visually debug geometry visually: 
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
 2015-09-20 13:03:46 -03:00
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
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
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
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
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
Kostadin Damyanov
c5f574b914 Merge remote-tracking branch 'upstream/master' 2015-09-05 12:03:17 +03:00
Juan Linietsky
b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky
4b40f9228b Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-23 20:22:08 -03:00
Juan Linietsky
07e9741425 **WARNING BEFORE PULLING** 
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)

Summary of Changes

-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
 2015-08-23 20:15:56 -03:00
Kostadin Damyanov
2a757a6ad4 Haiku: move the audio driver to platform/haiku 2015-08-14 22:52:28 +03:00
Mavhod
3942117bbf add () 
Sorry, firt time I put it but had no compiled for check.
 2015-08-13 18:56:13 +07:00
Mavhod
69710055f0 get_date on Linux 
tm_mon is 0-11
 2015-08-13 14:09:21 +07:00
Kostadin Damyanov
cdf1ac7d58 Merge remote-tracking branch 'upstream/master' 2015-08-09 12:45:21 +03:00
Juan Linietsky
0a139aaef9 Merge pull request #2302 from antonyjones67/AndroidTemplateCompileWindows 
Fixes compile bug for Android template on Windows.
 2015-08-08 11:14:28 -03:00
Juan Linietsky
5e326e4903 Merge pull request #2328 from her001/patch-1 
Fix vorbis seek_pos
 2015-08-08 11:04:46 -03:00
xodene
6b25e83ba7 tested and fixed unix os_system_time_msec() 2015-08-06 11:08:48 -07:00
Maximillian
6f9a084ac8 Add OS.get_system_time_msec 2015-08-06 10:29:33 -07:00
Andy Conrad
d110260c1e Fix vorbis seek_pos 2015-08-03 11:41:50 -05:00
Kostadin Damyanov
f5bfd497aa Haiku: add sound support 2015-07-26 02:18:32 +03:00
PeaceSells
9983ceecf2 Fixes compile bug for Android template on Windows. 2015-07-24 13:12:23 -06:00
Zher Huei Lee
69eff35cd5 Fixed incorrect failsafe return values 2015-07-24 16:15:04 +01:00
Zher Huei Lee
87c1e16834 Made RegEx API similar to old version 2015-07-24 14:09:39 +01:00
Zher Huei Lee
d9f1a85948 More nrex fixes 2015-07-24 13:25:04 +01:00
Lee Zher Huei
732bfd0baf Updated nrex fixes 2015-07-24 02:02:52 +01:00
Lee Zher Huei
ef005d4f64 Regex library Nrex initial port 2015-07-24 01:18:46 +01:00
Juan Linietsky
55b34e05b3 -some changes by okam 2015-06-30 11:28:43 -03:00
Kostadin Damyanov
e0e54ea7d4 Merge remote-tracking branch 'upstream/master' 2015-06-26 21:35:47 +03:00
Kostadin Damyanov
f61eb5fd8e Haiku: fix the glew.c hack 2015-06-26 21:32:57 +03:00
romulox_x
acb5cdb574 forgot to add mirroredrepeat flag to flags file. fixed. 2015-06-25 15:41:12 -07:00
romulox_x
85e49d4e75 added support for mirrored repeat texture wrapping 2015-06-25 14:51:21 -07:00
Juan Linietsky
52308aba68 ability to change shadow color in light2d 2015-06-24 18:15:43 -03:00
Kostadin Damyanov
0038e27fc3 Merge remote-tracking branch 'upstream/master' 2015-06-18 22:48:29 +03:00
Juan Linietsky
4b35654a02 Update rasterizer_gles2.cpp 
fixed camera plane
 2015-06-12 09:54:19 -03:00
Kostadin Damyanov
8df3e30abd Haiku: create a GL context and initialize the audio and physics servers 2015-06-11 22:57:41 +03:00
Juan Linietsky
9e479065f5 new space shooter demo 
ortho camera sort fix, closes #2063
 2015-06-11 10:00:48 -03:00
Kostadin Damyanov
f99b72c04f Haiku: remove an #ifdef as the platform now supports MSG_NOSIGNAL 2015-06-10 21:18:39 +03:00
Juan Linietsky
8d61817293 Merge pull request #2037 from est31/use-local-win 
Time zone support
 2015-06-07 00:32:29 -03:00
Juan Linietsky
9acab32daa new file dialog! 
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
 2015-06-06 09:44:38 -03:00
est31
c5338fd6c4 Add OS.get_time_zone_info function 
The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.
 2015-06-06 05:57:33 +02:00
est31
803069886e Add utc param to get_time and get_date methods 
If utc == false, we return the local time, like before.
Otherwise, we return UTC time.
utc defaults to false to not break behaviour.
 2015-06-06 05:55:28 +02:00
Juan Linietsky
d5348eebdc work in progress, resource previews 2015-05-31 02:00:18 -03:00
Kostadin Damyanov
a553327043 Haiku: some small fixes 2015-05-25 06:34:16 +03:00
Kostadin Damyanov
826f8af1ef Haiku: link with the haiku libs, stub the OS_Haiku class. 2015-05-25 06:02:55 +03:00
Kostadin Damyanov
4e07a2dea8 Haiku: fix building with UNIX_ENABLED. 2015-05-25 03:49:24 +03:00
Antony
5ceec67add Added Doxyfile for Doxygen documentation. Had to modify codec.h because it already had set up the mainpage. Added a logo without text for the Doxygen pages upper top left corner. Pointed Doxyfile to README.md. Thinking of adding Markup in c files pointing to Wiki links. That way we have current source markup but it points to Wiki for major documentation effort. 2015-05-10 14:36:58 -06:00
Juan Linietsky
1fd1b7a91b Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-09 13:09:20 -03:00
Juan Linietsky
1a7d370fcf -Corrected DirAccessWindows functions, fixes #1872, properly fixes #791. 2015-05-09 13:05:34 -03:00
Juan Linietsky
deba45ebf7 Merge pull request #1841 from SuperUserNameMan/updated_rtaudio 
update rtaudio to latest version
 2015-05-07 20:03:00 -03:00
yg2f
2f4c435bfa update rtaudio to latest version 
update rtaudio from latest version availbale on github
 2015-05-06 23:08:06 +02:00
ehriche
b89cd136a9 fixed ColorRgb attribute init order of struct 2015-05-06 01:22:38 +02:00
ehriche
edce27fc03 minor fixes in drivers mpc and vorbis. 2015-05-06 00:43:24 +02:00
Juan Linietsky
639f7e0016 Merge pull request #1810 from ricpelo/ricpelo-patch-3 
Fixes Theora build
 2015-05-04 20:42:26 -03:00
Ricardo Pérez
ba61a1dfd3 Fixes Theora build 
Changes memcpy() -> copymem()
 2015-05-04 23:57:55 +02:00
Juan Linietsky
fbbe7dcdfb Merge remote-tracking branch 'origin/master' 
Conflicts:
	drivers/windows/dir_access_windows.cpp
 2015-05-04 13:24:02 -03:00
Juan Linietsky
7f5b744b92 small unicode fixes 2015-05-04 13:12:05 -03:00
Juan Linietsky
f4caddbc23 -corrected frac() and hyperbolic sin,cos,tan when running on PC (GLSL120), fixes #1775 2015-05-04 10:53:54 -03:00
Juan Linietsky
c631d597ad Merge pull request #1792 from swenner/static_analysis_fixes 
Static analysis fixes
 2015-05-03 22:53:30 -03:00
Juan Linietsky
795ccf0e14 Merge pull request #1800 from antonyjones67/VSGenerator 
Added Visual Studio project generation. Use "vsproj=yes" in command line...
 2015-05-03 22:52:20 -03:00
Antony Jones
2a4da03f10 Added Visual Studio project generation. Use "vsproj=yes" in command line. This does not set up NMAKE properly. 2015-05-03 15:18:56 -06:00
Simon Wenner
3f1826866b fixed uninitialized name pointers (cppcheck) 2015-05-03 02:16:26 +02:00
Simon Wenner
332d9af81b fixed memory leak: triangulated (cppcheck) 2015-05-03 02:11:43 +02:00
Juan Linietsky
c45ffc2ca9 -fixed old condition in TextureFrame that caused bugs in materials, closes #1742 2015-05-01 12:16:51 -03:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Juan Linietsky
5c6b31c024 -fixed broken lighting in release version of godot for isometric light demo, fixes #1697 2015-04-30 11:34:24 -03:00
Juan Linietsky
0adca0a7c9 -made normalmaps easier in 2D, fixes #1467 2015-04-27 08:11:54 -03:00
Juan Linietsky
52e2f4606f -Objects with BlendMode!=MIX do not get affected by CanvasModulate, fixes #1724 2015-04-24 23:46:42 -03:00
Juan Linietsky
59154cccf9 -Changed Godot exit to be clean. 
-Added more debug information on memory cleanliness on exit (if run with -v)
-Fixed several memory leaks, fixes #1731, fixes #755
 2015-04-20 19:38:02 -03:00
Juan Linietsky
1de1a04b78 -fix local and global usage for DirAccess, fixes #791 
please test anyway..
 2015-04-18 20:11:33 -03:00
Juan Linietsky
a5cbfbbcbb -fixed relative path saving to file, fixes #1694 2015-04-18 16:33:31 -03:00
Juan Linietsky
fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Juan Linietsky
3b434eacde Fix clipping when used in viewport or inside another viewport, fixes #1661 2015-04-14 22:05:14 -03:00
Juan Linietsky
e573d3a945 fixed broken lighting, closes #1671 2015-04-12 20:41:25 -03:00
Juan Linietsky
f9906eeac8 -Fixed screen capture for viewports, added a screen capture demo, fixes #1529 2015-04-12 18:58:05 -03:00
Juan Linietsky
d148a03848 -Fixes bug in ShaderGraph material, when uniform property is not used, fixes #1634 and #1610 2015-04-09 00:29:21 -03:00
Juan Linietsky
b135cdbf05 Merge pull request #1531 from vkbsb/h5_canvas_polygon_fix 
H5 canvas polygon fix
 2015-04-07 20:22:58 -03:00
Juan Linietsky
b36e41cb71 Added a PVRTC encoder for iOS 2015-04-06 21:48:20 -03:00
Juan Linietsky
5d99e15e43 fix shadow issue with lights in mix mode, i think fixes #1611 2015-04-03 14:36:10 -03:00
Juan Linietsky
9fa1698c74 Changes to Light 
-=-=-=-=-=-=-=-=

-Changed material unshaded property for an enum, which supports light-only shading
-Added a "Mix" shading mode, useful for using lights as masks
-Added energy parameter to Light2D
 2015-04-03 01:43:37 -03:00
Juan Linietsky
68e42f53ba Beta1 Attempt #1 
-=-==-=-=-=-=-=-

-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
 2015-04-02 12:59:23 -03:00
Juan Linietsky
76c2b9d812 fix shadow attenuation 2015-04-01 12:23:13 -03:00
Juan Linietsky
7fc4059b13 read depth fixes 2015-03-31 17:57:16 -03:00
Juan Linietsky
ad634876b5 fixes for light2d in androids that do not support 
read depth
 2015-03-31 14:59:28 -03:00
reduz
7f8a0cddcf fixes to shader to get most new demos working on mobile 2015-03-25 22:56:35 -03:00
Juan Linietsky
23e13ce3c2 fixes to new window management API 
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
 2015-03-22 19:00:50 -03:00
Juan Linietsky
f706e3e5d1 Merge pull request #1380 from ElectricSolstice/wparentheses_removal 
Changed code to remove gcc -Wparentheses warnings.
 2015-03-22 15:05:47 -03:00
Juan Linietsky
ca30c87019 Merge pull request #1438 from Spooner/fix_isometric_demo 
Fix isometric demo
 2015-03-22 14:59:58 -03:00
Juan Linietsky
3a96937e93 Merge pull request #1512 from the-mech/master 
[Fix] make_dir_recursive on Windows
 2015-03-22 14:53:10 -03:00
rollenrolm
db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00