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

784 commits

Author SHA1 Message Date
Rémi Verschelde
0a5472e697 Remove trailing spaces 2016-04-02 20:26:12 +02:00
Rémi Verschelde
a895e2e372 Merge pull request #4105 from akien-mga/pr-android-shutdown-adb 
Expose android/shutdown_adb_on_exit parameter
 2016-03-20 18:34:05 +01:00
Rémi Verschelde
c584940387 Expose android/shutdown_adb_on_exit parameter and default to true 
It was added in 30d0ca9 for the Steam build but only enabled
when parsing a ._sc_ file that would define it.
It is now available for all users to toggle, in and outside of Steam.

Fixes #4073.
 2016-03-20 16:55:54 +01:00
blubee
a0fb5b5f95 Add support for gnu-libstc++-4.9 needed by recent NDK versions 
The 4.9 version is the default one, people can still build using 4.8
with older NDK versions by setting the (optional) NDK_TARGET
and NDK_TARGET_X86 environment variables.
 2016-03-20 20:29:37 +08:00
sanikoyes
9e026fecef Add -r flag to adb install for keep app user data 2016-03-18 18:11:55 +08: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
6eb4812317 Borderless window support for the Win32 build. Default window position is now also centred. 2016-03-12 16:38:12 +00:00
Hubert Jarosz
4b14c18d13 fix possible crash in platform/x11/joystick_linux.cpp 
ev may be tainted and out of MAX_KEY range,
which will cause joy->key_map[ev.code] to crash
 2016-03-09 00:16:56 +01:00
Hubert Jarosz
4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
hondres
02eddbf7da osx: fix inverted horizontal scrolling 2016-03-07 11:24:27 +01:00
Rémi Verschelde
21335e502c Merge pull request #3893 from leezh/diraccess_fix 
Added relative paths for DirAccess::remove()
 2016-03-05 13:13:08 +01:00
hondres
352db6b17e html5: workaround for echo key events. 2016-03-04 20:26:39 +01:00
volzhs
d6cc887627 fix gradle build on windows 2016-03-02 12:15:39 +09: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
Ariel Manzur
30d0ca9766 added [presets] to ._sc_ and "android/shutdown_adb_on_exit" to editor_settings 2016-02-27 12:11:40 -03:00
Ariel Manzur
89b4c76e0c theora on server build 2016-02-25 09:44:21 -03:00
hinsbart
1e54fd142b x11: fix joysticks not recognizing some buttons 
dpad on x360 pads with kernel < 4.3 is working now
 2016-02-24 12:18:30 +01:00
Aren Villanueva
7b25641813 Reject any native video player calls on iOS that point to files within .pck archives. 
Fix the paths for both res:// and user:// specified video files.
 2016-02-19 16:05:49 +11:00
Rémi Verschelde
130f8fa193 Rename KEY_KP_SUBSTRACT to KEY_KP_SUBTRACT 
The former name was incorrect in English, though for us latin lovers it's an understandable mistake.
Second part of and closes #3626.
 2016-02-17 23:01:27 +01:00
Rémi Verschelde
3cf16adf3c Merge pull request #3715 from Hinsbart/libudev_include 
X11: include libudev only on udev builds
 2016-02-15 18:56:38 +01:00
hondres
3065187300 include libudev only on udev builds 2016-02-15 15:09:48 +01:00
Ariel Manzur
ad405ade17 adding xcode project template 2016-02-14 18:18:47 -03:00
hondres
b350ece864 x11: make dependancy on libudev optional 2016-02-14 15:13:11 +01:00
Hondres
1fb9cc377f win: fix xinput triggers not resetting correctly 2016-02-12 15:06:50 +01:00
hondres
274f57feea fix platform bb10 compilation 2016-02-11 02:39:06 +01:00
punto-
b6b33e8886 Merge pull request #3428 from Hinsbart/android-gamepad 
support gamepad remapping on android
 2016-02-08 20:09:02 -03:00
