Commit graph

1026 commits

Author SHA1 Message Date
Rémi Verschelde
e6e878e139 Icon: Remove more grey capsules behind official logo 2016-05-30 00:41:42 +02:00
Juan Linietsky
c7d24b7814 hidpi for now not available on mingw, sorry 2016-05-29 14:34:06 -03: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
d31696e3db Merge pull request #4874 from Hinsbart/x11_dragndrop
x11: Add support for filesystem drag & drop using xdnd
2016-05-29 18:40:27 +02:00
Rémi Verschelde
96bdab6edf Merge pull request #4845 from vnen/pr-magnetometer
Add magnetometer sensor support for Android
2016-05-29 18:37:33 +02:00
Rémi Verschelde
7d262947af Merge pull request #4810 from marcelofg55/master
Added application/fat_bits property for EditorExportPlatformOSX::Edit…
2016-05-29 18:28:10 +02:00
Andreas Haas
2c9b28df13 xdnd: can handle more than 3 different target types
Now dropping also works with Nemo and PCManFM(gtk)
2016-05-29 17:40:08 +02:00
Juan Linietsky
65615c0353 fix freetype paths on osx and mingw 2016-05-29 12:26:15 -03: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
Andreas Haas
ae0a59731e x11: Add support for filesystem drag & drop using xdnd 2016-05-28 21:35:42 +02:00
fluffrabbit
4877b714b3
Add magnetometer sensor support for Android 2016-05-27 14:36:55 -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
marcelofg55
ba0fbe4f79 Added application/fat_bits property for EditorExportPlatformOSX::EditorExportPlatformOSX 2016-05-25 15:17:28 -03:00
volzhs
e5d16eca46 Add comments for NotificationCompat to support API < 16 2016-05-25 22:19:37 +09:00
volzhs
ff67c256f5 fix compatibility for Android API 14 with supporting API 23
using ``NotificationCompat`` in ``support-v4`` library will increase APK filesize a little bit, but it guarantees to run OK with API 4+
tested with API 19 and 23 devices
2016-05-24 11:22:35 +09:00
volzhs
5eb14d3af0 fix unexpected char: '\' error on windows
error occurred when register additional directory for android module on windows.

