Commit d7384801 authored by Matteo Triggiani's avatar Matteo Triggiani 🎱

Merge branch 'dev/godot-3.1.1' into 'dev/common'

update to godot 3.1.1

See merge request TheExperienceArchitects/Marte/marte-engine!6
parents 3c5a2d77 8449696f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -319,3 +319,10 @@ platform/windows/godot_res.res
# Scons progress indicator
.scons_node_count
# ccls cache (https://github.com/MaskRay/ccls)
.ccls-cache/
# compile commands (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
compile_commands.json
......@@ -27,7 +27,7 @@ matrix:
packages:
- clang-format-6.0
- env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no werror=yes"
- env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes"
os: linux
compiler: gcc-8
addons:
......@@ -49,7 +49,7 @@ matrix:
build_command: "scons p=x11 -j2 $OPTIONS"
branch_pattern: coverity_scan
- env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="werror=yes"
- env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
os: linux
compiler: clang
addons:
......@@ -57,7 +57,7 @@ matrix:
packages:
- *linux_deps
- env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="werror=yes"
- env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
os: linux
compiler: clang
......@@ -69,7 +69,7 @@ matrix:
os: osx
compiler: clang
- env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="werror=yes"
- env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="warnings=extra werror=yes"
os: linux
compiler: gcc-8
addons:
......
......@@ -45,6 +45,7 @@ name is available.
Błażej Szczygieł (zaps166)
Bojidar Marinov (bojidar-bg)
bruvzg
Camille Mohr-Daurat (pouleyKetchoupp)
Carl Olsson (not-surt)
Carter Anderson (cart)
Chris Bradfield (cbscribe)
......@@ -115,6 +116,7 @@ name is available.
Pieter-Jan Briers (PJB3005)
Poommetee Ketson (Noshyaar)
Przemysław Gołąb (n-pigeon)
Rafał Mikrut (qarmin)
Ralf Hölzemer (rollenrolm)
Ramesh Ravone (RameshRavone)
Ray Koopa (RayKoopa)
......
......@@ -369,17 +369,19 @@ Comment: libSquish
Copyright: 2006, Simon Brown
License: Expat
Files: ./thirdparty/thekla_atlas/
Comment: Thekla Atlas
Copyright: 2013, Thekla, Inc
License: Expat
Files: ./thirdparty/tinyexr/
Comment: TinyEXR
Copyright: 2014-2018, Syoyo Fujita
2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC
License: BSD-3-clause
Files: ./thirdparty/xatlas/
Comment: xatlas
Copyright: 2018, Jonathan Young
2013, Thekla, Inc
2006, NVIDIA Corporation, Ignacio Castano
License: Expat
Files: ./thirdparty/zlib/
Comment: zlib
Copyright: 1995-2017, Jean-loup Gailly and Mark Adler
......
......@@ -18,22 +18,21 @@ generous deed immortalized in the next stable release of Godot Engine.
Gamblify <https://www.gamblify.com>
Image Campus <https://www.imagecampus.edu.ar>
Yakaz.com <https://yakaz.com>
## Mini sponsors
Alan Beauchamp
Anandarup Mallik
Andrew Dunai
Arda Erol
Brandon Lamb
Christian Uldall Pedersen
Christoph Woinke
Connor Hill
Edward Flick
GameDev.net
GameDev.tv
Hein-Pieter van Braam
Jamal Alyafei
Jacob McKenney
Javary Games
Jay Sistar
Justin Arnold
......@@ -43,22 +42,18 @@ generous deed immortalized in the next stable release of Godot Engine.
Matthieu Huvé
Maxim Karsten
Mike King
Nathan Warden
Neal Gompa (Conan Kudo)
Patrick Aarstad
"Rainway "
Ruslan Mustakov
Slobodan Milnovic
StarFlare Software
Stephan Lanfermann
Stoney Meyerhoeffer
thechris
TigerJ
VilliHaukka
Zashi
## Gold donors
Asdf
Brandon Waite
cheese65536
David Gehrig
......@@ -69,8 +64,10 @@ generous deed immortalized in the next stable release of Godot Engine.
Nathanael Beisiegel
Officine Pixel S.n.c.
Retro Village
Sofox
Zaven Muradyan
Alexander Trey Saunders
Allen Schade
Andreas Schüle
Asher Glick
......@@ -80,7 +77,6 @@ generous deed immortalized in the next stable release of Godot Engine.
David Giardi
Edward E
Florian Breisch
Gary Oberbrunner
Gero
Jay Horton
Jon Smith
......@@ -88,6 +84,8 @@ generous deed immortalized in the next stable release of Godot Engine.
Jorge Bernal
Joshua Lesperance
Justo Delgado Baudí
Karl Werf
Kommentgames
Krzysztof Dluzniewski
Moonwards
Mored1984
......@@ -95,6 +93,7 @@ generous deed immortalized in the next stable release of Godot Engine.
paul gruenbacher
Paul LaMotte
Rob Messick
Ross Esmond
Scott Wadden
Sergey
Svenne Krap
......@@ -103,19 +102,20 @@ generous deed immortalized in the next stable release of Godot Engine.
Wyatt Goodin
Xananax
BanjoNode2D
Beliar
Abel Oroz Vicente
Chris Serino
Christian Padilla
Conrad Curry
Craig Smith
Daniel Egger
Dean Harmon
Ian Richard Kunert
Ivan Trombley
Joan Fons
Krzysztof Jankowski
Lord Bloodhound
Lucas Ferreira Franca
Michele Zilli
Nathan Lundquist
Pascal Grüter
Petr Malac
......@@ -125,27 +125,34 @@ generous deed immortalized in the next stable release of Godot Engine.
Ronnie Ashlock
ScottMakesGames
Thomas Bjarnelöf
Vincent Henderson
Wojciech Chojnacki
Xavier PATRICELLI
Alessandra Pereyra
Alexey Dyadchenko
Andrew Bowen
Asdf
Benjamin W Flint
Chau Siu Hung
Chris Goddard
Chris Petrich
Christian Leth Jeppesen
Christoph Schröder
Cody Parker
ComicSads
D
Daniel
Daniel Eichler
Deadly Lampshade
Eagle 3d
E.G.
Eric
Eric Monson
Ethan Bennis
Eugenio Hugo Salgüero Jáñez
flesk
Francisco Javier Moreno Carracedo
gavlig
GGGames.org
Giles Montgomery
......@@ -153,21 +160,24 @@ generous deed immortalized in the next stable release of Godot Engine.
Guilherme Felipe de C. G. da Silva
Heath Hayes
Hysteria
Jalal Chaabane
Jeppe Zapp
Jose Malheiro
Joshua Flores
Juan T Chen
Juraj Móza
Kasper Jeppesen
Klavdij Voncina
Leandro Voltolino
Lukáš Rendvanský
Maarten Elings
Malcolm Peralty
Marius Kamm
Markus Fehr
Markus Wiesner
Martin Eigel
Marvin
Matt Eunson
Matthew Hillier
Max R.R. Collada
MegaC
Nick Nikitin
Oliver Dick
oziatek
......@@ -175,39 +185,45 @@ generous deed immortalized in the next stable release of Godot Engine.
Paul Von Zimmerman
Pete Goodwin
Ranoller
ray-tracer
Ruben Soares Luis
Samuel Judd
Sofox
Scott Pilet
spilldata
Stoned Xander
Thomas Krampl
Tobias Bocanegra
Urho
WytRabbit
Xavier Fumado Beltran
yuanzhe zhou
## Silver donors
1D_Inc
Abraham Haskins
Adam Brunnmeier
Adam Carr
Adam Nakonieczny
Adam Smeltzer
Adisibio
Aidan O'Flannagain
Alder Stefano
Alessandro Senese
Alexander Gillberg
Alexander Koppe
Alex Davies-Moore
Alice Robinson
Andreas Evers
Andreas Krampitz
Anthony Bongiovanni
Arbor Interactive
Arda Erol
Arthur S. Muszynski
Aubrey Falconer
Avencherus