Franco Eusébio Garcia
68e2cd8caa Added constant to retrieve Windows' Documents path 
According to MSDN's
documentation (https://msdn.microsoft.com/en-us/library/windows/desktop/bb762181(v=vs.85).aspx),
CSIDL_PERSONAL represents the default path to Windows Document's folder:

"Previous to Version 6.0. The file system directory used to physically
store a user's common repository of documents. A typical path is
C:\Documents and Settings\username\My Documents. This should be
distinguished from the virtual My Documents folder in the namespace. To
access that virtual folder, use SHGetFolderLocation, which returns the
ITEMIDLIST for the virtual location, or refer to the technique described
in Managing the File System."
 2016-02-07 15:54:25 -02:00
punto-
63fc7ef798 Merge pull request #3615 from Hinsbart/joy_check_fix 
x11: more verbose checking for joystick capabilities
 2016-02-07 00:49:54 -03:00
hondres
fef92c0fab x11: more verbose checking for joystick capabilities 2016-02-07 00:17:16 +01:00
Juan Linietsky
9010a25c01 added option to link libstdc++ statically 2016-02-04 20:47:19 -03: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
d826b1db2a -removed buggy flags, makes mingw+32 bits+optimized work again, 2016-02-04 19:38:16 -03:00
hondres
df4faf8f33 support horizontal mouse wheel, use in text editor 2016-02-04 17:16:22 +01:00
Rémi Verschelde
cefca4429c Merge pull request #3575 from Hinsbart/_net_wm_name 
x11: set _net_wm_name property
 2016-02-04 07:19:52 +01:00
hondres
61c1b6f60e x11: set _net_wm_name property 2016-02-04 00:39:53 +01:00
Rémi Verschelde
c0aade4ba4 Merge pull request #3493 from Hinsbart/wm_class 
x11: use different strings for WM_CLASS depending on context
 2016-02-03 11:30:22 +01:00
Rémi Verschelde
fc65a57ff5 Merge pull request #3538 from Hinsbart/temp 
remove pc_joystick_map.h
 2016-02-03 11:18:43 +01:00
hondres
f7b1ab843c x11: fix non-gamepad devices being detected as joysticks 2016-02-02 23:23:20 +01:00
hondres
f4fa74fe28 remove pc_joystick_map.h 2016-02-01 14:28:53 +01:00
hondres
2809b31f8c close file descriptor if ioctls failed 2016-02-01 13:39:50 +01:00
punto-
987bfb4b5e Update detect.py 
removed -g from linkflags
 2016-01-29 17:33:45 -03:00
Ariel Manzur
593b01b709 audio crash 2016-01-29 07:18:53 -03:00
hondres
11e4c128ac x11: use different strings for WM_CLASS depending on context 2016-01-27 21:53:37 +01:00
Hondres
e7b6e3f20b use fallback mapping from list 2016-01-27 12:18:34 +01:00
punto-
93bef9b9b1 Merge pull request #3471 from Hinsbart/remove_libevdev 
remove dependancy on libevdev
 2016-01-27 04:32:27 -03:00
George Marques
82b24bea6f Revert "make msvc 64bits build again, fixes #3098" 
This reverts commit b21ce6cecb.
 2016-01-26 22:26:04 -02:00
hondres
29353808f0 remove dependancy on libevdev 2016-01-26 23:04:57 +01:00
Juan Linietsky
16b8b97472 Combies driver split and spawn fix, closes #3265 2016-01-25 00:25:32 -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
George Marques
f4a39692b9 Change default window size for desktop 
Fix #3149
 2016-01-24 17:52:33 -02:00
hondres
285bcac224 can use fallback mapping on all platforms 2016-01-24 18:01:37 +01:00
hondres
e7c920fdba support gamepad remapping on android 2016-01-24 05:29:09 +01:00
hondres
1ad6ca0a81 add mappings and increase max number of buttons 2016-01-22 22:56:05 +01:00
Hinsbart
77858b66d3 html5 gamepad support 2016-01-21 02:30:24 +01:00
Juan Linietsky
e7eb332799 fix export bug 2016-01-20 07:43:05 -03:00
Rémi Verschelde
55ab7d1d1c Merge pull request #3392 from Hinsbart/html5-gamepad 
fix string conversion in javascript export
 2016-01-20 10:08:13 +01:00
hondres
c4578453fa fix string conversion in javascript export 2016-01-20 08:59:14 +01:00
Rémi Verschelde
f3f74cf9ae Merge pull request #3391 from eska014/web-export-page 
Overhaul web export page
 2016-01-20 07:57:07 +01:00
Juan Linietsky
c9580965ea -Remote deploy now uses FS over USB on Android, super fast! 2016-01-20 00:29:34 -03:00
eska
696643ce18 Revamp web export page 2016-01-20 03:41:39 +01:00
volzhs
c937fd5be6 missed rename "keep_screen_on" for ios 2016-01-19 01:58:51 +09:00
Rémi Verschelde
1469508174 Merge pull request #3364 from Max-Might/master 
Haiku: fix build and add resource file
 2016-01-18 14:51:01 +01:00
Rémi Verschelde
7e20c86ac7 Merge pull request #3360 from volzhs/keep-screen-on-5 
Add ability to set "keep screen on" for android & iOS. fixes #2428
 2016-01-18 14:44:49 +01:00
mrezai
48bf9d3139 Fix 32 bit windows export crash 2016-01-16 19:22:40 +03:30
volzhs
182d2e5dc9 Add ability to set "keep screen on" for iOS 2016-01-16 20:59:09 +09:00
volzhs
fb2bf78591 Add ability to set "keep screen on" for android 2016-01-16 20:57:34 +09:00
Kostadin Damyanov
19753233ad Haiku: add resource file 2016-01-16 07:34:00 +02:00
Kostadin Damyanov
7998197ff1 Merge remote-tracking branch 'upstream/master' 2016-01-15 22:43:54 +02:00
punto-
7393e40452 Merge pull request #3272 from Hinsbart/joy-binding 
Add some joystick functions to input. Enables manipulation of mapping…
 2016-01-12 03:59:19 -03:00
mrezai
4cb14ae7d6 Fix crash on android 6.0.1, fixes #3321 2016-01-12 09:57:56 +03:30
Rémi Verschelde
1f1c3038c2 Update copyright in remaining files + prints in the UI 2016-01-11 21:34:22 +01: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
Rémi Verschelde
4c090313bc Merge pull request #3304 from eska014/fbsd-alsa 
Give FreeBSD a chance to enable ALSA
 2016-01-11 08:50:15 +01:00
Juan Linietsky
b21ce6cecb make msvc 64bits build again, fixes #3098 
disabled assembly for msvc 64 bits, as it is not supported
 2016-01-10 21:26:34 -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
eska
56e65f9e29 Enable ALSA driver in non-linux X11 when available 2016-01-10 17:52:15 +01:00
Juan Linietsky
c9852501a4 Fix bug related to EOF in Android FileAccess 2016-01-09 20:50:45 -03:00
eska
a6c1a5c6d0 Fix pthread renaming in Open/FreeBSD 2016-01-09 15:56:31 +01:00
mrezai
50cbe736de Fix maven repositories bug 2016-01-09 16:51:22 +03:30
Juan Linietsky
6a29edf048 removed unnecesary comma in gradle template 2016-01-08 17:55:13 -03:00
Juan Linietsky
40ba22631b Renamed godot domain from com.android.godot (which was incorrect) to org.godotengine.godot 2016-01-08 17:53:00 -03:00
Juan Linietsky
401622cc22 -Removed ANT build system for Android, as it was deprecated by Google 
-Added new Gradle build system, as it is the required build system
 2016-01-08 13:36:44 -03:00
hondres
c632c13c66 Add some joystick functions to input. Enables manipulation of mappings at runtime 2016-01-08 00:40:41 +01:00
Peace Sells
9f00d9e44b Better fix for visual studio project generation. 2016-01-06 22:47:43 -07:00
Rémi Verschelde
a98aa0bbbe Make joydev build using udev and evdev opt-out but blocking (linux) 
It is enabled by default, users have to specifically ask for it if they don't want gamepad support. If libudev or libevdev are missing, the build aborts and tells the user the reason and that they can disable gamepad support with the "gamepad=no" option.
 2016-01-06 19:21:37 +01:00
hondres
c0e4d8fbfd fix x11 crash on exit 2016-01-05 23:35:54 +01:00
hondres
3f64fd64eb define XUSER_MAX_COUNT if not present 2016-01-05 01:16:10 +01:00
Emmanuel Leblond
cabf923484 Remove unnecessary null pointer checks 2016-01-04 11:46:16 +01:00
Juan Linietsky
e0eff65fc0 change android install location to automatic, closes #1997 2016-01-03 20:31:37 -03:00
Juan Linietsky
908f75c23f having active items is pointless in input map 2016-01-03 18:52:42 -03:00
hondres
17d664cf1d send axis events only once per frame on linux 2016-01-03 02:24:43 +01:00
hondres
c60e1648ba make num_buttons local, no need to keep in joystick struct 2016-01-02 03:52:44 +01:00
George Marques
5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
Juan Linietsky
586e482a98 -Fix parsing of comments in VariantParser, fixes #3175 2015-12-31 10:25:21 -03:00
Rémi Verschelde
46eebac3ae Remove bogus argument in sample_get_description 
Copy-paste mistake from the setter most likely.
 2015-12-28 01:18:37 +01:00
Kostadin Damyanov
62574759ab Haiku: fix build 2015-12-26 18:54:05 +02:00
Hondres
d8143eb3fb Fix joystick hotplugging on windows, using right indices now 2015-12-26 13:14:13 +01:00
Ariel Manzur
6cfede11e3 removed -ffast-math on ios, compiler bug? 2015-12-23 11:19:12 -03:00
Ariel Manzur
02d6669a38 threads 2015-12-22 10:08:20 -03:00
Juan Linietsky
50e9839089 Merge pull request #3113 from Hinsbart/joy_fix 
Check pkg-config for libudev and enable gamepad code only if found.
 2015-12-22 09:29:38 -03:00
Ariel Manzur
8433221629 missing? 2015-12-22 09:26:54 -03:00
hondres
541c9039c5 Check pkg-config for libudev and enable gamepad code only if found. Linux only for now 2015-12-21 22:39:03 +01:00
Juan Linietsky
46dee92c8e -fixed build system to use pkg-config for evdev 2015-12-21 10:37:26 -03:00
Ariel Manzur
020700af1d windows resource version thing 2015-12-20 13:43:08 -03:00
Ariel Manzur
bec1e003e7 this failed on mingw on linux (but not on msvc) with 2 problems: 
1) it didn't print the error to the console, only this:

