1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 06:49:55 +00:00
Commit graph

855 commits

Author SHA1 Message Date
Jason Hooks
e041006063 Adding light and fog functions 2011-11-03 23:47:15 -04:00
Jason Hooks
edf85b26f9 Insert Mesh, Insert Light, insertBegin improved 2011-11-03 19:40:37 -04:00
Jason Hooks
9ac627c931 Commenting out assert 2011-11-02 22:45:58 -04:00
Jason Hooks
d49a02abe5 new insertBegin() 2011-11-02 22:41:48 -04:00
Jacob Essex
0e3859385d Now ensures that the directory to the config file exists before Ogre tries to access it 2011-11-02 11:11:27 +00:00
Jason Hooks
c2181d2091 Dealing with scenenodes 2011-11-02 00:13:33 -04:00
Jason Hooks
5822221ae1 Made recommended changes 2011-11-01 13:47:36 -04:00
Jason Hooks
3d43a4cd33 Made recommended changes 2011-11-01 13:46:57 -04:00
Jason Hooks
f1bc5b0ab6 Objects started, RenderingInterface 2011-10-31 23:59:16 -04:00
Jason Hooks
3761271c59 Empty creature, objects, npc 2011-10-31 00:04:06 -04:00
Jason Hooks
86d3cec1aa Changing refdata3 2011-10-30 22:38:15 -04:00
Jason Hooks
15fae749ae Changing refdata2 2011-10-30 17:31:49 -04:00
Jason Hooks
e1558e8e14 Changing refdata 2011-10-30 16:59:40 -04:00
Jason Hooks
1083db5582 Hiding debugging 2011-10-30 00:25:29 -04:00
Jason Hooks
db73487623 Physics fix and cmake changes 2011-10-29 18:52:57 -04:00
Jason Hooks
ee923e1abe Testing 2011-10-29 18:43:16 -04:00
Marc Zinnschlag
2ee6be1a34 finished cmake cleanup for apps/openmw source files 2011-10-29 13:17:04 +02:00
Marc Zinnschlag
583e7221ef silenced a warning and removed some tabs 2011-10-29 09:55:22 +02:00
Marc Zinnschlag
33ecd8b66c fixed collision toggling bug 2011-10-29 09:50:11 +02:00
Jason Hooks
c3a492bf74 Debugging file renamed 2011-10-25 14:06:44 -04:00
Jason Hooks
d4f63443e6 Hiding the rendering manager; crash eliminated 2011-10-24 22:11:36 -04:00
Jason Hooks
965ff24597 Removing Object: 2011-10-24 13:57:12 -04:00
Jason Hooks
0c8aa7fae3 Removing Object: 2011-10-24 13:55:10 -04:00
Jason Hooks
6efc61b9df Removal of MWScene; Object listing fixed 2011-10-24 13:42:36 -04:00
Marc Zinnschlag
ad086312b8 testing: cmake script simplification 2011-10-22 13:55:06 +02:00
Jason Hooks
30ba9b74da Simple Debugging class 2011-10-22 00:15:15 -04:00
Jason Hooks
47593f3641 Removing old files 2011-10-20 19:35:49 -04:00
Jason Hooks
fcf404d27b GetFacedHandle in Physics. RenderingManager constructor code added 2011-10-20 18:15:30 -04:00
Jason Hooks
3315de8b4a Naming convention change 2011-10-20 15:02:19 -04:00
Jason Hooks
d0f922ec5d Moved SkyManager creation 2011-10-20 13:55:56 -04:00
Jason Hooks
0992f1e903 Applying Gus's Windows fix 2011-10-18 21:02:42 -04:00
Jason Hooks
9126bb27b6 empty functions 2011-10-18 19:50:19 -04:00
Marc Zinnschlag
abeb3a22d4 Issue #19: Cleaned up Engine includes 2011-10-09 13:12:44 +02:00
Marc Zinnschlag
bc8db3612a Issue #19: Create OGRE renderer in go function instead of Engine's constructor
This avoids setting up a renderer each time openmw is called with the --help switch.
2011-10-09 13:05:38 +02:00
Marc Zinnschlag
39af941d6f Issue #19: Moved code from Engine to WindowManager and ScriptManager 2011-10-09 12:05:13 +02:00
Marc Zinnschlag
38c0f36d44 Issue #19: Finished cleaning out the Engine framelistener 2011-10-09 09:28:36 +02:00
Marc Zinnschlag
8bf4abf53b Issue #19: Focus Reporting Improvements
- moved focus reporting code out of the framelistener
- made focus reporting optional (new --report-focus switch)
- report based on tiem passed instead of number of frames passed
- only report if focus has changed
2011-10-08 10:31:23 +02:00
Marc Zinnschlag
fbcb5fe681 Issue #19: Some more framelistener cleanup 2011-10-08 10:15:03 +02:00
Marc Zinnschlag
8bebae17aa Issue #19: More local script related cleanup 2011-10-07 09:52:42 +02:00
Marc Zinnschlag
896b7da23d Issue #19: fixed RNG in engine's frame listener 2011-10-06 12:36:16 +02:00
Marc Zinnschlag
3bef04cb1d Issue #19: fixed exception handling in engine's frame listener 2011-10-06 12:34:13 +02:00
Marc Zinnschlag
10778d8c3e Issue #19: factored out local script handling into a separate class
This also fixes a bug related to self-destructing references (introduced during the cell handling improvements)
2011-10-06 12:30:30 +02:00
Marc Zinnschlag
695452e1a3 Issue #169: Don't continue to run local scripts after the reference the script is attached to has been deleted 2011-09-29 09:02:06 +02:00
Marc Zinnschlag
b866323cf3 Issue #31: create new exterior cells on the fly 2011-09-27 10:08:07 +02:00
Marc Zinnschlag
8da15440e0 Issue #31: added function for creating cell records 2011-09-26 11:11:30 +02:00
Marc Zinnschlag
cd7aaab48e Merge branch 'cells' into next
Conflicts:
	apps/openmw/engine.cpp
