Ariel Manzur
27e4c87869
no need to revert this actually
2015-12-14 11:10:16 -03:00
santiagopf
a9795d5826
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-14 10:58:26 -03:00
santiagopf
c8077de714
utf stuff on osx
2015-12-13 22:21:49 -03:00
Juan Linietsky
95a469ad28
added binary API to StreamPeer, fixes #2863
2015-12-13 12:53:29 -03:00
santiagopf
01f063e2fe
reverted mouse stuff
...
t Please enter the commit message for your changes. Lines starting
2015-12-13 01:28:42 -03:00
santiagopf
d6f9426748
isim
2015-12-12 19:13:40 -03:00
Juan Linietsky
890b462ffb
added rotation and scale support to gui controls
2015-12-12 13:54:26 -03:00
Juan Linietsky
cc7880fba5
-added windowed mode with -w, fixes #3020
...
-changed default windowed resolution to 1280x720
2015-12-12 12:06:53 -03:00
punto-
25d19e08bb
Merge pull request #590 from marynate/PR-fix-ios-release-event
...
Fixed ios release event not been dispatched when app entering background
2015-12-11 21:30:02 -03:00
Juan Linietsky
708ff381d6
changed a bit to use system()
2015-12-08 20:36:48 -03:00
Juan Linietsky
78b5404434
improve detection of linux, fixes #3201
2015-12-08 20:35:40 -03:00
Juan Linietsky
ac414c5581
Merge pull request #2849 from a12n/compobsd2
...
Compile on OpenBSD
2015-12-08 17:16:45 -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
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
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
Rémi Verschelde
e4e7e8f396
Merge pull request #2963 from akien-mga/pr-opus-arm-opt
...
Enable opus ARM optimisations only on ARM
2015-12-01 10:18:41 +01:00
Rémi Verschelde
99e7641f3d
Enable opus ARM optimisations only on ARM
...
i.e. do not enable it for x86.
Fixes #2962 .
2015-12-01 09:34:51 +01:00
est31
15f6d3cebf
Add way to look for templates at system wide level too
...
Useful for everybody wanting to package godot.
Fixes #1026 .
-> Retain the old behaviour: path in error msg only when exporting.
-> User templates override system templates
2015-11-30 01:36:08 +01:00
koalefant
bd396c5cfa
Enabled debug symbols for x11 when using platform=release_debug and debug_release=yes together
2015-11-29 20:56:27 +01:00
Rémi Verschelde
55d56d9b7c
Replace hardcoded references to Okam Studio by Godot Engine
...
Since the engine development is now independent.
Fixes #2836 .
2015-11-27 18:54:09 +01: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
mikica1986vee
d6b317a2c1
tegra 3 fix
2015-11-21 23:21:36 +01:00
Anton Yabchinskiy
b14c90801f
Disable X11 joystick functions also for OpenBSD
2015-11-20 23:36:34 +03:00
Anton Yabchinskiy
523e64d30b
Include string.h for memset() on OpenBSD
2015-11-20 23:36:14 +03:00
Anton Yabchinskiy
52f1bab6d5
Include stdlib.h for alloca() on OpenBSD
2015-11-20 23:35:53 +03:00
Anton Yabchinskiy
0931eed7be
Enable ALSA only for Linux
2015-11-20 23:35:19 +03:00
Juan Linietsky
2769da7744
compile fixes
2015-11-19 20:24:43 -03: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
ZuBsPaCe
ce3216429e
Added missing \n in script error output.
2015-11-19 15:35:18 +01:00
ZuBsPaCe
a5683def19
Nice error output padding. Code location behind " At: " is now aligned with the error message above. Also removed the dot after the file location.
2015-11-19 15:19:25 +01:00
ZuBsPaCe
42beb83178
Set console background color on windows in SetConsoleTextAttribute, otherwise text background will be black, which looks strange if the terminal color is not black.
2015-11-19 15:19:22 +01:00
ZuBsPaCe
a89c861931
Set output color of ERR_SCRIPT messages to purple. Same as on linux.
2015-11-19 15:19:20 +01:00
ZuBsPaCe
9f9452d023
Removed ANSI error codes from windows terminal error output. Windows does not support them.
...
See: http://stackoverflow.com/questions/16755142/how-to-make-win32-console-recognize-ansi-vt100-escape-sequences
See: http://stackoverflow.com/questions/22777142/is-there-a-way-to-make-windows-output-ansi-escape-sequences?lq=1
2015-11-19 15:19:18 +01:00
ZuBsPaCe
e23734363e
Inconsistent code formatting in print_error (Newlines and spaces)
2015-11-19 15:19:16 +01:00
Juan Linietsky
d3eb9e8c54
-remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260
2015-11-19 10:41:20 -03: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
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
067c96d26f
Merge pull request #2718 from SaracenOne/audio_system_crash_fix
...
Fixed Audio System Crash
2015-11-18 19:35:22 -03:00
Juan Linietsky
5fb95859e1
Merge pull request #2814 from masoudbh3/android-fa-locale
...
Android add FA(persian) locale strings
2015-11-18 19:21:54 -03:00
masoud bh
f2704eb162
Android add FA(persian) locale strings
2015-11-19 01:40:29 +03:30
Juan Linietsky
34a558ee8d
Merge pull request #2691 from volzhs/android_payment
...
improve android payments
2015-11-18 19:02:40 -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
4fdb4452b8
Merge pull request #2784 from masoudbh3/resigning-android-template
...
Skip META-INF from Android Template
2015-11-18 18:35:08 -03:00
Aren Villanueva
e68c2c6c2a
Use macros to determine which iOS SDK we have in order to be backwards compatible with older SDKs when fixing template compilation issues.
2015-11-16 12:35:54 +11:00
