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

5802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan Linietsky
ab4126f510 Merge branch 'master' of https://github.com/godotengine/godot 2016-10-30 09:00:45 -03:00
Rémi Verschelde
914015f3b6 Merge pull request #6962 from henriquelalves/external_editor_focus_bug 
Won't change editor tabs when using External Editor.
 2016-10-30 12:17:28 +01:00
Rémi Verschelde
21828209ec Merge pull request #6950 from rdb/master 
Add "Never" underline mode to LinkButton
 2016-10-30 12:11:49 +01:00
Rémi Verschelde
1ee1a959ab Merge pull request #6945 from Hinsbart/script_dnd 
Ability to drag script files from Filesystem dock to SceneTree dock.
 2016-10-30 12:10:45 +01:00
Rémi Verschelde
a23d8eafa3 Merge pull request #6928 from razvanc-r/fix-container 
make Container node aware of Size Flags
 2016-10-30 12:06:30 +01:00
Rémi Verschelde
644e810cef Merge pull request #6920 from volzhs/dragndrop-2d 
Improve drag and drop on 2D viewport
 2016-10-30 12:06:19 +01:00
Rémi Verschelde
dfec7190b9 Merge pull request #6918 from pkowal1982/tween_fix_k3k 
Fix regression #6864 caused by #6613
 2016-10-30 12:05:42 +01:00
Rémi Verschelde
f1b89f1778 Merge pull request #6887 from leezh/regex_module 
RegEx re-implemented as a module
 2016-10-30 12:02:44 +01:00
