krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
16154 commits 35 branches 0 tags 65 MiB
Commit graph

2507 commits

Author SHA1 Message Date
scrawl
cd68012498 Z-up conversion: raycasts 2013-02-26 14:28:35 +01:00
scrawl
2e7bc1a368 Z-up conversion: local map, fix tcg 2013-02-26 13:39:10 +01:00
Marc Zinnschlag
bd9884b244 Merge remote-tracking branch 'chris/misc-cleanup' 2013-02-25 19:45:09 +01:00
Marc Zinnschlag
08f13ef5ab Merge remote-tracking branch 'greye/master' 2013-02-25 19:34:03 +01:00
greye
661fd73c6e fix rotation for objects in inactive cells and forced vanity mode 2013-02-25 22:00:50 +04:00
Chris Robinson
48271e49ec Properly update the Ptr object in the mechanics manager when moving across cells 2013-02-25 09:57:34 -08:00
scrawl
b1fc68d44d Merge branch 'master' into graphics 2013-02-25 17:36:33 +01:00
scrawl
355390429e Fix World::isUnderwater to use dynamic waterlevel 2013-02-25 17:27:50 +01:00
Chris Robinson
5d5d28c06c Increase the ID cache to 40 
Helps improve performance with Tribunal and Bloodmoon's scripts
 2013-02-25 07:43:56 -08:00
scrawl
cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 2013-02-25 15:12:03 +01:00
scrawl
a3afb91485 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 18:04:51 +01:00
Chris Robinson
94be45e07e Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 06:20:10 -08:00
ChrisKCat
aab7cf137b Merge pull request #5 from greye/cross-cell 
fix and unify object cell change update in mwrender
 2013-02-24 05:32:52 -08:00
Marc Zinnschlag
fa880e3274 Merge remote-tracking branch 'lazydev/master' 2013-02-24 14:07:52 +01:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
Chris Robinson
89d4c245e9 Better calculate jump velocity 
The fatigue term isn't currently used correctly
 2013-02-24 03:30:33 -08:00
greye
6a8c532244 fix and unify object cell change update in mwrender 2013-02-24 15:04:56 +04:00
scrawl
3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 10:06:04 +01:00
Chris Robinson
90cb9ee0ac Don't set a vertical velocity when on the ground 2013-02-23 16:30:11 -08:00
lazydev
a5ff8181b7 fix for https://bugs.openmw.org/issues/569 2013-02-24 03:35:43 +04:00
Marc Zinnschlag
9e8d0128e0 Merge remote-tracking branch 'blunted2night/size_t-warnings_v2' 2013-02-23 20:06:27 +01:00
Nathan Jeffords
44b1c66c4b fixed various warnings about converting size_t to int 2013-02-23 10:23:38 -08:00
Chris Robinson
0148db8ccf Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
 2013-02-23 05:59:35 -08:00
scrawl
4b51184ec4 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 14:37:28 +01:00
greye
d983ed5c78 fix invalid SceneNode pointer on cell change 2013-02-23 16:45:55 +04:00
Chris Robinson
9c3af5f344 Do not interpret noclip mode as flying 2013-02-22 01:26:30 -08:00
Chris Robinson
4eb8ea0c95 Fix stepping and vertical force accumulation 2013-02-20 07:51:36 -08:00
Chris Robinson
b14def7c09 Set the character as being on the ground when colliding with a shallow enough slope 2013-02-20 05:24:38 -08:00
Chris Robinson
fe6fa9ebe7 Simplify newtrace a bit 2013-02-20 04:14:52 -08:00
Chris Robinson
cfdc820a1f Make an actor fly when it has a levitate effect 2013-02-20 01:55:12 -08:00
Chris Robinson
5d55b41714 Remove a now-unneeded(?) hack 2013-02-19 04:59:38 -08:00
Chris Robinson
89fabdb3a9 Update the PhysicActor's RigidBody when moving 
This works, but is less than ideal. As it is now, the rigid body gets updated
twice as the position and rotation are set separately. They should instead be
updated together.
 2013-02-19 04:18:15 -08:00
Chris Robinson
a510adc572 Allow stepping when not being affected by gravity 2013-02-19 02:25:57 -08:00
Chris Robinson
c694161272 Don't try to step if not on the ground 2013-02-19 01:28:02 -08:00
Chris Robinson
5a1a0b7338 Add and use an MWWorld::isFlying method 2013-02-18 22:39:43 -08:00
scrawl
5d403ebdd3 Fix collision debug drawer (tcg) 2013-02-19 04:03:24 +01:00
scrawl
32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-19 00:15:54 +01:00
Chris Robinson
bea460955d Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 16:03:39 -08:00
scrawl
00db13be32 Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed. 2013-02-17 15:56:22 +01:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
scrawl
373de19aee Removed dialogue fix again, now on separate branch 2013-02-17 03:02:47 +01:00
scrawl
df8e502f8c Ouch, I used && instead of &, this broke actions without a sound 2013-02-17 02:52:49 +01:00
scrawl
a5c8d5748f fix FailedAction. 2013-02-16 18:05:25 +01:00
scrawl
0bc34c1c0d Action::executeImp returns a bool value to indicate if the sound should be played. 2013-02-16 16:40:44 +01:00
scrawl
7d918caa93 Don't allow dialogue if player controls are disabled. 2013-02-16 16:26:40 +01:00
Douglas Mencken
eb09662f1d Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead. 
It is boost headers' job to deal with their internals.
 2013-02-16 14:49:11 +01:00
Chris Robinson
158e18b98d Remove an unused method 2013-02-16 00:30:07 -08:00
Chris Robinson
c965bd8e18 Increase step size to 30 2013-02-15 17:22:55 -08:00
Chris Robinson
c57001e3bd Remove an unused field 2013-02-15 05:11:06 -08:00
Chris Robinson
ac717373b1 Add a method to check if an object is on the ground 2013-02-14 22:35:15 -08:00
Chris Robinson
18b606fddf Use the PhysicActor's set/getOnGround method 2013-02-14 20:10:04 -08:00
Chris Robinson
15dc82f454 Increase step size to 15 2013-02-14 18:59:05 -08:00
Chris Robinson
a729b1b12a Snap to the ground after moving 
Depends on two factors:
* End up close enough above to a walkable plane (it's within sMaxStep units
  down and is angled sMaxSlope or less)
* Started out on the ground without any upward movement

This also reduces the distance needed to be to the ground to 4 (from 10), and
ensures the actor is 2 units above the ground when on it. Downward force is
also removed when starting on the ground.
 2013-02-14 18:34:51 -08:00
Chris Robinson
34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 2013-02-09 09:46:57 -08:00
scrawl
d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-09 16:40:10 +01:00
Marc Zinnschlag
f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 2013-02-09 15:30:29 +01:00
Mark Siewert
55bd9eef66 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2013-02-09 13:03:35 +01:00
Mark Siewert
eefbdde6de - For pull request: remove all instances of maps used to track refnumbers. 
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
 2013-02-09 13:00:57 +01:00
scrawl
6805c7bab4 Merge branch 'master' into graphics 2013-02-08 18:35:41 +01:00
Chris Robinson
f5afa43db5 Remove an unneeded parameter 2013-02-07 17:45:41 -08:00
Chris Robinson
d47d2216f2 Use some const references where appropriate 2013-02-07 16:33:44 -08:00
Chris Robinson
cbdd459500 Remove unneeded playerMove from PhysicActor 2013-02-07 15:48:41 -08:00
Chris Robinson
ca6f8b6d88 Reorganize a bit of code in the movement solver 2013-02-07 13:18:16 -08:00
Chris Robinson
fe0e6c452d Remove the unneeded playerMove object from PhysicsSystem 2013-02-07 12:11:10 -08:00
Chris Robinson
8de2d24d0e Restore old ground check 2013-02-06 21:57:59 -08:00
Chris Robinson
923d0d6eb4 Fix up some header includes 2013-02-06 21:47:09 -08:00
Chris Robinson
e577ee2de8 Add a method to set/retrieve being on the ground 2013-02-06 21:44:58 -08:00
Chris Robinson
a8f0ce43a5 Add a run key 2013-02-06 17:51:47 -08:00
Chris Robinson
bdda7278c4 Use 3/4ths of the physic actor's height to test if swimming 2013-02-06 12:56:30 -08:00
Chris Robinson
dfd16c4424 Fix movement rotations 2013-02-06 12:39:26 -08:00
Marc Zinnschlag
43912f927a Merge remote-tracking branch 'potatoesmaster/importer' into next 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-02-06 10:12:40 +01:00
Chris Robinson
9cf30f39bd Don't apply gravity when swimming 2013-02-05 19:45:51 -08:00
Chris Robinson
e217a3d25c Silence some console spam 2013-02-05 15:51:26 -08:00
Chris Robinson
ee3764e9b3 Increase max slope to 60. 45 is too low. 2013-02-05 15:07:48 -08:00
Chris Robinson
8c0bb1ff4d Rotate movement in the movement solver 2013-02-05 14:02:14 -08:00
Chris Robinson
2c39760bd5 Move the movement solver code to mwworld's physics system 2013-02-05 12:45:10 -08:00
Chris Robinson
0a4568bd11 Move the PtrMovementList typedef to MWWorld 
Use it for the doPhysics parameter, too
 2013-02-05 11:03:39 -08:00
Chris Robinson
2cdda96798 Clear out some unneeded doPhysics stuff 2013-02-05 10:23:26 -08:00
Chris Robinson
4bd1e63ac1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-02-05 03:26:46 -08:00
Marc Zinnschlag
c409f1184e cleaned up object movement and fixed a bug regarding local scripts 2013-02-05 12:19:06 +01:00
Marc Zinnschlag
86fb3574a0 Merge remote-tracking branch 'wheybags/master' into next 2013-02-05 11:55:47 +01:00
Chris Robinson
bd4fdf47a3 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2013-02-05 02:27:57 -08:00
Chris Robinson
1747c1e01a Integrate a new movement solver to handle object movement and collisions 
Temporary, and pretty breoken. Needs some serious integration fixes.
 2013-02-04 07:10:14 -08:00
scrawl
109d0a942f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-03 19:02:57 +01:00
Mark Siewert
3e43db5f76 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2013-02-03 16:14:41 +01:00
scrawl
15e51b76de Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth 2013-02-03 15:46:23 +01:00
Tom Mason
ac112ef972 refactored special variable code 2013-02-03 13:27:27 +00:00
Tom Mason
f785659297 Implemented OnPCAdd special variable 
Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised
for items added through it.
Does not get reset on drop, as per original morrowind.
 2013-02-02 17:36:12 +00:00
Marc Zinnschlag
85697e4628 reverted to C++03 2013-02-02 13:24:28 +01:00
Tom Mason
9ad08520fd Implemented OnPCDrop special variable 
Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.
 2013-01-31 18:45:32 +00:00
Tom Mason
0fc5ee5149 allow OnPCEquip special variable to be of any type 2013-01-31 17:46:16 +00:00
Tom Mason
09f9557ecb Implemented OnPCEquip special variable 2013-01-31 00:34:16 +00:00
Tom Mason
dc91211b12 Fixed Small bug where scripts were being removed when they shouldn't be. 
Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.
 2013-01-31 00:21:04 +00:00
Chris Robinson
fdabef65a1 Use a method to update an object's cell in the mechanics manager 
This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells.
 2013-01-29 00:19:24 -08:00