build_res_file(["platform/windows/godot_res.windows.tools.32.o"], ["platform/windows/godot_res.rc"])
scons: *** [platform/windows/godot_res.windows.tools.32.o] Error 1

I had to print the actual command and run it on a console to see the error. The builder should be able to print the command it's running and the error, like it does with compiler invocations, etc.

2) The actual error was a syntax error on line 11 of godot_res.rc. I looked up "FILEVERSION" and "PRODUCTVERSION" (here https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx), it says they take 4 numbers as parameters, so I added those 0s, but I'm not sure if they're in the right order.

@masoudbh3 can you check it out? thanks

It builds on msvc just fine with (and without) these changes.
 2015-12-20 11:50:16 -03:00
punto-
33e5c3181d Merge pull request #3101 from Hinsbart/remapping-new 
Better gamepad support
 2015-12-20 11:08:04 -03:00
hondres
87dab29f4b Use tabs instead of spaces for new gamepad code 2015-12-18 19:15:32 +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
hondres
af633c7941 Better gamepad support 2015-12-18 06:12:53 +01:00
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
Aren Villanueva
402c24ec8b iOS compile fixes. 2015-11-16 11:10:07 +11:00
masoud bh
14b9579748 Skip META-INF from Android Template 2015-11-14 20:40:22 +03:30
Ariel Manzur
8adc4ef65b windows crash and bind placeholder method 2015-11-14 11:14:17 -03: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
Anton Yabchinskiy
3b9868d2e4 Merge branch 'master' of github.com:okamstudio/godot 2015-11-02 20:25:01 +03:00
Saracen
e723488aa3 Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting. 2015-11-02 16:36:41 +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
ZuBsPaCe
fff7cedbe1 Fixes Visual Studio 2015 parallel builds (-j switch) 
Reference: http://stackoverflow.com/questions/284778/what-are-the-implications-of-using-zi-vs-z7-for-visual-studio-c-projects

