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

6546 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde df893aad1b Merge pull request #12412 from sersoong/2.1-test 
add copy button to sprite_frames_editor
 2017-10-27 12:46:13 +02:00
sersoong 66e76236b1 add copy button to sprite_frames_editor 2017-10-26 20:34:22 +08:00
Rémi Verschelde 4adcab2efd Travis: Disable Windows/MinGW build replaced by AppVeyor/MSVC 
[ci skip]
 2017-10-24 07:49:19 +02:00
Rémi Verschelde 5529699355 Merge pull request #12369 from hoelzl/scons3-2.1 
Make build scripts Scons 3.0/Python3 compatible
 2017-10-24 07:47:16 +02:00
Matthias Hoelzl fb236045de Make build scripts Scons 3.0/Python3 compatible 
- Cherry picked #10662 and fixed merge conflicts.
- Manualy merged the change from #11904.
- Did not merge #12236 since I'm not sure whether the issue
  affects Godot 2.1 and I don't have VS2013 to test.
- Did not merge #11843 since it doesn't seem relevant (the
  code is only needed for creating DONORS.md, etc.).
- Did not merge #10727 and #11752 since they seem to be
  already included in #11742.
- The Windows and Linux builds have been tested with Scons 3.0
  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-10-24 06:41:32 +02:00
Rémi Verschelde fc88cb9d21 Merge pull request #12354 from marcelofg55/osx_vsync 
Implemented vsync OS functions for OS X
 2017-10-23 19:11:42 +02:00
Marcelo Fernandez 5cf2fc3a5f Implemented vsync OS functions for OS X 2017-10-23 12:05:42 -03:00
Rémi Verschelde b0c6213577 Merge pull request #12264 from RandomShaper/fix-log-overflow-2.1 
Fix formatting of debug log overflow (2.1)

[ci skip]
 2017-10-20 21:06:55 +02:00
Pedro J. Estébanez 303c823588 Fix formatting of debug log overflow 
Fixes #12087.

(cherry picked from commit d645b80e46)
 2017-10-20 19:56:26 +02:00
Rémi Verschelde 1b40b2eadc Merge pull request #12251 from sersoong/2.1-test 
update GKScore init function
 2017-10-20 13:00:55 +02:00
sersoong 5ed8826dd0 update GKScore init function 2017-10-20 17:44:54 +08:00
Rémi Verschelde 09e014d078 Merge pull request #12244 from ISylvox/fix-message 
[2.1] Remove Duplication of 'later in' on "No main scene...." Alert
 2017-10-20 10:30:47 +02:00
