mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 08:19:56 +00:00
Code Issues Releases Wiki Activity
1628 commits 38 branches 54 tags 122 MiB
Commit graph

1013 commits

Author SHA1 Message Date
Sebastian Wick
9c2bb76869 disigned the interactive messagebox. Have to center it and add button events 2011-06-19 22:56:51 +02:00
Marc Zinnschlag
8446619ac4 Merge branch 'components_namespaces' into next 
Conflicts:
	apps/openmw/mwrender/interior.cpp
	components/bsa/bsa_archive.cpp
 2011-06-19 20:22:29 +02:00
Sebastian Wick
23194a932f creating the buttons on the fly 2011-06-19 19:41:42 +02:00
Lukasz Gromanowski
e9ff9a446b Mantis: #18 - Move components from global namespace into their own namespace. 
Moving classes from components/nifogre into NifOgre namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-06-19 19:14:14 +02:00
Sebastian Wick
5db8e8c449 InterMessageBox game mode 2011-06-19 19:10:44 +02:00
Lukasz Gromanowski
2ddd5dba11 Mantis: #18 - Move components from global namespace into their own namespace. 
Moving classes from components/nifbullet into NifBullet namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-06-19 18:45:23 +02:00
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
Pieter van der Kloet
274bce22c3 Added writeConfig in Data Files tab and implemented the close button 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
5f19f6cfce Added a function which returns the checked plugin names 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
e01afe1595 Included new header 2011-04-28 21:55:08 +02:00
Pieter van der Kloet
c911f62e8b Added ability to get the previous profile when a new one is selected 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
be47750a45 Added combobox slot for changing the profile 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
c68a4743bd Added uncheck all function 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
a321685e7a Modifications to the writeConfig function 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
8c4fad1f59 Added writeConfig in Data Files tab and implemented the close button 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
de78b81a8f Added a function which returns the checked plugin names 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
c17eed26f3 Removed whitespace 2011-04-28 21:55:06 +02:00
Pieter van der Kloet
a747bfb575 Moved the stylesheet to the Play page 2011-04-28 21:55:06 +02:00
Pieter van der Kloet
8f679218bd Added stylesheet implementation for the Play tab 2011-04-28 21:55:06 +02:00
Pieter van der Kloet
94f3bc115f Added missing resource file 2011-04-28 21:55:06 +02:00
Marc Zinnschlag
d481222d92 all program options (except help) can now be used from a cfg file 2011-04-28 21:55:06 +02:00
Marc Zinnschlag
6dba09462a change in multi_es branch broke fps switch; fixed now 2011-04-28 21:55:05 +02:00
Marc Zinnschlag
38c69f68c6 allow multiple --master and --plugin command line arguments 2011-04-28 21:55:05 +02:00
Pieter van der Kloet
5754a132c5 More modifications 2011-04-28 21:55:05 +02:00
Pieter van der Kloet
fc095b902d Added some more new files 2011-04-28 21:55:04 +02:00
Pieter van der Kloet
d1a75253d7 Huge rewrite, implementing all the new ideas for the launcher 2011-04-28 21:54:41 +02:00
Marc Zinnschlag
5b6ec405e3 Merge branch 'script' 2011-04-28 10:30:32 +02:00
Marc Zinnschlag
58cbdfd762 Merge branch 'journal' 2011-04-28 10:27:18 +02:00
Marc Zinnschlag
8b9ee30924 user/global mixup 2011-04-28 10:15:04 +02:00
Marc Zinnschlag
bdfd28f44d adjusted components/files namespace; some related cleanup 2011-04-28 09:56:50 +02:00
Marc Zinnschlag
7131c08ca4 moved path.hpp/path.cpp to a new component 2011-04-28 09:39:40 +02:00
Jan-Peter Nilsson
4189704b5f Initialize member variables in the same order they are defined to avoid compiler warning 2011-04-27 12:34:52 +02:00
Jan-Peter Nilsson
6aa1f3efdd Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 2011-04-27 12:34:52 +02:00
Jan-Peter Nilsson
b22234109d Remove unused variable (compiler warning) 2011-04-27 12:34:52 +02:00
Pieter van der Kloet
fbdc10f0b0 Removed some leftover files and more testing 2011-04-27 12:34:52 +02:00
Pieter van der Kloet
96e7df36e5 Added a proof-of-concept datafiles implementation to replace the old dialog 2011-04-27 12:34:52 +02:00
Pieter van der Kloet
1e62d8451f More testing and removing 2011-04-27 12:34:52 +02:00
Pieter van der Kloet
74eef82902 Messing around with a new datafilesdialog 2011-04-27 12:34:44 +02:00
Marc Zinnschlag
125319c441 splitting off console output from messageBox channel 2011-04-26 21:48:13 +02:00
Marc Zinnschlag
f52e6bd5ef made toggle-type script instructions more verbose 2011-04-26 21:38:21 +02:00
Marc Zinnschlag
e18dde4571 added topic tracking 2011-04-26 20:48:36 +02:00
Marc Zinnschlag
7a1b215b6a splitting of topic class from quest class 2011-04-26 20:39:59 +02:00
Marc Zinnschlag
3406d2fa89 removed redundant data from quest class 2011-04-26 20:22:50 +02:00
Marc Zinnschlag
944291d34f added quest tracking to the journal 2011-04-26 20:08:37 +02:00
Marc Zinnschlag
fc2d659925 Merge remote branch 'jpn/config' into config 2011-04-24 12:20:38 +02:00
Marc Zinnschlag
65e43c448a splitted StampedJournalEntry class off from JournalEntry 2011-04-22 11:16:39 +02:00
Marc Zinnschlag
f4f12e885f all program options (except help) can now be used from a cfg file 2011-04-21 18:23:46 +02:00
Marc Zinnschlag
8915e8a751 change in multi_es branch broke fps switch; fixed now 2011-04-21 18:10:35 +02:00
Marc Zinnschlag
9ea99a46ee Merge branch 'multi_es' 2011-04-21 18:07:32 +02:00
Marc Zinnschlag
f3fecdc627 quest entries are added to main journal now 2011-04-21 11:05:49 +02:00
Marc Zinnschlag
792de880cf another constness fix 2011-04-21 11:00:00 +02:00
Marc Zinnschlag
717b5e1784 fixed a constness problem 2011-04-21 10:49:45 +02:00
Marc Zinnschlag
23464e4035 added interface and container for main journal 2011-04-19 11:02:22 +02:00
Marc Zinnschlag
5851e0a28c added journal entry struct 2011-04-19 10:54:11 +02:00
Jason Hooks
92509d3b70 Trying to animate creatures 2011-04-13 20:35:44 -04:00
Jason Hooks
2ac1cc8aee Trying to animate creatures 2011-04-13 20:16:46 -04:00
Jan-Peter Nilsson
f2faa34bd9 If there is an openmw.cfg in the current path, use it as global config 2011-04-09 11:31:06 +02:00
Marc Zinnschlag
53e0e38862 added missing TCL instruction 2011-04-06 09:49:00 +02:00
Marc Zinnschlag
f321e549a4 added instruction GetPCCell 2011-04-04 15:10:37 +02:00
Marc Zinnschlag
e4a0702bb4 added journal-related script instructions 2011-04-04 14:49:26 +02:00
Marc Zinnschlag
b40117449a added journal script interface 2011-04-04 11:23:15 +02:00
Marc Zinnschlag
190f77f6c9 added journal class 2011-04-04 11:16:56 +02:00
Jan-Peter Nilsson
dc4e6216c3 Initialize member variables in the same order they are defined to avoid compiler warning 2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson
a94de76801 Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson
2e2d490c78 Remove unused variable (compiler warning) 2011-04-03 13:20:18 +02:00
Pieter van der Kloet
082902473b Changed the readConfig function to work with the new master/plugin options in openmw.cfg 2011-03-29 22:15:44 +02:00
Pieter van der Kloet
1d873c56a8 Fixed the "Restore defaults" function. 2011-03-29 20:15:15 +02:00
Pieter van der Kloet
493018322d Added function to write the list of plugins to openmw.cfg 2011-03-29 20:12:10 +02:00
Pieter van der Kloet
aa54975a2f Removed the directoryLoaded() signal as it's only available in Qt 4.7. 2011-03-29 17:07:24 +02:00
Marc Zinnschlag
beb1422c77 allow multiple --master and --plugin command line arguments 2011-03-29 13:57:56 +02:00
Pieter van der Kloet
7a03266729 Initial commit of the launcher 2011-03-29 01:36:26 +02:00
Pieter van der Kloet
833a61dd82 Fixed Boost errors with 1.46 caused by the deprecated name file_string() 2011-03-28 17:36:05 +02:00
Marc Zinnschlag
53e1d0e7e7 more cleanup 2011-03-23 23:05:15 +01:00
Marc Zinnschlag
a70e582ae2 removed debugging leftovers from the tab_complition branch 2011-03-23 23:03:41 +01:00
Marc Zinnschlag
c571148bef Merge branch 'collision' 2011-03-23 22:57:56 +01:00
Marc Zinnschlag
5661dc27c2 removed a leftover from physics debugging 2011-03-23 22:56:58 +01:00
gugus
3ad2b9986e fix actors not beeing deleted. Need the latest OEngine. 2011-03-23 19:16:51 +01:00
Marc Zinnschlag
d7226fc9c2 Merge branch 'tab_completion' 2011-03-23 17:08:52 +01:00
Marc Zinnschlag
7144657cfc Merge branch 'script' 2011-03-23 17:07:05 +01:00
gugus
773b7635a4 decrease the range of the raycast, and modifie the gravity/speed of the player. 2011-03-22 21:30:46 +01:00
Marc Zinnschlag
0866e4d4fe fix: NPCs were not added to physics system 2011-03-22 20:31:33 +01:00
Marc Zinnschlag
9946bb36f7 Merge remote branch 'gus/collision' into collision 2011-03-22 20:20:49 +01:00
gugus
7a28c9f3aa fix the door bug 2011-03-22 20:15:19 +01:00
Marc Zinnschlag
7653caea27 Merge branch 'master' into collision 
Conflicts:
	apps/openmw/mwclass/npc.cpp
 2011-03-22 20:02:03 +01:00
