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

22499 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde becbb7b525
Merge pull request #30891 from bojidar-bg/30875-tilemap-rightclick-pan 
Make it so that 2D viewport does not pan while editing tilemaps
 2019-07-28 21:51:44 +02:00
Rémi Verschelde d8e7e344bc
Merge pull request #30889 from Faless/ws/client_free_crash 
Fix WebSocketClient crash when unref during signal
 2019-07-28 21:49:51 +02:00
Bojidar Marinov 68b5f101c7
Make it so that 2D viewport does not pan while editing tilemaps 
Fixes #30875
 2019-07-28 17:00:05 +03:00
Fabio Alessandrelli d6c9b377b9 Fix WebSocketClient crash when unref during signal 
Always call disconnect before emitting signals, to avoid calling it on a
freed object if the user decides to unreference it in a signal.
 2019-07-28 15:23:20 +02:00
Rémi Verschelde 331a703f5d
Merge pull request #30887 from homer666/sorting-order-editor-settings 
Update "Sorting Order" dropdown in Editor Settings
 2019-07-28 10:14:50 +02:00
homer666 4553f2e6b8 Update "Sorting Order" dropdown in Editor Settings 2019-07-28 17:40:06 +10:00
Rémi Verschelde 6c9ccf18f8
Merge pull request #25327 from groud/frame_row_column 
Add frame_coords accessor to Sprite
 2019-07-27 14:09:45 +02:00
groud 11cb4eb363 Add frame_cords accessors to Sprite and Sprite3D 2019-07-27 13:05:02 +02:00
Rémi Verschelde 94aabf56a0
Merge pull request #30865 from godotengine/revert-28952-update-margins 
Revert "Update Control margins when size is overridden by change to minsize"
 2019-07-27 12:57:35 +02:00
Rémi Verschelde f494d5f10b
Revert "Update Control margins when size is overridden by change to minsize" 2019-07-27 12:55:03 +02:00
Rémi Verschelde 1107799de5
Merge pull request #30849 from bojidar-bg/7898-mixed-indentation 
Disallow using of both tabs and spaces for indentation in the same file
 2019-07-27 10:48:31 +02:00
Rémi Verschelde 0a190ae3aa
Merge pull request #30857 from cbscribe/kcc_doc_process 
[DOCS] Correct "fixed process" reference in KinematicBody doc
 2019-07-27 08:36:17 +02:00
Chris Bradfield 7f4059ceb7 [DOCS] Correct "fixed process" reference in KinematicBody doc 2019-07-26 18:50:12 -07:00
Ignacio Roldán Etcheverry 6f727c0476
Merge pull request #30855 from neikeq/issue-30853 
C#: Fix Transform2D.AffineInverse()
 2019-07-27 02:31:28 +02:00
Ignacio Etcheverry d54df7b904 C#: Fix Transform2D.AffineInverse() 2019-07-27 02:15:29 +02:00
Bojidar Marinov f12f3cf726
Disallow using of both tabs and spaces for indentation in the same file 
Closes #7898
 2019-07-26 21:24:34 +03:00
Rémi Verschelde e4ec59b6ae
Merge pull request #30763 from Calinou/editor-add-version-info 
Display version information in the editor at all times
 2019-07-26 19:08:42 +02:00
Rémi Verschelde 140e7e5edf
Merge pull request #30788 from Chaosus/direction_to_gdnative 
Added Vector2/3.direction_to methods to GDNative
 2019-07-26 18:58:25 +02:00
Rémi Verschelde 39579d2a6d
Merge pull request #30839 from Calinou/simplify-dim-editor-settings 
Simplify editor settings related to window dimming
 2019-07-26 18:55:31 +02:00
Rémi Verschelde 67ce3f7424
Merge pull request #30846 from YeldhamDev/filediag_tooltip_changes 
Small adjustments to tooltips in '(Editor)FileDialog'
 2019-07-26 18:54:33 +02:00
Rémi Verschelde 8c2566875e
Merge pull request #30828 from aaronfranke/oh-snap 
Snap transform gizmo values in the 3D editor
 2019-07-26 18:53:15 +02:00
Ignacio Roldán Etcheverry 6697ad2c4f
Merge pull request #30842 from neikeq/fix-custom-props-msbuild 
Mono: Fix custom defines for Mono's MSBuild; remove xbuild
 2019-07-26 18:33:52 +02:00
Ignacio Etcheverry 8821569689 Mono: Fix custom defines for Mono's MSBuild; remove xbuild 
Mono's MSBuild and System/VisualStudio's MSBuild expect a different format for surrounding property values with quotes on the command line.

xbuild does not seem to support semicolons in property values from the command line: https://xamarin.github.io/bugzilla-archives/16/16465/bug.html
It's a good time to just remove xbuild support entirely.
 2019-07-26 17:17:17 +02:00
Ignacio Roldán Etcheverry a82420fbe8
Merge pull request #30825 from neikeq/heya 
Fix incorrectly updating csproj and not closing build issues file
 2019-07-26 16:54:11 +02:00
Michael Alexsander Silva Dias e8fc875619 Small adjustments to tooltips in '(Editor)FileDialog' 2019-07-26 11:11:09 -03:00
Hugo Locurcio 6f6a9d9c09
Simplify editor settings related to window dimming 
Only a single checkbox is now exposed to control whether the editor
window should be dimmed when opening a popup. The main use case
for disabling it is picking colors from the editor window while
a popup is open.
 2019-07-26 15:29:04 +02:00
