godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,444 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

801 Commits

Author SHA1 Message Date
Pedro J. Estébanez 19ce11b908 Update/fix Android build 
Fix wrong path for 32-bit Windows, which fixes #7084
Exclude 32-bit Windows from multi-threaded linking because it's not supported by the NDK
Remove 32-bit Linux as there is no NDK variant for it
(cherry picked from commit 5a26459c06)
 2016-11-15 08:44:53 +01:00
Pedro J. Estébanez 221346521c Make Android export quicker (especially on Windows) 
(cherry picked from commit 56721e5d9d)
 2016-11-15 08:35:15 +01:00
volzhs 3e127ce3fd Fix Directory.dir_exist/get_current_dir for 'res://' on Android 
Fix #7014

(cherry picked from commit 8d454ed9a7)
 2016-11-15 08:34:51 +01:00
ISylvox 0413d85add vsnc --> vsync 
(cherry picked from commit b5c383fd61)
 2016-11-15 08:34:43 +01:00
Rémi Verschelde cd828bd5fc server: Allow building against system libraries 
(cherry picked from commit 5e360fe178)
 2016-11-03 22:55:24 +01:00
Rémi Verschelde ce54b6ea8b scons: Reorder options for clarity 
Also prefix all thirdparty-related toggles with `builtin`.

(cherry picked from commit cc95d4448c)
 2016-11-03 08:41:10 +01:00
Pedro J. Estébanez f629b1fd3e Improve Android build (Clang + tidyness) 
(cherry picked from commit b18ff942be)
 2016-11-02 22:34:17 +01:00
Rémi Verschelde eaf803f71e style: Various other PEP8 fixes in Python files 
Done with `autopep8 --select=E7`, fixes:

- E701 - Put colon-separated compound statement on separate lines.
- E702 - Put semicolon-separated compound statement on separate lines.
- E703 - Put semicolon-separated compound statement on separate lines.
- E711 - Fix comparison with None.
- E712 - Fix (trivial case of) comparison with boolean.
- E713 - Fix (trivial case of) non-membership check.
- E721 - Fix various deprecated code (via lib2to3).
 2016-11-02 22:30:34 +01:00
Rémi Verschelde a7389217f8 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-02 22:29:36 +01:00
Rémi Verschelde e259bf8bbb 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-02 22:28:28 +01:00
Rémi Verschelde 561c1f17a1 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-02 22:26:55 +01:00
George Marques 7a17d72e84 Fix extraneous NULL character on HTML export 
Fix #2801

(cherry picked from commit 604ddd691c)
 2016-10-30 23:58:41 +01:00
George Marques 52bf8bd168 Fix the hiding of mouse cursor before interaction 
Fix part of #6633

(cherry picked from commit 414d58e6c0)
 2016-10-30 23:58:32 +01:00
Błażej Szczygieł 85a7105345 SCons: Use colored output if available, change "colored"->"verbose" 
(cherry picked from commit 2bf4553fe0)
 2016-10-30 14:51:34 +01:00
Rémi Verschelde 5a49e45d21 SCsub: Add python shebang as a hint for syntax highlighting 
Also switch existing shebangs to "better" /usr/bin/env python.

(cherry picked from commit fc8ccd5b8c)
 2016-10-30 14:51:34 +01:00
Błażej Szczygieł 7143401e25 Theora: Don't compile unnecessary files, rename "x86_opt_*" 
(cherry picked from commit 4ffa8f224d)
 2016-10-30 14:51:34 +01:00
Rémi Verschelde d96842b80e 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.

(cherry picked from commit edbc0c0d0b)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde f1bd2f6f56 zlib: Split thirdparty files, simplify scons option 
(cherry picked from commit cbf52606f4)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde e04ec9565b 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.

(cherry picked from commit 36738ddda4)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde 1022705707 squish: Move to a module and split thirdparty lib 
(cherry picked from commit 8311a78df5)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde c8a97c3678 mpc: Move to a module and split thirdparty libmpcdec 
(cherry picked from commit 5c12c9e69b)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde 82e8721715 theora: Move to a module and split thirdparty lib 
Same rationale as the previous commits.

(cherry picked from commit cfcc8a20e8)
 2016-10-30 14:51:32 +01:00
Rémi Verschelde 4cd640f684 openssl: Move to a module and split thirdparty lib 
Same rationale as the previous commits.

(cherry picked from commit 422196759f)

Removed the winrt-specific parts.
 2016-10-30 14:51:32 +01:00
Rémi Verschelde 995dcb610c ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs 
Took the opportunity to undo the Godot changed made to the
opus source. The opus module should eventually be built in its
own environment to avoid polluting others with too many include
dirs and defines.

TODO: Fix the platform/ stuff for opus.
(cherry picked from commit d9a291f641)

speex module was only added while cherry-picking, as speex is removed
in the master branch but we don't want to break compatibility in 2.1.x.
Unbundling wasn't done as the module uses the internal speex_free,
so it would require some more work.
 2016-10-30 14:51:31 +01:00
Rémi Verschelde 55414bc573 webp: Make it a module and unbundle libwebp thirdparty files 
Note that there are two Godot-specific changes made to libwebp
for the javascript/HTML5 platform. They are documented in the
README.md.

(cherry picked from commit ee3cf211c6)
 2016-10-30 14:51:30 +01:00
