Enrico Turri 5c90746914 Merge with master + resolved conflicts

2018-07-17 10:44:23 +02:00

..

2DBed.cpp

…

2DBed.hpp

…

3DScene.cpp

Merge with master + resolved conflicts

2018-07-17 10:44:23 +02:00

3DScene.hpp

Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

2018-06-27 13:52:57 +02:00

AboutDialog.cpp

…

AboutDialog.hpp

…

AppConfig.cpp

…

AppConfig.hpp

…

BedShapeDialog.cpp

…

BedShapeDialog.hpp

…

BitmapCache.cpp

…

BitmapCache.hpp

…

BonjourDialog.cpp

…

BonjourDialog.hpp

…

ButtonsDescription.cpp

…

ButtonsDescription.hpp

…

ConfigExceptions.hpp

…

ConfigSnapshotDialog.cpp

…

ConfigSnapshotDialog.hpp

…

ConfigWizard_private.hpp

ConfigWizard: Fix default printer selection

2018-06-27 13:57:21 +02:00

ConfigWizard.cpp

Merge branch 'for_merging'

2018-06-28 17:43:15 +02:00

ConfigWizard.hpp

…

Field.cpp

Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate

2018-06-25 15:27:06 +02:00

Field.hpp

Updated PrintConfig default values for machine limits

2018-06-22 16:13:34 +02:00

FirmwareDialog.cpp

Firmware updater: Add support for l10n firmware images

2018-06-19 18:46:37 +02:00

FirmwareDialog.hpp

…

GLCanvas3D.cpp

Rotate gizmo radius changed only when moving one of multiple instances

2018-07-12 15:19:43 +02:00

GLCanvas3D.hpp

Keep fixed radius of rotate gizmo

2018-07-12 11:26:13 +02:00

GLCanvas3DManager.cpp

Rotate gizmo radius changed only when moving one of multiple instances

2018-07-12 15:19:43 +02:00

GLCanvas3DManager.hpp

Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

2018-06-27 13:52:57 +02:00

GLGizmo.cpp

Keep fixed radius of rotate gizmo

2018-07-12 11:26:13 +02:00

GLGizmo.hpp

Keep fixed radius of rotate gizmo

2018-07-12 11:26:13 +02:00

GLShader.cpp

Faster gizmos update

2018-06-21 08:37:04 +02:00

GLShader.hpp

Faster gizmos update

2018-06-21 08:37:04 +02:00

GLTexture.cpp

Code cleanup

2018-06-22 16:11:00 +02:00

GLTexture.hpp

Use mipmaps for bed textures

2018-06-14 10:37:28 +02:00

GUI.cpp

Merge with master + resolved conflicts

2018-07-17 10:44:23 +02:00

GUI.hpp

Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics

2018-06-22 17:44:12 +02:00

MsgDialog.cpp

…

MsgDialog.hpp

Octoprint: Add a dialog for setting the filename/path

2018-06-21 10:44:29 +02:00

OptionsGroup.cpp

Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate

2018-06-26 11:16:00 +02:00

OptionsGroup.hpp

"Machine limits" page is completed

2018-06-21 16:15:56 +02:00

Preferences.cpp

…

Preferences.hpp

…

Preset.cpp

Merge with master + resolved conflicts

2018-07-17 10:44:23 +02:00

Preset.hpp

Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf'

2018-07-17 09:47:49 +02:00

PresetBundle.cpp

Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf'

2018-07-17 09:47:49 +02:00

PresetBundle.hpp

…

PresetHints.cpp

…

PresetHints.hpp

…

RammingChart.cpp

Fixed typos from the previous commit.

2018-06-07 22:54:26 +02:00

RammingChart.hpp

…

Tab.cpp

Merge with master + resolved conflicts

2018-07-17 10:44:23 +02:00

Tab.hpp

Merge with master

2018-07-17 08:54:17 +02:00

TabIface.cpp

…

TabIface.hpp

…

UpdateDialogs.cpp

…

UpdateDialogs.hpp

…

Widget.hpp

…

WipeTowerDialog.cpp

Fixed mangling of UTF characters when converted implicitely to

2018-06-07 22:10:23 +02:00

WipeTowerDialog.hpp

…

wxExtensions.cpp

…

wxExtensions.hpp

…

wxinit.h

…

wxPerlIface.cpp

…