gugus
0cc94c81d4 Merge remote branch 'upstream/collision' into collision 2011-03-22 14:14:56 +01:00
Marc Zinnschlag
7b5d24c853 fixed a bug in phyiscs update code 2011-03-22 13:48:31 +01:00
gugus
3dddcbd958 fix a camera problem and increase player speed 2011-03-22 13:01:23 +01:00
Marc Zinnschlag
91ea36509d gus' fly mode fix; manually applied 2011-03-21 14:08:56 +01:00
Marc Zinnschlag
8788dcebcf Merge remote branch 'gus/collisions' into collision 2011-03-20 22:38:42 +01:00
gugus
8aeefd2af8 fix the fall bug when using ToggleCollision. Require lastest change with OEngine. 2011-03-20 21:52:31 +01:00
Marc Zinnschlag
647e88003e build and activation fix 2011-03-19 19:54:37 +01:00
gugus
21c224af25 add gravity change to the ToggleCollisionMode function. 2011-03-18 13:32:42 +01:00
gugus
102f1ee5dc filled the toggleCollisionMode function. It needs the lastest change in OEngine 2011-03-18 13:23:26 +01:00
gugus
2aee958789 Not sure about this commit: the PhysicEngine was initialized twice... 2011-03-18 13:22:51 +01:00
Marc Zinnschlag
72ce493123 non-unique NPC ID workaround 2011-03-18 10:20:14 +01:00
gugus
98b27813b7 change raycasting 2011-03-17 10:54:38 +01:00
Marc Zinnschlag
72a84356e2 added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene) 2011-03-16 09:09:45 +01:00
Marc Zinnschlag
8ebdd77772 Merge branch 'collision' into script 2011-03-16 08:48:13 +01:00
gugus
0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
 2011-03-15 13:36:25 +01:00