### config.py ###
```
def can_build(plat):
 return plat=="android"

def configure(env):
 if (env['platform'] == 'android'):
  env.android_add_res_dir("android/res")
```
2016-05-24 05:25:22 +09:00
Hubert Jarosz
33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02:00
marcelofg55
eeb83982e2 Added 'fat' option for bits param on scons for osx, this will produce a fat binary that contains both 32 bits and 64 bits binaries 2016-05-20 17:31:30 -03:00
volzhs
160713d4d3 Supporting Android API 23 (Android 6.0)
If we update build gradle to use ``compileSdkVersion 23``,
``org.apache.http`` package causes error. (issue #4711)

We need to use ``useLibrary 'org.apache.http.legacy'`` to solve this problem.
To use ``useLibrary``, we need to use latest gradle also.

And now, we faced another problem with ``APK Expansion`` java sources.

```
/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
137 :             mCurrentNotification.setLatestEventInfo(mContext, mCurrentTitle, mCurrentText, mContentIntent); // causes error
```

So, some of APK Expansion java sources are updated by referencing commits from https://github.com/danikula/Google-Play-Expansion-File
And dropped V3CustomNotification.java which was for android 3.0, since godot supports android 14 (4.0) above officially.

Unfortunately, another problem, The 'MissingTranslation' error was occurred.
So, build.gradle is updated to use ``disable 'MissingTranslation'``

Additionally, I updated ``buildToolsVersion``, ``targetSdkVersion`` to latest version.

I tested APK Expansion funtionality on Android 6.0 (Nexus 9, Nexus 6p) and Android 4.4 (Galaxy Note 2)  with Google Developer console.
2016-05-20 22:57:49 +09:00
Rémi Verschelde
5e0f0a962a Android buildsystem: Drop obsolete NDK_TOOLCHAIN argument
It was a duplicate of NDK_TARGET, and not used for anything.
2016-05-19 10:44:18 +02:00
marcelofg55
b697de92ef OS.get_screen_size now returns the correct value on OSX 2016-05-11 11:44:10 -03:00
Mattias Cibien
4ee2999777 Working even when re-entering window. 2016-05-09 15:46:05 +02:00
Mattias Cibien
0b64b97d41 Cursor hides only in client area
At the moment is however restored when going out and then in again.
2016-05-09 15:18:08 +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
Mattias Cibien
8fb7280f39 Fixed behavior of OS.set_window_resizable
Should fix #4428. 
 * Minimize button is not hidden anymore
2016-05-03 15:58:05 +02:00
Rémi Verschelde
f48d385644 Merge pull request #4274 from Griefchief/master
Fixes 64 bit MSVC builds, disables bits parameter
2016-05-02 17:45:21 +02:00
Rémi Verschelde
94274b9ab5 OSX: Fix lib suffix for Android lib (#4499)
Fixes #1452.
2016-05-01 11:38:15 +02:00
George Marques
2cd8e86aa0
Implement OS.get_process_ID for Windows
Based on code by @ratsdiov.
Closes #1733
2016-04-29 13:57:57 -03:00
Ariel Manzur
6aae63fce2 disabled appirater 2016-04-29 13:03:46 -03:00
Ariel Manzur
6962fd91c6 rate url on iOS and properly launching from .app on OSX 2016-04-29 10:54:25 -03:00
Ariel Manzur
de3ed61fc5 I think this is ok, "resizable" property might change 2016-04-29 10:54:25 -03:00
Ariel Manzur
b50c00ff90 merged iphoen changes 2016-04-29 10:50:56 -03:00
eska
ab4caa7953 Move export GUI debug toggle to export settings window 2016-04-28 16:13:26 +02:00
Rémi Verschelde
ec606f94dc Drop NACL platform
It's no longer maintained and Chrome-specific, so it's not a viable solution
to deploy Godot games in browsers. The current prefered alternative is asm.js
(platform/javascript), and we're looking forward to WebAssembly.
2016-04-25 19:08:22 +02:00
Rémi Verschelde
f368d380e7 Drop obsolete WIP for Flash platform
It was apparently never fully functional and has not been maintained.
Flash itself is nowadays clearly a deprecated technology, so there will
not be further work on it. platform/javascript and the upcoming
WebAssembly technologies should have a brighter future.
2016-04-25 19:08:22 +02:00
Rémi Verschelde
016be49e08 Merge pull request #4377 from eska014/web-keys
Fix key events in web export
2016-04-19 21:10:00 +02:00
eska
45b90f16ca Add fallback to legacy KeyboardEvent in web export
Fallback to KeyboardEvent property `charCode` is absence of both `key`
and `char` for retrieval of unicode value.
2016-04-19 17:03:13 +02:00
eska
0e9eefb7d4 Reimplement key input events in Emscripten export
Scancodes work, but unicode values are now completely broken in some
browser/OS combinations.
2016-04-19 14:02:26 +02:00
volzhs
e94e710893 remove unused resources and add korean locale for android
- remove unused resources in platform/android/java/res/values/strings.xml
- add korean language resource for apk expansion download screen
2016-04-19 11:10:55 +09:00
Ignacio Etcheverry
5907a007dc x11: Flush the X output buffer after changing mouse mode 2016-04-12 16:20:28 +02:00
Aleksandar Danilovic
7762e1afe6 Fixes 64 bit MSVC builds, disables bits parameter
Also Enables automatic detection of architecture for the MSVC compilers.
Builds without assembly optimisations for x64
Closes issue #3098

Signed-off-by: Aleksandar Danilovic <greatgames.alexandar@gmail.com>
2016-04-10 03:36:58 +02:00
MSC
391095e0ef memdelete 'joy_thread' + 'joy_mutex' on ::~joystick_linux() 2016-04-03 19:24:39 +02:00
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
Kostadin Damyanov
6f48ddc61d Haiku: add some screen and window-related methods 2015-06-21 02:08:31 +03:00
Kostadin Damyanov
b59e95ce1c Haiku: implemet get_widow_size() get/set_window_position() 2015-06-20 15:35:54 +03:00
Kostadin Damyanov
d44dfc2440 Haiku: cleanup, add TODOs 2015-06-20 03:43:11 +03:00
Kostadin Damyanov
93ac4ace0a Haiku: handle the quit request message 2015-06-20 01:59:32 +03:00
Kostadin Damyanov
0038e27fc3 Merge remote-tracking branch 'upstream/master' 2015-06-18 22:48:29 +03:00
Kostadin Damyanov
f10eb8ffa1 Haiku: implement get_mouse_pos() and get_mouse_button_state() 2015-06-18 22:41:33 +03:00
Kostadin Damyanov
2102d35e9c Haiku: read the status of the key modifiers and mouse buttons 2015-06-17 22:27:45 +03:00
Kostadin Damyanov
1505d65ac9 Haiku: handle mouse movement and click events 2015-06-16 21:52:24 +03:00
Juan Linietsky
4e46143499 some optimizations in godot memory handling 2015-06-12 18:27:48 -03:00
Kostadin Damyanov
8df3e30abd Haiku: create a GL context and initialize the audio and physics servers 2015-06-11 22:57:41 +03:00
Juan Linietsky
c76900beb8 draw button focus before text and icon
closes #2047
2015-06-08 10:36:27 -03:00
est31
ddba217109 Complete fix for windows compilability
Thanks @volzhs for testing :)
2015-06-07 16:12:03 +02:00
est31
64704ecbc5 Fix windows compilability 2015-06-07 15:36:14 +02:00
Juan Linietsky
8d61817293 Merge pull request #2037 from est31/use-local-win
Time zone support
2015-06-07 00:32:29 -03:00
Juan Linietsky
dac398ba58 Merge pull request #2017 from Razzlegames/multitouch_fix_1908
Additional Fix for Multi-touch release problem
2015-06-07 00:29:46 -03:00
est31
c5338fd6c4 Add OS.get_time_zone_info function
The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.
2015-06-06 05:57:33 +02:00
est31
803069886e Add utc param to get_time and get_date methods
If utc == false, we return the local time, like before.
Otherwise, we return UTC time.
utc defaults to false to not break behaviour.
2015-06-06 05:55:28 +02:00
est31
26ea12a873 Use local time for both time and date on win
On unix and nacl, both date and time are expressed in local time.
2015-06-06 03:23:34 +02:00
romulox_x
ef173a2c9c improved calculation of screen resolution on ios 2015-06-03 21:57:33 -07:00
Kyle Luce
77461a126e Additional Fix for Multi-touch release problem
- Was duplicating the functionality of event.getActionIndex() but was missing the bitmask.
- Switched back to getActionIndex() but kept the corrected getPointerId() from
  change #1980

https://github.com/okamstudio/godot/pull/1908
2015-05-31 19:37:19 -07:00
Kostadin Damyanov
8130707e01 Haiku: start implementing the os-dependant stuff 2015-05-30 00:57:07 +03:00
Kostadin Damyanov
db459fba1d Haiku: fix build, link with libGL and libGLEW 2015-05-29 23:36:48 +03:00
Kostadin Damyanov
513d509783 Haiku: enable building with GLES 2015-05-28 03:42:40 +03:00
Kostadin Damyanov
8dd674d639 Haiku: enable debug support 2015-05-28 00:59:41 +03:00
punto-
70edfcdc8d Merge pull request #1966 from romulox-x/iosServicesAdditions
Improved iOS Game Center functions
2015-05-26 11:41:56 -03:00
Juan Linietsky
9df77d2765 ability to run 2D physics in a thread
also, 2D physics is now thread safe too.
see physics_2d/thread_model
2015-05-26 01:06:05 -03:00
Kostadin Damyanov
a553327043 Haiku: some small fixes 2015-05-25 06:34:16 +03:00
Kostadin Damyanov
826f8af1ef Haiku: link with the haiku libs, stub the OS_Haiku class. 2015-05-25 06:02:55 +03:00
Kostadin Damyanov
4e07a2dea8 Haiku: fix building with UNIX_ENABLED. 2015-05-25 03:49:24 +03:00
Kostadin Damyanov
4a56f72f5b Haiku: Initial support. 2015-05-24 23:22:51 +03:00
romulox_x
95cd9b1ad5 added response event for game center overlay closing 2015-05-23 23:22:20 -07:00
romulox_x
94638e7bfe added data to descriptions dictionary that was missing. Made the elements that sound weird as plurals consistently singular. changed int arrays to bool arrays in descriptions 2015-05-23 19:04:02 -07:00
romulox_x
93e797f164 Fixed null pointer bug in ios store. added functions to game center to reset the user's achievements, request all the achievements they've made progress on, request descriptions of all possible achievements, and show the built in game center overlay. Upgraded all (I think) deprecated functions to ios 6 versions. as per discussion with reduz on IRC, ios 6 is now the official lowest supported iOS version. compatibility could be added, but it's so obsolete, it's tough to argue for continuing to support it. some naming of functions and dictionary parameters might need to change. I just named them whatever made sense to me :) 2015-05-23 03:17:52 -07:00
Rémi Verschelde
5f0bb18d55 Fix building release target with debug symbols
This forced the -g2 CCFLAG in release builds, making them relatively heavy.
Fixes #1781.
2015-05-22 22:19:16 +02:00
Juan Linietsky
f220183e40 fix a crash situation when starting a thread and other small fixes 2015-05-18 12:45:53 -03:00
Juan Linietsky
6e85ee3a43 fix crash on help, closes #1873 2015-05-17 14:17:57 -03:00
vipsbpig
bc3afc8ed8 fix multitouch release problem 2015-05-15 12:40:34 +08:00
Antony
9e14f971bc Change windows build to use CFlag /Od so that you get the full debug experience. Without this flag set, Visual Studio lets you use breakpoints, but the watch and locals is pretty much useless. 2015-05-09 15:46:59 -06:00
Juan Linietsky
c99813dc38 Merge pull request #1826 from eehrich/master
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
2015-05-07 20:02:54 -03:00
Ricardo Pérez
979b931995 Better OS X fullscreen support, without the nasty startup effect 2015-05-06 12:53:55 +02:00
punto-
fbd9839131 Merge pull request #1818 from ricpelo/ricpelo-patch-5
Really fixes fullscreen mode in OS X, even during startup
2015-05-06 04:36:57 -03:00
ehriche
897a1aade5 optional formal changes 2015-05-06 01:22:31 +02:00
Ricardo Pérez
1d619fad86 Really fixes fullscreen mode in OS X, even during startup 2015-05-05 12:02:47 +02:00
yg2f
43c41fc9f9 fixes issue #1693 winmain and main unicode
makes WinMain() and main() accepts unicode characters into arguments
2015-05-04 20:26:49 +02:00
Juan Linietsky
fbbe7dcdfb Merge remote-tracking branch 'origin/master'
Conflicts:
	drivers/windows/dir_access_windows.cpp
