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

6496 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde b2db9279fa Merge pull request #7769 from GodotExplorer/pr-resizeable-texturebutton_3 
Enhance TextureButton and TextureRect with resize
 2017-02-12 23:22:41 +01:00
Rémi Verschelde f3d339e33f Merge pull request #7768 from bojidar-bg/sc-multiple-names 
Make _sc_ files work like ._sc_
 2017-02-12 23:22:13 +01:00
Rémi Verschelde bbc6543172 Merge pull request #7763 from Limb/fixwindowscompile 
Fixed compilation issues with Visual Studio
 2017-02-12 23:22:02 +01:00
Rémi Verschelde d11f9f4817 Merge pull request #7746 from sanikoyes/Pr-fix-msvc-compile 
Fix msvc compile error
 2017-02-12 23:21:43 +01:00
Rémi Verschelde c96fa0f23e Merge pull request #7757 from volzhs/save-debug-options 
Save and restore debug options for each project
 2017-02-12 23:20:48 +01:00
Rémi Verschelde 70fff42df5 Merge pull request #7749 from Faless/fix_7697 
HTTPClient properly handle partial data in non-blocking mode
 2017-02-12 23:18:59 +01:00
Rémi Verschelde 458bd83dfc Merge pull request #7747 from sanikoyes/Pr-fix-tween-transform2d 
Fix tween Transform2D typo
 2017-02-12 23:18:38 +01:00
Rémi Verschelde 5ce18cbdb9 Merge pull request #7743 from karroffel/json_parsing-3.0 
JSON::parse reports errors on open-ended objects (master)
 2017-02-12 23:17:08 +01:00
Rémi Verschelde ceac8a780e Merge pull request #7740 from magyar123/master 
Add editor option for closing the output when stopping the game.
 2017-02-12 23:16:14 +01:00
Rémi Verschelde 530de920d4 Merge pull request #7723 from lonesurvivor/gdscript-range-fix 
Fix parsing bug which causes range(variable) to crash the engine
 2017-02-12 23:13:08 +01:00
Rémi Verschelde 53b7bbfcce Merge pull request #7722 from RandomShaper/improve-touch-button 
Fix touch button issues
 2017-02-12 23:12:18 +01:00
Rémi Verschelde d791f5f06e Merge pull request #7712 from kbake/deselect-selection-on-ctrl-home/end 
Selected text is now deselected on ctrl+home/end
 2017-02-12 23:09:34 +01:00
Rémi Verschelde c51990ec9d Merge pull request #7706 from RandomShaper/touch-button-shape-master 
Add shape property to TouchScreenButton
 2017-02-12 23:09:16 +01:00
Pedro J. Estébanez 49e7e2cd2a Solve TouchScreenButtons issues 
Fix touch button needing double tap after pause (applies to those not set to pass-by)
Fix error when a pressed TouchScreenButton with no associated action exits the tree
(with some refactoring of duplicate code)
 2017-02-10 20:54:54 +01:00
geequlim ab375117ba Add STRETCH_KEEP_ASPECT_COVERED to TextureRect StretchMode 
Make TextureButton to the same resize behavior with TextureRect
 2017-02-09 22:52:52 +08:00
Bojidar Marinov 27bb6b5282
Make _sc_ files work like ._sc_, fixes #7762 2017-02-09 12:26:18 +02:00
Kenneth Lorthioir 6961ed21bb Fixed compilation issues with Visual Studio 2017-02-08 18:14:52 -05:00
Rémi Verschelde b87a232668 Reorder the folders in tools to prepare moving tools/editor 
- `certs` and `editor_fonts` go to `thirdparty`
- `dist` and `scripts` go to a new `misc` folder
- `collada` and `doc` go to `tools/editor`

The next step will be to rename `tools/editor` to `editor` directly,
but this will be done at the right time to avoid breaking too many PRs.
 2017-02-09 00:08:27 +01:00
Rémi Verschelde b19c9bd198 Merge pull request #7759 from nunodonato/translationfix 
Added "Scots" locale name, fixing #7630
 2017-02-08 16:17:19 +01:00
Nuno Donato 6b5c595e40 Added "Scots" locale name, fixing #7630 2017-02-08 14:54:28 +00:00
volzhs 79e8616fbb Save and restore debug options 2017-02-08 23:51:13 +09:00
Juan Linietsky 07bbcf91f7 basic contact shadows implementation, will most likely need some polishing 2017-02-08 07:35:14 -03:00
Rémi Verschelde a73d46caa6 Merge pull request #7715 from m4nu3lf/bugfix/g6dof_joint_setter 
Fixed property setter in G6DOF joint
 2017-02-07 14:19:05 +01:00
