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

6740 Commits

Author SHA1 Message Date
George Marques 517f520f64
Merge pull request #13122 from sersoong/2.1-test2 
[2.1] - Change script list menu item to shortcut and add more item
 2017-11-21 12:45:37 -02:00
sersoong 1cf15bb847 Change script list menu item to shortcut and add more item 2017-11-21 08:02:01 +08:00
Rémi Verschelde deb360f4f5
Merge pull request #13112 from DmitryKrutskikh/view-fps-2-1 
[2.1] Add "View FPS" in 3D->Perspective's popup.
 2017-11-21 00:10:31 +01:00
Rémi Verschelde 9deae6e45d
Merge pull request #12506 from sanikoyes/pr-2.1-extends-enhance 
Allow to extends constant class variable
 2017-11-20 23:25:36 +01:00
Dmitry Krutskikh da1b3bfdcb Add "View FPS" in 3D->Perspective's popup. 2017-11-20 23:09:09 +03:00
Rémi Verschelde cf13e05d46
Merge pull request #12945 from sersoong/2.1-test 
2.1 - Add open scene feature to dependency_editor.cpp
 2017-11-20 09:12:17 +01:00
Rémi Verschelde 28f2e5483e
Merge pull request #12985 from sersoong/2.1-test2 
[2.1]-Add Close All,Close Others Options to script editor
 2017-11-20 09:00:49 +01:00
Rémi Verschelde f32497929b
Merge pull request #13067 from sersoong/2.1-test3 
[2.1] - Fix TextureRegionEditor's snap mode is not initial bug.
 2017-11-20 08:02:27 +01:00
sersoong 19d2ba2b08 Fix TextureRegionEditor's snap mode is not initial bug. 2017-11-20 09:15:49 +08:00
Rémi Verschelde 23e17e6ed2
Merge pull request #13029 from sersoong/2.1-test3 
[2.1] - porting 3.0 filesystem dock context menu to 2.1
 2017-11-19 21:57:15 +01:00
sersoong 320ee1851f Porting 3.0 filessytem_dock's context menu to 2.1 2017-11-19 11:21:36 +08:00
George Marques fa000c6327
Fix build error caused by cherry-pick from 3.0 
Problematic commit: 5e4f092ac
 2017-11-17 20:54:35 -02:00
Rémi Verschelde 52da15b6fc
Merge pull request #12994 from vnen/plugin-resource-save 
Make resources edited by plugins be sent as reference (2.1)
 2017-11-17 19:48:51 +01:00
George Marques 5e4f092acd
Make resources edited by plugins be sent as reference 
This ensures that a plugin can save a resource using the ResourceSaver.
 2017-11-17 16:43:51 -02:00
sersoong 88b5287731 Add Close All,Close Other Tabs to script editor 2017-11-17 21:42:01 +08:00
Rémi Verschelde e132adf49f
Merge pull request #12607 from rraallvv/window_position_2.1 
Fix window position on macOS (2.1)
 2017-11-17 00:36:24 +01:00
Rémi Verschelde 980f5b36a4
Merge pull request #12947 from volzhs/remove-printline 
Remove print spam when using encrypted script

[ci skip]
 2017-11-15 12:44:04 +01:00
volzhs 28dfd82734 Remove print spam when using encrypted script 2017-11-15 20:37:57 +09:00
sersoong 886aac981c Add open scene feature to dependency_editor.cpp 2017-11-15 15:50:32 +08:00
Rhody Lugo 75925198be fix window position computations on macOS 2017-11-14 08:59:50 -04:00
Rémi Verschelde fbb0732a36
Merge pull request #12889 from sersoong/2.1-test 
2.1-Add gdscript multiple template and 'template' OptionButton in Script_Create_Dialog.cpp
 2017-11-14 08:13:19 +01:00
Rémi Verschelde ff69d1fff2
Merge pull request #12886 from rraallvv/osx_android_travis_2.1 
travis: caching Android, iOS, macOS (cross-compile) (2.1)
 2017-11-13 21:44:45 +01:00
