9 Commits

Author	SHA1	Message	Date
George Marques	b2f8a365f2	Fix cherry-picking issues caused by code updates	2017-06-07 12:59:42 -03:00
Rémi Verschelde	8df5b7151f	Release 2.1.3-stable	2017-04-10 23:44:55 +02:00
Rémi Verschelde	20d1a28341	squish: Update to upstream version 1.15 ... Also fix clang-format pre-commit hook to ignore thirdparty files. (cherry picked from commit fa2d5b91dc)	2017-04-09 15:51:41 +02:00
Rémi Verschelde	a27876d5ac	Style: Apply clang-format (3.9.1) to Obj-C++ files	2017-04-09 14:03:52 +02:00
Rémi Verschelde	e9b045d9e5	Add "Godot Engine contributors" copyright line	2017-04-08 00:45:24 +02:00
Rémi Verschelde	62d8f96720	Remove redundant subfolder in iOS template ... (cherry picked from commit 1a0d1bb18d)	2017-03-26 22:04:29 +02:00
Rémi Verschelde	51c5a12f43	Travis: Run clang-format static check ... Commits or PRs that do not respect the clang-format style that we enforce will fail the test. Adding ubuntu-toolchain-r-test as its libstdc++ is necessary to install libllvm-3.9. (cherry picked from commit 6aee289b3e)	2017-03-19 16:14:53 +01:00
Rémi Verschelde	9d2c0f6c6e	clang-format: Add pre-commit hook ... Derived from https://github.com/githubbrowser/Pre-commit-hooks and https://gitlab.cern.ch/GeantV/geant/blob/master/hooks/pre-commit-clang-format (cherry picked from commit 0e4ee5935a)	2017-03-18 23:29:45 +01:00
Rémi Verschelde	6e5246e312	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. (cherry picked from commit b87a232668)	2017-03-18 23:29:43 +01:00