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

12658 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde e49ddf2984
Merge pull request #15555 from BastiaanOlij/clamp_blends 
Clamp blend to fix screen space reflections
 2018-01-10 13:36:13 +01:00
Bastiaan Olij ebc96195d8 Clamp blend to fix screen space reflections 2018-01-10 23:23:00 +11:00
Rémi Verschelde f1ef2d5183
Merge pull request #15553 from AlmightyScientist/issue-15453 
Shader Language: Fixes EXTRA_MATRIX undefined.
 2018-01-10 12:46:52 +01:00
bruvzg b3d803c901
Fix IME producing multiple events per key press. 2018-01-10 13:43:24 +02:00
Rémi Verschelde 8c6d830e07
Merge pull request #15543 from volzhs/fix-aspect 
Fix stretch aspect keep mode
 2018-01-10 12:40:06 +01:00
AlmightyScientist 4820910648 Shader Language: Fixes EXTRA_MATRIX undefined. 
Fixes #15453.
 2018-01-10 12:37:28 +01:00
Rémi Verschelde aebdc4c212
Merge pull request #15541 from neikeq/look-all-i-want-to-tell-you-is 
Mono: Some fixes for #15463
 2018-01-10 10:39:20 +01:00
Rémi Verschelde 415d128249
Merge pull request #15530 from akien-mga/signal-args 
Fix signal arguments shadowing member variables
 2018-01-10 10:38:28 +01:00
Rémi Verschelde 082d83fe0b
Merge pull request #15538 from touilleMan/fix-pluginscript-editor-preview 
Fix pluginscript editor preview
 2018-01-10 10:37:41 +01:00
Rémi Verschelde 4a25a4e53f
Merge pull request #15516 from StateOff/fixes_crash_on_drop_scene_file 
Fixes #15470 "Crash on drag and drop scene file on empty scene"
 2018-01-10 07:57:35 +01:00
Blazej Floch 9d4afdc372 - Fixes #15470 "Crash on drag and drop scene file on empty scene" 
- New: Allows for multiple files to be dragged over
- Added error when multiple nodes are dropped in scene **without** scene root
  - Removed TTR: "This operation requires a single selected node.", "I see.."
  - Introduces TTR: "Can not instaniate multiple nodes without root."
- Fixes "Can't add_child, already got a parent" error
- Reduced multiple resource loading by casting
- Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
 2018-01-09 23:16:47 -05:00
volzhs b6cff1ba69 Fix stretch aspect keep mode 
Fix #15407
Fix #15514
 2018-01-10 10:49:26 +09:00
Rémi Verschelde 2ac27608a6
Merge pull request #15540 from robfram/fix_color_to_html 
Fix bad color to HTML conversion. Alpha channel was added before RGB.
 2018-01-09 23:39:45 +01:00
Emmanuel Leblond 58f3ad69c7
Fix warning when editor resource preview try to read pluginscript resource 2018-01-09 23:12:39 +01:00
robfram 19915d674c Fix bad color to HTML conversion. Alpha channel was added befor RGB. 2018-01-09 22:34:00 +01:00
Ignacio Etcheverry f7de51b3a6 Mono: Some fixes for #15463 2018-01-09 22:27:55 +01:00
Rémi Verschelde cc487f8ce9
Merge pull request #15532 from lethiandev/fix-bitwise-not-op 
Fix bitwise NOT operator on BitMap's set_bit
 2018-01-09 22:27:27 +01:00
Rémi Verschelde 302dfea2f0
Merge pull request #15535 from touilleMan/fix-pluginscript-complete-code 
[GDnative] Fix crash in pluginscript complete_code
 2018-01-09 22:15:56 +01:00
Konrad Nowakowski c73589305e Fix bitwise NOT operator on BitMap's set_bit 2018-01-09 21:11:16 +00:00
Emmanuel Leblond 72d50b4185
Fix crash in pluginscript complete_code 2018-01-09 21:12:24 +01:00
Rémi Verschelde c037f6339f
Merge pull request #15463 from neikeq/the-stack-frame-madness 
Mono: Implement stack info for errors and exceptions
 2018-01-09 19:44:10 +01:00
Rémi Verschelde 958a15c7a7
Merge pull request #15533 from neikeq/issue-15307 
Mono: Fix iteration order of object types when generating bindings
 2018-01-09 19:43:37 +01:00
Ignacio Etcheverry 252702a304 Mono: Fix iteration order of object types when generating bindings 2018-01-09 19:06:59 +01:00
Rémi Verschelde 7251c5b582 Improve Control and Label documentation about mouse filtering 
Fixes #9657.
 2018-01-09 17:40:19 +01:00
Ignacio Etcheverry 1c6269f2dd External editor fixes 
- Fix VS Code opening on the previous line to the desired one.
- Fix running MonoDevelop without the line and column parameters.
- Fix `ScriptEditor::_goto_script_line` not working with language overriden external editors.
 2018-01-09 17:25:23 +01:00
