asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5552 commits 1 branch 0 tags 2.2 GiB
Commit graph

556 commits

Author SHA1 Message Date
Rémi Verschelde
768e925271 GLEW: Define static + enabled and includes via SCons 
This allows us not to have to hack our definitions in the upstream files,
making it easier to upgrade to newer versions in the future.

For the include paths to work, the headers are moved to a GL subfolder to
match their upstream location.
 2016-06-08 00:16:27 +02:00
Rémi Verschelde
4c658dc523 Haiku: Do not define GLEW_ENABLED to undefine it later 
Partial revert of f61eb5fd8e.
 2016-06-08 00:10:30 +02:00
Juan Linietsky
0c985913a7 Merge pull request #4092 from sanikoyes/Pr-etc1-pkm-loading 
Add etc1(pkm) texture loading support
 2016-06-06 22:14:11 -03:00
Juan Linietsky
be830d10c2 Merge pull request #5026 from Geequlim/patch9frame-extension 
Enhanced Patch9Frame
 2016-06-06 20:15:33 -03:00
Rémi Verschelde
7fd6977ef9 Merge pull request #5070 from zenvoid/master 
Add missing license information for bundled libraries
 2016-06-06 23:31:55 +02:00
Roberto
c0a8c4f6e4 Add missing license information (ogg/vorbis/opus) 2016-06-06 19:05:36 +02:00
Roberto
18fc2ccbe1 Add missing license information (Theora) 2016-06-06 16:32:37 +02:00
Roberto
f97f8971e3 Add missing license information (WebP) 2016-06-06 12:45:30 +02:00
J08nY
3fb3b7c1f7 Somewhat fixed Directory::get_space_left() return values. 2016-06-06 08:14:22 +02:00
Juan Linietsky
2420e46b44 vsync support 
-works on windows
-may not work on X11, if so please fix
-OSX does not seem to support disabling vsync
 2016-06-05 19:14:33 -03:00
Rémi Verschelde
2884faf55b Merge pull request #4999 from volzhs/fix-project-path 
change invalid characters when get user data dir on Windows & Unix
 2016-06-04 21:37:47 +02:00
Geequlim
fdf914e53e Add texture region support for stylebox render 2016-06-05 00:45:53 +08:00
Rémi Verschelde
bc25492e63 Update to libpng 1.5.27 
No security relevant fix as far as I can see, but the version bump
does not hurt either.
 2016-06-02 23:28:54 +02:00
volzhs
9073dc9963 change invalid characters when get user data dir on Windows & Unix 
Can't create user data folder when project name has ``\ / : * ? " < > |`` characters on OS_Windows & OS_Unix.
So, change it to ``-`` to be able to make folder.

fixes #4928 and it's altanative to #4986.
 2016-06-03 03:39:37 +09:00
Juan Linietsky
4f100f92d8 DPI Detection support 
Windows only for now.
Many builds may break (older visual studio, mingw32)
 2016-05-29 13:40:21 -03:00
Rémi Verschelde
53279bf02d FreeType: Add mandatory license text 
Part of #4859.
 2016-05-29 17:30:57 +02:00
Juan Linietsky
3e8eb396d7 Finalized DynamicFont implementation 
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
 2016-05-29 11:37:52 -03:00
Juan Linietsky
8be2fabbe5 Changed import workflow 
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
 2016-05-27 14:19:11 -03:00
Ariel Manzur
dbb4c0c9b7 fixes android drivers build 2016-05-21 21:47:21 -03:00
Ariel Manzur
4c4d79e3c9 fix drivers build on ios 2016-05-21 21:07:34 -03:00
Ariel Manzur
12bd9ee6f2 fix 2016-05-21 20:07:32 -03:00
Ariel Manzur
6cf2353305 using 1 env for all drivers 2016-05-21 19:31:58 -03:00
eska
2392824dba Remove nocpuid.c from builtin OpenSSL 
Since opensslconf.h no longer defines OPENSSL_CPUID_OBJ, OpenSSL defines
OPENSSL_cpuid_setup itself (with the same empty definition)
 2016-05-12 17:06:34 +02:00
