Commit graph

807 commits

Author SHA1 Message Date
Lukasz Gromanowski
90985e849e Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/misc into Misc namespace.

Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:14:03 +02:00
Lukasz Gromanowski
8a84201ba2 Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/bsa into Bsa namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 16:46:34 +02:00
Sebastian Wick
e77240dceb basics for InteractiveMessageBox 2011-06-18 15:50:41 +02:00
Marc Zinnschlag
beeaa2cf7f Merge remote branch 'swick/MessageBox' into MessageBox 2011-06-17 09:22:15 +02:00
Sebastian Wick
d74f834735 make to boxes apear on the correct place even if the oldest is erased 2011-06-16 18:12:50 +02:00
Sebastian Wick
315f4078c6 make them behave like the MessageBox in the original game 2011-06-16 17:11:50 +02:00
Sebastian Wick
5198de53b8 add the new header to the cmake script 2011-06-16 15:16:35 +02:00
Marc Zinnschlag
e3d05e90d4 Merge remote branch 'swick/MessageBox' into MessageBox 2011-06-16 14:11:53 +02:00
Sebastian Wick
b72e9d3b2b non-interactive MessageBox is finished. Didn't find any bugs. 2011-06-16 13:02:49 +02:00
Sebastian Wick
4d1db13c8f MessageBoxmangerTimer is now working properly 2011-06-16 12:12:50 +02:00
Sebastian Wick
a4217f8fb8 Everything should work fine but deleting the existing MessageBox'es. 2011-06-15 22:53:05 +02:00
Marc Zinnschlag
bc92b7b1fa Merge branch 'directories' into next
Conflicts:
	components/files/multidircollection.hpp
	components/nifogre/ogre_nif_loader.hpp
2011-06-15 22:40:24 +02:00
Marc Zinnschlag
0f2df4e2b8 more cleanup 2011-06-15 22:33:31 +02:00
Sebastian Wick
94e010b790 delete all non-interactive MessageBox'es when creating an interactive MessageBox 2011-06-15 19:53:32 +02:00
Sebastian Wick
6dc35247da Word wrap for MessageBox 2011-06-15 19:42:20 +02:00
Jason Hooks
56affd018a Some cleanup 2011-06-15 13:09:47 -04:00
Sebastian Wick
9c56031ee2 rudimental implementation of non-interactive MessageBox 2011-06-15 13:58:57 +02:00
Sebastian Wick
fc25ccef4e MW_Dialog set ro right propertys 2011-06-14 22:11:36 +02:00
Sebastian Wick
56dc9ffcf3 now, realy deleted needless code. 2011-06-14 18:29:55 +02:00
Sebastian Wick
84c19a90ad deleted needless code 2011-06-14 18:29:20 +02:00
Sebastian Wick
5bf5bde946 created new files, conncted MessageBoxManger with WindowManager 2011-06-14 16:41:30 +02:00
Jason Hooks
2fe66319fe streammusic strict 2011-06-12 16:36:18 -04:00
Jason Hooks
9eefee7168 Say strict 2011-06-11 20:01:21 -04:00
Pieter van der Kloet
371ec41530 Plugins moved using the actions now keep their selection too 2011-06-10 00:30:08 +02:00
Jason Hooks
93f41e25a4 fs-strict 2011-06-08 17:29:28 -04:00
Jason Hooks
65cc0e8317 trying strict 2011-06-08 17:15:13 -04:00
Pieter van der Kloet
6feaac3d6f Removed isChecked function, can be done with less code 2011-06-08 17:40:39 +02:00
Pieter van der Kloet
410229e521 Dropped plugins now retain their selection so you can see where they went 2011-06-08 16:55:53 +02:00
Jason Hooks
3a9007849d Windows fix 2011-06-08 00:35:30 -04:00
Jason Hooks
4d31ca2c86 Leading slashes now work, efficiency changes 2011-06-07 17:17:25 -04:00
Pieter van der Kloet
8b50cd48f5 Added refresh functionality for the plugins table 2011-06-07 21:14:27 +02:00
Pieter van der Kloet
44e3cf17d7 Fallback icons for the actions in the right-click context menu 2011-06-07 21:00:23 +02:00
Pieter van der Kloet
41c380e107 Merge remote-tracking branch 'upstream/master' into newlauncher 2011-06-07 20:22:32 +02:00
Pieter van der Kloet
8495d91d7c Added right-click context menu for modifying the plugins, e.g. move up, check/uncheck 2011-06-07 20:21:01 +02:00
Jason Hooks
45453fd7a9 Case insensitive external loader working 2011-06-06 20:11:23 -04:00
Pieter van der Kloet
9d2bf8af62 Added support for the load order of plugins specified in the profiles 2011-06-07 01:42:53 +02:00
Pieter van der Kloet
f219b0d47a Added error messages and fixed config file loading 2011-06-06 21:33:33 +02:00
Pieter van der Kloet
8c04d00a50 Modified row height of the plugins table to use the height of checkbox instead of dynamic resizing 2011-06-06 16:07:20 +02:00
Pieter van der Kloet
d7a3b84b3d Merge remote-tracking branch 'upstream/master' into newlauncher 2011-06-06 15:45:17 +02:00
Jason Hooks
f2a0fa8af2 Adding files to directory map 2011-06-05 23:46:18 -04:00
Jason Hooks
2aaa0f4578 Backslash working in linux 2011-06-04 01:29:57 -04:00
Jason
b92955763a Introducing Dir Archive 2011-06-03 20:28:47 -04:00
Marc Zinnschlag
7d2956329a some cleanup 2011-05-30 14:27:04 +02:00
Marc Zinnschlag
bed45a936e fixed cell change crash 2011-05-30 14:21:55 +02:00
Jason Hooks
51b74c2f05 starting 2011-05-23 19:01:36 -04:00
Jason Hooks
b945ce61a5 Merge remote branch 'upstream/master' 2011-05-23 15:01:47 -04:00
gugus
c7fb27e801 Clean up wasn't done properly when deleting a Cell. 2011-05-23 20:22:12 +02:00
gugus
faaa08d6d0 removed this stupide methode to generate unique ID. 2011-05-23 19:47:27 +02:00
gugus
4546ca3863 static Objects goes inside the static geometry 2011-05-23 19:39:10 +02:00
gugus
cd79df1d8b Merge branch 'static' of git@github.com:zinnschlag/openmw.git into optimisation
Conflicts:
	apps/openmw/mwrender/exterior.cpp
