aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #17075 from paulloz/fix-build-mono-debug-notoolsRémi Verschelde2018-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [mono] fix build error when compiling with mono, tools=no, target=debug
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix build error when compiling with mono, tools=no, target=releasePaul Joannon2018-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change TTR to RTR in `print_unhandled_exception`
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #17074 from AndreaCatania/fix1Rémi Verschelde2018-02-274-10/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fixes on physics
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed physics server typoAndrea Catania2018-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented Bullet method omit forcesAndrea Catania2018-02-273-9/+26
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #17072 from Noshyaar/leakRémi Verschelde2018-02-272-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TileSetEditorPlgn: Fix a leak
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TileSetEditorPlgn: Fix a leakPoommetee Ketson2018-02-272-1/+7
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15641 from ↵Rémi Verschelde2018-02-273-12/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neikeq/mono-is-picky-regarding-corlib-so-we-must-make-sure-to-ship-the-right-version-otherwise-something-bad-may-happen Mono: Buildsystem improvements
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono: Buildsystem improvementsIgnacio Etcheverry2018-01-123-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bundle with mscorlib.dll to avoid compatibilities issues - Add build option 'mono_assemblies_output_dir' to specify the output directory where the assemblies will be copied to. '#bin' by default.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #17027 from IndicaInkwell/doc-contribRémi Verschelde2018-02-271-0/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] added docs on Control's drag and drop api
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added docs on Control's drag and drop apiindicainkwell2018-02-261-0/+55
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #17046 from NathanWarden/fixed_mono_marshallingRémi Verschelde2018-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Mono] The marshalling *in* of Transform was also incorrect.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The marshalling in was also incorrect.Nathan Warden2018-02-261-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #17048 from hpvb/fix-17028Rémi Verschelde2018-02-261-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow running with a custom resource without a main scene
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow running with a custom resource without a main sceneHein-Pieter van Braam2018-02-261-15/+16
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 3f8a4cc7193e964f716fde2cd28a946669e2d8d6 trying to run an individual scene on a project without a main scene fails. We move the check until after we've determined whether or not we're trying to run an individual scene. We also stop trying to show the project manager if any game pack is found at all, unless the user explicitly asks for the project manager to be shown.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #17020 from neikeq/cs-api-asm-checksRémi Verschelde2018-02-2515-87/+428
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono: Better versioning and gracefully unloading of Godot API assemblies
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono: Better versioning and gracefully unloading of Godot API assembliesIgnacio Etcheverry2018-02-2515-87/+428
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a split editor to polygon 2D UV editor, moving an inch closer to adding ↵Juan Linietsky2018-02-256-18/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support for in the future
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix version.txt validation logic for export templates .tpzRémi Verschelde2018-02-251-15/+5
| |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It assumed that the version would always be `x.y-status`, with no dot possible in `status`, so: - It would not work for 3.0.1-stable (nor 3.0.1.stable with new version logic) - It would not support Mono templates when we provide them The validation it did was not really useful anyway, so we just use the raw string.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16804 from Valentactive/fix_mono_template_compilingRémi Verschelde2018-02-252-8/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix template builds with mono
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix release builds with monoMichele Valente2018-02-222-8/+3
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "_signals" and "signals_invalidated" were moved out of the "TOOLS_ENABLED" directive. Updated also the two "update_signals" and "_update_signals" methods so it makes sense.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #17003 from Noshyaar/docsRémi Verschelde2018-02-2518-25/+161
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] Sync classref with current source
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] Sync classref with current sourcePoommetee Ketson2018-02-2518-25/+161
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16996 from Zylann/line2d_tile_fixRémi Verschelde2018-02-253-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Line2D tile mode for non-square textures
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Line2D tile mode for non-square texturesMarc Gilleron2018-02-253-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16993 from bruvzg/fix-missing-returnsRémi Verschelde2018-02-253-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing return statements (iOS and server).
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing return statements (iOS and server).bruvzg2018-02-253-14/+20
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16981 from paulloz/mono-nested-exceptionsIgnacio Etcheverry2018-02-242-23/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [mono] show whole trace of nested exceptions
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only show information we have in stacktracePaul Joannon2018-02-241-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not show line number and/or file if not defined
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [mono] get stacktraces for all inner exceptionsPaul Joannon2018-02-241-20/+39
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16986 from neikeq/issue-16983Ignacio Etcheverry2018-02-241-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono: Fix bindings for parameters in vararg methods
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono: Fix bindings for parameters in vararg methodsIgnacio Etcheverry2018-02-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16952 from Noshyaar/datadirRémi Verschelde2018-02-241-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] clarify that OS.get_user_data_dir needs project name
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] clarify that OS.get_user_data_dir needs project namePoommetee Ketson2018-02-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --quit option to help output and update manpageRémi Verschelde2018-02-242-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Windows file case changingHein-Pieter van Braam2018-02-241-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows APIs don't really provide a way to change a filename case. This implements a little juggling to make this work. We first create a guaranteed unique temporary file, we then replace the original file with the temporary file and we finally rename it to the desired filename case. (cherry picked from commit d69d58deeaa523c6c38958b3956423ae8f814909)
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16973 from JFonS/fix_initial_gizmo_visibilityRémi Verschelde2018-02-241-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility of gizmos on scene load
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility of gizmos on scene loadJFonS2018-02-241-2/+6
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16970 from Noshyaar/inpRémi Verschelde2018-02-242-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Magnify|Pan)Gesture: implement as_text
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Magnify|Pan)Gesture: implement as_textPoommetee Ketson2018-02-242-0/+12
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed whitespaces around arguments of functions.anakimluke2018-02-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions automatically generated by conneting signals via GUI put whitespaces around the arguments of the generated function. This is inconsistent with the style guide. This commit fixes that. (cherry picked from commit 370f84f41cf3ce493c2de687455880d9e1e04be6)
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16932 from groud/fix_collision_shape_selectionRémi Verschelde2018-02-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes collisions shape selection
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes collisions shape selectionGilles Roudiere2018-02-221-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16930 from PJB3005/18-02-22-styleboxtexture-textureRémi Verschelde2018-02-243-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StyleBoxTexture: Texture instead of RES for texture and normal_map.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StyleBoxTexture: Texture instead of RES for texture and normal_map.Pieter-Jan Briers2018-02-223-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16925 from Noshyaar/enviRémi Verschelde2018-02-241-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error spam when using PanoramaSky without texture
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error spam when using PanoramaSky without texturePoommetee Ketson2018-02-221-3/+3
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16901 from jandrewlong/ios-restore-purchasesRémi Verschelde2018-02-242-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add restore purchases for ios
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add restore purchases for iOSJ Andrew Long2018-02-222-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #16957 from akien-mga/version-macrosRémi Verschelde2018-02-2413-23/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor version macros and fix related bugs