Indah Sylvia 61b3c1a29f Removed duplication of 'later in' on "No main scene has ever been defined" alert (#12237) 2017-10-20 08:27:09 +07:00
Rémi Verschelde e3a1bf247d Document -export_debug option in the help output 
Fixes #5903.
 2017-10-19 23:49:49 +02:00
Rémi Verschelde edd9e35b2d Merge pull request #12197 from rcurtis/2.1_issue12189 
Index p_index out of size and connect: Condition ' s->slot_map.has(target) ' is true

[ci skip]
 2017-10-18 11:23:00 +02:00
RCurtis 5fe2ce8199 Fixed duplicate signal connection 2017-10-17 18:34:50 -04:00
Rémi Verschelde aeb313541d Merge pull request #12102 from RandomShaper/fix-seek-to-end-2.1 
Fix animation not stopping after seeking to the end (2.1)
 2017-10-15 20:16:50 +02:00
Pedro J. Estébanez a0a9363b7a Fix animation not stopping after seeking to the end 
Fixes #10228.

(cherry picked from commit 2d2467c0ff)
 2017-10-14 22:23:52 +02:00
Rémi Verschelde 7644f337e0 Merge pull request #12098 from RandomShaper/fix-scons3-android-build-2.1 
Fix Android build error with SCons 3.0 (2.1)

[ci skip]
 2017-10-14 21:16:14 +02:00
Pedro J. Estébanez f50e5dc594 Fix Android build error with SCons 3.0 
Not sure why this happens without having upgraded Python itself, but is needed now.

Not needed for _master_ because there we have b6e1e47e3a that does this and more.

This commit does not address upgrading to Python 3.0. It just makes building for Android work again after upgrading SCons while keeping Python 2.7.
 2017-10-14 20:53:00 +02:00
Rémi Verschelde 6f4ddad5d1 Merge pull request #12086 from ISylvox/vk-to-keycode-2.1 
[2.1] Fix wrong Virtual-KeyCode(0x12) pair on Windows platform
 2017-10-14 20:12:22 +02:00
Indah Sylvia 06dd291865 Fixed wrong Virtual-KeyCode(0x12) pair on Windows platform (#12073) 2017-10-14 15:49:21 +07:00
Rémi Verschelde fd8a71397d Merge pull request #11796 from RameshRavone/back_event 
Handling BackPress event [Android]
 2017-10-12 20:12:00 +02:00
Rémi Verschelde c325ae5386 Merge pull request #12050 from ISylvox/libpng-1.6.33_-_2.1 
[2.1] Update LibPNG to v1.6.33
 2017-10-12 13:03:44 +02:00
Indah Sylvia bda3683b05 updated libpng to version 1.6.33 (September 28, 2017) 2017-10-12 14:34:42 +07:00
Rémi Verschelde 8122d943c4 Merge pull request #12040 from Shin-NiL/2.1 
Allows to export PCK/ZIP without templates
 2017-10-11 23:02:31 +02:00
Rémi Verschelde 7b5310753e Merge pull request #11977 from DmitryKrutskikh/filter-input-events-in-project-manager 
Skip unhandled input events on asset library tab. (2.1)

[ci skip]
 2017-10-11 22:31:53 +02:00
Rémi Verschelde b1ea083b3f Merge pull request #11863 from marcelofg55/conv_scripts_exp 
Added an experimental convert scripts option for godot3 export
 2017-10-11 22:21:46 +02:00
Rémi Verschelde 830d6346f1 Merge pull request #11742 from Listwon/vsproj 
Update VS project generation
 2017-10-11 22:17:28 +02:00
Dmitry Krutskikh fa08388c29 Skip unhandled input events on asset library tab. 2017-10-11 22:46:36 +03:00
Shin-NiL 5f0067a7ee Allows to export PCK/ZIP without templates 2017-10-11 15:25:02 -03:00
Andreas Haas 467dddf555 Merge pull request #12021 from Shin-NiL/2.1 
Won't change editor tabs when using External Editor.
 2017-10-11 15:34:51 +02:00
Shin-NiL d1c5272308 Won't change editor tabs when using External Editor. 2017-10-11 09:03:44 -03:00
Andreas Haas 552f71cad8 Merge pull request #11970 from volzhs/freetype-2.8.1-2.1.x 
Update freetype to 2.8.1
 2017-10-10 20:47:57 +02:00
Andreas Haas 2235f6266a Merge pull request #11968 from Faless/ipv6_no_linklocal_2.1 
[2.1] Do not allow link-local addresses to be used by editor debugger
 2017-10-10 20:40:45 +02:00
Marcelo Fernandez cecc893702 Added an experimental convert scripts option for godot3 export 2017-10-09 14:36:11 -03:00
volzhs 438175dd2b Update freetype to 2.8.1 2017-10-10 01:38:41 +09:00
Fabio Alessandrelli 0a34d35218 Do not allow link-local addresses to be used by editor debugger 
Default editor debugger address is now 127.0.0.1

(cherry picked from commit 72b4a09a14)
 2017-10-09 16:07:13 +02:00
Rémi Verschelde 8a57fe819d Merge pull request #11932 from DmitryKrutskikh/correct-project-icon-align 
Fix project icon align (2.1).
 2017-10-09 15:14:03 +02:00
Rémi Verschelde 5ac1348523 Merge pull request #11911 from Paulb23/line_edit_caret_resetting_2_1 
Fixed caret settings resetting (2.1)
 2017-10-09 14:52:44 +02:00
Rémi Verschelde ea3c476dcd Merge pull request #11909 from Paulb23/members_overview_2_1 
Added members overview (2.1)
 2017-10-09 14:52:32 +02:00
Rémi Verschelde b641a58951 Merge pull request #11847 from RameshRavone/patch-8 
flatDir support [Android] (2.1)
 2017-10-09 12:34:00 +02:00
Rémi Verschelde 87afd1800b Merge pull request #11781 from marcelofg55/iphone_crashfix 
Fix possible crash at exit on iOS
 2017-10-09 12:02:43 +02:00
Bartłomiej T. Listwon c871f50c55 Fix Intellisense 
Fix the CPPPATH passed to MSVSProject. Uses SCons Dir() function to convert "#" paths http://www.scons.org/doc/0.97/HTML/scons-user/a3414.html#CV-CPPPATH
 2017-10-09 12:01:41 +02:00
Bartłomiej T. Listwon 4d1a55be2f Update VS project generation 
Update VS project generation and add num_jobs option (default value: 2 - the same as before) for parallel builds inside Visual Studio. Tested with SCons 3.0 and Visual Studio 2017.
 2017-10-09 12:00:46 +02:00
Dmitry Krutskikh e6b7e055a0 Fix project icon align. 
Now icon vertically centered
 2017-10-08 19:59:37 +03:00
Paulb23 dcaa7ba2b8 Fixed carret settings resetting (2.1) 2017-10-07 14:54:10 +01:00
Paulb23 8cc56c16cf Added members overview (2.1) 2017-10-07 14:41:46 +01:00
Andreas Haas 1a934a58e4 Merge pull request #11870 from marcelofg55/main_scene_export 
Fix godot3 exporter main_scene conversion
 2017-10-06 19:59:57 +02:00
Andreas Haas fdc7bef9ac Merge pull request #11883 from marcelofg55/conv_filter_mipmaps 
Convert filter/gen_mipmaps on godot3 exporter
 2017-10-06 19:57:59 +02:00