2015-05-04 13:24:02 -03:00
Juan Linietsky
7f5b744b92 small unicode fixes 2015-05-04 13:12:05 -03:00
Juan Linietsky
c631d597ad Merge pull request #1792 from swenner/static_analysis_fixes
Static analysis fixes
2015-05-03 22:53:30 -03:00
Juan Linietsky
795ccf0e14 Merge pull request #1800 from antonyjones67/VSGenerator
Added Visual Studio project generation. Use "vsproj=yes" in command line...
2015-05-03 22:52:20 -03:00
Antony Jones
2a4da03f10 Added Visual Studio project generation. Use "vsproj=yes" in command line. This does not set up NMAKE properly. 2015-05-03 15:18:56 -06:00
Simon Wenner
bd08cd7fd2 fixed broken comment block 2015-05-03 02:04:30 +02:00
Juan Linietsky
524d9fad59 -fixed godot icon for android
-added a genname option to generate the name of android app
2015-05-01 23:21:27 -03:00
Juan Linietsky
61e90385f6 -option to select arm and x86 architectures on android export (will not work with current templates, you have to make new and include both x86 and arm support) 2015-05-01 22:45:32 -03:00
Juan Linietsky
1e422941c8 -Fixed android export options (screen sizes, orientation should work)
-added functions to get mouse position in CanvasItem
2015-05-01 21:13:20 -03:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Juan Linietsky
21939ce08b -some cleanups
-added tesselation function to curve and curve2d
2015-04-30 10:06:18 -03:00
Juan Linietsky
c6dce44dd8 fixes in handling of DirAccess for resource path on Android, fixes #1447 2015-04-28 09:38:07 -03:00
Juan Linietsky
59154cccf9 -Changed Godot exit to be clean.
-Added more debug information on memory cleanliness on exit (if run with -v)
-Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 19:38:02 -03:00
Juan Linietsky
1de1a04b78 -fix local and global usage for DirAccess, fixes #791
please test anyway..
2015-04-18 20:11:33 -03:00
Juan Linietsky
fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Juan Linietsky
b56badf77b -Added android immersive mode, fixes #303 2015-04-17 16:18:46 -03:00
Juan Linietsky
2dfa1279ea improved save path error messages for scene, textures and audio, fixes #1514 2015-04-12 16:45:59 -03:00
Juan Linietsky
87c51b6fc0 Modified OSX11 to try alternative audio drivers if pulseaudio does not work or user dislikes lennart potering , fixes #1511 2015-04-12 16:11:26 -03:00
Juan Linietsky
b135cdbf05 Merge pull request #1531 from vkbsb/h5_canvas_polygon_fix
H5 canvas polygon fix
2015-04-07 20:22:58 -03:00
Juan Linietsky
b989498004 Merge pull request #1568 from sanikoyes/Pr-missing-WM_RBUTTONDBLCLK
Pr-missing-WM_RBUTTONDBLCLK
2015-04-07 20:17:32 -03:00
Martho42
7a2698bb44 Fixes the accelerometer
Resolves the issue of the accelerometer behaving differently across devices with landscape as default and devices with portrait as default.
2015-04-04 17:03:56 -07:00
Anton Yabchinskiy
16746f157f Merge branch 'master' of github.com:okamstudio/godot 2015-04-04 09:31:21 +03:00
Juan Linietsky
42d41a3fbc wrong function, changing.. 2015-04-02 15:03:14 -03:00
Juan Linietsky
8ea7e3e2b1 javascript build fix 2015-04-02 14:54:36 -03:00
Juan Linietsky
68e42f53ba Beta1 Attempt #1
-=-==-=-=-=-=-=-