Chris Robinson
8d98f3649c Use a separate class to handle activator mechanics 2013-01-28 23:39:11 -08:00
Chris Robinson
7b71b4eb31 Add a missing include 2013-01-27 03:03:48 -08:00
Chris Robinson
0cd3880b20 Merge remote-tracking branch 'zini/master' into animation2 2013-01-26 04:54:52 -08:00
Mark Siewert
dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
 2013-01-25 18:22:01 +01:00
Tom Mason
f5f3c2e62d enabling / disabling should not affect scripts 2013-01-21 20:06:08 +00:00
Mark Siewert
713d324eeb - Minor code cleanup 2013-01-20 19:07:33 +01:00
Tom Mason
31c71c029d objects with scripts attached, that are inside containers will behave correctly when the container is moved 2013-01-20 17:01:30 +00:00
Tom Mason
23dada0ee4 moved script handling on enable / disable into their own functions 2013-01-20 16:38:56 +00:00
Tom Mason
28c580d280 disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly 2013-01-20 15:43:52 +00:00
Tom Mason
665a530e10 renamed realAdd to addImp 2013-01-20 14:14:34 +00:00
Tom Mason
3c6ddd7fa7 fixed isInCell method 2013-01-20 14:10:04 +00:00
Mark Siewert
a8e02779b2 - Add support for multiple plugins trying to modify the same reference 
- Fix a small signed/unsigned warning
 2013-01-19 23:33:18 +01:00
Chris Robinson
d2f5a886c7 Handle playgroup and skipanim through mwmechanics 2013-01-16 17:53:18 -08:00
Chris Robinson
63e685ea39 Add a method to get the Animation from a Ptr 2013-01-16 09:59:19 -08:00
Chris Robinson
1ce8eaf52c Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/actors.cpp
	apps/openmw/mwrender/actors.hpp
 2013-01-16 07:36:56 -08:00
Chris Robinson
94e30199d1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-15 14:59:30 -08:00
Tom Mason
6fc64e8a4e scripts run for items added to containers, and scripted items in player inv handled correctly 2013-01-13 19:49:56 +00:00
Tom Mason
7c8b3f1239 Merge remote-tracking branch 'real/master' 2013-01-13 17:07:18 +00:00
Tom Mason
c138e00aa2 objects scripts are now stopped when they are removed from a container 2013-01-13 17:05:12 +00:00
Tom Mason
d4ca954d47 scripts on items in containers added to script list on cell change 2013-01-12 18:31:57 +00:00
Nathan Jeffords
d5ebd6654d cache loaded NIF files to eliminate reloads 
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
 2013-01-10 21:47:02 -08:00
Marc Zinnschlag
274ff530dc Merge remote-tracking branch 'wheybags/master' 2013-01-10 11:53:42 +01:00
Chris Robinson
23ac1c2de5 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-09 20:52:12 -08:00
Tom Mason
3517635cfd added Drop and DropSoulGem functions 2013-01-09 21:16:45 +00:00
Marc Zinnschlag
4defb1a476 Merge remote-tracking branch 'trombonecot/lowerstring' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 2013-01-09 22:13:59 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Chris Robinson
a14132b5a0 Merge remote-tracking branch 'zini/master' into animation2 2013-01-09 11:12:26 -08:00
Tom Mason
5bfdb2449d allowed dropObjectOnGround to be used on npcs, not just player 2013-01-09 18:53:14 +00:00
Marc Zinnschlag
6567bf38f8 Merge remote-tracking branch 'wheybags/master' 2013-01-09 17:01:47 +01:00
Tom Mason
375961fe5e small fix 2013-01-09 13:27:12 +00:00
Tom Mason
b035a5aa4a beast races cannot equip anything they oughtn't to be able to equip 2013-01-09 13:18:05 +00:00
Marc Zinnschlag
649ae645f3 Merge remote-tracking branch 'blunted2night/bug_495_v2' 2013-01-09 12:12:41 +01:00
Nathan Jeffords
719663d86e added option to override the activation distance 
The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
 2013-01-08 20:00:06 -08:00
Tom Mason
62a2ba1cc6 beast races cannot equip shoes/boots 2013-01-09 03:03:14 +00:00
Tom Mason
135f0870f7 in actionequip, was ignoring actor param, and always using player 2013-01-09 02:16:17 +00:00
Chris Robinson
9675a6d04a Merge remote-tracking branch 'zini/master' into animation2 2013-01-08 02:25:37 -08:00
Nathan Jeffords
b3932e3dea added a separate activation distance for NPCs 2013-01-07 23:40:17 -08:00
Nathan Jeffords
b9fbd6ae4b Factored faced object lookups into MWRender::World 
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
 * Changed it to return an object pointer
 * Updated clients to use return object directly.
 2013-01-07 23:38:08 -08:00
Nathan Jeffords
05dad29005 update MWWord::World to track distances while performing occlusion queries. 
This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.
 2013-01-07 23:11:15 -08:00
Nathan Jeffords
0108be2e4f updated MWWorld::PhysicsSystem::getFacedXXX functions 
* changed the names and return values to be consistent
 * made the distance to search a parameter
 * change the distance returned to world units instead of percentage of query distance
 2013-01-07 23:00:00 -08:00
Nathan Jeffords
86f691d3d5 split MWWord::World::update into multiple functions 2013-01-07 22:48:24 -08:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-07 13:25:15 +01:00
scrawl
282601d6e9 support the allowSkipping extra parameter for playBink command. 2013-01-07 13:19:52 +01:00
Chris Robinson
921ae76ea9 Merge remote-tracking branch 'zini/master' into animation2 2013-01-06 21:20:49 -08:00
Chris Robinson
efca5ded47 Clean up some header includes to reduce nesting 2013-01-05 21:12:08 -08:00
Emanuel Guevel
63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter 
Edit other files accordingly.
 2013-01-06 01:37:58 +01:00
Mark Siewert
d6377fb2e3 - Support deleting references from a plugin 
- Add preliminary support for loading some unique fields appearing only in savegames
- Add a few lines required for supporting respawning references. Incomplete.
 2013-01-03 18:51:04 +01:00
greye
7e0713f6c4 fix string case update 2012-12-31 11:22:40 +04:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
eduard
98103e15eb conflict resolution 2012-12-30 13:46:07 +01:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 2012-12-30 13:09:37 +01:00
eduard
c75a5ae212 string compare and tolower 2012-12-28 18:05:52 +01:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +01:00
Marc Zinnschlag
4c28f3211b Merge remote-tracking branch 'lazydev/master' 2012-12-26 15:50:03 +01:00
Mark Siewert
8ccec17481 - Restore ability for plugins deleting records defined in parent files 
- Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)
 2012-12-26 10:34:59 +01:00
Mark Siewert
049b0e66e0 - Restore ability to generate references in the same cell from multiple plugins 
- Disable some code related to deleting entries in the store so that it builds again
 2012-12-25 20:27:30 +01:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Tom Mason
8ac8fdff47 implemented all text defines except a few for keybindings that don't exist yet 2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 2012-12-20 23:16:34 +00:00
scrawl
64210e6efa Revert "New Game button" 
This reverts commit c5dd0e1968.
 2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb Revert "remove commandline switch for new game" 
This reverts commit 86671096ec.
 2012-12-18 19:09:08 +01:00
Chris Robinson
7b2c3e6cd3 Pass a proper PlayMode enum to playSound and playSound3D 2012-12-18 06:01:21 -08:00
scrawl
86671096ec remove commandline switch for new game 2012-12-16 16:14:49 +01:00
scrawl
c5dd0e1968 New Game button 2012-12-16 16:05:31 +01:00
scrawl
faad64b254 Esc cancels the video 2012-12-12 01:13:53 +01:00
scrawl
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
 2012-12-11 22:28:23 +01:00
scrawl
e3dd3d565c fix 2 leaks 2012-12-10 00:59:39 +01:00
Marc Zinnschlag
8e1a2e3a13 Issue #474: adjust global variable pcrace 2012-12-04 10:58:43 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-12-01 11:30:51 +01:00
Mark Siewert
b103426cf0 - Partially reimplement deleting objects defined in a parent esX file. 
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
 2012-11-25 19:07:16 +01:00
Mark Siewert
896ab44d1e - Add some updated files missing from last commit. 
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
 2012-11-25 17:19:29 +01:00
Mark Siewert
8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
 2012-11-25 14:12:44 +01:00
scrawl
1ccad32877 GetWeaponType 2012-11-25 02:06:43 +01:00
scrawl
e8ef4dba1e getPcRunning, getPcSneaking, getForceRun, getForceSneak 2012-11-24 02:02:49 +01:00
Marc Zinnschlag
d7af9fbec6 various fixes 2012-11-22 17:24:28 +01:00
Marc Zinnschlag
9201baebf9 template fix 2012-11-22 10:19:11 +01:00
Marc Zinnschlag
5d45bcd03a Merge remote-tracking branch 'trombonecot/master' 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-11-19 21:21:00 +01:00
eduard
4e4d15f8ac Failed action 2012-11-19 21:04:49 +01:00
Mark Siewert
31fb715bd7 - Add support for moving existing references by plugin files. No cell changing yet. 
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
 2012-11-17 21:50:25 +01:00
eduard
82ea547ce4 Failed action 2012-11-17 18:17:08 +01:00
Mark Siewert
2175f13b67 - Add tracking for dependencies between plugins. 
- Add reference number mangling required for moving references around.
 2012-11-17 00:21:51 +01:00
Marc Zinnschlag
9669eed083 Issue #219: added last missing function filters 2012-11-15 20:00:27 +01:00
Mark Siewert
42eefaf36f - Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). 
- Reference loader now (partially) supports MVRF tag.
 2012-11-10 21:43:41 +01:00
greye
235b565bb7 update main character model 2012-11-10 11:51:48 +04:00
Marc Zinnschlag
2be60041f3 Merge remote-tracking branch 'greye/player-dynamics' into next 2012-11-08 18:32:25 +01:00
greye
af5fb7916f fix searching in store 2012-11-08 21:07:14 +04:00
greye
b5a59c3a07 minor doxygen comments update 2012-11-08 19:01:42 +04:00
greye
2a86432887 store birthsign in MWWorld::Player 2012-11-08 18:50:23 +04:00
greye
83e758ee50 clean up interfaces 2012-11-08 16:37:57 +04:00
greye
2a06d72e32 remove unused custom character classes 2012-11-08 02:27:01 +04:00
greye
9dc9098fa7 update MWBase::World interface since records contains own id 2012-11-08 01:52:34 +04:00
greye
5b9621bca5 store player record data in ESMStore 2012-11-08 01:36:43 +04:00
greye
9ab2c16055 store created character classes as dynamic records 2012-11-08 01:22:44 +04:00
greye
78740306db non-const access to Store<T> from ESMStore 2012-11-08 01:21:54 +04:00
Marc Zinnschlag
c5a6171aab cleanup 2012-11-07 19:43:42 +01:00
Marc Zinnschlag
918316168f Merge remote-tracking branch 'greye/store' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
 2012-11-07 19:34:28 +01:00
greye
11c0e6382f make ESMStore setting up itself after loading 2012-11-07 15:41:59 +04:00
greye
bc218759e9 forgotten module 2012-11-07 15:38:25 +04:00
Mark Siewert
7f77bf76c7 - Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used. 
- Add many TODOs to mark points where more work is required to fully implement this feature.
 2012-11-06 22:13:19 +01:00