2011-09-24 12:10:53 +02:00
Marc Zinnschlag
02ce672fdc preload cell's reference list when accessing a reference outside of the actice cells (memory usage and speed optimisation) 2011-09-24 11:45:59 +02:00
Marc Zinnschlag
af4f48fd3f Issue #28: implemented access to references outside of the active cells 2011-09-22 12:44:17 +02:00
Marc Zinnschlag
aa87370d8f Issue #28: moved cell-specific getPtr function from World to Cells 2011-09-22 11:59:39 +02:00
Marc Zinnschlag
ce7202a147 Issue #28: shifting around functionality among CellStore, Cells and CellList 2011-09-10 11:23:30 +02:00
Marc Zinnschlag
e8632a799d Feature #28: refactored out cell management into a separate class 2011-09-08 11:02:55 +02:00
Marc Zinnschlag
40853e292f various bits of clean up 2011-09-04 09:48:50 +02:00
Marc Zinnschlag
afa84b72e0 fixed exterior bug 2011-09-03 10:26:31 +02:00
Lukasz Gromanowski
d43455fd57 Issue #168: Configuration cleanup, part 2
Corrected --data and --data-local parameters handling.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-09-02 22:45:21 +02:00
Lukasz Gromanowski
54cb6deab9 Issue #168: Configuration cleanup, part 2 2011-09-02 20:01:24 +02:00
Marc Zinnschlag
0a2979caf2 more cleanup 2011-08-27 10:45:09 +02:00
Marc Zinnschlag
f8029aaa9e more cleanup; fixes for player handling during physics (unrelated to the actual refactoring bugs); fixed minor bug in character initialisation 2011-08-27 10:30:38 +02:00
Marc Zinnschlag
4191bb32d1 fixed an unitialised variable 2011-08-22 21:34:51 +02:00
Marc Zinnschlag
705e11becb Merge remote branch 'swick/mwrender' into mwrender
Conflicts:
	apps/openmw/mwworld/world.cpp
2011-08-22 21:27:53 +02:00
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-08-19 21:06:09 +02:00
Sebastian Wick
29b8a5374b get rid of the warnings 2011-08-19 17:03:47 +02:00
Marc Zinnschlag
6d8cfa7dfa fixed crash bug 2011-08-09 09:56:09 +02:00
Sebastian Wick
a13b958600 MWWorld::Scene::insertCell 2011-08-09 00:05:16 +02:00
Sebastian Wick
b7dbfb849a moved skyManager into RenderingManager 2011-08-08 21:11:30 +02:00
Marc Zinnschlag
012a41427c Merge remote branch 'swick/mwrender' into mwrender 2011-08-08 10:30:06 +02:00
Sebastian Wick
54724d7e7f start RenderingManager 2011-08-07 16:40:01 +02:00
Sebastian Wick
74b4a0cbe5 World::moveObjectImp private 2011-08-02 19:46:21 +02:00
Sebastian Wick
41d4ad93f8 World::moveObjectImp 2011-08-02 18:50:31 +02:00
Sebastian Wick
7cf66443df const std::string* to std::string 2011-08-02 18:44:10 +02:00
Sebastian Wick
52bf3af565 make World::PhysicsSystem not depending on World::World 2011-08-02 18:16:39 +02:00
Sebastian Wick
4b846a54f1 PhysicsSystem 2011-08-01 15:55:36 +02:00
Sebastian Wick
8d4dc096a4 move getExterior back 2011-08-01 14:41:15 +02:00
Sebastian Wick
3f007d29cc move mInteriors and mExterior back to World::World 2011-08-01 14:34:50 +02:00
Sebastian Wick
6baf904f0f mStore fixed; glibc detected in shutdown process 2011-08-01 04:53:06 +02:00
Sebastian Wick
b131f022ba constructor & destructor 2011-08-01 04:36:23 +02:00
Sebastian Wick
380cd5ca35 World::Scene improvements 2011-08-01 04:30:21 +02:00
Sebastian Wick
af59f3c475 cut down World::Scene 2011-08-01 04:17:50 +02:00
Sebastian Wick
97e4f698a7 World::World looks good for now, cutting down World::Scene; still the to_utf8 error 2011-08-01 04:11:50 +02:00
Sebastian Wick
64633ddcdb wired string to_utf8 error (maybe it returnes an empty string) 2011-08-01 04:06:38 +02:00
Sebastian Wick
ff68ca7e52 next try :/ 2011-08-01 03:33:02 +02:00
Marc Zinnschlag
b157273cd9 Merge branch 'next'
Conflicts:
	apps/openmw/main.cpp
