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

1212 commits

Author SHA1 Message Date
Glorf
e1c6c3fe02 Tabulators deleted 2013-03-15 10:22:02 +01:00
Glorf
521bebd2f4 Fallback system rewritten, added light fallbacks 2013-03-15 10:17:30 +01:00
scrawl
5b943a965f Handle always run in the inputmanager, instead of using forced stance. 2013-03-14 21:08:19 +01:00
scrawl
2d8f0949a4 Always run key (Y) 2013-03-14 20:27:16 +01:00
greye
d30b38f336 fix Store<T>::eraseStatic() 2013-03-14 19:28:17 +04:00
scrawl
84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 2013-03-14 03:04:02 +01:00
Marc Zinnschlag
25fd7a41eb Merge remote-tracking branch 'scrawl/next' into next 2013-03-12 18:13:57 +01:00
Marc Zinnschlag
9e68a420ae restructuring tes3 record structs 2013-03-12 08:15:20 +01:00
scrawl
41a958cd4e Fix hardcoded beast races in MWClass::Npc::getModel 2013-03-12 02:50:23 +01:00
scrawl
46d8f3ce5a Fix hardcoded race IDs 2013-03-12 02:44:03 +01:00
scrawl
eeb60edb65 Properly check for the Beast flag instead of hardcoding beast races 2013-03-12 02:09:54 +01:00
scrawl
543f573739 Fix the firstguard armor mod 2013-03-12 02:02:59 +01:00
Marc Zinnschlag
bdec87e51b some cleanup 2013-03-10 11:30:50 +01:00
Marc Zinnschlag
65c382116f Merge remote-tracking branch 'glorf/master' 2013-03-10 11:24:23 +01:00
Glorf
d5ca00c927 Another fix 2013-03-10 12:11:38 +01:00
Glorf
81338d3b23 Weather code fixes 2013-03-10 11:30:24 +01:00
Marc Zinnschlag
6cef7fb610 rescale all objects to the range of [0.5, 2] when a cell becomes active 2013-03-10 10:00:20 +01:00
Glorf
aebd9a3700 Weather to pull 2013-03-10 00:24:14 +01:00
scrawl
5c94c654d4 Fix wrong rotation of objects dropped on the ground 2013-03-09 13:27:24 +01:00
scrawl
d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 2013-03-08 23:46:25 +01:00
scrawl
285b4bf726 Allow zooming camera in vanity or preview mode with the mousewheel 2013-03-08 00:12:56 +01:00
Marc Zinnschlag
17e406e58c Merge remote-tracking branch 'mikesc/bug586' 2013-03-07 20:48:58 +01:00
Michal Sciubidlo
f2f4b6e2d5 Make MWWorld::getInterior case insensitive. 
Interior cells names can use different mix of uppercase/lowercase in different places.
getInterior() should return same cell in all cases. Fixes bug #586.
 2013-03-07 20:15:01 +01:00
scrawl
66a754e9aa Fix tooltip position when hovering the crosshair over NPCs 2013-03-07 15:25:22 +01:00
scrawl
0ee0dbdb97 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 2013-03-07 14:00:13 +01:00
Marc Zinnschlag
642653d10e World constructor fixes 2013-03-06 19:57:00 +01:00
Marc Zinnschlag
7e100c36b5 Merge remote-tracking branch 'gus/AI' 2013-03-06 19:05:55 +01:00
scrawl
268bb23590 Implemented sneaking animation 2013-03-06 16:58:56 +01:00
gus
8b6f0e0770 Correct orientation sign 2013-03-05 18:28:57 +00:00
Marc Zinnschlag
d839a4c6c2 Merge remote-tracking branch 'scrawl/graphics' 2013-03-05 16:31:22 +01:00
scrawl
fe7b2732d8 Avoid manually updating render targets from within frameRenderingQueued 2013-03-05 14:24:29 +01:00
Marc Zinnschlag
dc3edc6024 Merge branch 'vartype' 2013-03-05 10:59:08 +01:00
Marc Zinnschlag
ba4907fbaf use new Variant type for GMSTs 2013-03-05 08:02:27 +01:00
Marc Zinnschlag
a93034b0a9 Merge remote-tracking branch 'k1ll/store_segfault_fix' 2013-03-04 19:27:14 +01:00
Marc Zinnschlag
a1ac20c6f3 changed global variable records to new variant type 2013-03-04 14:32:59 +01:00
gus
48b3f1e0cf Clean up. But still a little hacky 2013-03-04 12:08:35 +00:00
scrawl
359ae06fcf Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 19:35:26 +01:00
Marc Zinnschlag
123a111580 Merge remote-tracking branch 'scrawl/master' 2013-03-03 17:13:05 +01:00
scrawl
f0e3463e9b Disable assertion for comparing iterators from different containers (Bug #605) 2013-03-03 16:50:10 +01:00
scrawl
05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:14:20 +01:00
scrawl
11f21a1988 Weather update should be before renderer update 2013-03-03 15:10:40 +01:00
gus
7fb2ff18a3 Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public) 2013-03-03 13:06:45 +00:00
scrawl
0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
 2013-03-03 11:02:38 +01:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
k1ll
dde43e8c87 Some cleanup 2013-03-02 21:46:31 +01:00
Nathan Jeffords
d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 2013-03-02 10:46:12 -08:00
k1ll
9acd4061cc Fix dangling static references in mShared 2013-03-02 17:04:17 +01:00
vorenon
f66f67eaa1 Loading text uses now the corresponding GMSTs 2013-02-28 17:54:42 +01:00
vorenon
a6fb58bc59 Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell" 
This commit replaces the default "Loading Cell" text with "Loading
Interior" and "Loading Exterior"
 2013-02-28 16:31:24 +01:00
vorenon
d4aa33b9a7 Removing the unloading cells part instead of just commenting them. 2013-02-28 15:58:03 +01:00
vorenon
ffd96c7715 Removed "Unloading Cell..." text from loading screen 
OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of
the "flicker" every time a cell loads.
 2013-02-28 13:19:05 +01:00
scrawl
369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-27 09:25:44 +01:00
scrawl
d4264353a3 Merge branch 'z-up' into graphics 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/water.cpp
	files/materials/water.shader
 2013-02-26 14:54:53 +01:00
Marc Zinnschlag
dc445844d2 Merge remote-tracking branch 'scrawl/z-up' 2013-02-26 14:37:50 +01:00
Marc Zinnschlag
a7102c143f ESX variable type cleanup 2013-02-26 14:37:11 +01:00
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