Rémi Verschelde
42c5af5e48
OSX: Remove unnecessary bits assignment
2018-02-19 23:34:11 +01:00
Rémi Verschelde
3925e6a543
Merge pull request #16696 from BTaskaya/master
...
PEP3101 applied with changing old type string formatting as new ones
2018-02-19 20:38:37 +01:00
Rémi Verschelde
f04958cd5d
OSX: Remove support for 32-bit and fat binaries
...
Mac OS X is 64-bit only since 10.7 (Lion), which has reached End-Of-Life in October 2014.
Therefore it no longer makes sense to support exporting 32-bit binaries for Mac OS X,
and we can now default to 64-bit instead of bigger "fat" binaries.
2018-02-19 12:53:28 +01:00
BTaskaya
78dba05fc0
PEP3101 applied with changing old type string formatting as new ones
2018-02-14 19:29:25 +03:00
Rémi Verschelde
e0f43e0678
Merge pull request #15564 from RandomShaper/adpod-topmost
...
Add new window setting: always on top
2018-02-14 16:43:40 +01:00
Rémi Verschelde
7d7f8d9e54
Merge pull request #15864 from GodotExplorer/pr-get_unique_id-desktop-impl
...
Implement more methods for OS on Desktop platforms
2018-02-14 16:11:53 +01:00
Marcelo Fernandez
ea1d726a46
Added OS::center_window to center the window precisely on desktop platforms
2018-02-12 15:45:41 -03:00
geequlim
5980bef672
OSX: implement OS.get_unique_id
...
Update the documentations for OS.get_unique_id()
2018-02-01 23:29:39 +08:00
Pedro J. Estébanez
2e8c7824c0
Implement always-on-top for MacOS
...
Courtesy of @bruvzg.
2018-01-30 20:39:53 +01:00
bruvzg
9ef0315b06
[macOS] Strip executable when `separate_debug_symbols` is set to yes
2018-01-30 16:51:46 +02:00
bruvzg
24b01fe70c
Fix macOS build after #16092
2018-01-26 22:39:08 +02:00
Hein-Pieter van Braam
c6d9a7665a
Make separate debug symbols opt-in
...
This adds a separate_debug_symbols option to the x11, windows, and osx
targets. This will default to adding normal debugging symbols to the
artifacts and only splits them when separate_debug_symbols=yes on the
Scons command line.
2018-01-26 20:46:56 +01:00
Bernhard Liebl
2419ffd428
On macOS, prevent key_event_buffer overflows
2018-01-19 08:47:30 +01:00
Bernhard Liebl
3ff18ee61e
Catch NSException in macOS run loop to prevent crashs
2018-01-15 09:31:12 +01:00
bruvzg
f0029fd3c6
[macOS] Adds ability to open files with "Open With" or double-click from Finder
2018-01-12 16:38:19 +02:00
bruvzg
b3d803c901
Fix IME producing multiple events per key press.
2018-01-10 13:43:24 +02:00
Rémi Verschelde
51709cd8c8
Merge pull request #15344 from bruvzg/osx_dylib_export
...
[GDnative] macOS `dylib` export fixes
2018-01-08 15:12:50 +01:00
bruvzg
ff82fbdf64
Remove 10.6+ runtime version checks, add 10.12+ runtime version checks
2018-01-07 01:21:47 +02:00
bruvzg
47770df198
Fix build on macOS pre 10.12, fix deprecation warnings on 10.12+
2018-01-06 16:12:57 +02:00
Rémi Verschelde
db49f35ab8
SCons: Fix usage of LD when we meant LINK
...
Also made LINK and CXXFLAGS configurable as command line options.
Note that LINK currently expects the *compiler* that will be used
for linking and will call its configured linker behind the scenes
(so g++, clang++, etc., not ld.gold). See #15364 for details.
2018-01-05 20:37:45 +01:00
Rémi Verschelde
e4213e66b2
Add missing copyright headers and fix formatting
...
Using `misc/scripts/fix_headers.py` on all Godot files.
Some missing header guards were added, and the header inclusion order
was fixed in the Bullet module.
2018-01-05 01:22:23 +01:00
bruvzg
cce6adfc51
Adds dylib export for "dmg" export mode and change dylib path to "/Contents/Frameworks"
2018-01-04 21:41:59 +02:00
Duy-Nguyen TA
322cb08dd9
Fix macOS and other builds after #15299
...
Commit ammended by @akien-mga to fix more platforms.
2018-01-04 19:48:05 +01:00
Juan Linietsky
6e2ed15ff1
Add support from properly exporting shared objects, needed for GDNative export
2018-01-04 15:43:06 -03:00
Emmanuel Leblond
e315c94900
Change OS::initialize signature to return Error (fix segfault on x11)
2018-01-04 15:15:55 +01:00
Rémi Verschelde
b997773b26
Merge pull request #15033 from poke1024/shortcuts-mac
...
Alternative keyboard shortcuts for macOS
2018-01-04 14:56:29 +01:00
Rémi Verschelde
6322b0bbb7
Merge pull request #12814 from guilhermefelipecgs/add_hardware_custom_cursor
...
Custom hardware-accelerated mouse cursor
2018-01-03 08:35:59 +01:00
Rémi Verschelde
b50a9114b1
Update copyright statements to 2018
...
Happy new year to the wonderful Godot community!
2018-01-01 14:40:47 +01:00
Bernhard Liebl
3f122672a2
On macOS, change some default editor shortcuts
2017-12-26 11:24:12 +01:00
Juan Linietsky
021f3c924b
-Removed OpenMP support, replaced by a custom class.
...
-Disabled Opus, implementation is wrong.
2017-12-24 09:32:12 -03:00
Rémi Verschelde
bf4d398d4e
Do not require OpenMP for non-tools builds (export templates)
2017-12-22 12:24:40 +01:00
Guilherme Silva
a392dbdbe3
Add implementation for custom hardware cursor
2017-12-17 13:40:29 -02:00
Juan Linietsky
652c98a7be
Add epic hack so vsync can be toggled in run-time from script. Fixes #14458 .
...
Call needs to be routed via visual server to reach the proper thread.
2017-12-16 17:11:02 -03:00
Rémi Verschelde
a68d15d509
Merge pull request #14597 from NathanWarden/linux_extensions
...
Updated Linux template extensions to match architecture.
2017-12-16 13:05:18 +01:00
Rémi Verschelde
9314628921
Merge pull request #14667 from bruvzg/macports-clang-imp
...
Minor improvements for #14658 (MacPorts clang support)
2017-12-14 21:29:26 +01:00
bruvzg
0571a36152
MacPorts clang version selection, and OpenMP linking fix.
2017-12-14 20:41:50 +02:00
Rémi Verschelde
fb84b49d87
Fix type mismatch in OS::set_borderless_window
...
Closes #14663 .
2017-12-14 19:16:20 +01:00
bruvzg
f8303ec6fb
Adds `macports_clang` build flag to build using clang-5.0 form MacPorts (with OpenMP support).
2017-12-14 16:44:45 +02:00
Juan Linietsky
f3ad14224e
-Add lightmapper
...
-Fixes to unwrapper (remove degenerates), makes Thekla not crash
-Added optional cancel button in EditorProgress
-Added function to force processing of events (needed for cancel button)
2017-12-14 09:01:27 -03:00
Nathan Warden
f89d78a7a4
Updated Linux template extensions to match architecture.
2017-12-12 16:09:48 -05:00
Stefano Bonicatti
c067cf2c6a
Fixes vsync setting ignored when using a separate thread for rendering
...
Setting the vsync in the main thread, after the rendering thread starts
and takes the OpenGL context fails, so we need to do that before.
Also, for some reason, the main thread cannot make current the context
anymore.
Fixes #13447
2017-12-09 01:43:23 +01:00
MattUV
93231819c2
Fix Manage Export Templates link
...
In some cases, the link to download export templates was missing.
Fixes #14391
2017-12-08 00:46:03 +01:00
Rémi Verschelde
13c2ff9320
Style: Apply new clang-format 5.0 style to all files
2017-12-07 08:02:00 +01:00
Unknown
fd1b94e307
Improve slang, especially in user-visible parts
2017-12-05 15:41:38 +01:00
bruvzg
4899d91732
Add macOS shell_open URL escaping
2017-12-01 16:48:21 +02:00
Rhody Lugo
a65c0939fd
disable caching for targets using helper functions
2017-11-28 23:24:12 -04:00
Rhody Lugo
a4a222d62d
use the same cache for all branches for appveyor
2017-11-28 03:23:33 -04:00
Juan Linietsky
bc2e8d99e5
Made Vector::ptrw explicit for writing, compiler was sometimes using the wrong function,
...
leading to unnecesary copy on writes and reduced performance.
2017-11-25 00:09:40 -03:00
Rémi Verschelde
6c9ee1f125
Merge pull request #13133 from endragor/resurrect-file-logging
...
Return and repair file logging
2017-11-21 14:25:33 +01:00
Ruslan Mustakov
d42c5646a5
Return and repair file logging
...
And make it configurable, too.
2017-11-21 16:43:44 +07:00
Bernhard Liebl
80ad8afc85
Native pan and zoom for macOS
2017-11-21 09:11:39 +01:00
Ruslan Mustakov
8f0f327f02
Allow configuring iOS export
...
- EditorExportPlugin's _export_begin accepts all the arguments related
to the current export (is_debug, path, flags).
- EditorExportPlugin API is extended with methods allowing to configure
iOS export: add_ios_framework, add_ios_plist_content,
add_ios_linker_flags, add_ios_bundle_file.
- iOS export template now contains Godot as a static library so that
it can be linked with third-party Frameworks and GDNative static
libraries.
- Adds method to DirAccess for recursive copying of a directory.
- Fixes iOS export to work with Xcode 9 (released recently).
2017-11-21 01:16:49 +07:00
Rémi Verschelde
6947bed015
Pass engine name and version parts as proper strings
...
Removes the need for _MKSTR all over the place which has the drawback of
converting _MKSTR(UNKNOWN_DEFINE) to "UKNOWN_DEFINE" instead of throwing
a compilation error.
2017-11-20 00:51:14 +01:00
Rémi Verschelde
ecf80fbbba
Merge pull request #12988 from akien-mga/xdg-home-paths
...
Add support for XDG Base Directory spec
2017-11-20 00:42:51 +01:00
Rémi Verschelde
6e3f2f44af
Use new XDG folders to dehardcode paths
2017-11-19 20:54:26 +01:00
Rémi Verschelde
32c12a92a5
Add initial support for the XDG Base Directory spec
...
Spec version 0.7 from https://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html
(latest as of this commit).
Three virtual methods are added to OS for the various XDG paths we will use:
- OS::get_data_path gives XDG_DATA_HOME, or if missing:
~/.local/share on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_config_path gives XDG_CONFIG_HOME, or if missing:
~/.config on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_cache_path gives XDG_CACHE_HOME, or if missing:
~/.cache on X11, ~/Library/Caches on macOS and %APPDATA% on Windows
So for Windows there are no changes, for Linux we follow the full split spec
and for macOS stuff will move from ~/.godot to ~/Library/Application Support/Godot.
Support for system-wide installation of templates on Unix was removed for now,
as it's a bit hackish and I don't think anyone uses it.
user:// will still be OS::get_data_path() + "/godot/app_userdata/$name" by
default, but when using the application/config/use_shared_user_dir option
it will now use XDG_DATA_HOME/$name, e.g. ~/.local/share/MyGame.
For now everything still goes in EditorSettings::get_settings_dir(), but
this will be changed in a later commit to make use of the new splitting
where relevant.
Part of #3513 .
2017-11-19 20:54:24 +01:00
Rémi Verschelde
9f134aa5d1
Cleanup old references to GLES2 renderer
...
There are still some left in the Android Java code, even stuff to swap between
GLES1 and GLES2 support from early Godot days... would be good to see some cleanup
there too one day.
The "graphics/api" option for Android exports is removed, as only GLES 3.0 is supported.
It can be readded when GLES 2.0 support comes back. Fixes #13004 .
2017-11-19 17:52:18 +01:00
Rémi Verschelde
ad199c3964
EditorSettings: Rename settings_path to settings_dir
...
Also to prepare for upcoming refactoring for XDG support.
2017-11-17 20:55:09 +01:00
Rémi Verschelde
73049d115e
Rename OS::get_data_dir to OS::get_user_data_dir
...
Will be needed to avoid confusion with system data path (XDG_DATA_HOME)
and editor data dir in upcoming refactoring.
2017-11-17 20:55:09 +01:00
Rhody Lugo
2355f545ec
fix window position computation on macOS
2017-11-14 08:59:22 -04:00
Rhody Lugo
7f3ecd4227
change matrix and enable caching for Android, iOS and macOS (cross-compile)
2017-11-13 15:05:26 -04:00
Rémi Verschelde
ed57f0a0d4
Remove get_default_video_mode definition on OSX/iOS
...
It had been missed in d09160a8b6
and broke compilation
for those platforms.
Took the opportunity to run clang-format on the code base to fix some corner cases
that went through our static tests/were overlooked recently.
2017-11-09 23:36:08 +01:00
Juan Linietsky
d09160a8b6
Make video mode initialization more intuitive, fixes #12022
2017-11-09 13:02:26 -03:00
Juan Linietsky
7715a261d5
Merge pull request #12262 from AndreaCatania/pplug
...
Physics server plug
2017-11-03 23:39:44 -03:00
AndreaCatania
7a9ca08f16
Implemented physics plug
...
Moved init_physics
Implemented physics 2D plug
Fix clang
Fix clang
Fix static check
Fix clang
Fix static check
Moved physics server initialization
Moved physics server settings initialization
2017-11-04 03:25:51 +01:00
N0hbdy
f3fc07272c
Add Colemak keybindings to editor for osx
2017-10-30 22:51:02 +01:00
Rémi Verschelde
87694d1884
Disable logging until the logs location is sorted out
...
Temporary workaround for #12277 .
2017-10-29 15:50:27 +01:00
Marcelo Fernandez
ad4000d376
Implemented vsync OS functions for OS X
2017-10-23 13:26:33 -03:00
J08nY
b1252caa10
Use binary names instead of absolute paths in calls to OS::execute.
...
Now that #12009 is merged, we should let the system find the binary on
the users $PATH and don't assume we know where to look for them in
different distributions.
2017-10-13 16:45:24 +02:00
Rémi Verschelde
e8b9cca614
Merge pull request #11810 from marcelofg55/osx_export_improv
...
OS X export code improvements
2017-10-09 12:20:39 +02:00
Rémi Verschelde
2e0c7bb22a
Merge pull request #11718 from poke1024/retina
...
Fixes some retina problems on multi monitor setups
2017-10-09 11:04:46 +02:00
N0hbdy
a0c6fa68fb
Fix python 3 build in osx-specific platform
2017-10-07 00:01:36 -07:00
Bernhard Liebl
a7f18798aa
fixes several scaling problems on multi monitor retina/non-retina setups on OS X
2017-10-05 08:12:17 +02:00
Juan Linietsky
3cadecf17b
fixed the OS.has_feature() API, and added support for 32 and 64.
2017-10-03 17:36:14 -03:00
Marcelo Fernandez
b6daa94a80
Improvements on the export code on OS X
2017-10-03 15:09:57 -03:00
Andreas Haas
132ba0ed97
Merge pull request #11568 from endragor/loggers
...
Extract logging logic
2017-10-02 23:51:26 +02:00
Poommetee Ketson
478fd21e07
Merge pull request #11575 from marcelofg55/move_path_to_trash
...
FileSystemDock will now remove files/dirs to trashcan using OS::move_to_trash
2017-10-02 23:52:09 +07:00
Marcelo Fernandez
12d40fa03f
Merged iphone and osx audio drivers into drivers/coreaudio
2017-09-30 02:16:42 -03:00
Marcelo Fernandez
20918587d3
FileSystemDock will now remove files/dirs to trashcan using OS::move_to_trash
2017-09-25 21:49:01 -03:00
Elliott Sales de Andrade
45a9a680a3
Use BoolVariable for third-party options.
2017-09-25 14:36:30 -04:00
Elliott Sales de Andrade
f9e463bce2
Use EnumVariable for choice-based build options.
2017-09-25 14:36:01 -04:00
Ruslan Mustakov
1a2311e350
Extract logging logic
...
Previously logging logic was scattered over OS class implementations
with plenty of duplication. Major changes in this commit:
- Extracted logging logic into a separate Logger hierarchy. It allows
easy configuration of logging mechanism depending on compile-time or
run-time configuration.
- Implemented RotatedFileLogger which is usually used with StdLogger,
providing persistency of logs. It is often important to be able to
obtain logs of the game even in production to be able to understand
what happened prior to some problem. On mobile there previously was
no way to obtain the logs aside from having the device connected to
your machine.
- flush() is not performed in release mode for every logged line. It
is only performed for errors.
2017-09-25 16:19:21 +07:00
BastiaanOlij
9d04f89beb
Removed get_resource_dir from osx platform
2017-09-24 19:37:22 +10:00
BastiaanOlij
86c66597f3
Comment out code that is causing project loading to fail on osx
2017-09-22 13:05:53 +10:00
Rémi Verschelde
e8a0c5da77
Merge pull request #11243 from hpvb/add-debug-info-on-release
...
Create separate debug info files by default
2017-09-21 10:30:17 +02:00
letheed
5ad9be4c24
Rename pos to position in user facing methods and variables
...
Rename user facing methods and variables as well as the corresponding
C++ methods according to the folloming changes:
* pos -> position
* rot -> rotation
* loc -> location
C++ variables are left as is.
2017-09-20 13:11:10 +02:00
Marcelo Fernandez
9a0aa45d5c
Fix crash handler not including stdlib.h
2017-09-19 11:21:45 -03:00
Marcelo Fernandez
ff1e0a3e2c
Prevent running the crash_handler when a debugger is present on windows
2017-09-18 16:29:23 -03:00
Rémi Verschelde
53bbc046ee
Merge pull request #11252 from marcelofg55/fix_noaudio_crash
...
Fix crash when no audio driver is available
2017-09-17 22:48:22 +02:00
Hein-Pieter van Braam
88be952fc9
Create separate debug info files by default
...
Now that we have a built-in stacktrace on a segfault it would be useful
to have debug information on debug_release builds so that bugreports can
include this information. Without this debug info we will still get
function names in the backtrace but not file location.
This commit will by default build all targets with minimal debug info
and then strip the information into separate files. On MacOS this is a
.dSYM file, on Linux/MingW this is a .debug file. MacOSX will
automatically load a dSYM file if it exists in its debugger. On
Linux/MingW we create a 'gnu debuglink' meaning that gdb and friends
will automatically find the debug symbols if they exist.
Existing workflow for developers does not change at all, except that we
now create two instead of one build artifact by default.
This commit also adds a 'debug_symbols' option to X11, MacOS, and MingW
targets. The default is 'yes' which corresponds to -g1. The alternatives
are 'no' (don't generate debug infos at all) or 'full' which runs with
-g2. A target=debug build will now build with -g3.
2017-09-16 12:00:46 +02:00
Thomas Herzog
7dffed485b
Merge pull request #11230 from maxim-sheronov/fix_enum_bindings
...
Fix enums bindings
2017-09-15 08:43:35 +02:00
Marcelo Fernandez
7a4c0ff35e
Fix crash when no audio driver is available
2017-09-13 20:54:55 -03:00
Maxim Sheronov
0fffa45158
Fix enums bindings
...
Add missed bindings for enums
Move some enums to class to have correct output of api.json
2017-09-13 20:57:07 +03:00
Marcelo Fernandez
83fe937362
Added a crash handler to dump the backtrace on Windows, Linux and OS X
2017-09-13 10:07:23 -03:00
Rémi Verschelde
42504ef0d4
Merge pull request #11062 from BastiaanOlij/osx_datapack
...
Fixed loading package from resource folder, exporting textures to bun…
2017-09-13 11:11:01 +02:00
Marcelo Fernandez
730d36f350
Fixed issues with surround sound on audio server
2017-09-12 15:13:28 -03:00
Marcelo
fb871b5ada
Implemented DirAccess get_drive and get_drive_count for OS X
2017-09-11 23:46:34 -03:00
BastiaanOlij
099546ac00
Fixed loading package from resource folder, exporting textures to bundle and added a bit of feedback for a debug compile
2017-09-08 11:39:32 +10:00
Rémi Verschelde
3694c58d3c
Merge pull request #10775 from marcelofg55/buffersize_fixes
...
Corrections to audio buffer size calculations
2017-09-01 21:41:24 +02:00
Marcelo Fernandez
f231eadc9e
Corrections to audio buffer size calculations
2017-09-01 11:12:13 -03:00
Poommetee Ketson
ed606ded52
Fix files header
2017-09-01 21:07:55 +07:00
poke1024
9d841b5336
Implements OS_OSX::get_system_dir()
2017-08-29 20:31:03 +02:00
Matthias Hoelzl
b6e1e47e3a
Make build scripts Python3 compatible
...
- The Windows, UWP, Android (on Windows) and Linux builds are
tested with Scons 3.0 alpha using Python 3.
- OSX and iOS should hopefully work but are not tested since
I don't have a Mac.
- Builds using SCons 2.5 and Python 2 should not be impacted.
2017-08-27 23:05:39 +02:00
Rémi Verschelde
bd282ff43f
Use HTTPS URL for Godot's website in the headers
2017-08-27 14:16:55 +02:00
Fabio Alessandrelli
d7f08ead4e
Allow building fat binaries with osxcross
2017-08-23 15:44:22 +02:00
Rémi Verschelde
7f49e2a7a0
Merge pull request #10487 from marcelofg55/curscr_as_default
...
p_screen param from get_screen_* funcs now default to the current screen
2017-08-22 08:12:04 +02:00
Rémi Verschelde
df590fc2d3
Merge pull request #10340 from Rubonnek/remove-unnecessary-assignments
...
Removed unnecessary assignments
2017-08-22 00:58:12 +02:00
Rémi Verschelde
13f879587d
Merge pull request #10254 from marcelofg55/master
...
Added notification const NOTIFICATION_WM_ABOUT
2017-08-22 00:56:31 +02:00
Marcelo Fernandez
63f847b306
p_screen param from get_screen_* funcs now default to the current screen
2017-08-21 18:28:29 -03:00
Wilson E. Alvarez
738d2ab969
Removed unnecessary assignments
2017-08-21 15:15:55 -04:00
Marcelo Fernandez
c6edf1821e
Fix y axis for set_window_position on OS X
2017-08-21 12:36:04 -03:00
Marcelo Fernandez
eab850524e
Add closest_power_of_2 func and implement mix_rate/latency on OS X
2017-08-17 19:51:13 -03:00
Marcelo Fernandez
aae29c7a0e
Added notification const NOTIFICATION_WM_ABOUT
2017-08-17 11:28:45 -03:00
bruvzg
8aa86cb9bc
Implement NSTextInputClient protocol for IME
2017-08-09 19:09:33 +03:00
toger5
2286037bc3
removed calls to cursor_set_visible on all platforms fixes #10167
2017-08-08 14:04:22 +02:00
Rémi Verschelde
b0dfec77c2
Merge pull request #10127 from bruvzg/3.0-osx-logging
...
Duplicate error messages to macOS logging system (Console.app)
2017-08-07 14:58:25 +02:00
Rémi Verschelde
ae88eb5b50
Merge pull request #10099 from bruvzg/3.0-fix-osx-warp_mouse_pos
...
Fix warp_mouse_pos on macOS
2017-08-07 14:47:54 +02:00
bruvzg
68bf243461
Duplicate error messages to macOS logging system
2017-08-06 21:55:30 +03:00
Bojidar Marinov
7b7c7c8dc0
Rename KEY_RETURN to KEY_ENTER and KEY_ENTER to KEY_KP_ENTER
...
Closes #7695
2017-08-06 16:26:07 +03:00
bruvzg
0ed3da8e2a
Fix warp_mouse_pos on macOS
2017-08-04 23:43:32 +03:00
Rémi Verschelde
76005a8e75
Style: Apply clang-format on all files
...
Thus fixing some invalid changes that had still made it to the master branch.
2017-07-30 22:53:40 +02:00
Marcelo Fernandez
76821bbb47
Fix mutex initialisation in OS X Audio Driver
2017-07-30 16:35:08 -03:00
Rémi Verschelde
263452ee91
Merge pull request #9960 from marcelofg55/master
...
Fix get_screen_* funcs returning old values after resolution changes on OS X
2017-07-30 20:59:04 +02:00
Marcelo Fernandez
abbf821ddf
Fix get_screen_* funcs returning old values after resolution changes on OS X
2017-07-28 18:08:57 -03:00
bruvzg
d18922a56e
Change display scale when moving the window from monitor to monitor
2017-07-28 20:17:19 +03:00
Rémi Verschelde
a7b35edf7b
Merge pull request #9874 from bruvzg/3.0-osx-menu
...
Add macOS main menu (3.0)
2017-07-28 11:05:05 +02:00
Rémi Verschelde
5caf9d0d08
Merge pull request #9876 from bruvzg/3.0-resize-fix
...
Improved macOS window resizing behaviour (3.0)
2017-07-28 11:02:28 +02:00
bruvzg
3220fee6b2
Fix is_window_fullscreen() and set_window_fullscreen() behaviour after window has entered/left full-screen mode via green zoom button.
...
Fix get/set_current_screen & set_window_maximized.
2017-07-27 10:05:33 +03:00
bruvzg
f98a203377
Add macOS main menu
2017-07-27 10:05:29 +03:00
bruvzg
1c1565d0f9
Improved macOS window resizing behaviour.
2017-07-26 16:29:48 +03:00
bruvzg
7de7ca8ae4
Remove duplicate keycode constant for Numpad Enter key.
2017-07-26 14:43:02 +03:00
Marcelo Fernandez
2c27501c3f
Fix Right-Click (Ctrl-Click) on OS X
2017-07-23 12:45:59 -03:00
Rémi Verschelde
e5aa8546ec
Merge pull request #9713 from marcelofg55/master
...
Fix for possible crash in OS X audio init.
2017-07-23 13:05:49 +02:00
Juan Linietsky
25678b1876
-Renamed GlobalConfig to ProjectSettings, makes more sense.
...
-Added system for feature overrides, it's pretty cool :)
2017-07-19 17:06:03 -03:00
Marcelo Fernandez
bbc207675f
Fix for possible crash in OS X audio init.
2017-07-19 11:05:51 -03:00
geequlim
5a2500f580
Fix errors with global config names no more sorrys please
2017-07-19 09:25:50 +08:00
Juan Linietsky
bbada82f80
-Reorganized all properties of project settings (Sorry, Again).
...
(Lot's of bloat accumulated, so it was time for clean up.)
-Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-17 22:18:58 -03:00
Marcelo Fernandez
764f607611
Reinit audio device when the system default device changes on OS X
2017-07-16 23:35:23 -03:00
BastiaanOlij
e735963182
Fix typo in plist export
2017-07-06 00:14:05 +10:00
Rémi Verschelde
5a48b428fd
Merge pull request #9476 from marcelofg55/master
...
Implemented borderless fullscreen code on OSX.
2017-07-05 10:51:55 +02:00
Rémi Verschelde
5c1995ef49
Merge pull request #9468 from BastiaanOlij/osx_export_dmg
...
On OSX export to DMG and optionally code sign the app bundle
2017-07-03 23:25:43 +02:00
Marcelo Fernandez
a9c5895c16
Implemented borderless fullscreen code on OSX.
2017-07-02 23:40:44 -03:00
BastiaanOlij
7ddf3d6cc4
On OSX export to DMG and optionally code sign the app bundle
2017-07-02 21:23:33 +10:00
Rémi Verschelde
e91a267a7c
Buildsystem: Improve detect.py readability and fix issues
...
Tried to organize the configure(env) calls in sections, using the same order
for all platforms whenever possible.
Apart from cosmetic changes, the following issues were fixed:
- Android: cleanup linkage, remove GLESv1_CM and GLESv2
- iPhone: Remove obsolete "ios_gles22_override" option
- OSX:
* Fix bits detection (default to 64) and remove obsolete "force_64_bits" option
(closes #9449 )
* Make "fat" bits argument explicit
- Server: sync with X11
- Windows: clean up old DirectX 9 stuff
- X11:
* Do not require system OpenSSL for building (closes #9443 )
* Fix typo'ed use_leak_sanitizer option
* Fix .llvm suffix overriding custom extra_suffix
2017-07-01 08:20:51 +02:00
Marcelo Fernandez
fd7976ddd7
Implemented borderless window code for OSX.
2017-06-27 16:57:28 -03:00
Poommetee Ketson
e3998528e0
BuildSystem: generated files have .gen.extension
2017-06-25 07:55:01 +07:00
BastiaanOlij
5b44f092f9
Reimplement export module for OSX
2017-06-23 00:01:55 +10:00
ageazrael
109ad227d3
Used in the macOS HiDPI options window is too small
2017-06-13 09:54:55 +08:00
ageazrael
b3accab62d
Fixed middle mouse button can't bounce in macOS
2017-06-13 09:27:49 +08:00
Juan Linietsky
bcc435094d
Restired multithread support in OSX and Windows, should stop the crashes.
2017-06-10 10:15:33 -03:00
toger5
328d0e2b4e
osx release right button event fixed
...
RIGHT_MOUSE_BUTTON was not removed from the button mask (instead it was added...)
fixes #9079
2017-06-06 19:40:06 -07:00
alexholly
a3c90b0293
renamed all Rect2.pos to Rect2.position
2017-06-04 02:09:17 +02:00
Andreas Haas
9bc5348961
InputEvent: Renamed "pos" property to "position"
...
Make the naming consistent with other classes.
2017-06-03 11:26:39 +02:00
volzhs
0627445863
Make OS.get_locale() returns same value
2017-05-27 03:50:22 +09:00
toger5
72876ef10b
added modifier key to scroll event
2017-05-22 03:46:54 -07:00
toger5
b90df858c1
fixed osx input event
2017-05-22 01:17:57 -07:00
Juan Linietsky
5b3709d309
Removal of InputEvent as built-in Variant type..
...
this might cause bugs I haven't found yet..
2017-05-20 17:05:38 -03:00
BastiaanOlij
63db9a4bee
Doing a little bit of cleanup
2017-05-20 09:30:31 +10:00
Juan Linietsky
98a3296702
Removal of Image from Variant, converted to a Resource.
2017-05-17 07:37:45 -03:00
toger5
304a1f5b5a
Implemented scrolling factor for smooth trackpad scrolling
...
Working platforms platform: OSX, Windows.
Support for almost all ui elements, including project list.
2017-05-07 14:23:56 +02:00
Rémi Verschelde
c8aea60324
Improve documentation of thirdparty code snippets
2017-05-07 11:42:37 +02:00
Sergey Pusnei
8589ca3903
Rename [gs]et_pos to [gs]et_position for Controls
...
Control set_pos -> set_position
Control set_global_pos -> set_global_position
[gs]et_mouse_pos -> [gs]et_mouse_position
[gs]et_global_mouse_pos -> [gs]et_global_mouse_position
fixes #8005
2017-04-10 08:27:34 +02:00
Rémi Verschelde
3fd10ff6f0
Style: Apply clang-format (3.9.1) to Obj-C++ files
2017-04-09 14:44:52 +02:00
BastiaanOlij
5c2ddb299b
Formatting of mm files
2017-04-09 21:22:40 +10:00
Rémi Verschelde
df61dc4b2b
Add "Godot Engine contributors" copyright line
2017-04-08 00:11:42 +02:00
Rémi Verschelde
9d28a5e7d9
Merge pull request #8159 from Hinsbart/last_id
...
Input: Remove usage of platform dependent event IDs.
2017-03-27 08:52:58 +02:00
Rémi Verschelde
d8f32637be
SCons: Add option to toggle warnings (on by default)
...
All the warnings are factored out of the platform-specific files and moved to
SConstruct. Will have to check that it does not introduce regressions on some
platforms/compilers.
(cherry picked from commit 31107daa1a
)
2017-03-26 21:58:37 +02:00
Andreas Haas
c0b6756875
Input: Remove usage of platform dependent event IDs.
...
The ID property for InputEvents is set by `SceneTree` when sending the event down the tree.
So there's no need for the platform specific code to set this value when it will later be overriden anyway...
2017-03-26 15:59:32 +02:00
Rémi Verschelde
5dbf1809c6
A Whole New World (clang-format edition)
...
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
Rémi Verschelde
e1c1d7d1d7
Add a bunch of missing Godot headers in own files
2017-03-05 15:47:28 +01:00
Rémi Verschelde
49c065d29c
Refactoring: rename tools/editor/ to editor/
...
The other subfolders of tools/ had already been moved to either
editor/, misc/ or thirdparty/, so the hiding the editor code that
deep was no longer meaningful.
2017-03-05 14:21:25 +01:00
Julian Murgia
94103c0c02
Add API to access battery power state
...
Done:
- X11, server (tested)
- Windows (developed, would be nice to retest)
- OSX (not tested)
Prepared (not developed):
- Android (code is here, but may not compile)
- iphone
- winrt
- bb10
- haiku
- javascript
2017-03-04 18:04:29 +01:00
Andreas Haas
a175ac7032
Better handling of joypad device IDs.
...
Now InputDefault is responsible for giving out joypad device IDs to the platform, instead of each platform handling this itself.
This makes it possible for c++ modules to add their own "custom" gamepad devices, without the risk of messing up events in case the user also has regular gamepads attached (using the OS code).
For now, it's implemented for the main desktop platforms.
Possible targets for future work: android, uwp, javascript
2017-02-26 21:01:31 +01:00
Juan Linietsky
de0045cf1b
-renamed globals.h to global_config.cpp (this seems to have caused a few modified files)
...
-.pck and .zip exporting redone, seems to be working..
2017-02-21 00:06:30 -03:00
Juan Linietsky
f6950956bd
Editor Export Settings Dialog is completed!! Now on to make some exporters..
2017-02-19 23:21:35 -03:00
Rémi Verschelde
e837b25f55
Fix missing semicolon in previous commit
2017-02-13 23:46:25 +01:00
Brett-Mitchell
6921e11805
Fix for issue #7766
...
Add initialization for OS_OSX.mouse_mode in OS_OSX::OS_OSX(). mouse_mode now defaults to OS::MOUSE_MODE_VISIBLE.
2017-02-13 12:55:26 -05:00
Juan Linietsky
96de0141cc
Removed import/export system, will start new one from scratch.
2017-01-25 21:57:08 -03:00
BastiaanOlij
cef0ae5d5d
Fix compile errors related to audio on OSX
2017-01-16 20:32:44 +11:00
Juan Linietsky
b400c69cd4
Oops! Audio engine has vanished :D
2017-01-15 16:07:51 -03:00
Rémi Verschelde
93ab45b6b5
Style: Fix whole-line commented code
...
They do not play well with clang-format which aligns the `//` part
with the rest of the code block, thus producing badly indented commented code.
2017-01-14 14:52:23 +01:00
Rémi Verschelde
4163be67a1
OSX: Revert back to kHIDUsage_GD_Joystick
...
Bug introduced in 547a57777b
.
2017-01-09 10:05:50 +01:00
Rémi Verschelde
5bfa4227b3
Finish replacement of joystick by joypad
...
Some parts were forgotten in 547a577
.
2017-01-08 21:33:37 +01:00
Juan Linietsky
547a57777b
renamed joystick to joypad everywhere around source code!
2017-01-08 17:06:33 -03:00
Juan Linietsky
2ab83e1abb
Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector
2017-01-07 18:26:38 -03:00
Rémi Verschelde
dc0d08cc93
Move glad files to thirdparty dir
2017-01-06 22:42:19 +01:00
Juan Linietsky
495d059a74
Merge branch 'master' of https://github.com/godotengine/godot
2017-01-05 09:18:03 -03:00
Juan Linietsky
0f7af4ea51
-Changed most project settings in the engine, so they have major and minor categories.
...
-Changed SectionedPropertyEditor to support this
-Renamed Globals singleton to GlobalConfig, makes more sense.
-Changed the logic behind persisten global settings, instead of the persist checkbox, a revert button is now available
2017-01-05 09:16:00 -03:00
BastiaanOlij
5e717ed8a3
Enabled code that requests an OpenGL 3 context.
2017-01-05 00:05:34 +11:00
BastiaanOlij
55d425807f
First set of changes to fix compilation errors and initialise the gles3 renderer for Mac OS X. Still broken at this point.
2017-01-04 23:34:02 +11:00
Juan Linietsky
118eed485e
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant.
...
All usages of "type" to refer to classes were renamed to "class"
ClassDB has been exposed to GDScript.
OBJ_TYPE() macro is now GDCLASS()
2017-01-02 23:03:46 -03:00
Rémi Verschelde
3f3f5a5359
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
...
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
2017-01-02 21:52:26 +01:00
Rémi Verschelde
c7bc44d5ad
Welcome in 2017, dear changelog reader!
...
That year should bring the long-awaited OpenGL ES 3.0 compatible renderer
with state-of-the-art rendering techniques tuned to work as low as middle
end handheld devices - without compromising with the possibilities given
for higher end desktop games of course. Great times ahead for the Godot
community and the gamers that will play our games!
2017-01-01 22:03:33 +01:00
BastiaanOlij
da5651fbb9
Set minimum version to 10.9 building OSX
2016-11-25 00:55:13 +11:00
Rémi Verschelde
817dd7ccbb
style: Fix PEP8 blank lines issues in Python files
...
Done with `autopep8 --select=E3,W3`, fixes:
- E301 - Add missing blank line.
- E302 - Add missing 2 blank lines.
- E303 - Remove extra blank lines.
- E304 - Remove blank line following function decorator.
- E309 - Add missing blank line.
- W391 - Remove trailing blank lines.
2016-11-01 00:35:16 +01:00
Rémi Verschelde
d4c17700aa
style: Fix PEP8 whitespace issues in Python files
...
Done with `autopep8 --select=E2,W2`, fixes:
- E201 - Remove extraneous whitespace.
- E202 - Remove extraneous whitespace.
- E203 - Remove extraneous whitespace.
- E211 - Remove extraneous whitespace.
- E221 - Fix extraneous whitespace around keywords.
- E222 - Fix extraneous whitespace around keywords.
- E223 - Fix extraneous whitespace around keywords.
- E224 - Remove extraneous whitespace around operator.
- E225 - Fix missing whitespace around operator.
- E226 - Fix missing whitespace around operator.
- E227 - Fix missing whitespace around operator.
- E228 - Fix missing whitespace around operator.
- E231 - Add missing whitespace.
- E231 - Fix various deprecated code (via lib2to3).
- E241 - Fix extraneous whitespace around keywords.
- E242 - Remove extraneous whitespace around operator.
- E251 - Remove whitespace around parameter '=' sign.
- E261 - Fix spacing after comment hash.
- E262 - Fix spacing after comment hash.
- E265 - Format block comments.
- E271 - Fix extraneous whitespace around keywords.
- E272 - Fix extraneous whitespace around keywords.
- E273 - Fix extraneous whitespace around keywords.
- E274 - Fix extraneous whitespace around keywords.
- W291 - Remove trailing whitespace.
- W293 - Remove trailing whitespace.
2016-11-01 00:35:16 +01:00
Rémi Verschelde
97c8508f5e
style: Start applying PEP8 to Python files, indentation issues
...
Done with `autopep8 --select=E1`, fixes:
- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.
2016-11-01 00:33:51 +01:00
Błażej Szczygieł
2bf4553fe0
SCons: Use colored output if available, change "colored"->"verbose"
2016-10-17 22:40:14 +02:00
Rémi Verschelde
e96c49f849
Merge pull request #6850 from akien-mga/pr-scsub-shebang
...
SCsub: Add python shebang as a hint for syntax highlighting
2016-10-17 20:13:18 +02:00
Rémi Verschelde
fc8ccd5b8c
SCsub: Add python shebang as a hint for syntax highlighting
...
Also switch existing shebangs to "better" /usr/bin/env python.
2016-10-17 20:10:46 +02:00
Błażej Szczygieł
4ffa8f224d
Theora: Don't compile unnecessary files, rename "x86_opt_*"
2016-10-16 22:31:27 +02:00
Rémi Verschelde
edbc0c0d0b
freetype: Make it a module and split thirdparty library
...
Comment out the weird workaround for building on Windows at it might
not be needed anymore. Testing needed to confirm.
2016-10-15 18:10:17 +02:00
Rémi Verschelde
cbf52606f4
zlib: Split thirdparty files, simplify scons option
2016-10-15 12:20:47 +02:00
Rémi Verschelde
36738ddda4
glew: Split thirdparty files and isolate env
...
Not fully happy about the way this one interacts with the various
platforms. Maybe the platform_config.h should be generated by the
SCsub instead of passing a define just to know where is the header.
2016-10-15 12:01:28 +02:00
Juan Linietsky
22d83bc9f6
Begining of GLES3 renderer:
...
-Most 2D drawing is implemented
-Missing shaders
-Missing all 3D
-Editor needs to be set on update always to be used, otherwise it does not refresh
-Large parts of editor not working
2016-10-03 21:35:16 +02:00
Juan Linietsky
fc61eb37ce
Merge pull request #5920 from 29jm/fix-warnings
...
Fix some more warnings
2016-09-10 12:21:02 -03:00
Andreas Haas
8c886b9d7a
osx: Support gamepad input.
...
Fixes #3881
Vibration support is not optimal yet as it doesn't try to emulate the "weak" and "strong" motor strength,
but just takes the parameter with the highest value for the vibration gain.
2016-09-06 00:47:54 +02:00
Johan Manuel
046f94d3ac
Remove some unused variables
2016-08-13 13:21:35 +02:00
marcelofg55
bf320fd4ea
Crashfix for OSX on Sierra beta
2016-08-09 13:40:14 -03:00
marcelofg55
38de4d24ef
Fix set_window_size not setting the correct size on OSX
2016-08-02 22:30:19 -03:00
GungnirInd
2c1a74fb3a
Implement OS.request_attention() for OSX ( #5662 )
...
Keeps bouncing icon until user focuses window
2016-07-21 17:30:20 +02:00
Rémi Verschelde
02aeac12d1
OSX export: Default to fat format, make it an enum
...
Since we want to distribute only the fat binary in the official templates, this should
make it work out of the box. 32 bits and 64 bits options are still available for people
that want them, but will throw an error if the binaries are not in the template zip.
2016-07-09 00:46:10 +02:00
Rémi Verschelde
0a72f9ccb8
Merge pull request #5362 from J08nY/png
...
libpng: New version 1.6.27
2016-06-23 07:40:03 +02:00
J08nY
0ab05b09e4
Fixed iCCp chunk in pngs
...
neccesary for libpng 1.6.27 to work silently
2016-06-22 21:13:29 +02:00
Keyaku
072da51f20
Added alert() functionality for OS X
2016-06-22 16:58:31 +01:00
Juan Linietsky
61655d6dc2
Fixed make_dir and make_dir_recursive erros, closes #1680 closes #1872
2016-06-18 11:13:03 -03:00
Rémi Verschelde
a7fc04626a
Add missing license headers in our source files ( #5255 )
...
Also removes a couple wrong Godot headers from third-party source files.
2016-06-18 14:46:12 +02:00
Juan Linietsky
94a6ff3d7a
-make freetype build for all platforms the same, default as builtin except on x11.
...
closes #5119
2016-06-09 21:28:07 -03:00
Rémi Verschelde
768e925271
GLEW: Define static + enabled and includes via SCons
...
This allows us not to have to hack our definitions in the upstream files,
making it easier to upgrade to newer versions in the future.
For the include paths to work, the headers are moved to a GL subfolder to
match their upstream location.
2016-06-08 00:16:27 +02:00
J08nY
3fb3b7c1f7
Somewhat fixed Directory::get_space_left() return values.
2016-06-06 08:14:22 +02:00
marcelofg55
76ab7d3886
Right click->Quit on the godot icon will now close the application on OSX.
...
Fixed get_window_position that missed a return on OSX.
2016-06-04 12:35:00 -03:00
marcelofg55
4e0f2389c3
Merge remote-tracking branch 'upstream/master'
2016-06-02 18:56:28 -03:00
Juan Linietsky
344a39dafd
Implemented file drop support in OSX
2016-05-31 01:27:48 -03:00
marcelofg55
bb223869e0
Key modifiers (Ctrl, Alt, Meta and Shift) may be used as Input keys now on OSX
2016-05-31 00:02:14 -03:00
Juan Linietsky
9b1f8230ec
-Some fixes to OSX retina scaling for window functions
...
-Implemented HiDPI detection and support for Godot Editor!
2016-05-30 00:28:29 -03: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
Juan Linietsky
65615c0353
fix freetype paths on osx and mingw
2016-05-29 12:26:15 -03:00
marcelofg55
ba0fbe4f79
Added application/fat_bits property for EditorExportPlatformOSX::EditorExportPlatformOSX
2016-05-25 15:17:28 -03: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
marcelofg55
b697de92ef
OS.get_screen_size now returns the correct value on OSX
2016-05-11 11:44:10 -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
eska
ab4caa7953
Move export GUI debug toggle to export settings window
2016-04-28 16:13:26 +02:00
Rémi Verschelde
0a5472e697
Remove trailing spaces
2016-04-02 20:26:12 +02: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
Zher Huei Lee
d7052ddba3
Added relative paths for DirAccess::remove()
...
Follows similar behaviour to DirAccess::rename()
2016-03-01 10:40:31 +00:00
Rémi Verschelde
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
hondres
df4faf8f33
support horizontal mouse wheel, use in text editor
2016-02-04 17:16:22 +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
George Marques
f4a39692b9
Change default window size for desktop
...
Fix #3149
2016-01-24 17:52:33 -02: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
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
santiagopf
c8077de714
utf stuff on osx
2015-12-13 22:21:49 -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
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
Juan Linietsky
b987d2113b
0theora compilation fixes
2015-11-25 00:28:03 -03:00