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

5544 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bojidar Marinov 6ad84850ab Ternary operator in GDScript (a if x else b) 
Fixes #1961
 2017-01-10 17:09:26 +01:00
Bojidar Marinov c0743f898a Allow for linebreaks in function calls and definitions and yeild/signal. 
(Plus maybe a few other things)
 2017-01-10 17:08:50 +01:00
Pedro J. Estébanez 8589a1b117 Fix uniforms with the same name shadowing others 
Follow-up of #7344
 2017-01-10 17:05:31 +01:00
Rémi Verschelde 40de567297 classref: Sync with current code 2017-01-08 12:36:38 +01:00
Emmanuel Leblond 1e646e2797 Fix codeblock tag in classes.xml for EditorSettings 
(cherry picked from commit 28d7486267)
 2017-01-08 12:35:02 +01:00
Rémi Verschelde 4a7d5f7b0e i18n: Sync translations with Weblate 
Adds 100% complete Bengali translation.
 2017-01-08 12:16:19 +01:00
Rémi Verschelde a86dae5761 Merge pull request #7141 from Faless/2.1.x-ipv6 
Cherry pick IPv6 patches to 2.1.x
 2017-01-04 08:38:28 +01:00
Fabio Alessandrelli 7a77fd1cd5 Expose HTTP classes' set_ip_type to scripting 
(cherry picked from commit d194e1c48e)
 2017-01-04 00:46:33 +01:00
Fabio Alessandrelli ac9f0aea1a Remove old unused AI_V4MAPPED flag to getaddrinfo 
(cherry picked from commit de23ce11b5)
 2017-01-04 00:46:33 +01:00
Fabio Alessandrelli 3bb1709fd7 Separate hostname resolve cache based on ip_type 
(cherry picked from commit c1c1ec690e)
 2017-01-04 00:46:33 +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 7ef71b9013 Allow setting ip_type for TCP/UDP and HTTP classes 
(cherry picked from commit a77a0118f6)
 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 19b31297ec Fix _set_ip_addr_port not setting the address. 
(cherry picked from commit cdc1ca0f13)
 2017-01-04 00:46:32 +01:00
Fabio Alessandrelli 4635671de5 Fix getaddrinfo failing on android 
(cherry picked from commit 311f1f165b)
 2017-01-04 00:46:32 +01:00
Rémi Verschelde 8f23be8752 Merge pull request #7344 from RandomShaper/fix-uniform-reuse-2.1 
Fix error when fragment and lighting code share an uniform
 2016-12-23 15:57:31 +01:00
Pedro J. Estébanez 490f51a202 Fix error when fragment and lighting code share an uniform 2016-12-21 02:24:47 +01:00
Fabio Alessandrelli 1a7f14b206 [IPv6] Fix windows build script (link to ws2_32) 2016-12-11 18:12:46 +01:00
Fabio Alessandrelli e1dfaaf786 Define IPV6_V6ONLY flag if not defined on windows (old mingw versions) 
(cherry picked from commit bdc7ca84ca)
 2016-12-11 18:12:46 +01:00
Fabio Alessandrelli 3f6fe2f3f1 Update docs to IPv6 
(cherry picked from commit 7f42da0330)
 2016-12-11 18:12:46 +01:00
Fabio Alessandrelli 2fff8e8cde Set proper ip_type default for listen() and resolve_hostname() 
(cherry picked from commit 7eef15b734)
 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 a2048efd72 Add optional IP type param in TCP/UDP connect/set_send_address 
(cherry picked from commit 2f1c859272)
 2016-12-11 18:12:45 +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 5546929712 added implementation of is_valid_ip_address() 
(cherry picked from commit a3131a6b5b)
 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
Ariel Manzur 904285f4b4 address type for http client 
(cherry picked from commit 1c2ac490cf)
 2016-12-11 12:35:06 +01:00
Ariel Manzur 53fea7f196 fixed some byte order and parsing problems 
(cherry picked from commit 1d45f35a4a)
 2016-12-11 12:35:06 +01:00
Ariel Manzur fd1022fd29 adding ipv6 
(cherry picked from commit 887a897c02)
 2016-12-11 12:35:06 +01:00
Rémi Verschelde 24a440a34f Merge pull request #7239 from eska014/2.1-asmjs 
Backport web export changes for 2.1
 2016-12-08 07:46:37 +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
Andreas Haas ed2c369785 Fix Script Editor drawing over Dialogs. 
Resets the z-index when focus is lost and the completion is shown.

Fixes #6769

(cherry picked from commit f73b501d6f)
 2016-11-19 13:04:02 +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
Rémi Verschelde 3e2247ca53 Release 2.1.1-stable 2016-11-15 09:14:21 +01:00
Rémi Verschelde bf3cf5505e classref: Sync with current source 2016-11-15 09:14:02 +01:00
Rémi Verschelde bcc887bbe5 i18n: Sync translations with Weblate and update template 2016-11-15 09:10:37 +01:00
Rémi Verschelde 9b32df9cab i18n: Remove translations below 20% completion 
They are of course kept in master to be synced in Weblate.
 2016-11-15 09:07:53 +01:00