maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5631 commits 10 branches 35 tags 1.1 GiB
Commit graph

833 commits

Author SHA1 Message Date
Pedro J. Estébanez
fec41c528c Fix resources for Android modules not being merged 
Fixes #7421
 2017-01-24 16:29:09 +01:00
Fabio Alessandrelli
8322c1aa64 Fix bug in windows TCP poll function 
Bug introduced when implementing TCP disconnection detection.
(too much yank-paste).
Fixes #7545

(cherry picked from commit c356ec5e8b)
 2017-01-16 15:51:43 +01:00
Fabio Alessandrelli
9c8ecb45f8 Improvements to scons defined WINVER/_WIN32_WINNT 
(cherry picked from commit 65483d57bf)
 2017-01-12 19:15:30 +01:00
Ignacio Etcheverry
8a5596322d Detect bits when building with MinGW 
(cherry picked from commit 460f030b73)
 2017-01-12 19:15:30 +01:00
Rémi Verschelde
d66740175e Windows: Define _WIN32_WINRT to 0x0600 (Vista) 
Passed as a compiler define to be sure it is always define before windows.h
is loaded. This means that Godot officially requires Vista API or later, it will
not work on Windows XP or earlier.

Also fix a bogus check for Windows 7 API.

(cherry picked from commit 6323779596)
 2017-01-12 19:15:30 +01:00
Rémi Verschelde
5672852351 x11: Improve logic for cross-dependencies between freetype, zlib and libpng 
Fixes #7373.

(cherry picked from commit d945c4e58e)
 2017-01-12 19:15:30 +01:00
Rémi Verschelde
d8223ffa75 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!

(cherry picked from commit c7bc44d5ad)
 2017-01-12 19:15:30 +01:00
Gustav Lund
f10a78e5c0 fix for crash when no ALSA or Pulse installed on linux 
(cherry picked from commit 2495e8a941)
 2017-01-12 19:15:27 +01:00
