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
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
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
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
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