Rémi Verschelde
c7292b1f3d OpenSSL buildsystem: actually apply the flag on gcc/clang 
Commit 972b0f7 was bogus.
 2016-05-11 19:41:52 +02:00
Rémi Verschelde
972b0f78b3 Windows: Fix MinGW argument being passed to MSVC 
Fixes #4620
 2016-05-11 18:48:04 +02:00
George Marques
2e44e255ed
Add ignore error flag to OpenSSL driver 2016-05-09 12:52:49 -03:00
Rémi Verschelde
8a45936abd Merge pull request #4560 from eska014/fix-emscripten-opus 
Fix JavaScript build
 2016-05-07 20:19:58 +02:00
Ariel Manzur
baaa74f215 cloning env for builtin_openssl _and_ openssl :) 2016-05-06 22:43:22 -03:00
Ariel Manzur
62c17d65a8 clonning env for builtin ssl 2016-05-06 22:30:48 -03:00
eska
5619efe9f8 Ignore unneeded Opus file, fix JavaScript build 2016-05-05 19:21:57 +02:00
George Marques
81297f0fa1
Fix build for Windows 64-bits with GCC 2016-05-05 14:10:41 -03:00
Juan Linietsky
8043135e0d missing default value 2016-05-04 12:46:37 -03:00
Juan Linietsky
fd6667a7dc fix to avoid video texture scaling 2016-05-04 12:44:50 -03:00
Juan Linietsky
89d87294db ability to shrink all images x2 on load 
this is for extreme cases when running on devices with very low video
memory, so you can still retain compatibility.
 2016-05-04 12:37:07 -03:00
Rémi Verschelde
db0fde9d39 Merge pull request #4541 from vnen/pr-fix-win64-build 
Fix windows 64-bits build.
 2016-05-04 08:35:45 +02:00
George Marques
9424c6c58f
Fix windows 64-bits build. 
The change in `tools/doc/doc_data.cpp` is needed because the MSVC
compiler does not support variable length arrays.

Fix #4113
 2016-05-03 16:35:36 -03:00
mrezai
ab623c923d Update OpenSSL to 1.0.2h 2016-05-03 23:59:14 +04:30
George Marques
7c59d819a7
Update Opus driver to 1.1.2 
And opusfile to 0.7.
 2016-05-02 13:18:34 -03:00
Aren Villanueva
e5c1a2c3f7 Implements get_executable_path for OS X should proc_pidpath in os_osx.mm doesn't succeed. Silences the warning for javascript as the function currently appears superfluous. 2016-04-20 17:49:48 +10:00
Rémi Verschelde
206895afae Merge pull request #4329 from mrezai/openssl-1.0.2g 
Update OpenSSL to version 1.0.2g
 2016-04-18 19:21:46 +02:00
Zher Huei Lee
48b2dfab9f Fixed zero-length arrays in nrex. Fixes #4346 2016-04-18 10:06:47 +01:00
mrezai
e97922f220 Update OpenSSL to version 1.0.2g 2016-04-15 19:03:35 +04:30
mrezai
2cbd850979 Fix OpenSSL compilation on Windows 
Fixes #4285.
 2016-04-12 07:58:56 +02:00
Rémi Verschelde
925aa086a2 Merge pull request #4275 from mrezai/openssl-1.0.1s 
Update OpenSSL to version 1.0.1s
 2016-04-11 23:16:31 +02:00
mrezai
c860574d8b Update OpenSSL to version 1.0.1s 2016-04-10 17:48:59 +04:30
Zher Huei Lee
6207d56b95 Updated nrex to v0.2 
* Fixed capturing groups matching to invalid results
 * Fixed parents of recursive quantifiers not expanding properly
 * Fixed LookAhead sometimes adding to result
 2016-04-08 13:29:37 +01:00
MSC
7a9998370f free Material 'shadow_material_double_sided' on ::finish() 2016-04-03 19:24:14 +02:00
sanikoyes
dda9528dac Add etc1(pkm) texture loading support 2016-03-19 09:48:41 +08:00
Kyle Luce
674c6f2f2d Add function to convert Date time from a dictionary to Epoch 
- Also changed get_time_from_unix_time to get_date_time_from_unix_time to be
  consistent.