Rémi Verschelde
4ed2f98730 Merge pull request #6874 from mateka/issue-6839 
Option to load script for node (#6839)
 2016-10-30 11:57:56 +01:00
Rémi Verschelde
89001369e7 Merge pull request #6751 from SuperUserNameMan/new_PRNG_for_rand_from_seed 
xorshift32 PRNG for Math::rand_from_seed()
 2016-10-30 10:49:22 +01:00
Rémi Verschelde
426ff9e7ac Merge pull request #6614 from TheKK/issue5989 
Make FileDialog directory selection less misleading
 2016-10-30 10:46:01 +01:00
Ignacio Etcheverry
33766a4935 Merge pull request #6901 from volzhs/fix-inputevent-compare 
Fix comparison bug with InputEvent
 2016-10-29 22:29:18 +02:00
Henrique L. Alves
13c92099e6 Won't change editor tabs when using External Editor. 
Fixes issue #3046.
 2016-10-29 11:44:57 -02:00
George Marques
a52cbd65a8 Merge pull request #6937 from SuperUserNameMan/fix_win_standalone_msvc_and_mingw_incompatibilities 
fix bug introduced by #6501
 2016-10-28 20:57:51 -02:00
rdb
d517bc908f Add "Never" underline mode to LinkButton 2016-10-28 10:52:57 +02:00
Andreas Haas
a3944e66da
Ability to drag script files from Filesystem dock to SceneTree dock. 
Allows to attach scripts by dragging them onto the target Node.
 2016-10-27 16:32:41 +02:00
Rémi Verschelde
8321e48ab0 Merge pull request #6943 from damon-myers/fix-mac-locale 
Fix locale for macOS-style locales
 2016-10-27 14:37:44 +02:00
Damon
1e7f078ce9 Fix locale for macOS-style locales 2016-10-27 07:29:00 -05:00
Zher Huei Lee
9a5ce099f1 Changed RegEx to inherit Resource 2016-10-27 10:27:40 +01:00
Zher Huei Lee
c3b4686082 Added global sub and bounds checking to RegEx 2016-10-27 10:27:40 +01:00
Zher Huei Lee
439d439321 RegEx re-implemented as a module 
Re-wrote nrex as a module using godot-specific parts and new
features:

 * Added string substitutions.
 * Named groups are now supported.
 * Removed use of mutable variables in RegEx. RegExMatch is returned
   instead.
 2016-10-27 10:27:40 +01:00
Damon Myers
470ead74db Change set_locale to fallback to the global language (#6910) 2016-10-27 10:36:32 +02:00
Rémi Verschelde
6f09841e24 Merge pull request #6936 from Faless/udp_ntohs 
Fix PacketPeerUDP get_packet_port()
 2016-10-27 09:34:30 +02:00
yg2f
f7773d499d fix bug introduced by #6501 
( @Akien : this PR is for current HEAD only, not to be cherry-picked for 2.1.1 )

this is manual revertion of #6501 which introduced a bug that prevented
scons from detecting Mingw under Windows when MSVC was installed.
(thanks to @vnen for finding this)

AND
it fixes the actual bug that prevented scons from detecting MSVC standalone
compiler ( a confusions between ``VSINSTALLDIR`` and ``VCINSTALLDIR`` )

The freeware Standalone MSVC C++ Build Tools are available here :
http://landinghub.visualstudio.com/visual-cpp-build-tools
 2016-10-26 19:29:30 +02:00
Fabio Alessandrelli
25e29972a9 Fix PacketPeerUDP get_packet_port() 
Properly convert port field from network to system ordering on incoming packets.
 2016-10-26 18:27:01 +02:00
Pawel Kowal
20a18907c1 Fix regression #6864 caused by #6613 2016-10-26 15:15:20 +02:00
Rémi Verschelde
c67e3a485d Merge pull request #6925 from godotengine/ipv6 
Adding IPv6 support
 2016-10-26 14:32:51 +02:00
volzhs
eed9179ea3 Improve drag and drop on 2D viewport 2016-10-26 21:21:01 +09:00
Răzvan Cosmin Rădulescu
6ed15e995d make Container node aware of Size Flags 2016-10-26 11:45:16 +02:00
Fabio Alessandrelli
80e911647c 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
 2016-10-26 08:20:31 +02:00
Rémi Verschelde
c7f9d853e2 Merge pull request #6898 from zaps166/scons-msg-fix 
"CCFLAGS" are for C and C++ compiler
 2016-10-25 21:36:02 +02:00
Rémi Verschelde
d067ec8753 Merge pull request #6906 from volzhs/remove-dead-code 
Remove dead code in FileSystemDock
 2016-10-25 21:27:15 +02:00
volzhs
9605a1d0da Remove dead code in FileSystemDock 2016-10-23 23:38:49 +09:00
volzhs
b76a0ca40c Fix comparison bug with InputEvent 2016-10-23 05:47:36 +09:00
Błażej Szczygieł
ace18d28d2 "CCFLAGS" are for C and C++ compiler 2016-10-22 17:28:10 +02:00
Rémi Verschelde
24337f9c5e Merge pull request #6884 from vnen/html-export-char 
Fix extraneous NULL character on HTML export
 2016-10-22 13:09:54 +02:00
Rémi Verschelde
7740b3912c Merge pull request #6882 from vnen/mouse-mode 
Fix the hiding of mouse cursor before interaction
 2016-10-22 13:08:18 +02:00
Rémi Verschelde
ad07b31353 Merge pull request #6881 from vnen/msvc-project-output 
Fix output binary paths for VS project generation
 2016-10-22 13:07:37 +02:00
Randy Tan Shaoxian
638a31d972 Fixed tiny error in detect.py causing compilation for Android to fail. 
(cherry picked from commit c9d7f77c6f)
 2016-10-22 13:04:13 +02:00
Rémi Verschelde
ee6c5c5c23 Merge pull request #6858 from zaps166/gcc-color-output 
SCons: Use colored output if available, change "colored"->"verbose"
 2016-10-22 12:59:45 +02:00
Rémi Verschelde
3dd405c517 Merge pull request #6857 from zaps166/disable-asserts-in-release 
Disable asserts in release mode
 2016-10-22 12:55:21 +02:00
Henrique Lacreta Alves
853d1ce9f3 Prevent unwanted script editor input on game crash 
Fixes #6530.
 2016-10-22 12:54:38 +02:00
Rémi Verschelde
f5818c8e63 Merge pull request #6812 from RandomShaper/get-visualserver-clear-color 
Add/expose VisualServer::get_default_clear_color()
 2016-10-22 12:52:40 +02:00
Rémi Verschelde
ac765fd518 Merge pull request #6710 from lordadamson/master 
fix #6031 when creating a script the default language will be what yo…
 2016-10-22 12:48:59 +02:00
Rémi Verschelde
cf3ba3379f Merge pull request #6564 from SuperUserNameMan/gdscript_opcode_line_opcode_breakpoint 
fixes #6487, GDscript compiler ignores OPCODE_LINE and OPCODE_BREAKPOINT in Release mode
 2016-10-22 12:45:46 +02:00
Rémi Verschelde
afd86ee240 Merge pull request #6090 from WalasPrime/raytrace_force 
Added force_raycast_update GDScript method for RayCast[2D]
 2016-10-22 12:40:14 +02:00
George Marques
604ddd691c
Fix extraneous NULL character on HTML export 
Fix #2801
 2016-10-20 21:11:13 -02:00
George Marques
414d58e6c0
Fix the hiding of mouse cursor before interaction 
Fix part of #6633
 2016-10-20 20:01:28 -02:00
Adham Zahran
a84a461767 fix #6031 when creating a script the language will be what you selected last time 2016-10-20 23:53:15 +02:00
George Marques
c8093678a0
Fix output binary paths for VS project generation 2016-10-20 19:02:10 -02:00