fatal error C1041: cannot open program database 'C:\godot\vc140.pdb'; if multiple CL.EXE write to the same .PDB file, please use /FS
 2015-10-30 03:13:55 +01:00
volzhs
3fbaa479e3 improve android payments 
GodotPaymentV3 currently consumes purchased item right after purchasing.
But, some in-app item should not consume like "remove ads permanently"
So, I added "setAutoConsume(boolean)", "requestPurchased()",
"consume(sku_string)".
AutoConsume is true by default as before.

usage:

func _ready():
	var payment = Globals.get_singleton("GodotPayments")
	payment.setPurchaseCallbackId(get_instance_ID())
	payment.setAutoConsume(false) # default : true
	payment.requestPurchased() # callback : has_purchased
	payment.purchase("item_name") # callback : purchase_success,
purchase_fail, purchase_cancel, purchase_owned
	payment.consume("item_name") # callback : consume_success

func purchase_success(receipt, signature, sku):
	print("purchase_success : ", sku)

func purchase_fail():
	print("purchase_fail")

func purchase_cancel():
	print("purchase_cancel")

func purchase_owned(sku):
	print("purchase_owned : ", sku)

func consume_success(receipt, signature, sku):
	print("consume_success : ", sku)

func has_purchased(receipt, signature, sku):
	if sku == "":
		print("has_purchased : nothing")
	else:
		print("has_purchased : ", sku)
 2015-10-28 15:48:37 +09:00
