graffy76 9ce4a04a2d merge from saving ...

Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp

2013-10-25 14:44:22 -05:00

..

adjusterwidget.cpp

Merge branch 'master' into esxSelector

2013-10-25 08:11:24 -05:00

adjusterwidget.hpp

Reimplemented constentselector view class

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

filedialog.cpp

merge from saving

2013-10-25 14:44:22 -05:00

filedialog.hpp

merge from saving

2013-10-25 14:44:22 -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

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

Issue #567: workaround for crash with non-English ESX files

2013-02-17 19:26:01 +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

added optional per-subview status bar

2013-07-25 14:29:56 +02:00

subview.hpp

added optional per-subview status bar

2013-07-25 14:29:56 +02: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

minor cleanup; less pointer usage

2013-07-26 12:42:15 +02:00

view.cpp

added topic and journal tables

2013-10-20 17:15:32 +02:00

view.hpp

added topic and journal tables

2013-10-20 17:15:32 +02:00

viewmanager.cpp

added dialogue type column to topics table

2013-10-20 17:26:09 +02:00

viewmanager.hpp

splitting new game and new addon functions (new game currently not working)

2013-09-08 12:06:28 +02:00