Marc Zinnschlag 0b309d9ef4 Merge branch 'master' into load ...

Conflicts:
	apps/opencs/view/doc/viewmanager.cpp

2014-05-03 14:36:06 +02:00

..

adjusterwidget.cpp

Fixed pathing issues in launcher

2013-11-03 00:02:46 -05:00

adjusterwidget.hpp

Fixed path problem with adjuster widget and local data path.

2013-10-31 18:12:13 -05:00

filedialog.cpp

Fixed broken dependency check

2013-11-03 06:21:28 -06:00

filedialog.hpp

fixed missing adjuster widget in file dialog open view

2013-10-27 20:21:19 -05:00

filewidget.cpp

Reimplemented constentselector view class

2013-10-22 21:52:35 -05:00

filewidget.hpp

Reimplemented constentselector view class

2013-10-22 21:52:35 -05:00

loader.cpp

content file loading progress bar

2014-05-03 13:01:29 +02:00

loader.hpp

content file loading progress bar

2014-05-03 13:01:29 +02:00

newgame.cpp

Reimplemented constentselector view class

2013-10-22 21:52:35 -05:00

newgame.hpp

fixed missing initialisation of adjuster widget in file dialogue

2013-09-23 11:26:29 +02:00

opendialog.cpp

fixed encoding problems

2014-03-21 11:56:48 +01:00

opendialog.hpp

Upload missing files.

2013-02-02 18:36:01 +01:00

operation.cpp

Operations widget height fix and abort button feature. Successfully

2013-02-22 21:53:32 -06:00

operation.hpp

Operations widget height fix and abort button feature. Successfully

2013-02-22 21:53:32 -06:00

operations.cpp

Merge branch 'master' into saveOnClose

2013-03-02 09:24:42 -06:00

operations.hpp

Operations widget height fix and abort button feature. Successfully

2013-02-22 21:53:32 -06:00

startup.cpp

added warning message to startup window

2013-09-14 14:00:07 +02:00

startup.hpp

added proper startup dialogue (still missing icons)

2013-09-08 09:15:26 +02:00

subview.cpp

Re-link user settings to editor main application

2014-04-22 22:19:53 -05:00

subview.hpp

Fixed failed signal/slot connection between UserSettings and

2014-04-23 17:02:37 -05:00

subviewfactory.cpp

rewrote subview factory system

2012-12-11 13:22:43 +01:00

subviewfactory.hpp

rewrote subview factory system

2012-12-11 13:22:43 +01:00

subviewfactoryimp.hpp

disallow sorting (via column headers) in info tables

2013-10-31 13:40:14 +01:00

view.cpp

Fixed broken delegate display modes (Display Format settings). Moved

2014-04-25 07:16:40 -05:00

view.hpp

Re-link user settings to editor main application

2014-04-22 22:19:53 -05:00

viewmanager.cpp

Merge branch 'master' into load

2014-05-03 14:36:06 +02:00

viewmanager.hpp

Merge branch 'master' into load

2014-05-03 14:36:06 +02:00