-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
2015-04-02 12:59:23 -03:00
Ariel Manzur
ebd743f7c2 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-02 01:35:12 -03:00
Ariel m
7c1d516c01 fullscreen thing 2015-04-02 01:32:02 -03:00
Juan Linietsky
ed2a24ef21 solved color depth issues on osx 2015-04-01 12:39:54 -03:00
Juan Linietsky
3920c497b3 Option in Android export to use 32 bits buffer. 2015-03-31 19:02:40 -03:00
Juan Linietsky
7fc4059b13 read depth fixes 2015-03-31 17:57:16 -03:00
Juan Linietsky
ad634876b5 fixes for light2d in androids that do not support
read depth
2015-03-31 14:59:28 -03:00
reduz
7f8a0cddcf fixes to shader to get most new demos working on mobile 2015-03-25 22:56:35 -03:00
sanikoyes
042ead0e5d add missing WM_RBUTTONDBLCLK message 2015-03-25 10:58:22 +08:00
steve
a6f6bd85f9 fixed build error on OSX from new WM code 2015-03-23 22:07:03 -07:00
steve
e3957e32de fixed iphone build with new window manamenet changes 2015-03-23 18:55:45 -07:00
Juan Linietsky
3cf9490c46 window managements functions work
but still side-functions, all API needs to be migrated to them
2015-03-23 20:47:53 -03:00
Juan Linietsky
0245d4a2b0 oops, fucntion was there twice 2015-03-23 16:12:59 -03:00
Juan Linietsky
8db3922f56 small android fix 2015-03-23 14:15:11 -03:00
Juan Linietsky
7ad7f2f6a9 android fixes, please test
(can' t build android atm)
2015-03-23 11:31:23 -03:00
rollenrolm
ca0b3ce1f6 New API: build fixes for x11 2015-03-23 01:31:38 +01:00
Juan Linietsky
c68563aeb4 Merge pull request #1542 from jotson/wmclass
Reverted change to classHint
2015-03-22 19:18:44 -03:00
Juan Linietsky
23e13ce3c2 fixes to new window management API
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
2015-03-22 19:00:50 -03:00
John Watson
182c86de3f Reverted change to classHint
Using `char wmclass[] = "Godot"` causes `xprop` to report the
following for WM_CLASS:

`WM_CLASS(STRING) = "\200\326\322\365\377\177", "\200\326\322\365\377\177"`

This makes the Unity window manager fail to connect the running app
with the icon on the launcher.
2015-03-22 14:05:24 -07:00
Juan Linietsky
15bee515e6 Merge pull request #1487 from hurikhan/x11-window-management
X11 window management
2015-03-22 15:10:50 -03:00
Juan Linietsky
f6e537b08f Merge pull request #1432 from UsernameIsAReservedWord/fixes_platform_windows_detect_py
Fixes platform/windows/detect.py
2015-03-22 15:01:27 -03:00
rollenrolm
db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00
V.VamsiKrishna
eb3c88b3dd Revert "Revert "Removing etc1 from build for javascript platform.""
This reverts commit 9965e93f7e.
2015-03-20 11:47:56 +05:30
V.VamsiKrishna
9965e93f7e Revert "Removing etc1 from build for javascript platform."
This reverts commit 41b729ccff.
2015-03-20 11:12:13 +05:30
V.VamsiKrishna
41b729ccff Removing etc1 from build for javascript platform.
Based on inputs from reduz
1) Made etc1 optional driver and default yes.
2) Reverted the hack in rg_etc1.cpp
3) Disabled etc1 for javascript plaform.
2015-03-20 10:18:13 +05:30
V.VamsiKrishna
72895ddecf Replacing spaces with tabs 2015-03-20 07:47:06 +05:30
V.VamsiKrishna
1d45cd0ff1 Fix Javascript build. 2015-03-19 10:31:36 +05:30
Juan Linietsky
53e1694e1e New option to send canvas to render buffer
allows to use 3D environment effects for post processing such as Glow,
Bloom, HDR, etc. in 2D.
2015-03-16 01:14:59 -03:00
Anton Yabchinskiy
43713810de Merge branch 'master' of https://github.com/okamstudio/godot 2015-03-10 11:44:40 +03:00
hurikhan
52a4e8495c fix introduced bug 2015-03-08 04:24:21 -05:00
hurikhan
87be945d49 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-03-08 15:10:48 +08:00
Juan Linietsky
2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
2015-03-03 14:41:36 -03:00
Juan Linietsky
4d2198110b merges from okam repo 2015-03-03 14:39:13 -03:00
Juan Linietsky
440cc5e4b6 Merge pull request #1437 from Hinsbart/fix_win_joy
fix get joystick name from registry on some systems
2015-03-02 01:00:56 -03:00
Juan Linietsky
a1f715a4da support for 2D shadow casters
Added support for 2D shadow casters.

*DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a
CanvasItem and pull this, you will lose them. Shaders now work through a
2D material system similar to 3D. If you don't want to lose the 2D
shader code, save the shader as a .shd, then create a material in
CanvasItem and re-assign the shader.
2015-03-02 00:54:43 -03:00
Hinsbart
9229d9d1bb fix get joystick name from registry on some systems 2015-02-25 16:33:08 +01:00
UsernameIsAReservedWord
b3976ec14c Update detect.py 2015-02-24 22:38:49 +01:00
UsernameIsAReservedWord
fde7f11a55 Update detect.py 2015-02-24 22:31:18 +01:00
UsernameIsAReservedWord
84905809a1 fixes platform/windows/detect.py
- fixes issue #1298 : under windows, too long `ar` command lines are split into several smaller command lines.
- fixes issue #1285 : under linux, cross compiling with Mingw-w64 now generates actual 64bits EXE.
- `MINGW32_PREFIX` and `MINGW64_PREFIX` environment variables are also available for Windows.
- started to clean-up the remains of previous hacks and workarounds.
- added some documentation into the script.
2015-02-24 22:28:51 +01:00
Anton Yabchinskiy
19a99afa81 Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-20 13:41:37 +03:00
Juan Linietsky
5ef3f7392f support for light and normal mapping in 2D 2015-02-18 19:40:02 -03:00
greay
ef565b9778 fix for “no viable conversion from 'NSPoint' (aka '_NSPoint') to 'CGPoint'” build error on OS X 2015-02-17 19:19:29 -08:00
Anton Yabchinskiy
e024ff89b2 Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-17 15:57:24 +03:00
hurikhan
f5d2e1f42c Renamed EXPERIMENTAL_WM_API to NEW_WM_API 2015-02-15 18:26:49 +08:00
hurikhan
ee81d4b359 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-15 17:49:34 +08:00
Juan Linietsky
2185c018f6 begin new serialization framework
also got rid of STL dependency on triangulator
2015-02-15 01:21:26 -03:00
Juan Linietsky
d2f86cc09b fixes to mouse warp
-can warp now from viewport and control, in their respective coordinate
systems
-warp is now local to the window on Windows and OSX.