Rhody Lugo f09bbfa372 change matrix and enable caching for Android, iOS and macOS (cross-compile) 2017-11-13 15:13:46 -04:00
sersoong 875fd90467 Add more template to Script_Create_dialog.cpp 2017-11-13 14:31:51 +08:00
Rémi Verschelde aafb06cf9f
Merge pull request #12820 from eska014/2.1-html5-pointer-input 
Backport HTML5 pointer-input patches to 2.1
 2017-11-12 20:28:35 +01:00
Leon Krause b717d1dc4c Implement HTML5 touch events 
(cherry picked from commit 86f5ac3d74)
 2017-11-10 20:54:58 +01:00
Leon Krause 9b07e32656 Reimplement HTML5 mouse input without GLUT 
Fixes inverted scrolling on Chromium

(cherry picked from commit a99b6b2063)
 2017-11-10 20:51:16 +01:00
Rémi Verschelde 55c010aa61
Merge pull request #11837 from Listwon/FixEditorTooltips 
Fix "enable_object_picking" disables editor tooltips
 2017-11-10 10:57:53 +01:00
Rémi Verschelde 49a12ddbc5
Merge pull request #12748 from rraallvv/unified_headers_fix_2.1 
unified headers fix (2.1)
 2017-11-09 16:40:14 +01:00
Rhody Lugo fd10b1cf4c unified headers fix 2017-11-09 09:47:28 -04:00
Rémi Verschelde 6851d00a20
Merge pull request #12771 from GodotExplorer/pr-debugger-fix-2.1 
Add null check to fix crashing with debugger
 2017-11-09 11:31:37 +01:00
Geequlim 9f24aefdc8 Add null check to fix crashing with debugger 2017-11-09 18:28:52 +08:00
Sofox f5b6bfbbd1 Parallax Fixes. Ensures Parallax Background works at different zoom levels, both when the camera is Centered and Fixed TopLeft. 2017-11-06 19:34:46 +00:00
Rémi Verschelde 73e3947493
Merge pull request #12605 from rraallvv/unified_headers_2.1 
add support for Android NDK unified headers (2.1)
 2017-11-06 16:07:02 +01:00
Rémi Verschelde 9493d7b218
Merge pull request #12697 from volzhs/dont-stop-music 
Prevent to stop music in another background app on iOS
 2017-11-06 12:53:53 +01:00
Rhody Lugo c0647681d8 add support for Android NDK unified headers 2017-11-06 07:52:47 -04:00
volzhs bc285b2ba4 Prevent to stop music in another background app on iOS 2017-11-06 20:13:36 +09:00
Rémi Verschelde fb9e830b08
Merge pull request #10769 from RandomShaper/fix-joints-2.1 
Fix joints collision exceptions, plus a bit more (2.1)
 2017-11-04 11:37:28 +01:00
Rémi Verschelde 56a5c643dd
Merge pull request #12578 from volzhs/lto-iphone 
Respect use_lto option for building iPhone template

[ci skip]
 2017-11-02 09:39:57 +01:00
volzhs 50868dfd27 Respect use_lto option for building iPhone template 2017-11-02 17:35:06 +09:00
Rémi Verschelde 8c2b57cbd0
Merge pull request #12560 from marcelofg55/wasapi_improv_21 
Improved WASAPI driver logic when devices are connected or disconnected
 2017-11-01 15:23:23 +01:00
Marcelo Fernandez 9dfdddd827 Improved WASAPI driver logic when devices are connected or disconnected 2017-11-01 10:53:58 -03:00
sanikoyes 2004c24a6e Allow to extends constant class variable 2017-10-30 19:08:53 +08:00
Rémi Verschelde 290b32ee57 libpng: Cosmetic update to upstream 1.6.34 
No code change in the part we are using, it only affected contrib code.
[ci skip]

(cherry picked from commit e9d1d648cd)
 2017-10-29 17:07:13 +01:00
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