Aaron Franke 53d2a4e905 Snap transform gizmo values in the 3D editor 
Snap to step size, and then also be careful to only display that many digits (to avoid numbers like 1.234001)
 2019-07-25 19:40:35 -04:00
Rémi Verschelde d483a85a0f
Merge pull request #30829 from santouits/shadow-local 
fix getting correct mingw-w64 version
 2019-07-26 00:01:06 +02:00
Rémi Verschelde b6ab5b5e2b
Merge pull request #30823 from Paulb23/issue_29500_syntax_highlighter_leak 
Fix memory leaks with SyntaxHighlighters
 2019-07-25 23:12:35 +02:00
santouits 21297a533e fix getting correct mingw-w64 version 
When checking mingw-w64 version, at least on debian, the regex being used returned 86 because the name of the binary in debian starts with x86_64-w64 so we use the dumpversion option that gcc has. This fixes not compiling because gcc versions < 7 don't have some checks like shadow-local
 2019-07-26 00:04:16 +03:00
Ignacio Etcheverry 4e84478f4e Fix incorrectly updating csproj and not closing build issues file 2019-07-25 21:06:40 +02:00
Hugo Locurcio dee9e9dc62
Display version information in the editor at all times 
This closes #27811.
 2019-07-25 21:05:36 +02:00
Ignacio Roldán Etcheverry 3a68b24171
Merge pull request #30820 from neikeq/issue-28394 
Mono: Don't try to update project assemblies from project manager
 2019-07-25 19:00:10 +02:00
Paulb23 e51aa14208 Fix memory leaks with SyntaxHighlighters 2019-07-25 17:30:48 +01:00
Ignacio Etcheverry c9befa63d2 Mono: Don't try to update project assemblies from project manager 
Previously, when running the project manager, we would try to load the API assemblies from the project and fail because we were not editing any project. This would make us try to copy the prebuilt API assemblies to the project. Since there is no project, it would try to copy them to the executable location. This would fail if Godot doesn't have permissions to write to that location.
This commit fixes that by instead trying to load the prebuilt API assemblies in the first place, if running the project manager.
 2019-07-25 17:52:45 +02:00
Rémi Verschelde eb16c9830b
Merge pull request #30817 from YeldhamDev/body_warning_fix 
Fix wrong placement of new line in 'PhysicsBody' warning
 2019-07-25 17:43:18 +02:00
Michael Alexsander Silva Dias 4ff360b73b Fix wrong placement of new line in 'PhysicsBody' warning 2019-07-25 11:53:54 -03:00
Rémi Verschelde 510bb3789e
Merge pull request #30815 from YeldhamDev/debugger_monitor_text_integer 
Fix text position in the debugger's "Monitors" tab not being an integer
 2019-07-25 16:47:52 +02:00
Rémi Verschelde 1a33ef31a7
Merge pull request #30814 from StraToN/makerst-add-meta-gh-hide 
Adds a meta on top of every generated class to hide Edit on Github link
 2019-07-25 16:44:13 +02:00
Michael Alexsander Silva Dias 7f12618fdf Fix text position in the debugger's "Monitors" tab not being an integer 2019-07-25 11:02:17 -03:00
StraToN d83b8881ae Adds a meta on top of every generated class to hide 'Edit on Github' link 
Linked docs issue https://github.com/godotengine/godot-docs/pull/2656
 2019-07-25 15:57:43 +02:00
Rémi Verschelde 4c74f50d1a
Merge pull request #30351 from bojidar-bg/30288-override-global-theme 
Keep track of default theme and project custom default theme seperatelly
 2019-07-25 14:54:27 +02:00
Rémi Verschelde 27d1e63dd4
Merge pull request #30807 from akien-mga/da-get_next-hidden 
DirAccess: Drop compat get_next(bool *is_dir) which was hidden
 2019-07-25 14:51:01 +02:00
Rémi Verschelde 7d1dd54d8b
Merge pull request #30810 from Xrayez/doc-kinematic-test-only 
Make KinematicBody docs consistent regarding `test_only` argument
 2019-07-25 14:32:24 +02:00
Andrii Doroshenko (Xrayez) 8ba50823c4 Make KinematicBody docs consistent regarding test_only argument 
This simply makes the `move_and_collide` method descriptions in
both 2D and 3D to be in sync.

Co-authored-by: 2DemiGods <2DemiGods@users.noreply.github.com>
 2019-07-25 15:09:25 +03:00
Rémi Verschelde ffc8fb9c48
Merge pull request #30685 from jonri/vehicle-per-wheel-forces 
Vehicle per-wheel forces
 2019-07-25 11:45:22 +02:00
Rémi Verschelde e9bff84ce3
Merge pull request #23820 from clayjohn/pointmesh 
Added PointMesh primitive
 2019-07-25 11:44:11 +02:00
Rémi Verschelde 43238bb59a DirAccess: Drop compat get_next(bool *is_dir) which was hidden 
Fixes this warning:
```
./core/os/dir_access.h:74:17: warning: 'virtual String DirAccess::get_next(bool*)' was hidden [-Woverloaded-virtual]
```

Part of #30790.
 2019-07-25 11:09:57 +02:00
Rémi Verschelde 1481d299ea
Merge pull request #30776 from akien-mga/editor-configurable-float-step 
Inspector: Make default float step configurable
 2019-07-25 10:33:45 +02:00
Rémi Verschelde ffca740185
Merge pull request #30806 from akien-mga/fix-hint-sprite-frames 
Inspector: Fix PROPERTY_HINT_SPRITE_FRAME not behaving as RANGE
 2019-07-25 10:33:18 +02:00