Mark Siewert
64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 2012-11-06 20:37:29 +01:00
greye
58b7927a36 move 'player' record to dynamic 2012-11-06 18:17:32 +04:00
greye
83f5b1df81 change to static --> dynamic search order 2012-11-06 17:58:49 +04:00
greye
9f1733a415 move record insertion to ESMStore 2012-11-06 17:51:38 +04:00
Marc Zinnschlag
d661d4f6d6 Merge remote-tracking branch 'emoose/bug-368' into next 2012-11-06 13:04:38 +01:00
greye
dccc157f4c setting up 2012-11-06 15:26:55 +04:00
greye
18bb5960e4 let's rescue linker 2012-11-06 15:10:57 +04:00
greye
0fd22ce4b0 CellRefList<X>::find(CellRef &, Y &list) -> ::load(CellRef &, ESMStore &) 2012-11-06 14:23:21 +04:00
greye
242a9b5a59 various interface fixes, commented unused code 2012-11-06 14:03:36 +04:00
greye
b3ad872845 new interface in manualref, fix various typos 2012-11-06 13:43:48 +04:00
greye
e74b2c060d disable createRecord(), Land constness hack, various fixes with Store<T> interface 2012-11-06 13:14:03 +04:00
greye
ff8da265ed applying new interface vol.9, inconsistent 2012-11-06 12:36:21 +04:00
emoose
3e5b396b56 Changed: world: cleanup 2012-11-05 21:10:04 +00:00
emoose
5c1b3fc043 Fixed: scene: adjust rotation/scale when creating objects 2012-11-05 20:45:04 +00:00
greye
4637503680 applying new interface vol.6, inconsistent 2012-11-06 00:34:11 +04:00
emoose
e8e3c211a4 Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation 2012-11-05 19:56:20 +00:00
emoose
7a7825577a Changed: use MWWorld::Ptr for PhysicsSystem arguments 2012-11-05 19:37:27 +00:00
greye
11567663a7 applying new interface vol.4, inconsistent 2012-11-05 22:34:08 +04:00
Marc Zinnschlag
61942c9c4a Issue #440: Make day numbers start at 1 instead of 0 2012-11-05 18:01:50 +01:00
greye
7cf0b8a680 just replace esmstore, inconsistent 2012-11-05 18:09:58 +04:00
greye
d205723a17 resolving m prefix/ESMStore movement 2012-11-05 18:02:47 +04:00
greye
8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 2012-11-05 17:41:36 +04:00
greye
10ae5d3365 dynamic storage for cells 2012-11-05 17:18:02 +04:00
greye
0f524e4a60 dynamic storage for records with string id 2012-11-05 17:18:01 +04:00
greye
9995fd324d split record comparator from store 2012-11-05 17:18:01 +04:00
greye
558e0557d0 basic static esmstore 2012-11-05 17:18:01 +04:00
greye
dd8f5e1a91 stores for records indexed with int, basic resolving 2012-11-05 17:18:01 +04:00
greye
ce91c5636d load() method for records with string id 2012-11-05 17:18:01 +04:00
greye
5ac54d1fff alter ESM::Script for storing id as std::string 2012-11-05 17:18:01 +04:00
greye
f0ecbbb056 basic Pathgrid store 2012-11-05 17:18:01 +04:00
greye
3b86955d37 basic Cell store 2012-11-05 17:18:01 +04:00
greye
e1f2f190d4 base record containers 2012-11-05 17:18:01 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f m prefix for mwworld/cellstore.hpp 2012-11-05 16:07:59 +04:00
emoose
accf8b2f71 Updated Bug #430 fix so it only moves the player now 2012-11-04 23:26:26 +00:00
emoose
cadc753216 Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell 
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
 2012-11-03 19:29:55 +00:00
emoose
4a9821dc65 fix kdevelop indentation... 2012-11-02 20:43:07 +00:00
emoose
15f972cc62 fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit 
todo: going from CharacterCreation back to CreateClassDialog loses data
 2012-11-02 20:33:08 +00:00
Marc Zinnschlag
4bc4ca775c Issue #432: fixed MWWorld::ContainerStore::clear 2012-11-01 15:11:13 +01:00
Marc Zinnschlag
c635447cea Merge branch 'death' 2012-10-27 13:34:20 +02:00
Marc Zinnschlag
ed3641b214 Issue #68: check for essential actors 2012-10-27 13:33:54 +02:00
scrawl
33361e6539 Merge branch 'master' into spellcreation 2012-10-23 10:38:53 +02:00
scrawl
d76522e7a4 searchPtrViaHandle 2012-10-19 19:48:02 +02:00
scrawl
28cc480ce1 fix some alchemy issues and make the gui use the new implementation 2012-10-18 22:21:39 +02:00
scrawl
c991f68a2d buying created spell 2012-10-15 21:54:19 +02:00
Mark Siewert
1f961d575e Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp
 2012-10-07 20:35:54 +02:00
Mark Siewert
28d4d7ea3f Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. 
- Remove check for 255 master/plugin files.
 2012-10-07 20:00:55 +02:00
scrawl
dc33dee22e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
 2012-10-01 20:25:23 +02:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
greye
721324c1db rm record inheritance, rework esmtool accordingly 2012-09-30 23:34:53 +04:00
Marc Zinnschlag
bb6d9a329c Merge remote-tracking branch 'scrawl/book_skillgain' into next 2012-09-26 20:35:48 +02:00
scrawl
caef570c8a fix the weather not changing when sleeping/waiting 2012-09-25 21:49:34 +02:00
scrawl
d163f8203c change books to RecListWithIDT 2012-09-25 21:38:34 +02:00
scrawl
853d62adba book skillgain 2012-09-25 18:59:24 +02:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +02:00
greye
807a56c9e4 fix dynamic potion id 2012-09-23 19:29:00 +04:00
scrawl
9f2668b45b Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
scrawl
9106e5307c moved global map from RenderingManager to gui and removed world method 2012-09-21 14:11:01 +02:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04:00
scrawl
8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 2012-09-20 17:41:14 +02:00
scrawl
86cfc91ef3 global map rendering 2012-09-20 13:56:37 +02:00
Marc Zinnschlag
a3c680d20a Merge remote-tracking branch 'scrawl/sleep_wait' into next 2012-09-19 09:41:32 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
scrawl
ab698bb401 date time label 2012-09-18 20:53:32 +02:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
Marc Zinnschlag
4469976be9 Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-09-18 10:44:25 +02:00
gugus
032ff7c879 Clean-up. There is still a little bug. 2012-09-17 13:36:48 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
Jason Hooks
192d634098 Movement keys; View angles 2012-09-16 13:19:38 -04:00
Jason Hooks
76f2a82884 More pmove stuff; Turned off broadphase, we could not fall in exteriors 2012-09-15 22:48:24 -04:00
Jason Hooks
f586f53a42 positioning 2012-09-15 16:45:50 -04:00
scrawl
9cf1cbc89b remove book skill gain 2012-09-15 20:03:53 +02:00
scrawl
3e5ab069a6 remove the const cast 2012-09-15 19:52:18 +02:00
Jason Hooks
02bca98e9f Setrotate working 2012-09-15 13:23:49 -04:00
scrawl
f5237ff1a6 skill gain from books 2012-09-15 19:06:56 +02:00
scrawl
2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
 2012-09-15 00:57:29 +02:00
Marc Zinnschlag
b7c9285b24 added support for out of world rendering 2012-09-14 21:12:16 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0 race selection preview 2012-09-13 19:03:31 +02:00
scrawl
d90af9c524 Merge branch 'master' into characterpreview 2012-09-13 14:22:17 +02:00
Marc Zinnschlag
835c530e06 Merge branch 'ingredients' 2012-09-13 13:31:46 +02:00
Marc Zinnschlag
fe68a252d5 Issue #356: Implemented ingredient eating 2012-09-13 13:02:26 +02:00
scrawl
4f3eb3c34a character preview WIP 2012-09-13 00:54:32 +02:00
Jason Hooks
a1a7733730 Set scale implemented 2012-09-12 18:30:32 -04:00
scrawl
2f0b47fc38 test 2012-09-13 00:21:58 +02:00
scrawl
d5a08e31e7 scene does not disappear anymore during load 2012-09-11 17:36:20 +02:00
scrawl
2b339f6c0f loading screen 2012-09-11 16:37:54 +02:00
Jason Hooks
23777033fd Starting to implement new PhysicActor 2012-09-05 17:44:11 -04:00
Marc Zinnschlag
0879abb948 Merge branch 'actiontarget' 2012-09-04 20:56:40 +02:00
Marc Zinnschlag
da041f902f Issue #370: fixed item taking sound 2012-09-04 20:56:28 +02:00
Marc Zinnschlag
fb8aae243d Issue #370: replaced custom target handling in talk action with base class implementation 2012-09-04 15:38:21 +02:00
Marc Zinnschlag
8ed8dd649a Issue #370: replaced custom target handling in take action with base class implementation 2012-09-04 15:34:44 +02:00
Marc Zinnschlag
ea1c3fe1e4 Issue #370: replaced custom target handling in open action with base class implementation 2012-09-04 15:29:51 +02:00
Marc Zinnschlag
8c2b4f996c Issue #370: replaced custom target handling in equip action with base class implementation 2012-09-04 15:27:10 +02:00
Marc Zinnschlag
b51c42146f Issue #370: replaced custom target handling in read action with base class implementation 2012-09-04 15:24:55 +02:00
Marc Zinnschlag
3f181f9a9d Issue #370: Support for targets in containers 2012-09-04 15:21:56 +02:00
Marc Zinnschlag
cc55056adf Issue #370: replaced custom target handling in apply action with base class implementation 2012-09-04 15:18:59 +02:00
Marc Zinnschlag
733654d730 Issue #370: implemented target handling in action base class 2012-09-04 15:14:33 +02:00
Marc Zinnschlag
1cecab6e3d fixed RefData::getHandle 2012-09-04 15:08:59 +02:00
Jason Hooks
2efceba1fc Tearing apart PhysicActor 2012-09-03 20:32:20 -04:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
gugus
95c27723f7 fixed a bug (see commit reverted) 2012-09-02 18:12:13 +02:00
gugus
99885e8ca4 Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p" 
This reverts commit 165065d378.
 2012-09-02 18:04:36 +02:00
Jason Hooks
0697c7f7f4 Finally merged in master 2012-09-01 17:28:12 -04:00
scrawl
d9276ca09d don't make copy of CellRefList in World::getNorthVector 2012-08-28 18:23:59 +02:00
scrawl
3c39c47e2f don't make copies of CellRefList & LiveCellRef 2012-08-28 18:23:01 +02:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
Marc Zinnschlag
40d4dad15e Issue #378: Fix (record wasn't build fully) 2012-08-28 09:32:38 +02:00
Marc Zinnschlag
d0cebea580 some cleanup 2012-08-26 18:50:47 +02:00
Marc Zinnschlag
450656a890 Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next 2012-08-26 18:39:09 +02:00
Douglas Diniz
5cbb08fee1 Task 339 - Moving all sounds to actions 2012-08-26 11:47:45 -03:00
gugus
165065d378 fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p 2012-08-21 19:54:42 +02:00
Douglas Diniz
82e7c04c0a Changing sounds to Action. 
Adding onActor to Action to choose between playSound and playSound3D.
 2012-08-19 20:11:50 -03:00