Phobos Tro
2d2ab92680 Made the Atom net_wm_icon local 2015-10-26 01:36:27 +08:00
Phobos Tro
746ef7cbd6 Fixing memory leaks 2015-10-25 22:15:56 +08:00
steve
15a826571c Added setting for CADisplayLink on iOS, so you no longer need to recompile to change it 2015-10-22 17:31:09 -07:00
firefly2442
c2aedde7e3 rasterizer comparison fix 2015-10-18 20:28:51 -05:00
Juan Linietsky
97f483af0a fixes broken 3D in editor 2015-10-17 23:05:39 -03:00
Juan Linietsky
3d121b474b Merge pull request #2203 from volzhs/fix_android_payments 
Fix android payments
 2015-10-17 12:12:34 -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
b217e1417a Merge pull request #2479 from firefly2442/cppcheck-unusedvars 
ran cppcheck, found unused variables
 2015-10-17 10:25:36 -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
4a8bc25f18 Merge pull request #2485 from masoudbh3/fix-x11-editor-boot-splash 
Fix X11 Editor Boot Splash (Maximized Boot Splash)
 2015-10-17 10:12:34 -03:00
Juan Linietsky
782444d366 Merge pull request #2602 from sanikoyes/Pr-REUSE_ADDR_WIN32 
Pr-REUSE_ADDR_WIN32
 2015-10-17 09:44:07 -03:00
Kostadin Damyanov
c925fbce2d Haiku: fix build 2015-10-17 15:41:01 +03:00
Didier Vandekerckhove
d48a1bd22d Added specific get_locale to OSX platform 
The default unix get_locale didn’t work. OS X requires a specific one.
 2015-10-16 19:42:26 +02:00
sanikoyes
15f6991064 REUSE_ADDR under windows platform 2015-10-13 13:11:33 +08: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
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
George Marques
6e87314d83
Add support for Opus audio format 2015-10-02 14:25:38 -03:00
Juan Linietsky
e055247b17 -Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing) 
-Added ability for exporter to shrink images to non-integer values. Helps if you want to convert your game artwork from 1080->720 or similar
 2015-10-01 16:25:36 -03:00
punto-
0840303a9c Merge pull request #2548 from romulox-x/iCloud 
Initial iCloud implementation
 2015-09-28 17:20:16 +02:00
steve
b4daeda48b improved iCloud build option description 2015-09-27 17:21:32 -07:00
steve
1fe5cc8e1d Initial iCloud implementation, supporting key value pairs 2015-09-27 16:54:20 -07:00
Rémi Verschelde
be51861310 Hide stderr when trying to detect mingw binaries on posix 2015-09-27 16:31:19 +02:00
Rémi Verschelde
092f84642c Rename voice_set_volume argument to p_volume to avoid confusion 
This argument is indeed expected to be a volume on a linear scale (not dB),
typically from 0.0 to 1.0, though it can go higher than 1.0.
 2015-09-26 22:43:34 +02: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