Rémi Verschelde bd8df0f21d Merge pull request #7709 from bojidar-bg/sort-scripts-by-path 
Sort settings for scripts in the editor
 2017-02-07 14:14:54 +01:00
Fabio Alessandrelli 833994b294 HTTPClient properly handle partial data in non-blocking mode 
Use block to send DVector::Write out of scope in
HTTPClient::read_response_body_chunk()
 2017-02-07 11:01:53 +01:00
sanikoyes 9123e91634 Fix tween Transform2D typo 2017-02-07 15:45:49 +08:00
sanikoyes 16b3973c75 Fix msvc compile error 2017-02-07 15:44:46 +08:00
Juan Linietsky 6bfaa0f12c shadows were not working in-editor for nvidia, fixed now 2017-02-06 20:18:35 -03:00
Karroffel d5071a940d JSON::parse reports errors on open-ended objects 2017-02-06 19:34:34 +00:00
mbalint12 1bd1af776c Add editor option for automatically closing the output when stopping the game. 2017-02-06 18:17:20 +01:00
Juan Linietsky 5cc63dee0f ability to adjust propagation in gi probe 2017-02-06 05:12:15 -03:00
Juan Linietsky 6f2e16306a Several bugfixes, improving the import workflow 2017-02-06 00:38:39 -03:00
Juan Linietsky af3fabeb77 Ensure proper config version when reading the new configuration file. 2017-02-04 21:02:52 -03:00
Juan Linietsky 102b5fce85 Renamed engine.cfg to godot.cfg, to forcefully break compatibility with 2.x 2017-02-04 20:53:55 -03:00
Juan Linietsky 331a4d8078 completed scene importing (I hope?) 2017-02-04 20:31:15 -03:00
lonesurvivor c71a6c6d71 Fix parsing bug which causes range(variable) to crash the engine 
problem was a segmentation fault caused by trying to access Vector constants[0] which isn't there if op->arguments.size() is not bigger than one.

- the changed OR condition didn't make sense (always true), should be AND
- changes the "constant" variable to be false per default and gets set to true when there is actually something pushed to "constants"
 2017-02-04 20:57:39 +01:00
Juan Linietsky ad2e1b1b92 fix continous reimport bug (i hope) 2017-02-04 11:12:03 -03:00
Juan Linietsky 27eae4ada1 Scene import more or less working, needs some missing features. 2017-02-04 09:48:04 -03:00
m4nu3lf 0d9b53ce5e Fixed property setter in G6DOF joint 2017-02-03 21:23:23 +00:00
Juan Linietsky d2b2d6801f Changed OGG Vorbis type to be imported, so it's possible to specify loop 2017-02-03 08:55:29 -03:00
kbake 1169f4e040 Selected text is now deselected on ctrl+home/end 
This fixes Issue #7694 and also the error mentioned in the comments of that issue.
 2017-02-03 02:01:41 -05:00
Juan Linietsky 9ce2ab9749 OBJ file importing! 2017-02-03 00:08:50 -03:00
Juan Linietsky a02933bb3c wav file importing! 2017-02-02 22:51:58 -03:00
Rémi Verschelde 63673de247 Merge pull request #7708 from volzhs/match-err 
Match ERROR_QUERY_FAILED enum with others

[ci skip]
 2017-02-02 13:33:45 +01:00
Bojidar Marinov 6f3fc1f05a
Sort settings for scripts in the editor 2017-02-02 14:31:01 +02:00
volzhs e3cf472651 Match ERROR_QUERY_FAILED enum with others 2017-02-02 21:15:47 +09:00
Pedro J. Estébanez 7b2fa207e9 Add shape property to TouchScreenButton 
Adapted from 67a0da34a2
 2017-02-02 12:16:14 +01:00
volzhs 86a04198d9 Fix crash when saving root node by "Save Branch as Scene" with unsaved scene 
Fix #7667

(cherry picked from commit 43a2599801)
 2017-02-02 08:24:52 +01:00
Pawel Kowal b602096b9b Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolling is enabled 
(cherry picked from commit e9316a009e)
 2017-02-02 08:24:37 +01:00
Rémi Verschelde 251e014b59 Merge pull request #7578 from baekdahl/master 
x11: don't wait for window to be mapped
 2017-02-02 08:21:05 +01:00