Commit Graph

413 Commits

Author SHA1 Message Date
Juan Linietsky 5769f8aaae Change rb+ to wb+ on file access READ_WRITE to allow more use cases, closes #2278 2016-01-02 12:03:33 -03:00
George Marques 5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
reduz 875bff2c4e -fix loading of samples in mod, s3m and xm. Fixes #2553 2015-12-29 16:06:45 -03:00
reduz 77b5b4f4df removed some prints 2015-12-29 12:56:58 -03:00
mrezai 92cc8fcc74 redundant TAB removed 2015-12-23 15:41:46 +03:30
mrezai 0897b73cd6 Fix ios libpng link error 2015-12-23 14:57:00 +03:30
Ariel Manzur 02d6669a38 threads 2015-12-22 10:08:20 -03:00
Ariel Manzur 83f2084cb8 testing patch for aligned reads by webp in javascript 2015-12-22 09:19:12 -03:00
mrezai bf69e07ea6 Fix libpng link errors on android 2015-12-21 11:50:54 +03:30
Rémi Verschelde 6750c8a729 Update to libpng 1.5.26
Includes numerous security fixes compared to the previous version which was around 1.5.7 or so.
Fixes #2787
2015-12-19 20:41:22 +01:00
Ariel Manzur 4a7e5fafb1 thread rename for ios and osx (if called from the thread to be renamed) 2015-12-18 02:58:30 -03:00
Ariel Manzur 10298b9534 thread set name 2015-12-17 06:24:27 -03:00
Ariel Manzur 6c3c20fc35 compile thing 2015-12-16 02:40:02 -03:00
Juan Linietsky a1142225bf -split view of property editor and editor settings 2015-12-15 23:39:36 -03:00
Juan Linietsky b12a2f456c -fixes to theora video ending sooner than expected, fixes #3066 2015-12-15 09:17:32 -03:00
Juan Linietsky 95a469ad28 added binary API to StreamPeer, fixes #2863 2015-12-13 12:53:29 -03:00
Juan Linietsky 0f57bbb8e9 remove editor driver split
fixes #3001
2015-12-11 09:03:54 -03:00
est31 3dbf7dd7fa Fix windows build 2015-12-09 16:06:00 +01:00
Juan Linietsky 428984ec0c -New mask mode for lights, makes using masks MUCH easier. 2015-12-08 20:25:08 -03:00
Juan Linietsky e176bb6a7c Merge pull request #2719 from SaracenOne/clipping_fix
Canvas Clipping fix
2015-12-08 17:18:19 -03:00
Juan Linietsky eff81965af Merge pull request #2956 from est31/add_system_wide_export_path
Add way to look for templates at system wide level too
2015-12-08 17:04:24 -03:00
Juan Linietsky afb895f197 Merge pull request #2993 from leezh/nrex-v0.1
updated the RegEx library nrex to v0.1
2015-12-08 17:00:27 -03:00
Juan Linietsky 5e2f327d4b Merge branch 'master' of https://github.com/godotengine/godot 2015-12-07 11:51:01 -03:00
Juan Linietsky 8bdf2be4a6 -Webp include paths are broken, hacked them to work, fixes #2995 2015-12-07 11:50:00 -03:00
Saracen 157b97b087 Extended clipping fix to missing clipping-related features. 2015-12-07 13:59:42 +00:00
Juan Linietsky 7ba484bc74 some fixes
-fix compilation on tres/tscn on MSVC
-fixed theora playback performance, closes #3004
2015-12-06 20:22:45 -03:00
Juan Linietsky fe2a9bc746 optional streaming from thread for Theora 2015-12-05 23:16:41 -03:00
Zher Huei Lee d0ddf150d9 updated the RegEx library nrex to v0.1
After implementing unit testing to nrex I caught and fixed some errors
so it should behave more like Python's RegEx In addition, I've added
version numbering so it should be able to tell if the library needs
updating. Here are a list of changes:

