Commit Graph

20508 Commits

Author SHA1 Message Date
Hein-Pieter van Braam
ad744cefb0
Merge pull request #28361 from homer666/animationplayer-fps-mode-fixes
AnimationPlayer FPS mode fixes
2019-04-25 23:09:47 +03:00
Michael Alexsander Silva Dias
bf1fe11143
Merge pull request #28415 from LinuxUserGD/master
Add new QtCreator .cxxflags and .cflags files to .gitignore
2019-04-25 14:51:52 -03:00
Linux User
3189560d52 Update .gitignore
Update .gitignore
2019-04-25 19:35:41 +02:00
Rémi Verschelde
cce2e4b07c
Merge pull request #22301 from YeldhamDev/button_popup_highlight
Enable toggle behaviour for buttons that trigger popups
2019-04-25 17:47:23 +02:00
Rémi Verschelde
9fc84061dd i18n: Sync translation template with current source
(cherry picked from commit 23cf9f3b6f)
2019-04-25 14:31:13 +02:00
Rémi Verschelde
d6994c9b70 i18n: Sync translations with Weblate
(cherry picked from commit 348270df38)
2019-04-25 14:31:06 +02:00
Rémi Verschelde
f67c78d9cd
Merge pull request #28413 from akien-mga/xatlas-cleanup-thekla
SCons: Clean xatlas SCsub from thekla/poshlib defines
2019-04-25 13:53:29 +02:00
Rémi Verschelde
1cd8dda461
Merge pull request #28267 from Xrayez/fix-bmp-indexed-8-4-1
Load and import 4/1-bit BMP images
2019-04-25 13:43:14 +02:00
Max Hilbrunner
80ad49748e
Merge pull request #28265 from Xrayez/fix-tga-indexed-palette
Fix TGA indexed images loaded with flipped color table
2019-04-25 13:39:07 +02:00
Rémi Verschelde
8c948800cd
Merge pull request #28357 from AnthonyYoManz/issue-28263-save-layout-on-close-scene-with-right-click
Save Layout When Scene Is Closed Via Context Menu
2019-04-25 13:34:54 +02:00
Rémi Verschelde
42194e2f09
Merge pull request #28354 from gdupr/gui_improvements_in_asset_editor
GUI improvements in the asset library editor.
2019-04-25 13:34:12 +02:00
Rémi Verschelde
5fe971145c
Merge pull request #28347 from homer666/tilemap-hide-menu
Hide "TileMap" menu properly in CanvasItem view
2019-04-25 13:32:04 +02:00
Rémi Verschelde
8b3eb59d66
Merge pull request #28340 from guilhermefelipecgs/fix_connection_dialog
Small fixes to connection dialog
2019-04-25 13:31:33 +02:00
Rémi Verschelde
bfd2ad0059
Merge pull request #28338 from qarmin/disable_project_export_button
Disable Project Export button after deleting preset
2019-04-25 13:30:15 +02:00
Rémi Verschelde
cfc6ae8920
Merge pull request #28336 from guilhermefelipecgs/fix_play_pos
[StateMachine] Fix play position
2019-04-25 13:28:58 +02:00
Max Hilbrunner
4ad22f8148
Merge pull request #28359 from Calinou/doc-improve-projectsettings
Improve the ProjectSettings documentation
2019-04-25 13:19:32 +02:00
Rémi Verschelde
af5b8ec2a8
Merge pull request #28376 from MuffinManKen/translation_server_get_all_loaded_locales
Add method to get locales that have loaded translations
2019-04-25 12:32:15 +02:00
Rémi Verschelde
eb155bc91a SCons: Clean xatlas SCsub from thekla/poshlib defines
Those are not used in xatlas.
2019-04-25 12:27:10 +02:00
Rémi Verschelde
24005bc03d
Merge pull request #28396 from akien-mga/scons-capture-the-flags
SCons: Review uses of CCFLAGS, CXXFLAGS and CPPFLAGS
2019-04-25 12:22:22 +02:00
Rémi Verschelde
7dc7cbea0a
Merge pull request #28410 from guilhermefelipecgs/fix_typo
[Tilemap] Fix typo
2019-04-25 12:17:53 +02:00
Rémi Verschelde
c26f0c9bbd
Merge pull request #28377 from YeldhamDev/connection_info_script_changes
Make small changes to the new connection info on script feature
2019-04-25 10:41:27 +02:00
Rémi Verschelde
778322161c
Merge pull request #28380 from kiidmale/fix-cpuparticles
Make multimesh invisible initially in CPUParticles
2019-04-25 09:00:46 +02:00
Rémi Verschelde
9334aea203
Merge pull request #28236 from Calinou/android-real-one-click-deploy
Require only one click to deploy to Android if one device is connected
2019-04-25 08:53:49 +02:00
Yuri Roubinsky
9f3899b20a
Merge pull request #28411 from Chaosus/fix_vs_crash
Fix crash regression in visual shader
2019-04-25 07:48:59 +03:00
Chaosus
446f8a2cc2 Fix crash regression in visual shader 2019-04-25 07:46:18 +03:00
Ken Paulson
6b117c44fb Added TranslationServer::get_loaded_locales to return an array of all locales with a loaded Translation 2019-04-24 21:39:29 -04:00
Guilherme Felipe
6fb19bebbb [Tilemap] Fix typo 2019-04-24 21:30:50 -03:00
Ignacio Roldán Etcheverry
e9be53acd7
Merge pull request #28400 from neikeq/issue-28388
Fix invalid mono log file name on Windows
2019-04-25 01:19:18 +02:00
Michael Alexsander Silva Dias
11bac340d0
Merge pull request #28363 from YeldhamDev/themeeditor_namepopup_size_fix
Fix "Name" popup's size in theme editor
2019-04-24 17:22:18 -03:00
Juan Linietsky
cf5881f574 Rename wrong field. 2019-04-24 17:01:20 -03:00
Juan Linietsky
a424d39f76 Remove forgotten strings in configuration files 2019-04-24 16:31:23 -03:00
Juan Linietsky
faaecd6987 Fixes to make exporting more responsive.
-Process and drop input in step functions.
-Hide editor file dialog right after pressing ok
-Use actual editor file dialogs for project export.
2019-04-24 15:52:15 -03:00
Ignacio Etcheverry
d93c354807 Fix invalid mono log file name on Windows 2019-04-24 18:52:03 +02:00
Rémi Verschelde
c2a669a9f0 SCons: Review uses of CCFLAGS, CXXFLAGS and CPPFLAGS
Many contributors (me included) did not fully understand what CCFLAGS,
CXXFLAGS and CPPFLAGS refer to exactly, and were thus not using them
in the way they are intended to be.