9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky
82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Juan Linietsky
ce6fefced8 Properly implement OS.alert() from script, and use xmessage on X11 2015-09-21 09:39:46 -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
3c466afb68 Fix X11 Editor Boot Splash 2015-09-17 05:19:43 +04:30
firefly2442
afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
masoud bh
9d540afd1c android remove "gen" folder from git. 2015-09-16 16:28:01 +04:30
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
56c907ad04 fix to builtin freetype defines on linux 2015-09-10 22:15:00 -03:00
Juan Linietsky
751202768c fix to freetype detection 2015-09-10 21:40:34 -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
59e1ad2773 disabling theora for now (will be re-written, re-enabled later) 2015-09-10 13:27:15 -03:00
Juan Linietsky
3013a83f2f Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 00:12:05 -03:00
Juan Linietsky
0fb7b5aa0c HTML5 exporter Improvements 
-Better template handling
-Voice support
-Stream support
 2015-09-10 00:10:54 -03:00
punto-
4d900859e2 ios build with osxcross 2015-09-09 21:57:49 +02: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
cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
Juan Linietsky
3a59747c62 -fixes to capture mode 
-ability to drag spinboxes and tree ranges to change values, like in Unity or Unreal
 2015-08-29 01:43:21 -03:00
Juan Linietsky
700fdf5c0c fix build issue with ssl, closes #2384 2015-08-23 20:54:13 -03:00
Juan Linietsky
e1e54d39e4 damn github built-in editor 2015-08-21 22:33:49 -03:00
Juan Linietsky
2de5e12116 fix for built-in ssl (easier to build 32 bits export) 2015-08-21 22:31:06 -03:00
Kostadin Damyanov
2a757a6ad4 Haiku: move the audio driver to platform/haiku 2015-08-14 22:52:28 +03:00
Kostadin Damyanov
b038a2c3c2 Haiku: update logo.png 2015-08-13 22:36:43 +03:00
Kostadin Damyanov
ced44b45d3 Haiku: remove unneeded code 2015-08-12 22:14:40 +03:00
Kostadin Damyanov
f48ce8901a Haiku: remove unneeded code 2015-08-12 21:40:45 +03: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
Maximillian
6f9a084ac8 Add OS.get_system_time_msec 2015-08-06 10:29:33 -07:00
Juan Linietsky
9d185ccc30 -Merged the file server with the live editing and remote debug 
-It is now really easy to deploy an android build with debug, and debug it
 2015-08-06 02:37:40 -03:00
Anton Yabchinskiy
dc8df8a91a Merge branch 'master' of github.com:okamstudio/godot 2015-07-29 23:01:36 +03: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
Jari Ronkainen
983fd0dfc3 Use tabs instead of spaces. 2015-07-23 19:35:47 +03:00
Jari Ronkainen
8027a3f004 Fix audio driver setup if the first driver fails. 2015-07-23 19:32:10 +03:00
Kostadin Damyanov
f8db8b7215 Haiku: update detect.py 2015-07-20 22:45:22 +03:00
Kostadin Damyanov
07e76a3f2c Haiku: add keyboard support 2015-07-12 00:52:47 +03:00
Kostadin Damyanov
77e78cdb20 Haiku: gl context locking 2015-07-02 18:41:32 +03:00
romulox_x
1d22b0265b fixed ios compilation error 2015-07-01 23:07:01 -07:00
volzhs
f6668dc9db Merge branch 'master' of https://github.com/okamstudio/godot into fix_android_payments 2015-07-01 15:13:10 +09:00
Juan Linietsky
55b34e05b3 -some changes by okam 2015-06-30 11:28:43 -03:00
Juan Linietsky
95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources. 
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
 2015-06-29 00:29:49 -03:00
volzhs
903e6b37c0 fix crash by payments when run on android 5.1.1 device. 
(http://stackoverflow.com/questions/24480069/google-in-app-billing-illegalargumentexception-service-intent-must-be-explicit)
 2015-06-29 02:56:38 +09:00
Kostadin Damyanov
e0e54ea7d4 Merge remote-tracking branch 'upstream/master' 2015-06-26 21:35:47 +03:00
Kostadin Damyanov
7ad89c7e83 Haiku: implement some more window-related methods 2015-06-23 21:22:12 +03:00
James McLean
2f33f820e9 Fixed compilation error on MacOS X. 2015-06-22 00:56:49 -04:00
Kostadin Damyanov
174df9a276 Haiku: add support for mouse wheel 2015-06-21 22:18:27 +03:00