Ticket:
https://github.com/godotengine/godot/issues/4038
 2016-03-16 23:13:39 -07:00
Rémi Verschelde
c9a401e541 Merge pull request #3694 from techtonik/patch-1 
Show driver information in verbose mode
 2016-03-15 10:30:47 +01:00
Rémi Verschelde
aec4f57f95 Merge pull request #3528 from SaracenOne/baked_light_realtime_colourize 
Ability to colourize baked lighting in real time.
 2016-03-15 10:22:09 +01:00
Kyle Luce
feef563f3f Fixes the month consistency issue in enums and get_date etc 
- Also updated the docs to reflect this.
- Added some vim temp files to gitignore
- Changed NaCL to be consistent with the other OS_Unix::get_date implementation
   (added 1 to month to map to 1-12)

Ticket:
https://github.com/godotengine/godot/issues/4025
 2016-03-13 15:27:39 -07:00
Saracen
24bc7d8db7 Fix 'FLAG_RECEIVE_SHADOWS' flag for GeometryInstances so that turning it off now correctly disables shadows from affecting the instance. 2016-03-12 16:51:17 +00:00
Juan Linietsky
8b1dcbfe4d -Made editor support SSL certs by default (embedded them) 
-Made asset sharing support https
-Many fixes to HTTPRequest
-Added an asset installer dialog
-Visual cleanups to asset sharing tab
-Fixed some issues in ScrollContainer, hope it does not break things
-Asset sharing tab is not visible (hidden on purpose) for now.
 2016-03-12 10:46:38 -03:00
Juan Linietsky
a3d6768199 Merge pull request #3958 from SaracenOne/cpu_skinning_path_fix 
Fix to CPU skinning path when using GPU skinning (meshes with morphs)
 2016-03-08 15:34:36 -03:00
Saracen
7fecebd8a8 Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only. 
Conflicts:
	servers/visual/visual_server_raster.h
 2016-03-07 23:14:14 +00:00
volzhs
db89a47e28 This will disable png arm neon optimizing for android template if compile on windows, but make compiling successful. 
And arm neon opt is enabled if not on windows.
 2016-03-07 21:20:32 +09:00
Saracen
23a4683879 Fix to CPU skinning path when using GPU skinning (meshes with morphs) causing modifications to root bone to have doubled offset and wasted performance. 2016-03-06 18:47:52 +00:00
Zher Huei Lee
d7052ddba3 Added relative paths for DirAccess::remove() 
Follows similar behaviour to DirAccess::rename()
 2016-03-01 10:40:31 +00:00
Rémi Verschelde
f740d0ced3 Merge pull request #3693 from SaracenOne/hardware_skinning_fix 
Fixed hardware-accelerated skinning support.
 2016-02-28 23:01:56 +01:00
anatoly techtonik
ba6858dd41 Show which video driver is used in verbose mode 2016-02-24 23:36:40 +03:00
Saracen
fe49ac19df Fixed hardware-accelerated skinning support. 2016-02-24 02:16:20 +00:00
est31
fb1e52f4d8 Fix allocation bug if compiled with modern clang or gcc 
* Add overflow checked intrinsic abstractions that check on overflow.
* Use them for memory allocation code.
* Use size_t type for memory allocation code to support full platform dependent width.

Fixes #3756.
 2016-02-19 07:58:42 +01:00
Julian Murgia - StraToN
aec721b61f Forgot to correct the ERR_FAIL_COND_V. 2016-02-12 07:50:35 +01:00
Julian Murgia - StraToN
e380ea8fac Added RegEx::get_capture_start() method 2016-02-12 07:45:12 +01:00
Saracen
de5281c398 Ability to colourize baked lighting in real time. 2016-02-06 18:03:20 +00:00
Juan Linietsky
80e88c6a50 Removed PE-bliss, win32 binares so far remain without icon, had many issues with it: 
-corrupted 32 binaries without reason
-does not support upx binaries
-forces dependency o libstdc++
 2016-02-04 20:03:03 -03:00