Rémi Verschelde
5b27f05e7e Fix console output for MinGW compilers 
Reworked patch from @jay3d (#7116).
(cherry picked from commit f28ff8a208)
 2017-01-12 19:15:27 +01:00
volzhs
2e74bdab35 Add alert window on Android 
(cherry picked from commit 9a20068ab7)
 2017-01-12 19:15:26 +01:00
BastiaanOlij
ef009a8b91 Set minimum version to 10.9 building OSX 
(cherry picked from commit da5651fbb9)
 2017-01-12 19:15:26 +01:00
Fabio Alessandrelli
00fdcf3cd0 IP_Address now handle IPv4 and IPv6 transparently 
IP_Address changes:
- Converts to and from String transparently while handling IPv4 as IPv6
  mapped (::ffff:[IP]) address internally.
- Completely remove AddrType enum.
- Setting/Getting of ip array is now only possible through dedicated functions
  (ie. set_ipv4, get_ipv4, set_ipv6, get_ipv6)
- Add function to know if the address is a valid IPv4 (for IP implementation and enet)

(cherry picked from commit 1aff508dd9)
 2017-01-04 00:46:33 +01:00
Fabio Alessandrelli
e8a6cbc897 Migrate int.IP_TYPE_ constants to IP.TYPE_ 
(cherry picked from commit c18c5013f8)
 2017-01-04 00:46:32 +01:00
Fabio Alessandrelli
47ae6c6507 Move V6ONLY flag selection inside helpers 
(cherry picked from commit 4d90a4fcd5)
 2017-01-04 00:46:32 +01:00
Fabio Alessandrelli
5e79ac72b7 Automatically map IPv4 address to IPv6 when needed 
(cherry picked from commit 9200da58e4)
 2017-01-04 00:46:32 +01:00
Fabio Alessandrelli
a46a643f90 Use an instance variable for ip_type in raw sockets 
PacketPeerUDP/StreamPeerTCP/TCP_Server now uses an instance variable
to store the selected ip_type (IPv4/IPv6/ANY, where ANY = dual stack).
All calls to resolve addresses, sending/receving data, connecting/listening
will use that socket type.

(cherry picked from commit 95bdd97768)
 2017-01-04 00:46:32 +01:00
Fabio Alessandrelli
c030e602e5 Properly handle tcp connection failure 
(cherry picked from commit 4f07b595a1)
 2017-01-04 00:46:32 +01:00
Fabio Alessandrelli
1a7f14b206 [IPv6] Fix windows build script (link to ws2_32) 2016-12-11 18:12:46 +01:00
Fabio Alessandrelli
754e9aa60a TCP/UDP Listen sockets can now be set to IPv6 only 
(cherry picked from commit eb27e993f0)
 2016-12-11 18:12:46 +01:00
Fabio Alessandrelli
70a6791150 Fix windows debugger connection problems. 
Unify network socket creation between platform.
Ensure IPV6_V6ONLY flag is not set on sockets (allow IPv4 connection in IPv6 socket, dual-stack).

(cherry picked from commit 812908e236)
 2016-12-11 18:12:45 +01:00
Fabio Alessandrelli
6e0de0cce8 TCPServer listen now default to IP type ANY (v6 socket with v4 support) 
(cherry picked from commit ee69bd81cf)
 2016-12-11 18:12:45 +01:00
Fabio Alessandrelli
04def2161e Fix PacketPeerUDP get_packet_port() 
Properly convert port field from network to system ordering on incoming packets.

(cherry picked from commit 25e29972a9)
 2016-12-11 18:12:45 +01:00
Fabio Alessandrelli
b3443fd848 Pass correct address size (ipv4,ipv6) to socket connect, bind, sendto 
The address size passed to network system calls now reflects the the actual IP type (v4 or v6).
Fix Windows and OSX ipv6 sockets

(cherry picked from commit 80e911647c)
 2016-12-11 12:35:06 +01:00
Ariel Manzur
d8b0070b8c added windows support for ipv6, cleaned up unix code 
(cherry picked from commit 672225b710)
 2016-12-11 12:35:06 +01:00
eska
5ede1a1226 Emit asm.js code into a dedicated file for asm.js export 
This helps prevent browser lockups during start-up at the cost of having
to distribute an extra file.
 2016-12-04 02:52:14 +01:00
eska
17422f1f86 Add fullscreen features in web export 
- Implement fullscreen control, get_window_size, get_screen_size
 - Fix fullscreen resolution
 2016-12-04 02:52:14 +01:00
eska
49e22aa83f Fix some mouse bugs in WebAssembly/asm.js 
- Emit mouse wheel release events
 - Set button masks, fixes #5092
 2016-12-03 15:33:59 +01:00
eska
6d86a63648 OS additions and fixes for WebAssembly/asm.js 
- Implement alert, shell_open, set_window_title
 - Add locale lookup, fixes #2477
 - Print without color control sequences
 - Move get_executable_path implementation to OS_JavaScript
 2016-12-03 15:33:32 +01:00
Rémi Verschelde
a3582fa3cb png: Allow building shared freetype with bundled libpng 
This was the behaviour when building Godot 2.1, which allows to build against
Ubuntu 12.04 and its freetype that links old libpng12, while still bundling
libpng16.

(cherry picked from commit 4965ddfaa1)
 2016-11-19 14:09:12 +01:00
Rémi Verschelde
326978dcce Revert "libpng: Fix erroneously linking against libpng12 on old distros" 
This reverts commits 5fa1bb331a
and ec4be71fad.

Looks like Debian/Ubuntu are not even shipping libpng16 nowadays in their
stable releases, we'll have to go back to statically linking our own
libpng16 to wait for them to stop being 5 years behind everybody.

(cherry picked from commit c32766a482)
 2016-11-19 13:40:53 +01:00
Rémi Verschelde
76233a3022 libpng: Same fix as previous commit for server platform 
(cherry picked from commit ec4be71fad)
 2016-11-19 13:26:30 +01:00
Rémi Verschelde
220bcbf7c0 libpng: Fix erroneously linking against libpng12 on old distros 
This bit us for 2.1.1 binaries built on Ubuntu 12.04 LTS where
libpng.pc apparently prioritizes libpng12.

(cherry picked from commit 5fa1bb331a)
 2016-11-19 13:00:17 +01:00
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