- Fixed zero count quantifiers failing.
- Fixed infinite recursion if quantifying zero length token.
- Fixed `$` (as a string pattern on its own) not matching.
- Fixed look behind rewinding beyond the start of the string.
- Added support for alternative back reference format `\g{1}` similar to
Python. This allows digits to be used immediately after back references.
- Number of capture groups are still limited to 9 by default but can now
be manually set, with option for no limit at all. (Python has no limit)
- Curly bracket quantifiers `{0}` no longer interpreted as a literal
string if previous token is not quantifiable. (Python behaviour)
2015-12-04 21:18:41 +00:00
Juan Linietsky 504e464c8a -Missing files in new webp version 2015-12-04 10:21:22 -03:00
Juan Linietsky da113fe40d -Upgraded webp to a MUCH newer version. Hoping it fixes some bugs in the process. Keeping old version just in case for now.
-Added ability to convert xml and tscn scenes to binary on export, makes loading of larger scenes faster
2015-12-04 10:18:28 -03:00
Juan Linietsky 4b1f0afb01 -several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device. 2015-12-02 11:15:48 -03:00
est31 e1d02e4831 Make the setting unix-only.
For this, put the detection into the OS class and its subclass.
2015-11-30 02:35:59 +01:00
koalefant 2355e1c3b8 Fixed leak when saving PNG-s 2015-11-29 20:11:42 +01:00
George Marques 4057907cf4 Remove redundant Opus directive definition
Clean up the build command line another extra bit.
2015-11-27 19:59:50 -02:00
George Marques fc0c4c6175 Remove Opus extra includes
Remove the extra directories to include that were needed by the Opus
library. Now the lib includes more specific paths to avoid those.
2015-11-27 19:59:13 -02:00
Juan Linietsky b987d2113b 0theora compilation fixes 2015-11-25 00:28:03 -03:00
Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	main/main.cpp
2015-11-24 10:52:41 -03:00
Juan Linietsky ccd40f76e8 -work in progress resourceparser and .tscn parser. Still non-functional
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
Rémi Verschelde aa30e01f26 Merge pull request #2752 from SaracenOne/shadow_color
New shader feature: change the colour of shadows on a per-material basis
2015-11-23 11:40:52 +01:00
Saracen 2cc52bc3ff Modification to GUI in 3D demo to show resolved viewport clipping bug and small fix to bug causing viewport clipping to be inverted. 2015-11-19 23:47:25 +00:00
Juan Linietsky dd09215c90 Revert "libao audio driver" 2015-11-19 20:05:26 -03:00
Juan Linietsky 6127f17368 Merge pull request #2756 from trond/bugfix_udp
UDP fixes
2015-11-19 19:33:04 -03:00
Juan Linietsky 43ce972ddb Merge pull request #903 from a12n/libao
libao audio driver
2015-11-19 19:31:56 -03:00
Trond Abusdal a8a2458f0b Fixed mistake where available buffer size would not be updated for each recvfrom-call in PacketPeerUDPWinsockPposix. 2015-11-19 19:06:01 +01:00
Juan Linietsky 0168947084 Merge pull request #2518 from masoudbh3/godot-icons
Add icon to exe file in windows export
2015-11-19 00:08:47 -03:00
Juan Linietsky 33aa019e4f Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation
Visual studio 2015 compilation
2015-11-18 23:56:06 -03:00
Saracen dd00452997 Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
2015-11-18 23:18:10 +00:00
Juan Linietsky 0c3386b2ed Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
Juan Linietsky f0aeb036d1 Merge pull request #2715 from SaracenOne/shader_fix_and_enhancement
Write to 4-dimensional position access and shader graph code generation fix.
2015-11-18 19:36:47 -03:00
Juan Linietsky 0fd3e18818 Merge pull request #2724 from SaracenOne/disable_baked_light_sampling_on_shadeless
Disable baked lighting sampling on shadeless materials.
2015-11-18 19:31:18 -03:00
Juan Linietsky 474822b6db Merge pull request #2642 from leezh/nrex-update
Updated nrex with new features
2015-11-18 19:13:57 -03:00
Juan Linietsky 1ceefd4759 Merge pull request #2661 from romulox-x/lowMem2D
Added low_memory_2d_mode
2015-11-18 19:12:34 -03:00
Juan Linietsky 7f5eb40c19 Merge pull request #2726 from SaracenOne/set_loop_restart_time_fix
Fixed broken set_loop_restart_time method in AudioStreamPlaybackOGGVorbis
2015-11-18 19:00:38 -03:00
Juan Linietsky f738906519 Merge pull request #2737 from akien-mga/type-specific-error-output
Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
2015-11-18 18:58:22 -03:00
Juan Linietsky 9827c3cd26 Merge pull request #2748 from vnen/fix-2744
Fix Opus driver build for VS2010 and VS2012
2015-11-18 18:55:19 -03:00
Juan Linietsky 18e014a193 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	drivers/theora/video_stream_theora.cpp
2015-11-18 04:49:28 -03:00
Juan Linietsky 081a236c67 -Merged Script and Help tabs
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
2015-11-17 09:46:08 -03:00
Ariel Manzur 4811313056 tabs 2015-11-16 09:29:00 -03:00
Ariel Manzur 906c6374dc drivers and theora 2015-11-16 08:44:03 -03:00
Aren Villanueva 4f40a3dc65 Changed drviers/SCsub spaces to tabs. 2015-11-16 13:03:51 +11:00
Aren Villanueva e420b69606 Properly fixes compilation in an msys environment. 2015-11-16 11:14:40 +11:00
Aren Villanueva 402c24ec8b iOS compile fixes. 2015-11-16 11:10:07 +11:00
Aren Villanueva 00d79a6d6c Optimised the oc_filter_hedge and oc_filter_vedge routines in theora a little. 2015-11-16 11:10:07 +11:00
Aren Villanueva c1fdc3b5d1 Compile fixes for mingw msys2.
The drivers directory has way too many source files being compiled for a single library file. The command line length limit was getting hit.
2015-11-16 11:10:07 +11:00
Rémi Verschelde 9ab7de243f Fix error messages forcing a white font for subsequent messages
This is achieved using the "no specific formatting" \E[0m tag.
Fixes #2566.

Also remove the hardcoded black background colour and use default bolded terminal font for error message.
Error logs should now look good both on terminals with a dark and light background colour.
2015-11-10 18:30:40 +01:00
Rémi Verschelde 6334895088 Display error type (error, warning, script error) in OS::print_error
Previously all types of errors would be shown as ERROR, thus making for example warnings (WARN_PRINT) somewhat aggressive.
ERROR is displayed in red, WARNING in yellow and SCRIPT ERROR in magenta (though the latter does not seem used so far).
Fixes #1127.
2015-11-10 18:29:34 +01:00
Trond Abusdal 41a161647d * Winsock UDP messages sent to an unavailable target causing WSAECONNRESET will no longer close the socket.
* Ensured that unsigned<->signed conversion would not cause wrong buffer size values sent to recvfrom.
2015-11-09 01:33:16 +01:00
Trond Abusdal f809cd44ea Fixed PacketPeerUDP getting wrongly closed due to recvfrom using rb.data_left instead of rb.space_left. 2015-11-09 00:22:05 +01:00
masoud bh 55b8c3ee48 change pe_bliss parent directory from /drivers to /tools 2015-11-09 02:24:01 +03:30
masoud bh 24f3f43457 Add icon to exe file in windows export
add version_info and icon sections in "export to windows platform".
add version_info and icon to godot exe file (editor & template exe).
fix an problem in image class.
change all default icons to android export icon (a little more rounded).
create an python script for convert file to cpp byte array for use in
'splash.h'.
2015-11-09 02:23:58 +03:30
Saracen c1d19ad258 New shader feature: change the colour of shadows on a per-material basis.
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
2015-11-08 03:54:55 +00:00
Zher Huei Lee f0d246a7bc Exposed RegEx expanded option to scripts 2015-11-07 11:03:24 +00:00
Zher Huei Lee 26b977c967 Fixed segfault in RegEx.get_capture() 2015-11-07 11:03:24 +00:00
Zher Huei Lee 6d54f82ab4 Updated nrex to latest version 2015-11-07 11:03:24 +00:00
Zher Huei Lee 8766d3100d Updated nrex for LookAhead support 2015-11-07 11:03:24 +00:00
George Marques 03d4c05150 Fix Opus driver build for VS2010 and VS2012
Fix #2744
2015-11-06 18:59:21 -02:00
Juan Linietsky 800c575b13 maybe fix stop issue in theora 2015-11-04 09:46:25 -03:00
Juan Linietsky eb419bee04 fix video/audio synchronization code in theora 2015-11-03 09:30:28 -03:00
Saracen 6bcc2e1f83 Fixed broken set_loop_restart_time method in AudioStreamPlaybackOGGVorbis class. 2015-11-02 17:42:56 +00:00
Saracen 539bbd6654 Disable baked lighting sampling on shadeless materials. 2015-11-02 17:30:18 +00:00
Anton Yabchinskiy 3b9868d2e4 Merge branch 'master' of github.com:okamstudio/godot 2015-11-02 20:25:01 +03:00
Saracen ff363c94db Another clipping fix: default back to using window size to calculate clipping on viewports which don't have a rendertarget which fixes clipping on the editor viewport. 2015-11-02 16:48:11 +00:00
Saracen 5072134f41 Fixed canvas clipping on offscreen viewports. 2015-11-02 16:48:09 +00:00
Saracen b54d96ceba Added ability to write directly to 4-dimensional position vector from within custom vertex shader code. Bugfixes to shader graph code generation concerning xforms. 2015-11-02 16:03:31 +00:00
Rémi Verschelde 399b1b0474 Cosmetic fixes to SCons buildsystem
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
Juan Linietsky 61ecb6a5e6 properly compute total time for ogg vorbis 2015-11-01 12:32:11 -03:00
ZuBsPaCe b051914032 Fixes Visual Studio 2015 linker error (___iob_func)
The original, uncommited fix simply changed compiler flag /MT to /MD. This
would link the C runtime dynamically instead of statically. This is bad,
because some users would have to install the c runtime before starting the
editor.

You can find alot of info about this error, which can happen after
upgrading to VS 2015, and there are workarounds. But I realized, that the
only place, where iob_func is used, is in e_os.h of the openssl library.
The latest version already contains a workaround. I simply updated the
part in e_os.h.

Reference: https://github.com/openssl/openssl/blob/master/e_os.h#L268
Reference: https://software.intel.com/en-us/forums/intel-parallel-studio-beta-archived/topic/266345
Reference: https://connect.microsoft.com/VisualStudio/feedback/details/1144980/error-lnk2001-unresolved-external-symbol-imp-iob-func
Reference: http://stackoverflow.com/questions/757418/should-i-compile-with-md-or-mt

Here's the original error message:

   Creating library bin\godot.windows.tools.lib and object bin\godot.windows.tools.exp
drivers1.windows.tools.lib(t1_enc.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(txt_db.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(d1_enc.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(ui_openssl.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(cryptlib.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(pem_lib.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(d1_both.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(rsa_sign.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
bin\godot.windows.tools.exe : fatal error LNK1120: 1 unresolved externals
scons: *** [bin\godot.windows.tools.exe] Error 1120
2015-10-30 03:03:05 +01:00
romulox_x b86e3c3402 added low_memory_2d_mode, to indicate when 3D post processing buffers and viewport depth buffers should not be allocated 2015-10-21 19:23:34 -07:00
Juan Linietsky b59c86f6f9 -Ability to debug video memory usage
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
Juan Linietsky 2b12a8109d Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-19 18:48:34 -03:00
Juan Linietsky 5d86a25f4d -some fixes to where screen is read from rasterizer
-fixed bug in ogg vorbis looping
-properly flushing audiostream rb when stopping
2015-10-19 18:47:49 -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 13d2710fed Merge pull request #2474 from masoudbh3/android-armeabi-v7a
Fix android build script
2015-10-17 10:20:47 -03:00
Juan Linietsky 79e5ced7e6 -A little More control about pixel snapping in 2D 2015-10-13 15:53:34 -03: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
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