IF YOU RUN OSX, PLEASE TEST THIS! And make sure it works!, new code is
in OS_OSX::warp_mouse_pos. I don't have OSX so i can't test!
2015-02-14 19:22:06 -03:00
hurikhan
a13e180052 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-12 15:58:29 +01:00
hurikhan
df7d26ff5b cleanup + MouseGrab 2015-02-12 15:58:00 +01:00
Hinsbart
97e46194f4 fix get_joy_name() on windows 2015-02-12 04:17:29 +01:00
Rhody Lugo
d67e866788 add support for CADisplayLink 2015-02-10 22:10:10 -04:30
Juan Linietsky
f53b27dca3 Merge pull request #1300 from umxprime/fix/ios-init-crash
Fix init crash on iPad 1st gen device with iOS 5.1.1
2015-02-09 21:38:43 -03:00
Juan Linietsky
b1ec72a799 Merge pull request #1299 from umxprime/fix/isim-sdk-path
Fix iOS Simulator SDK path for isim platform.
2015-02-09 21:38:38 -03:00
Juan Linietsky
3b3829e002 Merge pull request #1259 from laganojunior/feature/fix_modifier_key_unpress
Modifiers are unset on events for the modifier key itself
2015-02-09 21:31:39 -03:00
sambler
8baa00a6e4 Adjust x11/detect.py
Test if clang is defined in CC/CXX/LD - this allows a specific version of clang to be defined
move appending -DTYPED_METHOD_BIND to keep clang options together
move sanitize option out of use_llvm test, gcc48+ also supports sanitize=address
2015-01-27 20:40:17 +10:30
Maxime CHAPELET
f9d63a7683 Fix init crash on iPad 1st gen device with iOS 5.1.1 2015-01-23 11:27:53 +01:00
Maxime CHAPELET
f7b00960dd Fix iOS Simulator SDK path for isim platform. 2015-01-22 22:19:45 +01:00
hurikhan
94d94a0855 * fix compilation without scons experimental_wm_api=yes
* Extended the demo with an addional MouseGrab Test
2015-01-22 01:14:50 +09:00
Anton Yabchinskiy
6f93e6812e Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-21 12:03:29 +03:00
hurikhan
d878b3205a Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-19 21:46:03 +09:00
Manuel Lagang
a4f40ec3be Fix whitespace on previous commit
Choose tabs or spaces, not both!
2015-01-17 23:06:20 -08:00
Manuel Lagang
fa62125e05 Modifiers are unset on events for the modifier key itself
This patch removes modifiers when processing key events for the
particular modifier key. For example, previously a Shift keypress
would register as a Shift + Shift modifier event.