As per the SCons manual: https://www.scons.org/doc/HTML/scons-user/apa.html

- CCFLAGS: General options that are passed to the C and C++ compilers.
- CFLAGS: General options that are passed to the C compiler (C only;
  not C++).
- CXXFLAGS: General options that are passed to the C++ compiler. By
  default, this includes the value of $CCFLAGS, so that setting
  $CCFLAGS affects both C and C++ compilation.
- CPPFLAGS: User-specified C preprocessor options. These will be
  included in any command that uses the C preprocessor, including not
  just compilation of C and C++ source files [...], but also [...]
  Fortran [...] and [...] assembly language source file[s].

TL;DR: Compiler options go to CCFLAGS, unless they must be restricted
to either C (CFLAGS) or C++ (CXXFLAGS). Preprocessor defines go to
CPPFLAGS.
2019-04-24 16:57:58 +02:00
Hugo Locurcio
436d000066
Improve the ProjectSettings documentation 2019-04-24 13:37:14 +02:00
Rémi Verschelde
e1d16e722e
Merge pull request #28374 from akien-mga/thirdparty-disable-cflags
Also disable C and C++ specific warnings in thirdparty code
2019-04-24 12:36:02 +02:00
Yuri Roubinsky
90739c36fa
Merge pull request #28381 from Chaosus/fix_vs_glitch
Fix connection lines glitch in visual shaders
2019-04-24 13:01:59 +03:00
Chaosus
3a3df84d3b Fix connection lines glitch in visual shaders 2019-04-24 12:47:54 +03:00
Daeil Kim
692205da33 Make multimesh invisible initially in CPUParticles
Fixes #28252
2019-04-24 16:52:49 +09:00
Yuri Roubinsky
93e7eb0ddb
Merge pull request #28375 from Chaosus/fix_vs_loopback
Disallow loopback connection in visual shaders
2019-04-24 09:41:06 +03:00
Chaosus
21ca9f6c7c Disallow loopback connection in visual scripts and visual shaders 2019-04-24 09:14:45 +03:00
Michael Alexsander Silva Dias
4bca3236d1 Make small changes to the new connection info on script feature 2019-04-24 03:13:25 -03:00
Rémi Verschelde
ea56d18256 doc: Sync classref with current source 2019-04-24 07:50:14 +02:00
Rémi Verschelde
8d867cf7c5 Also disable C and C++ specific warnings in thirdparty code
Move the `Append` up to make sure that the keys exist and avoid the
need to check `if CPPFLAGS in self`, etc.
2019-04-24 07:41:00 +02:00
Yuri Roubinsky
6cf7cfa081
Merge pull request #28372 from Chaosus/fix_vs_transform_preview2
Removes preview from existing transform nodes in visual shader
2019-04-24 08:13:59 +03:00
Chaosus
9ac770be45 Removes preview from existing transform nodes in visual shader 2019-04-24 08:08:29 +03:00
homer666
e3b7f9e1ca AnimationPlayer FPS mode fixes 2019-04-24 10:52:10 +10:00
Michael Alexsander Silva Dias
dac9a5ba96 Fix "Name" popup's size in theme editor 2019-04-23 20:21:31 -03:00
DixiE
f06b62028e Save Layout When Scene Is Closed Via Context Menu 2019-04-23 22:37:02 +01:00
Rémi Verschelde
80f91c9d36
Merge pull request #28351 from Paulb23/fix_state_crash
Fix crash when restoring script editor state
2019-04-23 23:23:32 +02:00