2011-07-31 19:28:12 +02:00
Sebastian Wick
008a3768e2 use MWWorld::Scene 2011-07-31 17:59:08 +02:00
Sebastian Wick
e7057bed29 moving stuff from MWWorld::World to MWWorld::Scene but receiving segfault signals 2011-07-31 17:07:11 +02:00
Marc Zinnschlag
4367b93e64 typo 2011-07-23 11:56:01 +02:00
Marc Zinnschlag
7bc1adde9f allow adding records at runtime (only potions and classes) 2011-07-22 15:56:54 +02:00
k1ll
0ece722ff3 Added handling of quotation marks and search for matches now ignores the case of input and keywords. When completing and there are matching or partly matching uppercase keywords the output will be upercase too. If this is a problem i'll change it. 2011-07-19 18:42:34 +02:00
k1ll
ac43d482c5 Basic tab-completition seems to be finished. It's working like requested in the old thread. 2011-07-18 18:49:38 +02:00
Lukasz Gromanowski
0bf2a2df41 Mantis: #3 - Fixed spelling error "Font" -> "Character"
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-07-17 22:53:20 +02:00
Lukasz Gromanowski
ac9b1715d5 Added new command line option: "encoding"
Added new command line option: "encoding" which allow to
change font encoding used in game messages.

Currently there are three evailable encodings:

    win1250 - Central and Eastern European (languages
              that use Latin script, such as Polish,
              Czech, Slovak, Hungarian, Slovene, Bosnian,
              Croatian, Serbian (Latin script),
              Romanian and Albanian)

    win1251 - languages that use the Cyrillic alphabet
              such as Russian, Bulgarian, Serbian Cyrillic
              and others

    win1252 - Western European (Latin) - default

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-07-17 22:16:50 +02:00
Marc Zinnschlag
aded4608c0 added GetButtonPressed function 2011-07-12 21:26:58 +02:00
Marc Zinnschlag
058822b676 Merge branch 'next' into MessageBox 2011-07-12 21:18:27 +02:00
Marc Zinnschlag
c4177698d0 Merge remote branch 'swick/MessageBox' into MessageBox 2011-07-12 21:18:21 +02:00
Sebastian Wick
317c920e03 everything works, also the readPressedButton function should do the job 2011-07-12 20:05:04 +02:00
Sebastian Wick
16ed02baeb all MessageBoxes look good; next: make them do something ;) 2011-07-12 19:17:07 +02:00
Sebastian Wick
0fc77dc1c3 everything looks good if buttons are on one line 2011-07-12 18:05:46 +02:00
Sebastian Wick
537b2bf963 set position on interactive MessageBox'es 2011-07-12 17:57:16 +02:00
Marc Zinnschlag
d9a25427c5 added --version command line option 2011-07-08 16:16:20 +02:00
Marc Zinnschlag
a7b266c4d2 another minor correction (fixing the previous one) 2011-07-08 16:16:06 +02:00
Marc Zinnschlag
27cba6c624 created config.hpp file for appps/openmw 2011-07-08 14:39:23 +02:00
Nikolay Kasyanov
e48d265b5d Mac fix: added local config dir support, app root dir is dir where bundle located 2011-06-26 20:15:42 +04:00
Nikolay Kasyanov
31749fc97b Added include for Ogre::macBundlePath to main.cpp and removed such
include from engine.cpp (no longer needed there).
2011-06-25 19:29:11 +04:00
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
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
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
Jason Hooks
45453fd7a9 Case insensitive external loader working 2011-06-06 20:11:23 -04: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