2011-05-23 19:27:40 +02:00
Marc Zinnschlag
7192bc4f89 added static flag 2011-05-23 19:12:28 +02:00
gugus
41d283a3aa very experimental: static geometry. 2011-05-23 15:00:01 +02:00
Marc Zinnschlag
64d6ee26bd changed OGRE framelistener function from frameStarted to frameRenderingQueued 2011-05-18 16:37:09 +02:00
Marc Zinnschlag
80691250ec don't create a new virtual machine for each script and frame 2011-05-18 16:01:19 +02:00
Pieter van der Kloet
eba813b4ac Fixed clear button in the filter line-edit and changed "delete profile" icon 2011-05-13 01:58:26 +02:00
Pieter van der Kloet
157822eeaf Removed what's this? button from dialog titlebar 2011-05-11 22:44:11 +02:00
Pieter van der Kloet
b877a94481 Modified the launcher to use the new multi-dir plugin approach 2011-05-11 22:23:37 +02:00
Pieter van der Kloet
ac965af671 Moved functions around for better readability 2011-05-11 20:09:11 +02:00
Pieter van der Kloet
d3143c6e52 Implemented filter function for the plugin list 2011-05-11 20:04:25 +02:00
Pieter van der Kloet
9b439d74da Removed some leftover files belonging to the old launcher 2011-05-11 18:48:42 +02:00
Pieter van der Kloet
b9acc4a0ac Implemented the Graphics page, launcher now loads and saves Ogre settings 2011-05-11 01:12:25 +02:00
Pieter van der Kloet
409bd0fe7e Moved the stylesheet to main.cpp and made some stylesheet-related changes 2011-05-10 22:47:08 +02:00
Pieter van der Kloet
a0586cda99 Complete support for fallback icons on Windows using the Tango theme 2011-05-10 18:00:15 +02:00
Pieter van der Kloet
76653cb2d5 Started working on fallback icons for Windows 2011-05-09 22:38:52 +02:00
Pieter van der Kloet
7c1f00884d Merge remote-tracking branch 'upstream/master' into newlauncher 2011-05-08 20:21:57 +02:00
Marc Zinnschlag
8829398bfc added --fs-strict switch 2011-05-05 19:56:16 +02:00
Marc Zinnschlag
ef1e986a87 added --data-local switch 2011-05-05 19:50:28 +02:00
Marc Zinnschlag
e60f0e3b38 --data switch accepts multiple directories now 2011-05-05 19:39:11 +02:00
Marc Zinnschlag
6e880cffb2 changed engine class to support multiple data directories for esm files 2011-05-05 19:32:42 +02:00
Pieter van der Kloet
1487daac3d Fixed preprocessor #if to #ifdef 2011-05-04 03:22:23 +02:00
Pieter van der Kloet
0ff068817e Fixed icon and changed minimumsize 2011-05-03 16:26:22 +02:00
Pieter van der Kloet
dbd37a6d58 Added messageboxes for game execution errors 2011-05-03 16:16:53 +02:00
Pieter van der Kloet
2131452fac Fixed file loading problem with relative paths when launcher wasn't run from cmdline 2011-05-03 15:09:21 +02:00
Pieter van der Kloet
c42f99a586 Implemented starting the game by pressing either the big play button or the dialog play button 2011-05-03 03:17:01 +02:00
Pieter van der Kloet
2b0dabe669 Changed profile switching again; Some stylesheet modifications 2011-05-03 02:46:46 +02:00
Pieter van der Kloet
7bf21262a1 Plugins and masters from the current profile are written to openmw.cfg now 2011-05-03 02:01:25 +02:00
Pieter van der Kloet
a68be84b7f Re-implemented the profile combobox on the Play page 2011-05-03 01:23:35 +02:00
Pieter van der Kloet
4dbdc1cb26 Implemented copy and delete profile functions 2011-05-03 01:13:40 +02:00
Pieter van der Kloet
9e852a36bf Changed all QList<> to const 2011-05-03 00:47:12 +02:00
Pieter van der Kloet
ee4a2d0a8d Fixed a problem with the currentprofile not being set in the combobox 2011-05-03 00:43:44 +02:00
Pieter van der Kloet
ba3e4330f2 Changed the way the masters get retrieved in masterSelectionChanged 2011-05-03 00:36:20 +02:00
Pieter van der Kloet
2e058409bd Fixed problem with profile writeout 2011-05-02 23:06:11 +02:00
Pieter van der Kloet
314bac7862 Preliminary support for new profiles and some other modifications and cleanups 2011-05-02 22:21:42 +02:00
Pieter van der Kloet
557e659e15 CMake modifications, stylesheet gets copied to destination dir now 2011-05-02 20:07:37 +02:00
Pieter van der Kloet
366ade0e5f Modified Play page, widgets are now properly centered 2011-05-02 17:47:51 +02:00
Pieter van der Kloet
8256343d77 Masters in the data directory are loaded now, even when they don't have dependent plugins 2011-04-29 01:54:20 +02:00
Pieter van der Kloet
9a218b12c8 Deleted some leftover resource files 2011-04-28 23:08:05 +02:00
Pieter van der Kloet
1fc18075ff Modified config loading function to always read/write from userPath
There is no need for default (global) settings yet
2011-04-28 22:54:50 +02:00
Pieter van der Kloet
7747c78584 Fixed the use of path.hpp, which is in a CMake component now
Also fixed some leftover lines from a wrongly modified conflict
2011-04-28 22:23:42 +02:00
Pieter van der Kloet
7b554897e7 Merge remote-tracking branch 'upstream/master' into newlauncher
Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	components/esm/defs.hpp
	components/esm/loadappa.hpp
	components/esm/loadbody.hpp
	components/esm/loadclas.hpp
	components/esm/loadcrea.hpp
	components/esm/loadsndg.hpp
	components/interpreter/installopcodes.cpp
2011-04-28 22:05:53 +02:00
Pieter van der Kloet
24f2c57c32 Added missing resource file 2011-04-28 21:55:10 +02:00
Pieter van der Kloet
4f18452ef6 Merged clean newlauncher branch with config
Conflicts:

	apps/launcher/CMakeLists.txt
	apps/launcher/datafilesdialog.cpp
	apps/launcher/datafilesdialog.h
	apps/launcher/lineedit.hpp
	apps/launcher/maindialog.cpp
	apps/launcher/resources.qrc
	apps/launcher/resources/images/openmw-icon.png
2011-04-28 21:55:09 +02:00
Pieter van der Kloet
e4129ce26e Fixed config loading problem 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
64d636574e More configfile stuff 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
0fc4767846 Some renaming and ugly support for getPath 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
4ee748552b More messing around with the launcher config file 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
5f6b4a853f Removed leftover files 2011-04-28 21:55:09 +02:00
Jan-Peter Nilsson
1899e5dc1e If there is an openmw.cfg in the current path, use it as global config 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
84ee3b585c Added ability to get the previous profile when a new one is selected 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
04bc42a5c7 Added combobox slot for changing the profile 2011-04-28 21:55:08 +02:00