greye
e6c3e0744e tvm update and fix 2012-08-19 10:37:51 +04:00
greye
5b2b378f25 tvm script instruction 2012-08-18 18:05:10 +04:00
Marc Zinnschlag
1da56e2832 removed some unused variables 2012-08-17 15:37:14 +02:00
greye
4f10138a04 using real player sight angles on ray cast 2012-08-17 15:20:57 +04:00
greye
0e6e141fd4 camera control related script instructions 2012-08-17 15:20:57 +04:00
greye
6961830efb using real player eye direction when moving 2012-08-17 15:19:44 +04:00
greye
392e6efcb5 initial player rendering 2012-08-17 15:19:43 +04:00
greye
6f87c0c36d preview mode, advanced vanity support 2012-08-17 15:19:43 +04:00
greye
fe1a9ac3c5 poor camera with some fixes 2012-08-17 15:19:43 +04:00
greye
c46eeaa100 initial 3d-person camera support 2012-08-17 15:19:43 +04:00
Jason Hooks
8762f4a47a boxrotation nif field; commented functions 2012-08-15 16:47:26 -04:00
Jason Hooks
7b8b4c366d Set angle now working for npcs and creatures 2012-08-14 20:29:48 -04:00
Jason Hooks
1f5bc229e0 Separate adjustRigidBody function 2012-08-14 18:04:58 -04:00
Michael Mc Donnell
b373d0ec7b Correct struct to class in forward declarations 
Fixes http://bugs.openmw.org/issues/362
 2012-08-13 13:58:35 -04:00
Marc Zinnschlag
88e70cb5bd Merge branch 'decouple' 2012-08-12 18:11:17 +02:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
Marc Zinnschlag
484cce12a8 Issue #107: removed redundant getStore function from window manager 2012-08-12 14:36:46 +02:00
Jason Hooks
e7329d5f8b Creatures now have a properly positioned box shape 2012-08-12 00:36:49 -04:00
Marc Zinnschlag
b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
greye
f7f8ac0a73 fix move/rotateObject code 2012-08-11 18:28:37 +04:00
Marc Zinnschlag
380defa52f Merge remote branch 'greye/cross_cell-borders' 2012-08-11 15:08:17 +02:00
greye
47f7a5e988 fix double pos/rot adjustment 2012-08-11 17:01:55 +04:00
Marc Zinnschlag
766e782aae Merge remote branch 'greye/cross_cell-borders' 2012-08-11 12:05:10 +02:00
Marc Zinnschlag
6eb9f15b6d fixed time stamp operator 2012-08-11 11:38:26 +02:00
greye
45306e4bc3 fixed rotation adjustment 2012-08-11 13:23:54 +04:00
greye
5018db3332 removed some redundant code, added some comments 2012-08-11 12:13:16 +04:00
scrawl
11fadf4a07 forgot something 2012-08-10 16:25:27 +02:00
scrawl
44ff31b50a removed world exit methods 2012-08-10 16:21:53 +02:00
scrawl
f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 2012-08-10 15:15:48 +02:00
Jason Hooks
083e3537b4 post merge 2012-08-09 17:21:59 -04:00
greye
38b06aee6c resolving conflicts 2012-08-09 21:49:00 +04:00
Marc Zinnschlag
aca08eb4c2 Merge branch 'decouple' into player_control 
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.hpp
 2012-08-09 16:12:10 +02:00
Marc Zinnschlag
6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 2012-08-09 14:33:21 +02:00
Marc Zinnschlag
923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 2012-08-09 10:35:53 +02:00
greye
ec9cf4d3c6 rotateObject() added, input system rewritten 2012-08-09 00:15:52 +04:00
greye
b6f7f21bcf fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added 2012-08-08 14:51:33 +04:00
greye
79b7487c87 fix using deleted objects 2012-08-07 22:21:46 +04:00
greye
d32a61b928 fix object moving 2012-08-06 18:20:48 +04:00
Marc Zinnschlag
1db7978361 silenced a warning 2012-08-04 22:03:14 +02:00
Marc Zinnschlag
0c5f886683 Merge remote branch 'greye/player_control' 2012-08-04 21:55:13 +02:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04:00
greye
16ad97610d add support for some scripting player control switches 2012-08-04 11:54:42 +04:00
Marc Zinnschlag
994e33e3d2 fixed object rotation code 2012-08-04 09:34:49 +02:00
greye
ff62770657 World::isUnderwater(), World::isSwimming() 2012-08-03 14:42:09 +04:00
greye
f2a2e5f57d remove MWWorld::Player::setPos() 2012-07-31 19:30:24 +04:00
greye
0e3f70413e a very little comments 2012-07-31 16:52:21 +04:00
greye
288b63350c fixed objects update, local script handling 2012-07-31 11:46:57 +04:00
greye
37990b5133 fix player update 2012-07-30 23:54:26 +04:00
greye
d6150b7482 high-level implementation, unstable 2012-07-30 23:28:14 +04:00
Marc Zinnschlag
8b08928dae Issue #351: Added sound playing to Action 2012-07-27 12:19:25 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
Marc Zinnschlag
7725190f89 removed some redundant code 2012-07-26 19:09:45 +02:00
greye
aa5f63ffcc disabled items placing handling 2012-07-26 19:06:48 +04:00
greye
26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 2012-07-26 16:14:11 +04:00
greye
cd04911f3c dropping on the ground 2012-07-25 20:31:39 +04:00
greye
49b1d5e127 fix object placing 2012-07-25 20:31:39 +04:00
greye
e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 2012-07-25 20:31:39 +04:00
greye
bcc47cd5fb local scripts, move placing to World::placeObject(Ptr, CellStore, Position) 2012-07-25 20:31:39 +04:00
greye
d5fe378a66 Revert "local script registration" 
This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.
 2012-07-25 20:31:39 +04:00
greye
aff05b9d36 local script registration 2012-07-25 20:31:39 +04:00
greye
e1c7d1f529 fixed item sinking 2012-07-25 20:31:39 +04:00
greye
6a3a728a56 Class::getModel implementation 2012-07-25 20:31:39 +04:00
greye
87050e48c8 physics getObjectHeight(), MWWorld::Class::getModel() definition 2012-07-25 20:31:39 +04:00
greye
71253c64ab moving part 2, adding position parameter, stable 2012-07-25 20:31:39 +04:00
greye
61cb012ee7 moving Scene::insertObject to CellStore::insertObject, part 1 2012-07-25 20:31:39 +04:00
greye
b760225179 wrong branch 
This reverts commit d36d6aacf4.
 2012-07-24 00:00:10 +04:00
greye
d36d6aacf4 move Scene::insertObject to CellStore::insertObject, part 1 2012-07-23 23:56:20 +04:00
greye
9a2690f849 Revert "wrong" 
This reverts commit 3aa53fea32.
 2012-07-23 23:07:28 +04:00
greye
3aa53fea32 wrong 2012-07-23 23:06:53 +04:00
scrawl
acc5c3bbbf some fixes 2012-07-20 17:08:15 +02:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
6744375636 fixed a logic error in the auto equip code 2012-07-17 18:35:01 +02:00
Marc Zinnschlag
beb18282bb Issue #342: various fixes 2012-07-17 16:44:55 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2012-07-14 11:16:35 +02:00
Marc Zinnschlag
29b4a5e5f7 Issue #314: added apply actions 2012-07-13 09:41:38 +02:00
scrawl
7731e9a6fa finished cleaning up sky 2012-07-13 09:13:12 +02:00
Marc Zinnschlag
805b81bf6e Issue #314: added skillUsageSucceeded function to Class 2012-07-13 09:03:17 +02:00
Marc Zinnschlag
7a2d613043 Issue #314: extended Class::apply function to cover the actor 2012-07-13 08:50:46 +02:00
Marc Zinnschlag
ec9ebe6b58 Merge branch 'skillgain' into potions 
Conflicts:
	apps/openmw/mwmechanics/activespells.cpp
 2012-07-10 14:08:30 +02:00
Marc Zinnschlag
f11bf49a90 cmake fix; silenced some warnings 2012-07-10 13:23:41 +02:00
gugus
164a5c8fe4 rotation now also work with the physic representation 2012-07-10 12:10:50 +02:00
gugus
70c74ede05 changed rotation order 2012-07-10 11:53:12 +02:00
gugus
410b693555 setAngle improvement 2012-07-10 11:15:46 +02:00
gugus
557e114992 clean-up + getScale/Angle script instructions 2012-07-09 19:28:44 +02:00
gugus
0a67f60a6e Clean-up 2012-07-09 18:47:59 +02:00
gugus
e6716c25c3 little correction. 2012-07-09 15:41:19 +02:00
gugus
feec67094f Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwworld/physicssystem.cpp
 2012-07-09 15:23:26 +02:00
gugus
03f7740474 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/worldimp.hpp
 2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d merge 2012-07-07 15:27:04 -04:00
Marc Zinnschlag
fe86ce5a2c DrawState workaround 2012-07-07 20:53:19 +02:00
Marc Zinnschlag
6277e39216 Merge branch 'master' into skillgain 2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson
113457d934 Fixed some windows issues and got rid of a few tiny warnings while at it. 2012-07-07 01:14:18 +02:00
Marc Zinnschlag
10723a149b Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC 2012-07-06 18:25:16 +02:00
Marc Zinnschlag
d30ba14a17 Issue #324: Finished turning NpcStats into a proper class 2012-07-06 18:23:48 +02:00
Marc Zinnschlag
771863e73b Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue 2012-07-06 15:50:26 +02:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e Issue #107: Ptr related include cleanup 2012-07-03 13:55:53 +02:00
Marc Zinnschlag
5a7b95bf7a Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp 2012-07-03 13:15:20 +02:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
Marc Zinnschlag
035c1c4b6e added World interface class; cleanup of World interface 2012-07-03 01:06:38 +02:00
Marc Zinnschlag
7fcd41c69d Issue #107: Detemplateised CellStore; some include cleanup 2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00
Marc Zinnschlag
83c3972a89 Issue #314: added return value to addSpell function 2012-06-24 16:23:43 +02:00
scrawl
63ce143a04 fix triangle / batch counts with compositors 2012-06-22 12:56:04 +02:00
Marc Zinnschlag
89ac0fa232 Issue #312: Implemented ID-search caching to speed up some badly written scripts 2012-06-21 11:43:18 +02:00
Jason Hooks
5c51674070 update 2012-06-20 13:14:27 -04:00
Jason Hooks
86d8a07fc7 Switching back to old scaling 2012-06-19 13:28:06 -04:00
Marc Zinnschlag
1f0efa9f7d Merge remote branch 'scrawl/guifixes' 2012-06-19 19:06:18 +02:00
scrawl
15e959868c make some of the gui mode changes a bit safer 2012-06-19 17:07:00 +02:00
Marc Zinnschlag
590dfe8d63 fixed the container fill problem on cell load 2012-06-19 16:42:10 +02:00
Jason Hooks
4d55ecfdbe Deleting scaled shapes; scaleObject() 2012-06-18 13:03:00 -04:00
Jason Hooks
33fe80723c btScaledBvhTriangleMeshShapes 2012-06-17 20:56:10 -04:00
gugus
5397b9dba6 Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 2012-06-16 11:38:07 +02:00
gugus
01fefca0a3 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-15 14:53:19 +02:00
Jason Hooks
20288de685 Post merge 2012-06-11 15:39:57 -04:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
gugus
0012d7eb58 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-03 12:53:23 +02:00
scrawl
0ba0b2122e set the implicit object for script excution by clicking on it 2012-06-02 12:25:24 +02:00
scrawl
36d26e0681 set the camera orientation after using teleport doors 2012-05-30 15:52:39 +02:00
Marc Zinnschlag
2bbbff2b75 Merge remote branch 'scrawl/spellwindow' 2012-05-30 10:22:56 +02:00
scrawl
2c90654401 fix a typo that caused a crash when trying to disable an already disabled object 2012-05-30 09:21:41 +02:00
gugus
a711a3ebe1 Various fixes 2012-05-29 16:45:43 +02:00
scrawl
30461438f6 still left: spell success formula 2012-05-29 12:35:03 +02:00
gugus
d8051095d6 rotation are updated in the physis system 2012-05-29 10:36:12 +02:00
gugus
26d6c9453c more work on rotation 2012-05-29 10:15:29 +02:00
scrawl
8c7cb6909d addition to c7010623fb : apparently talking _is_ allowed during the starting sequence, it is only disabled via scripts for certain actors 2012-05-29 01:59:16 +02:00
gugus
77084b27c0 some work for rotation/scaling 2012-05-28 16:01:35 +02:00
scrawl
738e107b52 Merge branch 'master' into next 2012-05-26 05:31:32 +02:00
scrawl
c7010623fb Issue #294: disallowed inventory prevents Talk, Open and Take actions 2012-05-25 18:45:17 +02:00
gugus
51b6d5cae0 Scale *should* work. (no script instruction yet) 2012-05-25 18:23:06 +02:00
Marc Zinnschlag
173820d29b Merge branch 'enable' 2012-05-25 18:19:12 +02:00
Marc Zinnschlag
6fe53aa320 Issue #277: containers in cells were not filled up on cell load when the cell was preloaded before 2012-05-25 17:55:00 +02:00
Marc Zinnschlag
0131c53005 Issue #176: removed enable/disable functions from MWWorld::Class 2012-05-25 17:28:27 +02:00
scrawl
51b8a76a68 merged by branches together, starting with alchemy window 
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
 2012-05-24 15:57:23 +02:00