Marc Zinnschlag
4100a72e8d don't do physics calculations while the GUI is up 2011-03-13 22:39:44 +01:00
Marc Zinnschlag
f1bfca7c7c player class cleanup 2011-03-13 22:37:54 +01:00
Marc Zinnschlag
eb93ef68f1 fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class 2011-03-13 22:33:55 +01:00
Jan-Peter Nilsson
0f2152903e Get rid of deprecated warning for eventWindowChangeCoord 2011-03-12 13:54:00 +01:00
Jan-Peter Nilsson
f83c5327f3 Move eventDone to WindowBase and make it tell which window is done 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
54fc64cb6a Decrease number of classes that need to know about other components 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
67b4243a7f Use one instead of five state variables to keep track of character creation progress 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
183ccad872 Move ClassPoint struct definition from source to header file 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
53b85eaaa9 Stat setValue, use the enum values all the way through instead of converting enum->string->same enum 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
0695e8d8b2 Move HUD implementation out of the header file 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
2a53afc2bf Move StatsWindow class to it's own file. 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
5342bd77f1 Use one event with a parameters instead of four events to tell with dialog we want to see 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
a0ee11c51b Don't care about the widget 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
03158f4b62 Change indentation to four spaces 2011-03-12 10:56:10 +01:00
Nikolay Kasyanov
edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 2011-03-12 03:00:42 +03:00
Marc Zinnschlag
a14db99aa8 Merge remote branch 'gus/collisions' into collision 2011-03-11 22:09:01 +01:00
gugus
9b606be4b8 fix direction bug 2011-03-11 19:39:45 +01:00
Marc Zinnschlag
8ed1c59059 Merge remote branch 'jpn/collision' into collision 2011-03-09 19:31:18 +01:00
gugus
00de2e6d98 correct some stuff with the physic implementation 2011-03-09 19:09:11 +01:00
gugus
40193253b0 fix some time bug 2011-03-09 18:29:57 +01:00
Nikolay Kasyanov
768c9bdf07 On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root 2011-03-09 01:42:04 +03:00
Nikolay Kasyanov
943eea8104 .app bundle finally works 2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
3d75eea377 Merge remote-tracking branch 'upstream/master' 2011-03-08 19:03:20 +03:00
Jan-Peter Nilsson
12db15d9a2 Reset arm position changed by commit 27f69d0f5b 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
d68141d203 Remove unused variables 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
6840e2c42f Fix mising of signed/unsigned types in WindowManager::showClassQuestionDialog 2011-03-07 19:13:24 +01:00
Nikolay Kasyanov
4028600768 Builds on OS X now 2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
fb2f6f3c02 Delete mPhysicEngine when we are done with it 2011-02-27 13:37:17 +01:00
Jan-Peter Nilsson
1ce77229c0 Don't create physics before we have initialized ogre 2011-02-27 00:50:08 +01:00
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +01:00
gugus
33f22fd68b fix camera bug 2011-02-23 12:28:13 +01:00
gugus
903f39cb50 change the rayCasting system. It use bullet now. NOT TESTED! 2011-02-22 20:52:05 +01:00
gugus
d3c1640723 add physic support 2011-02-22 14:11:53 +01:00
gugus
7386fd0442 solve error with min/max macro for windows 2011-02-19 19:21:32 +01:00
gugus
84dce2eb36 add physic and solve a problem with window.h macro min/max 2011-02-19 19:18:03 +01:00
gugus
ff941b5963 add physic 2011-02-19 17:59:40 +01:00
sergoz
53ac8776ec added box for fps counter and changed font colour to white 2011-02-19 18:55:58 +03:00
gugus
ee0d73e142 Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions 2011-02-19 15:54:00 +01:00
gugus
746cf3a45a add physic. 2011-02-19 11:36:57 +01:00
sergoz
5132531f73 added fps counter 2011-02-18 17:46:24 +03:00
Marc Zinnschlag
ef7a06dea5 player was not registered at mwscene (for physics) 2011-02-11 09:51:11 +01:00
Marc Zinnschlag
9807e7dadc simplified actor-related physics interface to mwscene 2011-02-11 09:24:59 +01:00
Marc Zinnschlag
5c1aae3e26 added object movement code in mwscene (will be replaced by physics code later); does not work well, because OpenEngine manipulates camera instead of player node 2011-02-10 13:32:34 +01:00
Marc Zinnschlag
9c6bc4975c attached camera to a scene node 2011-02-10 12:56:19 +01:00
Marc Zinnschlag
151560b882 added missing run flag for NPCs 2011-02-10 11:08:25 +01:00
Marc Zinnschlag
9a3158675a reworked cell changing mechanism 2011-02-10 10:38:45 +01:00
Marc Zinnschlag
f773cf27cb replaced old movement input system 2011-02-03 12:16:59 +01:00
Marc Zinnschlag
3cd1088695 crash bug fix 2011-02-03 12:16:20 +01:00
Marc Zinnschlag
65232008a5 fixed a crash bug in NPC rendering 2011-02-03 11:47:42 +01:00
Marc Zinnschlag
8a3445beec collect movement vectors from all actors 2011-02-03 11:43:29 +01:00
Marc Zinnschlag
4468a2b6a8 added movement data to MW references; added movement interface to MWWorld::Class 2011-02-03 11:37:17 +01:00
Marc Zinnschlag
ca44b3640a pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug 2011-02-01 10:11:41 +01:00
Marc Zinnschlag
7449de22b1 removed a leftover debugging breadcrumb 2011-01-30 13:21:54 +01:00
Marc Zinnschlag
8b2252e7a1 first attempt at building with bullet 2011-01-30 13:19:41 +01:00
Marc Zinnschlag
40d772b33a call doPhysics function once per frame 2011-01-29 17:39:34 +01:00
Marc Zinnschlag
88b0908104 adding physics when insertering objects into the OGRE scene 2011-01-29 17:33:48 +01:00
Marc Zinnschlag
6a14ea8ec3 handle physics during player changing cells 2011-01-29 16:57:33 +01:00
Marc Zinnschlag
5486c70edf connected object-manipulator functions in world to physics interface 2011-01-27 09:46:54 +01:00
Marc Zinnschlag
9a5a6eac2b stop reporting changes originating from physics system back to physics system 2011-01-27 09:29:55 +01:00
Marc Zinnschlag
ec88aee581 added a missing function 2011-01-25 18:12:13 +01:00
Marc Zinnschlag
843a0288c3 added more physics interface to MWScene 2011-01-25 17:56:49 +01:00
Marc Zinnschlag
162db31a5f physics interface 2011-01-23 15:28:42 +01:00
Marc Zinnschlag
36cb10572a fixed tab problem 2011-01-18 15:20:36 +01:00
Marc Zinnschlag
eb5e4427c1 Merge remote branch 'star/master' into movement 2011-01-18 15:15:00 +01:00
Star-Demon
588e6e9995 Fixed a syntax error! Oops! 2011-01-18 08:36:42 -05:00
Marc Zinnschlag
b48a5084be added NPC stances 2011-01-18 10:45:29 +01:00
Star-Demon
09023bb853 Toggle now toggles, conventions... 2011-01-18 00:16:01 -05:00
Star-Demon
962b8c9781 Cleaned up inputmanager, tightened up player.exectueAutoMove() 2011-01-17 16:36:44 -05:00
Star-Demon
1bc9a46c6b Cleaned up and changed executeAutoMove() 2011-01-17 15:48:12 -05:00
Marc Zinnschlag
18b8cdce29 added GetInterior script function 2011-01-17 10:18:12 +01:00
Star-Demon
90e6029bad Fixed object reference error in player gets 2011-01-16 13:45:54 -05:00
Star-Demon
81c0909dbf Player constructor now inits new variables. 2011-01-16 12:39:54 -05:00
Star-Demon
1a56ef9a67 More AutoMove, now including walking - ready for a look and then test 2011-01-16 11:05:03 -05:00
Star-Demon
5aec3815fd The player should now be able to run AND walk... 2011-01-16 10:47:03 -05:00
Star-Demon
f96f53484c More AutoMove stuff, Sneak bools, cleaning 2011-01-16 10:25:33 -05:00
Jan-Peter Nilsson
a724de2429 Follow the 'XDG Base Directory Specification' instead of putting the configfile in ~/.openmw/ 
Also updated based on feedback from athile:
Fix broken Linux elif.
Use boost:filesystem instead of mkdir for increased future portability.
Break appart class definition and implementation.
 2011-01-14 22:51:47 +01:00