This would cause issues when a modifier key as the action key in
the input map, because unpresses of the modifier key don't match as
matching inputs for that action. E.g. if Shift is used as an action,
the stored action event is Shift + Shift modifier (as indicated
in the editor as "Shift + Shift". The unpress event does not have the
Shift modifier set, so the event of unpressing Shift + no modifier
doesn't match the action which has the modifier set.

This patch removes the shift modifier on just pressing the Shift
key down, so the action event is registered as just Shift with
no modifier (as indicated in the editor as "Shift"), which matches
the unpress event.
2015-01-17 22:40:01 -08:00
marynate
9f61a4881e Fix mingw windows build error 2015-01-18 02:08:26 +08:00
hurikhan
dfb5a1d5e1 * multi_screen testing + bugfixes
* ALT-TAB is working
* tested on Ubuntu 14.10 Unity + LXDE
* minor cleanup
2015-01-18 00:28:04 +09:00
Anton Yabchinskiy
fa38e9b838 Merge branch 'master' of github.com:okamstudio/godot 2015-01-17 18:27:08 +03:00
hurikhan
dee27ce991 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-17 22:19:57 +09:00
Juan Linietsky
7ac7956baf Merge pull request #1188 from hurikhan/scons_colored
Scons colored
2015-01-17 09:47:02 -03:00
Juan Linietsky
07e63c3dc1 Merge pull request #1223 from NateWardawg/master
1: File path in save dialog automatically appended with correct extension if not manually added by the user.  2: Removed .bin as default extension for Linux exports as it causes problems for common file managers.
2015-01-17 09:43:00 -03:00
hurikhan
f1dc00e380 * cleanup window state handling
* first attemps in handling ALT+TABa (WIP)
2015-01-17 19:43:12 +09:00
the_mech
726d379775 added nvidia optimus enablement 2015-01-17 02:48:35 +01:00
hurikhan
6185949f6a Make it set_minimized() + set_maximized() work in both worlds: Unity and LXDE 2015-01-17 02:36:07 +09:00
hurikhan
716971655e added the following methods:
* set_minimized(bool)
 * bool is_minimized()
 * set_maximized(bool)
 * bool is_maximized()
2015-01-17 00:18:45 +09:00
hurikhan
f1b9953d0b fixing the warnings in os_x11.cpp 2015-01-16 14:44:41 +09:00
Nathan Warden
c2ffdb05d4 Set the default Linux extension to nothing. 2015-01-15 13:00:33 -05:00
hurikhan
d269344bbd WIP -- set_resizable() + is_resizable added 2015-01-15 22:50:23 +09:00
Anton Yabchinskiy
d6998995b5 Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
	platform/x11/detect.py
2015-01-14 23:17:15 +03:00
hurikhan
8a30feebbe Merge remote-tracking branch 'upstream/master' into x11-window-management
Conflicts:
	platform/x11/detect.py
2015-01-14 13:31:16 +08:00
hurikhan
7222e195e5 minor cleanup 2015-01-14 13:19:27 +08:00
hurikhan
790d8ecbb9 get_screen() + set_screen() added 2015-01-14 12:02:59 +08:00
Juan Linietsky
823d7ae3b5 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-13 11:23:05 -03:00
Juan Linietsky
7c7ab30c4e fixes 2015-01-13 11:22:56 -03:00
hurikhan
f55c0e9285 Using Xinerama extension for getting screen info 2015-01-13 21:01:24 +08:00
hurikhan
ce7c7a862e get_screen_position() added 2015-01-13 17:25:50 +08:00
hurikhan
c0d3632667 introduced the scons experimental_wm_api switch:
================================================

Usage:
    scons p=x11 experimental_wm_api=yes
2015-01-13 15:44:39 +08:00
hurikhan
928e068f71 -try fixing LLVM color diagnostic on osx 2015-01-13 12:54:23 +08:00
hurikhan
067a0d0e64 osx support for llvm coloring added 2015-01-12 14:04:25 +08:00
hurikhan
f9a4e6890b SCons: colored compilation 2015-01-12 12:54:17 +08:00
hurikhan
6b6c526048 Merge branch 'master' into x11-window-management 2015-01-12 11:30:19 +08:00
Juan Linietsky
66afddb3e8 -Initial (untested) implementation of 2D shaders. Probably broken, will be fixed later.
-fixed issue of opacity not working
2015-01-11 11:43:31 -03:00
hurikhan
f9d0de0d2a get_screen_size() added 2015-01-11 19:35:53 +08:00