Marc Zinnschlag
684208dfc9 Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager 2012-05-24 13:26:07 +02:00
scrawl
7ebbc099b3 allow stacking gui modes 2012-05-23 12:23:35 +02:00
Jason Hooks
0066ef9b54 Some cleanup 2012-05-22 21:40:24 -04:00
scrawl
656a8f1be9 working menu transparency slider 2012-05-23 01:32:36 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics' 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-05-21 11:24:36 +02:00
gugus
dac98b2213 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 2012-05-21 11:02:10 +02:00
gugus
ca9224ed7f starting scale function 2012-05-21 10:58:04 +02:00
Marc Zinnschlag
3e85151c9d Merge remote branch 'scrawl/inventoryGUI' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-05-21 10:13:27 +02:00
scrawl
8f2c8bbea4 Merge branch 'master' into graphics 2012-05-21 09:50:46 +02:00
Marc Zinnschlag
420cd53be0 Merge branch 'effects' 2012-05-19 17:41:47 +02:00
Marc Zinnschlag
be46f5a59c various fixes 2012-05-19 17:39:24 +02:00
Marc Zinnschlag
74ae3605e0 Issue #256: added getTimeStamp function to World 2012-05-19 09:31:45 +02:00
scrawl
9ca579ba63 slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly 2012-05-19 00:36:01 +02:00
scrawl
8a0c859c16 Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI 2012-05-18 22:27:48 +02:00
Marc Zinnschlag
498530fad7 container iterator fix 2012-05-18 22:24:19 +02:00
scrawl
c004f5d570 adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications 2012-05-18 22:06:25 +02:00
Marc Zinnschlag
a4343bfa18 Issue #256: added TimeStamp class 2012-05-18 22:04:22 +02:00
Marc Zinnschlag
124ea77612 Issue #256: consider equipped items when calculating magic effects 2012-05-18 15:48:55 +02:00
scrawl
3cacc8feec add re-stocking items to containers (though restocking isn't implemented) 2012-05-17 23:22:41 +02:00
scrawl
1f85475536 Merge branch 'master' into inventoryGUI 2012-05-17 19:03:41 +02:00
scrawl
375c198ebd WeatherManager: fix for cells that have no region. 2012-05-17 18:21:05 +02:00
scrawl
ae77e7b0d8 don't try to retrieve land data from non-predefined cells. 2012-05-17 18:11:34 +02:00
Marc Zinnschlag
6b74fec8ed don't do a half finished cell change, when trying to switch to an interior cell that does not exist 2012-05-17 17:13:41 +02:00
scrawl
fca9f1fc5f gold dropping works without crash, but the code needs clean up. 2012-05-16 22:56:54 +02:00
scrawl
178ad876d7 fix for objects other than Miscellaneous. 2012-05-16 22:17:13 +02:00
scrawl
5875ce5128 select the correct gold base object (still crashing) 2012-05-16 22:13:56 +02:00
scrawl
f73d3ad33f fix to the "drop object on ground" feature. still crashes for gold. 2012-05-16 21:27:02 +02:00
scrawl
6d34e61dbd don't stack gold if it has a script (not used in MW, but some mods might) 2012-05-16 19:18:50 +02:00
scrawl
4b5d6ce311 allow stacking gold 2012-05-16 17:22:25 +02:00
scrawl
0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping 2012-05-16 16:08:55 +02:00
scrawl
2fa7ce0c19 equipping works also when the item wasn't in player inventory before. 2012-05-16 00:02:05 +02:00
scrawl
e9ea1fba4e fixed typo getCapacity method 2012-05-15 22:31:52 +02:00
scrawl
d3a53ae0b8 removed the _freeSlot method which is now unneeded 2012-05-15 22:01:09 +02:00
scrawl
0063387979 Merge branch 'master' into inventoryGUI 2012-05-15 21:48:05 +02:00
Marc Zinnschlag
7e00fea18b added getEncumbrance function 2012-05-15 21:34:00 +02:00
Marc Zinnschlag
c6493fb133 added getCapacity function 2012-05-15 21:17:00 +02:00
scrawl
ca4fa21d64 removed the attempt to unify activation and use scripts which was incorrect 2012-05-15 20:51:19 +02:00
scrawl
71de10cb7e equipping items works, but only if you have more than one of the item that you're equipping 2012-05-15 20:33:34 +02:00
scrawl
ab6336b745 using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now) 2012-05-15 18:05:53 +02:00
scrawl
b18ee198b4 use a raycast to determine where to place object, if distance is too far 
drop it on the ground
 2012-05-15 16:47:23 +02:00
scrawl
933a40de14 better floating object label positioning. 2012-05-14 21:37:43 +02:00
scrawl
d3e162ec83 dropping items works 2012-05-14 17:41:17 +02:00
scrawl
f300a5621c Merge branch 'master' into inventoryGUI 2012-05-13 17:45:57 +02:00
scrawl
82b9f835b1 make sure iterator is not end() before trying to get the equipped item 2012-05-13 16:54:18 +02:00
scrawl
471f6467ec Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-05-13 16:18:22 +02:00
scrawl
e9a1ef4269 Merge branch 'master' into inventoryGUI 2012-05-13 16:16:54 +02:00
scrawl
d341d2113c fixed some issues 2012-05-13 14:58:38 +02:00
scrawl
ee7e482cba implemented un-stacking 2012-05-13 11:52:17 +02:00
scrawl
16522ddc59 InventoryStore re-stacking unequipped items 2012-05-12 23:09:03 +02:00
scrawl
6ee4e8fb5a Merge branch 'itemstacking' into inventoryGUI 
Conflicts:
	apps/openmw/mwclass/armor.hpp
	apps/openmw/mwclass/clothing.hpp
	apps/openmw/mwclass/weapon.hpp
	apps/openmw/mwworld/class.hpp
 2012-05-12 18:32:06 +02:00
scrawl
9f2595183b type 2012-05-12 16:30:27 +02:00
scrawl
5b0251b09f item stacking 2012-05-12 16:17:03 +02:00
scrawl
296dbce298 Merge branch 'master' into graphics 2012-05-12 13:47:56 +02:00
scrawl
a1b86acc38 Merge branch 'master' into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
 2012-05-11 16:41:27 +02:00
gugus
9dd65dce30 Finished merging. 2012-05-11 11:52:07 +02:00
gugus
8e8f80807e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp
 2012-05-11 10:40:40 +02:00
scrawl
ee883446b5 Merge branch 'master' into graphics 2012-05-04 07:38:11 +02:00
scrawl
ad5753ba91 Merge branch 'master' of https://github.com/zinnschlag/openmw into gui 2012-05-04 07:34:38 +02:00
scrawl
9fc1138a87 opening, closing and taking books/scrolls works 2012-05-03 05:26:05 +02:00
scrawl
6acb777c5a minimum framerate fix 2012-05-01 20:51:32 +02:00
scrawl
86b6184f43 pMove in a seperate loop with fixed timestep to prevent frame-dependent movement 2012-04-30 23:55:22 +02:00
scrawl
4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-30 18:46:51 +02:00
scrawl
aaa81397ed Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-30 18:24:05 +02:00
scrawl
50d79a8815 Merge branch 'next' into tooltips 2012-04-29 17:30:34 +02:00
scrawl
11ebae3be2 toggleCompositors command useful for debugging 2012-04-29 03:33:10 +02:00
scrawl
5d4d35a02c Merge branch 'master' into graphics 2012-04-28 20:43:53 +02:00
scrawl
4ce83badc9 flickering lights 2012-04-28 20:42:53 +02:00
Marc Zinnschlag
d5e52e46ea removing even more cout spam (thanks to scrawl for finding this one) 2012-04-24 09:19:41 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
 2012-04-24 02:02:03 +02:00
scrawl
e443455612 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2012-04-24 00:54:35 +02:00
Marc Zinnschlag
7ac9523e0c Merge branch 'master' into next 2012-04-23 15:32:02 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
Marc Zinnschlag
7102a825c2 Issue 255: moved global scripts into script manager (simplifying the environment class) 2012-04-23 11:15:47 +02:00
scrawl
2c89306306 Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 2012-04-22 00:33:37 +02:00
Jason Hooks
8ebae0b706 Solid trace 2012-04-21 16:57:46 -04:00
Jason Hooks
16855291a7 Implementing snapping 2012-04-21 16:21:30 -04:00
Marc Zinnschlag
cc86998281 removing some cout spam 2012-04-21 10:12:59 +02:00
scrawl
c6da3872b4 light improvements 2012-04-19 20:59:57 +02:00
pchan3
f902c8fa6f Fixes on Namespace issue & more. 2012-04-18 22:35:35 +10:00
scrawl
75b336baea Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	apps/openmw/mwworld/player.cpp
	libs/openengine/bullet/physic.cpp
 2012-04-18 13:43:15 +02:00
