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

156 commits

Author SHA1 Message Date
Marc Zinnschlag
705e11becb Merge remote branch 'swick/mwrender' into mwrender
Conflicts:
	apps/openmw/mwworld/world.cpp
2011-08-22 21:27:53 +02:00
Marc Zinnschlag
6d8cfa7dfa fixed crash bug 2011-08-09 09:56:09 +02:00
Sebastian Wick
b7dbfb849a moved skyManager into RenderingManager 2011-08-08 21:11:30 +02:00
Sebastian Wick
54724d7e7f start RenderingManager 2011-08-07 16:40:01 +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
b131f022ba constructor & destructor 2011-08-01 04:36:23 +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
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
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
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
Marc Zinnschlag
7d2956329a some cleanup 2011-05-30 14:27:04 +02:00
Marc Zinnschlag
6e880cffb2 changed engine class to support multiple data directories for esm files 2011-05-05 19:32:42 +02:00
Marc Zinnschlag
5b6ec405e3 Merge branch 'script' 2011-04-28 10:30:32 +02:00
Marc Zinnschlag
f52e6bd5ef made toggle-type script instructions more verbose 2011-04-26 21:38:21 +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
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
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
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
7144657cfc Merge branch 'script' 2011-03-23 17:07:05 +01:00
gugus
7a28c9f3aa fix the door bug 2011-03-22 20:15:19 +01:00
gugus
3dddcbd958 fix a camera problem and increase player speed 2011-03-22 13:01:23 +01:00
gugus
2aee958789 Not sure about this commit: the PhysicEngine was initialized twice... 2011-03-18 13:22:51 +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
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
gugus
ff941b5963 add physic 2011-02-19 17:59:40 +01: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
9a3158675a reworked cell changing mechanism 2011-02-10 10:38:45 +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
40d772b33a call doPhysics function once per frame 2011-01-29 17:39:34 +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
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
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
f01a3d5e35 split Player class into a MWWorld and a MWRender component 2011-01-08 15:11:37 +01:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Marc Zinnschlag
4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 2011-01-04 15:58:22 +01:00
Jason Hooks
a038c67e5a Preliminary region sound framework2 2010-11-07 12:51:59 -05:00
Jason Hooks
cab2341259 Preliminary region sound framework 2010-11-06 13:11:09 -04:00
Marc Zinnschlag
814d721e33 build external cell names from name of region instead of from internal region id 2010-09-11 15:12:42 +02:00
Marc Zinnschlag
db2b238328 adjusted coordinates for coc/coe for exteriors (place player in the middle of the cell instead of at the border) 2010-09-11 12:21:55 +02:00
Marc Zinnschlag
5f84b680af implemented exterior coc 2010-09-11 11:55:28 +02:00
Marc Zinnschlag
07c06acc08 implemented loading of 3x3 exterior cell grid 2010-08-25 11:50:13 +02:00
Marc Zinnschlag
bdb5749b57 temporarily removed statics from raycast test (makes object activation easier by removing inactive obstacles, that overlap the AABB of the object) 2010-08-25 09:19:15 +02:00
Marc Zinnschlag
9e8251e6b4 finally got rid of the nasty coordinates bug 2010-08-22 21:30:48 +02:00
Marc Zinnschlag
0fce360908 more refactoring 2010-08-22 20:55:22 +02:00
Marc Zinnschlag
033c771be8 load/unload cells while player is moving around in the exteriors 2010-08-21 12:41:59 +02:00
Marc Zinnschlag
0d20719158 re-routed player movement through MWWorld::World 2010-08-21 12:31:04 +02:00
Marc Zinnschlag
fe3b6230fc refactored cell unloading 2010-08-21 11:43:07 +02:00
Marc Zinnschlag
0111631ee9 very early implementation of exterior rendering 2010-08-20 13:33:03 +02:00
Marc Zinnschlag
5543c84586 bug-fixes: actors were registered twice at cell change; disabled references were rendered at cell change 2010-08-14 21:58:54 +02:00
Marc Zinnschlag
6f28bd9adf handle sounds when enabling/disabling 2010-08-14 11:39:32 +02:00
Marc Zinnschlag
d57c984517 added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived 2010-08-14 11:27:13 +02:00
Marc Zinnschlag
4649d7fa41 stop sounds on cell change 2010-08-14 09:29:38 +02:00
Marc Zinnschlag
de2eeb4cde integrated insertObject function into class hierarchy 2010-08-14 09:20:47 +02:00
Marc Zinnschlag
7afc8ffd2e Merge branch 'container'
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
2010-08-07 20:33:07 +02:00
Marc Zinnschlag
2eee3d32f1 fixed World::disable function 2010-08-07 20:29:10 +02:00
Marc Zinnschlag
a7fe28ecbe implemented take action 2010-08-07 20:25:17 +02:00
Marc Zinnschlag
10a63b10b5 Merge branch 'master' into container
Conflicts:
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/container.hpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
2010-08-06 14:37:53 +02:00
Marc Zinnschlag
c883921af3 minor cell change fix 2010-08-05 15:57:06 +02:00
Marc Zinnschlag
87c84e6fcd limited activation range according to GMST settings 2010-08-05 13:29:49 +02:00
Marc Zinnschlag
e0a3b1b1db implemented item count 2010-08-04 14:04:22 +02:00
Marc Zinnschlag
052d049a6c integrated name-lookup into ape's code; added missing implementation of a function 2010-08-03 22:06:48 +02:00
Marc Zinnschlag
69ea00455f Merge branch 'poly'
Conflicts:
	apps/openmw/mwworld/world.cpp