Juan Linietsky
f6a8a0f513 -Correctly flip BG texture if viewport is flipped, fixes #3507 2016-02-02 07:40:38 -03:00
Ariel Manzur
0cd8c054a2 thread renaming 2016-01-31 20:23:24 -03:00
Ariel Manzur
b406aae790 total pointers 2016-01-31 20:23:24 -03:00
Ariel Manzur
5b68608b10 checking for file? 2016-01-31 20:23:23 -03:00
Juan Linietsky
caddcca4f4 -Many fixes to windows build system with Mingw on Windows. Fixes #2690 2016-01-25 00:21:04 -03:00
Juan Linietsky
2fce78ad10 Correct viewport scaling with stretch mode viewport, fixes #1571 2016-01-24 00:46:26 -03:00
Juan Linietsky
784a3eeb90 -Fixed video stream theora not finishing when stream finishes, closes #3066 2016-01-23 17:58:17 -03:00
Juan Linietsky
08e536dbe0 -Support the TRNS flag on libpng, fixes #3097 2016-01-23 17:19:51 -03:00
Rémi Verschelde
d67df42cc8 Merge pull request #2180 from sketchyfun/SketchyFun 
Billboards were displayed upside down when drawn to a render texture
 2016-01-19 22:25:40 +01:00
Saracen
1cc5ccba1b Allows vec4 shader uniforms to be set by quaternion variant type. 2016-01-13 22:09:07 +00:00
Juan Linietsky
c633a29a39 improve reporting of error in wrong inheritance for autoload script 2016-01-13 09:42:03 -03:00
Ariel Manzur
761b08ec8f loading unaligned pbm 2016-01-12 06:24:47 -03:00
punto-
4a5db60843 Update bitmap_loader_pnm.cpp 2016-01-11 11:55:20 -03:00
Juan Linietsky
9e8f647440 fix issue loading binary pbm 2016-01-11 11:44:53 -03:00
Rémi Verschelde
7f82c8d7c5 Merge pull request #3230 from touilleMan/issue-55 
Remove unnecessary null pointer checks
 2016-01-11 12:00:44 +01:00
Juan Linietsky
6eb742d49f -Make a rare corner case where disabling/reenabling mipmaps causes invalid texture state. Fixes #3102 2016-01-10 21:45:58 -03:00
Juan Linietsky
a120c66f98 -Removed OS.get_system_time_msec(), this is undoable on Windows and also unusable from GDscript due to precision. 
-Added, instead an OS.get_system_time_secs(), which is 32 bits friendly, fixes #3143
 2016-01-10 18:24:55 -03:00
Juan Linietsky
f6798d9d73 -Made tile parameter work, fixes #3167 2016-01-10 17:45:41 -03:00
Juan Linietsky
52e53d4513 -Added a new mode, WRITE_READ to File, to recover compatibility with old projects but also achieve desired functionality. Closes #3272 2016-01-10 15:15:04 -03:00
eska
a6c1a5c6d0 Fix pthread renaming in Open/FreeBSD 2016-01-09 15:56:31 +01:00
mrezai
88ecc29d1e Fix uint compile error 2016-01-05 15:45:02 +03:30
Emmanuel Leblond
cabf923484 Remove unnecessary null pointer checks 2016-01-04 11:46:16 +01:00
Juan Linietsky
908f75c23f having active items is pointless in input map 2016-01-03 18:52:42 -03:00
Juan Linietsky
e8fbf39f88 -Replaced tinyjpg for jpgd (public domain), fixes progressive encoded jpgs and speeds up. Closes #2040 
-Removed support of loading BitMap as image, now it must be load as a pnm, also closes #2040
 2016-01-03 17:14:28 -03:00
Juan Linietsky
eca92bb7ac make it impossible to shrink framebuffer < 0, fixes #2066 2016-01-02 21:08:57 -03:00
Juan Linietsky
8fb70142e4 Ability to use opacity on distance field textures, fixes #2148 2016-01-02 15:57:19 -03:00
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