Jason Hooks
4d07ae7fe0 Swimming working 2012-04-18 00:13:38 -04:00
Jason Hooks
5f9056c45d Better no clip 2012-04-17 20:31:36 -04:00
Jason Hooks
1ce759af06 Merging in master 2012-04-17 18:12:05 -04:00
scrawl
cdd4d83d9e moved the tooltip info to the appropriate MWWorld::Class classes 2012-04-16 22:58:16 +02:00
scrawl
282f37b1b7 fix compilation 2012-04-16 19:34:46 +02:00
scrawl
53b48196f9 add interface for tooltips to MWWorld::Class 2012-04-16 19:30:52 +02:00
Marc Zinnschlag
afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-15 22:06:05 +02:00
scrawl
688e79e6d1 Merge branch 'master' into tooltips 2012-04-15 21:14:39 +02:00
gugus
58d05fa503 more clean-up. Container window shows up! But there is no working close button. 2012-04-15 20:56:45 +02:00
gugus
78c8a22cd1 more clean up. The container GUI shows up now 2012-04-15 19:32:41 +02:00
gugus
a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-04-15 17:54:13 +02:00
gugus
b309d245c5 cleaning up hircine work 2012-04-15 17:52:39 +02:00
scrawl
d37bc9cba8 basic mouse-over info for in-game objects 2012-04-15 17:10:08 +02:00
scrawl
f2fae770d4 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwworld/player.cpp
 2012-04-13 13:55:13 +02:00
Jason Hooks
7fce57f335 Getting started with a new branch 2012-04-11 20:16:22 -04:00
scrawl
75dd651205 Merge branch 'terraincollision' into physicsterrain 
Conflicts:
	apps/openmw/mwworld/physicssystem.cpp
 2012-04-09 13:56:09 +02:00
Jason Hooks
74deb5588d Post merge 2012-04-08 20:41:49 -04:00
Marc Zinnschlag
5e9d209b21 Merge remote branch 'minty3/testbranch' 2012-04-08 23:40:48 +02:00
Aleksandar Jovanov
db928dcb2f put an opening bracket on a new line 2012-04-08 19:44:11 +02:00
Aleksandar Jovanov
9893e4b384 made player respect NpcStats for mDrawState 2012-04-08 19:43:04 +02:00
Marc Zinnschlag
9e3299cae8 Merge remote branch 'scrawl/water' 2012-04-08 18:40:19 +02:00
Alexander "Ace" Olofsson
00b8ce6b35 Fix linker error in windows. 2012-04-08 18:22:41 +02:00
scrawl
9e1a9e5758 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	libs/openengine/bullet/physic.cpp
 2012-04-08 17:08:36 +02:00
scrawl
b1c84f28a9 Merge branch 'master' into water 
Conflicts:
	files/settings-default.cfg
 2012-04-08 16:11:16 +02:00
Aleksandar Jovanov
15526d6110 only fists support lacks 2012-04-08 13:17:16 +02:00
Marc Zinnschlag
77604086e2 Merge branch 'autoequip' 2012-04-08 13:01:25 +02:00
Marc Zinnschlag
dcab6737e5 consider skills when auto equipping 2012-04-08 12:26:21 +02:00
Aleksandar Jovanov
b1259ca15c added a 'backend' for NPC/Player draw state 2012-04-08 12:25:33 +02:00
scrawl
c748252d33 weather fix again 2012-04-07 22:55:25 +02:00
scrawl
cdea19206c Revert "more accurate fog, TODO: apply this to the terrain" 
This reverts commit 96c37d3e7c.
 2012-04-07 22:47:39 +02:00
Marc Zinnschlag
34a02fef45 consider item value when auto equipping 2012-04-07 20:09:09 +02:00
Marc Zinnschlag
d5a7d418dd added getValue function to Class hierarchy 2012-04-07 19:53:49 +02:00
Marc Zinnschlag
f52b9cc162 Merge branch 'autoequip' 2012-04-07 18:48:30 +02:00
scrawl
96c37d3e7c more accurate fog, TODO: apply this to the terrain 2012-04-07 16:55:32 +02:00
scrawl
dbf7547003 fixed first weather transition being instant 2012-04-07 16:33:03 +02:00
scrawl
f008ca166b restored moons like they were 2012-04-06 19:21:28 +02:00
scrawl
456eb95209 reversed sun and moon paths (sunrise at east) 2012-04-06 18:22:37 +02:00
scrawl
e718d4b6f0 another sky fix 2012-04-05 22:36:48 +02:00
scrawl
b36c0d95b8 night transition fix 2012-04-05 22:11:04 +02:00
scrawl
88c50c5171 Merge branch 'master' into water 2012-04-05 15:38:46 +02:00
Sebastian Wick
57ae1bdc43 Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg 
Conflicts:
	apps/openmw/main.cpp
 2012-04-04 20:58:02 +02:00
Sebastian Wick
48b7b03453 typo; World::getFallback(std::string key, std::string def) 2012-04-04 16:15:15 +02:00
Sebastian Wick
16e7bf353a remove debug message 2012-04-04 16:08:46 +02:00
scrawl
052cc47ee9 fixed waterAdded 2012-04-03 16:53:33 +02:00
Jason Hooks
57299571d5 Preparing for clothes/armor 2012-04-02 22:08:46 -04:00
Sebastian Wick
73705dadf6 parse fallback with boost program option custom validators 2012-04-03 02:14:39 +02:00
Sebastian Wick
ab9c430632 fallback in apps/openmw; fix for apps/mwiniimporter 2012-04-02 20:47:09 +02:00
scrawl
c0af3c7241 Merge branch 'master' into terraincollision 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-02 19:57:58 +02:00
scrawl
e0631dd9be Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-02 14:38:02 +02:00
Marc Zinnschlag
6022d3ab13 Merge remote branch 'corristo/pgrd-rendering' 
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
 2012-04-02 12:04:47 +02:00
Marc Zinnschlag
fb44a5da10 Merge remote branch 'ace/win-fix' 2012-04-02 11:46:09 +02:00
Marc Zinnschlag
cdd0182912 Merge remote branch 'scrawl/occlusionquery' 
Reduced cout spam

Conflicts:
	apps/openmw/mwrender/occlusionquery.cpp
 2012-04-02 11:33:16 +02:00