Rémi Verschelde 575e986bde png: Split library to thirdparty dir and allow unbundling 
Uses the new structure agreed upon in #6157, but the thirdparty/ folder
does not behave following a logic similar to that of modules/ yet.

The png driver can't be moved to a module as discussed in #6157, as it's
required by core together with a few other ImageLoader implementations
(see drivers/register_driver_types.cpp:register_core_driver_types())

Dropped the possibility to disable PNG support, it's a core component
of Godot.

(cherry picked from commit 5fef84a135)
 2016-10-30 14:51:30 +01:00
Rémi Verschelde 846db09038 Drop nedmalloc which is apparently not used anymore 
(cherry picked from commit f63bf12193)
 2016-10-30 14:51:30 +01:00
Randy Tan Shaoxian c9d7f77c6f Fixed tiny error in detect.py causing compilation for Android to fail. 2016-10-20 21:17:21 +08:00
Andreas Haas e88a540b91 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.

(cherry picked from commit 8c886b9d7a)
 2016-10-18 18:34:16 +02:00
volzhs 00b0f3dfde Fix crash when using Directory.dir_exists(path) on Android 
(cherry picked from commit 4a57821349)
 2016-10-17 20:50:57 +02:00
Anthony Fieroni b4edaa892d Correct OS architecture detection 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
(cherry picked from commit f87e32696d)
 2016-10-17 20:48:05 +02:00
Pedro J. Estébanez 82dfaf7af6 Fix compile flags not getting to the Android build 
(cherry picked from commit 7f51bb7b1c)
 2016-10-09 17:34:36 +02:00
Pedro J. Estébanez 12d4d65668 Improve debug focus behavior 
Fix focusing debugged game on Windows
Add re-focusing editor on continue

(cherry picked from commit 66dac878ac)
 2016-10-09 17:29:59 +02:00
Marc Gilleron 268b3446c6 Windows: prevent huge prints from crashing the engine 
(cherry picked from commit 0c09de3ef1)
 2016-10-09 17:23:08 +02:00
syskrank 4b2243f82e removed confusing "if(true)" statement with empty "else" block 
(cherry picked from commit af4b0db1e4)
 2016-10-09 17:22:36 +02:00
romeojulietthotel 228ee4363e Use pkgconfig to locate ALSA libs (#6119) 
* This allows building when ALSA libs are in a non-standard location. PKG_CONFIG_PATH alone is not enough as the final link fails. Adding this makes the final link succeed.

* The extra LIBS flag for alsa is not needed so removing.

(cherry picked from commit 94d6757a0d)
 2016-10-09 17:21:17 +02:00
Andreas Haas d1ad94acf0 x11: Fix event.is_action() for release of modifier keys 
The bug was that the release events for these also had the modifier state set, so the event comparison
failed.

Fixes #5901

(cherry picked from commit 6fcf2b2bd8)
 2016-10-09 17:20:57 +02:00
Pedro J. Estébanez 45a5769162 Fix manifest generation bug in Android export 
(cherry picked from commit 2c9d98bb48)
 2016-10-09 17:20:27 +02:00
Pedro J. Estébanez f90370886f Fix (potentially) Android libs packaging issue (#5645) 
(cherry picked from commit e9065632c6)
 2016-09-18 23:11:18 +02:00
Rémi Verschelde fd58f8dce8 Move templates and distribution stuff to tools/dist 
Also removed the obsolete iOS xcode template.

(cherry picked from commit 3efe1231f0)
 2016-09-18 23:04:26 +02:00
Mario Schlack 9ea76ff46d Hide the mouse cursor when MOUSE_MODE_CAPTURED is activated. 
(cherry picked from commit f0b6a242cc)
 2016-09-01 08:46:03 +02:00
Andreas Haas 37fc61f986 x11: Use proper sonames for loading libXrandr. 
(cherry picked from commit f59860f464)
 2016-09-01 08:38:24 +02:00
marcelofg55 0c76ba32cc Crashfix for OSX on Sierra beta 
(cherry picked from commit bf320fd4ea)
 2016-08-09 18:47:13 +02:00
Skyfrit c56ea7cf91 Android: Rename values-zh to values-zh-rCN (#6063) 
(cherry picked from commit 4f6a21b0df)
 2016-08-08 18:15:55 +02:00
Skyfrit 1913e4a040 Android: Add support for Traditional Chinese (HK) (#6061) 
(cherry picked from commit 664b5b5137)
 2016-08-08 18:15:49 +02:00
Skyfrit 2b35ba4815 Android: Add support for Traditional Chinese (TW) (#6061) 
(cherry picked from commit 8ab4acd17f)
 2016-08-08 18:15:43 +02:00
marcelofg55 fd6f62fd9a Fix set_window_size not setting the correct size on OSX 
(cherry picked from commit 38de4d24ef)
 2016-08-03 17:52:10 +02:00
George Marques 0bc589a0c7
Fix Windows resource script 2016-07-27 15:35:49 -03:00
George Marques b48fd16add
Improve Windows application details 2016-07-27 12:37:12 -03:00
Rémi Verschelde fd659e869b Windows: Make alert message box use MB_TASKMODAL 
This flag pauses the current running thread, allowing for the user to see the
alert and acknowledge it before the thread continues (and e.g. crashes :)).

Thanks to @SuperUserNameMan for finding it.
Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/ms645505(v=vs.85).aspx
 2016-07-26 15:16:45 +02:00