Ignacio Etcheverry 5be356b72f Mono: Implement stack info for errors and exceptions 2018-01-09 17:19:03 +01:00
Rémi Verschelde 52165fa12d Fix bindings of EditorSettings.set_initial_value 
Also ran doctool.
 2018-01-09 16:52:46 +01:00
Rémi Verschelde 4b6bef6524 Fix signal arguments shadowing member variables 
Fixes #10212.
 2018-01-09 16:51:19 +01:00
Rémi Verschelde 29ae3e5f33 Revert "Fix "Attach Node Script" inherits popup type" 
This reverts commit 227238b424.

This dialog is used to both open and create scripts, so it needs to have
the features of the save dialog.
 2018-01-09 16:15:22 +01:00
Rémi Verschelde e1c799f1b4
Merge pull request #15495 from poke1024/font-oversampling 
Two potential glitches in font oversampling
 2018-01-09 16:03:13 +01:00
Rémi Verschelde 3c0dd37744
Merge pull request #15518 from volzhs/shader-compile-error-android 
Fix shader compile error on Android
 2018-01-09 14:36:32 +01:00
volzhs 1c806abdaa Fix shader compile error on Android 
**ERROR**: EffectBlurShaderGLES3: Fragment Program Compilation Failed:
23:191: S0001: Type mismatch, cannot convert from 'int' to 'float'
   At: drivers/gles3/shader_gles3.cpp:168:_display_error_with_code() - EffectBlurShaderGLES3: Fragment Program Compilation Failed:
 2018-01-09 16:44:56 +09:00
Rémi Verschelde 4b414f45c4
Merge pull request #15507 from poke1024/fix15106 
Fix whole word search missing occurences
 2018-01-08 22:59:16 +01:00
Bernhard Liebl 3af5dfbbf3 Fix whole word search missing occurences 2018-01-08 22:50:33 +01:00
Rémi Verschelde 99da466979 Add author mappins for the git log 
See https://git-scm.com/docs/git-shortlog#_mapping_authors

Makes for a prettier commit overview:
$ git shortlog -s -n --no-merges
  1673  Juan Linietsky
   696  Rémi Verschelde
   239  volzhs
   225  Andreas Haas
   209  Ignacio Etcheverry
   164  Daniel J. Ramirez
   164  Pedro J. Estébanez
   153  George Marques
   150  Paul Batty
   129  Poommetee Ketson
   122  Franklin Sobrinho
   120  marynate
   115  Bojidar Marinov
   107  Leon Krause
    96  Thomas Herzog
   ...
 2018-01-08 22:29:53 +01:00
Rémi Verschelde 1748ce74cc
Merge pull request #15504 from Jerome67000/fix_inherits_open_file_type 
Fix "Attach Node Script" inherits popup type
 2018-01-08 21:41:42 +01:00
Jerome67000 227238b424 Fix "Attach Node Script" inherits popup type 2018-01-08 21:33:51 +01:00
Rémi Verschelde bc521741a9
Merge pull request #15500 from Jerome67000/removed_depthprepass_disable 
removed unused project setting rendering/quality/depth_prepass/disable
 2018-01-08 21:32:44 +01:00
Jerome67000 87bbaddac3 removed unused project setting rendering/quality/depth_prepass/disable 2018-01-08 21:02:53 +01:00
Rémi Verschelde d2f4964f58
Merge pull request #15490 from AndreaCatania/kin 
Fixed #15417 kinematics char jumping
 2018-01-08 20:13:27 +01:00
Rémi Verschelde 15cb56122e
Merge pull request #15498 from poke1024/fix15478 
Don't delete edit menu too early when closing script tabs
 2018-01-08 20:08:04 +01:00
Bernhard Liebl 7e1b39245f Don't delete edit menu too early when closing script tabs 2018-01-08 19:47:47 +01:00
Rémi Verschelde 299e490cf4
Merge pull request #15494 from brainsick/obsolete-undoredo-max-steps 
obsolete UndoRedo max_steps; no users identified
 2018-01-08 19:33:15 +01:00
Rémi Verschelde 05297d8b39
Merge pull request #15060 from poke1024/camera2d-update 
Update Camera2D scroll using NOTIFICATION_INTERNAL_PROCESS
 2018-01-08 19:31:50 +01:00
Bernhard Liebl d4adcf3fa2 Update Camera2D scroll using NOTIFICATION_INTERNAL_PROCESS 2018-01-08 18:29:22 +01:00
Bernhard Liebl a64dc5af74 Two potential glitches in font oversampling 2018-01-08 18:09:41 +01:00
Todd Ross 6e932c3108 obsolete UndoRedo max_steps; no users identified 2018-01-08 10:57:07 -06:00
Rémi Verschelde efe27c6ed2
Merge pull request #15491 from volzhs/doc-kinematicbody 
Fix KinematicBody documentation about move_and_slide
 2018-01-08 17:09:06 +01:00
volzhs e04a9cdf6e Fix KinematicBody documentation about move_and_slide 2018-01-09 01:05:28 +09:00
AndreaCatania c507a4988d Removed useless error print on bullet shapes 2018-01-08 16:49:04 +01:00