Jason Hooks
07d0203a3c Merge remote-tracking branch 'upstream/master' 2012-04-02 00:08:12 -04:00
Alexander "Ace" Olofsson
cec9562282 Fixing an ambigous symbol 2012-04-01 20:29:00 +02:00
scrawl
0a5757791c Merge branch 'master' into minimap 2012-04-01 20:17:07 +02:00
scrawl
ee754eda6c don't create sky until entering an exterior cell 2012-04-01 15:07:41 +02:00
scrawl
df8e0bbff2 player check 2012-04-01 14:53:41 +02:00
scrawl
80456778be fix for pickup up transparent objects, workaround for doors 2012-04-01 14:22:04 +02:00
Jason Hooks
0021ccf862 Merge remote-tracking branch 'upstream/master' 2012-03-31 20:48:42 -04:00
Marc Zinnschlag
751e7d2199 basic auto-equipping (picks the first matching item 2012-03-31 17:26:15 +02:00
Marc Zinnschlag
a1d3516e0a constness fix 2012-03-30 17:01:23 +02:00
scrawl
521b9eec6c Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/world.cpp
 2012-03-30 15:31:07 +02:00
scrawl
4a6d034591 Merge branch 'master' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
 2012-03-30 14:39:42 +02:00
Nikolay Kasyanov
b21a6291f7 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
	apps/openmw/mwworld/world.hpp
 2012-03-30 02:50:30 +04:00
scrawl
79c2a2e465 implemented toggleWater (twa); formatting again 2012-03-29 18:33:08 +02:00
scrawl
01ecf3e0be attempt at rotation (BROKEN) 2012-03-29 18:16:11 +02:00
scrawl
37e6db69d8 fix 2012-03-29 17:07:59 +02:00
scrawl
f497813043 formatting, added Water::setHeight 2012-03-29 15:49:24 +02:00
Nikolay Kasyanov
c3357c4396 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
 2012-03-29 13:27:13 +04:00
scrawl
39b3afb98f use camera height instead of player height for underwater check 2012-03-29 05:03:34 +02:00
scrawl
c5f044eb0d fixed compilation 2012-03-28 22:46:29 +02:00
scrawl
58f7a03626 Merge branch 'terrain18' into terraincollision 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-03-28 21:46:52 +02:00
scrawl
e6303fc3f4 Merge branch 'master' into water 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-28 21:37:20 +02:00
scrawl
4249d2c536 add getNorthVector method 2012-03-28 03:15:10 +02:00
Jason Hooks
b9fabce9c4 Awesome, working 2012-03-27 20:17:54 -04:00
scrawl
43b1f896f4 fix object pickup when player is very close to object 2012-03-27 22:36:02 +02:00
scrawl
8f6d10f229 fix uninitalised stuff 2012-03-27 20:59:58 +02:00
Jason Hooks
e4251be529 Down gravity 2012-03-25 15:16:02 -04:00
scrawl
53d4be5cf6 object pickup should work everywhere 2012-03-25 20:52:56 +02:00
Jason Hooks
18a139cd66 adding up and down move buttons 2012-03-24 22:03:08 -04:00
scrawl
743ea0c9be use hardware occlusion query for sun glare effect 2012-03-24 17:59:26 +01:00
scrawl
6067053f08 Merge branch 'next' into water 
Conflicts:
	CMakeLists.txt
 2012-03-22 21:41:32 +01:00
scrawl
ab9aa1ba74 Merge branch 'next' into minimap 
Conflicts:
	files/mygui/openmw_map_window_layout.xml
 2012-03-22 19:36:37 +01:00
Marc Zinnschlag
47828f91f0 Issue #217: added getWeight function to ContainerStore 2012-03-22 09:45:48 +01:00
Marc Zinnschlag
3dcfcf46cb Issue #217: container change tracking 2012-03-21 12:48:05 +01:00
Marc Zinnschlag
a0ee2954bd Issue #217: moved some functino implementations from ptr.hpp to ptr.cpp 2012-03-21 12:29:07 +01:00
Marc Zinnschlag
0adbe258fd Issue #217: made Ptr track container; fixed a cmake script bug 2012-03-21 12:20:19 +01:00
Jason Hooks
2b3e75718c Updating everything 2012-03-19 20:03:48 -04:00
Jason Hooks
ed7cb1dc67 restarting 2012-03-19 19:38:44 -04:00
scrawl
04c6f23a2b disabled solstheim weather (we can't travel there anyway) 
also, there was a bug that could cause this weather to show up on
morrowind, which is fixed now
 2012-03-19 22:54:04 +01:00
gugus
11569819db compilation fix 2012-03-19 18:01:54 +01:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
gugus
7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-19 00:20:43 +01:00
scrawl
1840401172 weather transitions (e.g. from clear to cloudy) use timescale 2012-03-17 13:14:31 +01:00
scrawl
3ae69f792a no light-"jumps" during night 2012-03-17 12:57:52 +01:00
scrawl
5ea2122f79 sun gradually disappears 2012-03-16 20:39:58 +01:00
scrawl
d18b3271b1 transition tweak 2 2012-03-16 20:32:41 +01:00
scrawl
460b584934 transition tweaks 2012-03-16 19:49:01 +01:00
scrawl
a67cc8e73b more fixes 2012-03-16 19:02:33 +01:00
gugus
10321ff51a Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-16 17:58:23 +01:00
scrawl
c885ec1bd1 Merge branch 'master' into minimap 2012-03-16 17:10:27 +01:00
scrawl
91d2031eb7 first attempt at map window 2012-03-16 17:09:31 +01:00
Nikolay Kasyanov
65fc141b62 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-15 20:38:21 +04:00
Marc Zinnschlag
5b378e820d warning level adjustments and some related fixes 2012-03-15 16:01:41 +01:00
Marc Zinnschlag
c616d005e8 fixed a spelling mistake 2012-03-15 14:31:16 +01:00
scrawl
2edd7e59f4 some fixes and facilities for saving the fog of war to disk 2012-03-14 20:44:06 +01:00
Michael Papageorgiou
947288e13a Merge master and rewrite around the new detection function 2012-03-14 00:38:44 +02:00
scrawl
f46d9b094b fix weather sounds sometimes playing in interiors 2012-03-13 17:25:07 +01:00
scrawl
9612ce595b Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision 
Conflicts:
	CMakeLists.txt
 2012-03-13 17:09:50 +01:00
Michael Papageorgiou
6dddf8a3d5 Pickup sounds for armors 2012-03-13 18:05:38 +02:00
scrawl
771f920c2c Merge branch 'master' of https://github.com/zinnschlag/openmw into minimap 2012-03-13 15:59:09 +01:00
Marc Zinnschlag
c314cddb1c added getEquipmentSkill function to Class hierarchy 2012-03-13 14:27:13 +01:00
Marc Zinnschlag
ea336214de more inventory sanity checks 2012-03-13 14:04:19 +01:00
Marc Zinnschlag
4b73116b9d added getEquipmentSlots function to MWWorld::Class hierarchy 2012-03-13 13:50:11 +01:00
Marc Zinnschlag
635b7ec6cb slot system 2012-03-13 13:31:11 +01:00
Marc Zinnschlag
222b5b741e Merge branch 'master' into equipment 2012-03-13 12:14:47 +01:00
Jason Hooks
6d346933db gus's changes 2012-03-10 17:45:34 -05:00
scrawl
fa68be2b19 set map window cell name 2012-03-10 16:05:12 +01:00
scrawl
5b38b17baf local map rendering (nothing to see yet, as it is not displayed in GUI) 2012-03-10 15:28:18 +01:00
Nikolay Kasyanov
5328853445 Feature #37 (In Progress) Render Path Grid 
added "togglepathgrid" script command
 2012-03-10 18:13:44 +04:00
Marc Zinnschlag
79158b9325 NPCs are using InventoryStore instead of ContainerStore from now on 2012-03-10 12:49:54 +01:00
Marc Zinnschlag
84c8cd3720 added InventoryStore class (doesn't do anything yet) 2012-03-10 12:49:27 +01:00
Marc Zinnschlag
5562653578 provisionally fill up containers on cell load 2012-03-10 12:36:29 +01:00
Marc Zinnschlag
06e0706b35 added fill and clear functions to container store 2012-03-10 12:11:07 +01:00
scrawl
2196e1321b added weather sounds 2012-03-09 18:30:03 +01:00
gugus
39415f0b4a fix compilation bug with Visual C++ 2012-03-07 17:35:10 +01:00
gugus
4990ba48ed Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-07 09:47:46 +01:00
Marc Zinnschlag
25f5bdf7aa Merge remote branch 'scrawl/weather' 2012-03-05 22:45:52 +01:00
scrawl
3ea2a9f05d changeWeather bugfix 2012-03-05 19:13:11 +01:00
Marc Zinnschlag
69f0ec99f1 implemented dialogue scripts 2012-03-05 16:56:14 +01:00
scrawl
ba0365a427 collision shape scale fix 2012-03-02 16:47:39 +01:00
Marc Zinnschlag
739870489a Merge remote branch 'scrawl/weather' into weather 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-02-27 15:02:03 +01:00
scrawl
c9ceb74e5c transition fix 2012-02-27 12:21:00 +01:00
scrawl
8b0ef8f98c improvements to sun glare 2012-02-26 20:46:09 +01:00
scrawl
932983c2fa fix toggleSky 2012-02-26 18:21:11 +01:00
scrawl
c1d39bb35f tweaked cloud color 2012-02-26 15:54:52 +01:00
scrawl
f79bf1f300 fog 2012-02-26 13:13:29 +01:00
scrawl
528cff5a59 implemented ChangeWeather script function 2012-02-26 11:51:02 +01:00
scrawl
a05ba97382 choose a random weather depending on region's weather probabilities 2012-02-25 23:41:02 +01:00
scrawl
d77d5080bd implemented GetCurrentWeather script function 2012-02-25 21:34:38 +01:00
scrawl
8d5783d75d - set moon phase using (day%32)/4 (not really correct, but good for now) 
- added all weather patterns from morrowind.ini
 2012-02-25 21:06:03 +01:00
scrawl
e31ad90802 moon positions and fading 2012-02-25 16:36:45 +01:00
scrawl
4650672bb1 thunderstorm 2012-02-25 13:46:17 +01:00
scrawl
0ebdce543a - added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise 
- changed WeatherGlobals members to static
 2012-02-24 23:26:38 +01:00
scrawl
67c7b965f0 calculate a sun position depending on time of day 2012-02-24 18:30:16 +01:00
scrawl
811c4a41b7 fade in/out for sunrise and sunset 2012-02-24 17:42:31 +01:00
scrawl
aad8f6605e send a raycast through the physics engine to check if sun is visible 2012-02-24 16:12:43 +01:00
scrawl
af83742e6f - disable the sky renderer completely in interior cells 
- SkyManager update (initial sun glare effect, no raycast)
 2012-02-23 21:44:56 +01:00
scrawl
d9c02ca526 - added isCellExterior / isCellQuasiExterior methods to World 
- interior now have the sun disabled properly (and ambient managed by cell, not sky)
 2012-02-23 21:12:06 +01:00
scrawl
90af78e3b8 attempt to fix openmw's lighting (restored the sun, set proper ambient value outside) 
- the fix should remain in this branch since the main branch still has the lighting by caelum
 2012-02-23 20:33:34 +01:00
scrawl
a5720e9a4f set sky colors according to time of day 2012-02-23 19:49:56 +01:00
Marc Zinnschlag
26bd2be1e8 Merge branch 'equipment' into next 2012-02-23 13:02:20 +01:00
Marc Zinnschlag
8f60d5b180 made container store data members private 2012-02-23 13:01:53 +01:00
Marc Zinnschlag
af23cc352e more cleanup 2012-02-23 12:58:12 +01:00
Marc Zinnschlag
699246e54b removed insertIntoContainer function from MWWorld::Class hierarchy 2012-02-23 12:53:48 +01:00
Marc Zinnschlag
f39aa2a68d changed take action to use the new container store interface 2012-02-23 12:38:25 +01:00
Marc Zinnschlag
e13e858c7a fixed container store iterator; new add function 2012-02-23 12:34:25 +01:00
Marc Zinnschlag
b7ea110632 manually created objects were initialised incompletely 2012-02-23 12:33:50 +01:00
scrawl
ce98397565 adding ini values for 'cloudy' and 'clear' 2012-02-22 20:39:14 +01:00
scrawl
1badb5d04f some restructurings 2012-02-22 20:12:08 +01:00
scrawl
41a8b22ebd implemented weather transitions (currently only blends the clouds) 2012-02-22 19:17:37 +01:00
scrawl
4efc5bc1f2 forgot to add file 2012-02-21 22:56:34 +01:00
scrawl
b2de9e8f45 allow setting the clouds opacity 2012-02-21 22:11:41 +01:00
scrawl
c1fb5ce769 added (incomplete) WeatherManager, created by World 2012-02-21 20:22:46 +01:00
Marc Zinnschlag
db205cf8aa Merge remote branch 'scrawl/next' into test 
Conflicts:
	libs/openengine
 2012-02-20 14:54:08 +01:00
Marc Zinnschlag
e02cba58b1 Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-02-20 14:34:27 +01:00
Marc Zinnschlag
1beaea0115 forgot to add cone file 2012-02-20 14:14:39 +01:00
Marc Zinnschlag
781b16a00e removed bCollision variable from World 2012-02-20 14:07:16 +01:00
Marc Zinnschlag
4a16553acc replaced an include with a forward declaration 2012-02-20 12:44:17 +01:00
Marc Zinnschlag
e3e6b3809f added container store iterator (a.k.a. the most hilarious iterator I ever had the misfortune to write) 2012-02-20 12:38:34 +01:00
Jason Hooks
38a0d1d1c5 Merging in master 2012-02-19 15:39:12 -05:00
scrawl
f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 2012-02-18 18:25:28 +01:00
scrawl
40e23fe26f added twf console command 2012-02-18 16:06:03 +01:00
Marc Zinnschlag
a0ac6e5150 cells were sometimes not fully loaded 2012-02-12 12:35:29 +01:00
Marc Zinnschlag
78b6ceabc7 Merge branch 'refdata' into equipment 2012-01-30 12:38:55 +01:00
Marc Zinnschlag
e19cea3e7b Merge branch 'refdata' into next 2012-01-30 12:38:35 +01:00
Marc Zinnschlag
a4785ffc4f minor fix 2012-01-30 12:38:13 +01:00
Jason Hooks
2d0e83a2cf Reversing changes 2012-01-30 00:06:29 -05:00
Jason Hooks
d2b3c1dbac Collision may be working correctly 2012-01-29 18:13:43 -05:00
Jason Hooks
9c73fa6b6d Physics sort of fixed 2012-01-29 17:50:51 -05:00
Marc Zinnschlag
81d0d58346 Merge remote branch 'mirc/master' into openengine 2012-01-29 20:25:11 +01:00
Cris Mihalache
daa8fb15ce Removed all physics-related code from Engine 2012-01-29 20:51:20 +02:00
Cris Mihalache
6d4fa9274e Moved OpenEngine systems into their appropriate classes 2012-01-29 17:31:18 +02:00
Marc Zinnschlag
0d7f39fcb5 Merge branch 'refdata' into next 2012-01-28 11:46:34 +01:00
Marc Zinnschlag
f2972b1ca0 turned ContainerStore from a template into a simple struct 2012-01-28 11:45:55 +01:00
Marc Zinnschlag
c081160591 replaced container store in ref data with new custom data implementation 2012-01-27 14:55:58 +01:00
Marc Zinnschlag
b0256cea34 replaced movement settings in ref data with new custom data implementation 2012-01-27 13:17:30 +01:00
Marc Zinnschlag
aa87bd4030 replaced creature stats in ref data with new custom data implementation 2012-01-26 11:35:47 +01:00
Marc Zinnschlag
c6761e3470 replaced NPC stats in ref data with new custom data implementation 2012-01-25 16:56:49 +01:00
Marc Zinnschlag
baf9cff21d added customdata base class (issue #185) 2012-01-24 11:24:05 +01:00
Marc Zinnschlag
4b6cd582a7 removed some redundant (and misplaced) functions 2012-01-24 10:45:40 +01:00
Marc Zinnschlag
26c328e73f added some more comments to avoid further confusion 2012-01-23 14:55:00 +01:00
Marc Zinnschlag
16bc374921 animation updates were hooked up to the wrong update function 2012-01-23 14:33:06 +01:00
Jason Hooks
e1aba44da6 Switching cells in exterior works 2012-01-22 16:38:10 -05:00
Jason Hooks
ec94ecacaf Zinis branch merge 2012-01-22 15:02:38 -05:00
Marc Zinnschlag
7439c83623 Added custom copy-constructor, assignment-operator and destructor for RefData 
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.
 2012-01-22 11:22:12 +01:00
Marc Zinnschlag
6a88133178 Split refdata.hpp in a hpp and a cpp file 
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.
 2012-01-22 11:00:40 +01:00
Jason Hooks
a0838369b2 Very basic exterior water 2012-01-21 20:05:08 -05:00
Jason Hooks
84f45b1972 underwater view 2012-01-20 17:59:56 -05:00
Jason Hooks
2aad3a0bd8 Correct water levels 2012-01-19 23:29:07 -05:00
Jason Hooks
ff2bbc9fc5 Transparent water 2012-01-18 22:42:07 -05:00
Jason Hooks
8798f7dd40 Bringing in some of Azathoth's work 2012-01-14 18:34:14 -05:00
Jason Hooks
1d2e77d947 Turning off hardware skinning 2012-01-04 19:47:06 -05:00
Jason Hooks
653d999ac4 Animation creatures 2011-12-26 19:23:46 -05:00
Jason Hooks
7eee54bcd7 More physics and managing of Animation objects 2011-12-25 01:52:57 -05:00
Jason Hooks
1b835d6702 Cell changing fixes 2011-12-24 21:53:12 -05:00
Jason Hooks
ee98a2af1a Empty npcs 2011-12-09 00:08:30 -05:00
Jason Hooks
7bd911b401 Problems with handles 2011-11-24 23:13:34 -05:00
Marc Zinnschlag
0f4adc39b3 added animation-related script instructions 2011-11-21 14:08:44 +01:00
Marc Zinnschlag
51d5c7cd59 Merge remote branch 'jhooks/mwrender' into mwrender 
Conflicts:
	apps/openmw/engine.cpp

- fixed code that did not compile
- removed tons of tabs
- more clean up
 2011-11-21 12:52:28 +01:00
Jason Hooks
d8367f4968 Activation fix 2011-11-19 17:45:05 -05:00
Jason Hooks
7319f7a8c6 Many bugs fixed related to changing cells 2011-11-19 01:01:19 -05:00
Jason Hooks
15fcdc8b72 Physics working 2011-11-17 19:38:52 -05:00
Jason Hooks
b3e1044699 Exterior cells 2011-11-17 18:08:48 -05:00
Jason Hooks
a0947cd432 Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed 2011-11-16 21:15:49 -05:00
Jason Hooks
9b94074472 addObject 2011-11-16 16:22:13 -05:00
Jason Hooks
58f103a75c Adding new insertCellRefList;Collection switched to a set 2011-11-15 23:31:18 -05:00
Jason Hooks
bc06d13d30 Removing backups 2011-11-13 23:17:56 -05:00
Jason Hooks
dd46694059 Changing a lot of things in scene and world 2011-11-13 23:14:18 -05:00
Jason Hooks
bc58ef28cd Made corrections 2011-11-12 15:58:22 -05:00
Jason Hooks
0b3bb2719f Fixing some errors 2011-11-12 00:19:22 -05:00
Jason Hooks
62d8d1add2 more recommended changes 2011-11-11 14:37:42 -05:00
Jacob Essex
746c3dc297 Added some minor documentation 2011-11-11 11:25:01 +00:00
Jason Hooks
f4e7bd6dfd Made some recommended changes 2011-11-11 00:20:53 -05:00
Jason Hooks
042bceb547 Changes to insertObjectRendering; Proposed insertObject 2011-11-09 18:06:55 -05:00
Jason Hooks
1faa07b279 insertObjectRendering proposed 2011-11-09 15:47:06 -05:00
Jason Hooks
c25b49d2b6 refdata change 2011-11-08 22:59:39 -05:00
Jacob Essex
9aac625000 Changes to move the mutable ESM::Position data to RefData 2011-11-08 00:08:00 +00:00
Jason Hooks
5822221ae1 Made recommended changes 2011-11-01 13:47:36 -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
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
6efc61b9df Removal of MWScene; Object listing fixed 2011-10-24 13:42:36 -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
Marc Zinnschlag
8bebae17aa Issue #19: More local script related cleanup 2011-10-07 09:52:42 +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
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
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
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
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
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
Marc Zinnschlag
190f77f6c9 added journal class 2011-04-04 11:16:56 +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
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
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
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
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +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
9c6bc4975c attached camera to a scene node 2011-02-10 12:56:19 +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
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
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
Marc Zinnschlag
9a5a6eac2b stop reporting changes originating from physics system back to physics system 2011-01-27 09:29:55 +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
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
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
Star-Demon
bfcfcecab6 Most of AutoMove finished - just needs some speed in Player class. 2011-01-14 09:52:28 -05: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
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
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
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
Jan Borsodi
1907aeb6c6 The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager. 
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
 2010-09-15 14:48:19 +02: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
1dc805d0d4 Merge branch 'master' into exterior 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2010-09-08 15:38:19 +02:00
Nicolay Korslund
d911653846 Merge with athile's WIP windows build 2010-09-02 12:55:27 +02:00
Marc Zinnschlag
459dd82896 implemented locking/unlocking for doors (can not be invoked by user interaction yet) 2010-08-30 11:56:55 +02:00
athile
d955a0efc4 WIP Windows build 2010-08-30 02:12:54 +01: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
bdd5e2f064 modified teleport action to support exteriors; coordinates are wrong here too 2010-08-20 14:56:26 +02:00
Marc Zinnschlag
0111631ee9 very early implementation of exterior rendering 2010-08-20 13:33:03 +02:00
Marc Zinnschlag
3b49d6c826 added NPC stats 2010-08-19 12:49:13 +02:00
Marc Zinnschlag
2cfe5f0697 Merge branch 'master' into dialogue 
Conflicts:
	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-18 09:25:07 +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
2acfe22975 added test for actor ID 2010-08-08 14:28:35 +02:00
Marc Zinnschlag
8086933282 Merge branch 'master' into dialogue 
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-08 14:14:43 +02:00
Marc Zinnschlag
8d85211fa1 modified Npc and Creature class to let them store a copy of their own ID 2010-08-08 14:09:09 +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
589f8b5ede added GetItemCount 2010-08-07 16:21:07 +02:00
Marc Zinnschlag
3ea85b4619 added AddItem instruction 2010-08-07 15:11:31 +02:00
Marc Zinnschlag
0a60bde834 added insertIntoContainer function to class hierarchy 2010-08-06 22:20:20 +02:00
Marc Zinnschlag
b5d59edd44 re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing) 2010-08-06 19:25:26 +02:00
Marc Zinnschlag
d42747e85b Merge branch 'master' into dialogue 
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-06 19:20:05 +02:00
Marc Zinnschlag
c806415f08 changed namespace, class and function names to ensure consistent spelling 2010-08-06 19:16:44 +02:00
Marc Zinnschlag
09c42589cc implemented npc/creature activation (enters dialog gui mode for now) 2010-08-06 18:15:46 +02:00
Marc Zinnschlag
8045320ac9 added dialog manager 2010-08-06 18:01:34 +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
7a313f24ab integrated activation into script system 2010-08-05 15:40:03 +02:00
Marc Zinnschlag
87c84e6fcd limited activation range according to GMST settings 2010-08-05 13:29:49 +02:00
Marc Zinnschlag
ee7570f7e7 added containerstore 2010-08-04 14:37:23 +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
5827591d05 Merge commit 'ape/master' 
Conflicts:
	apps/openmw/mwworld/world.hpp
 2010-08-03 21:52:19 +02:00
Marc Zinnschlag
69ea00455f Merge branch 'poly' 
Conflicts:
	apps/openmw/mwworld/world.cpp
 2010-08-03 21:43:05 +02:00
Armin Preiml
adc209d135 Implemented the faced handle method to the engine. Faced handles will 
be written to stdout every 10th frame.
 2010-08-03 20:40:45 +02:00
Marc Zinnschlag
d1c000313f added getPtr function that works via Ogre handle 2010-08-03 20:01:52 +02:00
Marc Zinnschlag
002345270b implemented teleport doors (only for the player for now) 2010-08-03 18:44:52 +02:00
Marc Zinnschlag
7e5ddae3b3 modified action interface to allow other actors besides the player 2010-08-03 18:22:01 +02:00
Marc Zinnschlag
c38b02bd5c added action interface 2010-08-03 18:20:15 +02:00
Marc Zinnschlag
239498bcd4 added getName function 2010-08-03 17:11:41 +02:00
Marc Zinnschlag
f50ced4616 added missing record classes 2010-08-03 15:24:44 +02:00
Marc Zinnschlag
0851044fa6 removed superfluous includes 2010-08-03 14:43:14 +02:00
Marc Zinnschlag
bfc282779b added item health interface 2010-08-03 14:14:04 +02:00
Marc Zinnschlag
93754b2851 moved some includes around 2010-08-03 13:32:37 +02:00
Marc Zinnschlag
33b6a0b800 moved concrete record classes to separate sub-system (mwclass) 2010-08-03 13:17:31 +02:00
Marc Zinnschlag
9d6e658e05 previous commit was missing some files 2010-08-03 13:03:08 +02:00
Marc Zinnschlag
ca842d1b4d reimplemented access to creature stats via new class interface 2010-08-03 11:49:12 +02:00
Marc Zinnschlag
a70c3876a2 added foundation for esm record class hierarchy 2010-08-03 11:14:57 +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
455bcf3b01 added get, set and mod instructions for health, magicka and fatigue 2010-07-28 18:27:46 +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
5d40055b44 added comparison operators for Ptr class 2010-07-27 12:04:52 +02:00
Marc Zinnschlag
77a0215d53 added get-, set- and mod-instructions for attributes 2010-07-26 23:09:37 +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
04b86f7e1e added first set of character and creature stats (attributes) 2010-07-26 12:52:32 +02:00
Marc Zinnschlag
61d09c4768 read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues) 2010-07-26 11:15:38 +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
e670753497 fixed handling of global variables of type short 2010-07-21 14:48:03 +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
Marc Zinnschlag
2c63d67ceb added gui manager skeleton and a cmake fix 2010-07-07 18:48:06 +02:00
Nicolay Korslund
359f2903d7 Merged athile and zinnschlag 2010-07-07 09:46:11 +02:00
Marc Zinnschlag
9d73718ec1 added GetSecondsPassed 2010-07-06 12:06:50 +02:00
Marc Zinnschlag
cc0c21cf35 added function to retrieve a live cell ref via name 2010-07-05 12:09:04 +02:00
athile
5fe4313b95 Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux. 2010-07-04 20:17:10 -07:00
Marc Zinnschlag
a61b2c39f0 added scriptrunning/startscript/stopscript; sorted out more case problems 2010-07-04 16:00:32 +02:00
Marc Zinnschlag
df8f8a315c added missing part of global variable implementation (storage and interpreter context) 2010-07-04 13:33:33 +02:00
Marc Zinnschlag
4482884eb5 implemented global script execution 2010-07-04 10:43:34 +02:00
Marc Zinnschlag
3fae68b403 added unifying LiveCellRef pointer class 2010-07-03 17:46:55 +02:00
Marc Zinnschlag
d51e6fb7c4 second part of refactoring 2010-07-03 15:41:20 +02:00