2010-08-03 21:43:05 +02:00
Marc Zinnschlag
d1c000313f added getPtr function that works via Ogre handle 2010-08-03 20:01:52 +02:00
Marc Zinnschlag
f50ced4616 added missing record classes 2010-08-03 15:24:44 +02:00
Armin Preiml
389a28a836 Added const reference to esmstore to some methods down to CellRenderImp.
Body part mesh names will be now obtained by the bodypart id.
2010-08-02 09:59:59 +02:00
Marc Zinnschlag
63f686ffab update attribute values in stats window 2010-07-27 15:59:41 +02:00
Marc Zinnschlag
1d9df6cf40 implemented handling of disabled actors 2010-07-27 14:43:46 +02:00
Marc Zinnschlag
3d987f1b7a register actors in active cells with MechanicsManager 2010-07-27 14:05:05 +02:00
Marc Zinnschlag
8bbcbc05d5 removed duplicate code from World class 2010-07-27 13:09:35 +02:00
Marc Zinnschlag
e43b475ade changed PlayerPos::getPlayer return type from CellRef to Ptr 2010-07-26 13:09:44 +02:00
Marc Zinnschlag
fa50bbc77b added a CellStore pointer to PlayerPos 2010-07-26 12:59:50 +02:00
Marc Zinnschlag
0e641f1246 implemented coc instruction 2010-07-22 12:29:23 +02:00
Marc Zinnschlag
2d8fbc6e55 implemented month variable and fixed some day/gamehour bugs 2010-07-22 11:48:27 +02:00
Marc Zinnschlag
77e03f0f31 fixed global variable search to properly handle injected variables (DaysPassed) 2010-07-21 15:01:35 +02:00
Marc Zinnschlag
c8a18b7d70 use global variable timescale instead of fixed factor 2010-07-21 14:10:52 +02:00
Marc Zinnschlag
f3b70e05a9 added sky-related script functions and instructions 2010-07-18 19:48:02 +02:00
Marc Zinnschlag
d27c548710 implemented passing of time 2010-07-18 18:29:16 +02:00
Marc Zinnschlag
083b11c740 moved global variable handling into a separate class 2010-07-18 16:48:01 +02:00
Nicolay Korslund
c84672a560 Added MyGUI to OpenMW, fully working (with events and script hooks) 2010-07-17 19:38:32 +02:00
Nicolay Korslund
13d3f9c87e Integrated OpenEngine, replaces entire components/engine/ directory. 2010-07-16 14:56:14 +02:00
Marc Zinnschlag
8134c5b760 integrated CellStore pointer into Ptr class 2010-07-10 13:19:04 +02:00
Marc Zinnschlag
592fa84e2d added Enable, Disable, GetDisabled 2010-07-09 16:07:03 +02:00
Nicolay Korslund
359f2903d7 Merged athile and zinnschlag 2010-07-07 09:46:11 +02:00