Star-Demon
60c9c31c7a Silly error Fixed in binding 2011-01-14 10:03:45 -05:00
Star-Demon
bfcfcecab6 Most of AutoMove finished - just needs some speed in Player class. 2011-01-14 09:52:28 -05:00
Marc Zinnschlag
d865c3cfc6 backend for tab completion: identifiers 2011-01-12 18:48:37 +01:00
Marc Zinnschlag
6848115c18 backend for tab completion: keywords 2011-01-12 18:24:00 +01:00
Star-Demon
3ab4a4487f Sneak State, Bound Sneak and AutoMove, began outlining AutoMove 2011-01-12 12:19:33 -05:00
Star-Demon
d4dccc0b54 Merge remote branch 'zinnschlag/master' 2011-01-12 12:19:25 -05:00
Jan-Peter Nilsson
851385d989 Allow override of OpenMW user configuration path with OPENMW_HOME environment variable 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
8cb8481b37 Use a local plugins.cfg if available (allow us to run without installing) 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
4221824681 Build debian package using cpack if dpkg is available 
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
0b1f18cc12 plugins.cfg is global config 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
429775d485 Store configuration in /etc/openmw/ and ~/.openmw/ on linux 
Requires new openengine version.
 2011-01-12 18:18:06 +01:00
Marc Zinnschlag
bb2bc0b518 getting rid of the nullptr compatibility nonsense. Hopefully once and for all 2011-01-11 10:11:08 +01:00
athile
27f69d0f5b Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp. 2011-01-10 16:13:32 -07:00
athile
75f77e9659 Add 'm' prefix to member variables in ExteriorCell 2011-01-10 15:26:13 -07:00
athile
c459eb7c55 Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010. 2011-01-10 13:48:16 -07:00
Star-Demon
43c33ee85f Merge remote branch 'zinnschlag/master' 2011-01-09 16:43:33 -05:00
Star-Demon
e98eef8cd3 corrected grammar for merge 2011-01-09 16:42:38 -05:00
Marc Zinnschlag
46a8ccc2ff changed collision mode instruction from enable/disable to toggle 2011-01-09 21:07:27 +01:00
Marc Zinnschlag
42ef7a61a0 Merge branch 'script' 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/world.cpp
	apps/openmw/mwworld/world.hpp
 2011-01-09 20:56:21 +01:00
Marc Zinnschlag
bb34f6e7fc added Enable/DisableCollision instructions 2011-01-09 20:44:17 +01:00
Marc Zinnschlag
0a832f2d23 Merge branch 'playerpos' into script 2011-01-09 19:22:27 +01:00
Marc Zinnschlag
f01a3d5e35 split Player class into a MWWorld and a MWRender component 2011-01-08 15:11:37 +01:00
Marc Zinnschlag
4f51391003 general player class cleanup 2011-01-06 10:07:01 +01:00
Marc Zinnschlag
4dd8616f87 Merge remote branch 'pvdk/master' 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwsound/soundmanager.cpp
 2011-01-06 09:45:14 +01:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Jan-Peter Nilsson
ba18dc46ef Don't try to play random tunes when sound is disabled 2011-01-05 02:12:43 +01:00