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

2007 commits

Author SHA1 Message Date
scrawl
45206bc3f6 Savegame: write and read dynamic Store before Cells 2014-07-28 00:32:59 +02:00
scrawl
6262d6c964 Don't leave stale player CharacterController in Actors when loading game (Fixes #1713) 2014-07-27 23:10:58 +02:00
scrawl
d81e9cfefd Implement actors fighting for the actor they are following (Fixes #1141) 2014-07-27 20:33:45 +02:00
scrawl
8c81e22f3e Determine target for On Touch effects for non-player actors 2014-07-27 20:33:44 +02:00
Marc Zinnschlag
af54bb9623 removed some redundancies; some more general cleanup 2014-07-25 12:23:18 +02:00
scrawl
469d2afffa Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwgui/levelupdialog.cpp
 2014-07-24 02:33:46 +02:00
scrawl
d4ff17f1c5 Remove unused FLTV and NAM0 from CellRef 2014-07-24 02:20:16 +02:00
scrawl
75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 2014-07-24 02:17:38 +02:00
scrawl
ca45a63cf7 Close doors instantly when using Lock instruction 2014-07-22 17:55:54 +02:00
scrawl
2b57c7fa67 Use CellRef's global variable to disable owner (Fixes #1677) 2014-07-22 17:06:40 +02:00
Michał Ściubidło
e24173f94a Fix bug 1482: 
- put powers on cooldown only when they are used succedsfully
 2014-07-21 23:56:38 +01:00
scrawl
63fd04882a Make sure crime gold discounts don't reduce price to zero 2014-07-19 23:49:54 +02:00
scrawl
08ce6ed7fb Attempt to restack item after repair or recharge (Fixes #1656) 2014-07-17 16:16:06 +02:00
slothlife
d0e1210dd7 Fix for Bullet debug assert 
After changing the vector comparison to squaredDistance, the threshold
for rejecting similar vectors needed to be readjusted.
 2014-07-13 01:39:42 -05:00
scrawl
83819b2894 Traverse spells in record order from content files. bronrod_the_roarer is perfect now. Other NPCs have some differences. 2014-07-12 18:53:15 +02:00
scrawl
53c70dbdaa Exit dialogue when going to jail (Fixes #1635) 2014-07-11 04:25:56 +02:00
scrawl
0704fa2b3d Reset local rotation axis in SetAngle (Fixes #1630) 2014-07-09 10:23:01 +02:00
scrawl
6cd6578a88 Handle Deleted moved references (Bug #1613) 2014-07-01 21:47:27 +02:00
scrawl
e666ddfe18 Fix list of moved references being discarded (Fixes #1613) 2014-07-01 21:42:11 +02:00
scrawl
4949aa1fbb Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif) 2014-06-28 18:21:56 +02:00
scrawl
f929004635 Search exterior cells in reverse (workaround for duplicate chargen_plank reference in Morrowind.esm and Bloodmoon.esm) 2014-06-28 17:44:52 +02:00
scrawl
3b2358888b Attempt to fix player position after using coc/coe 2014-06-28 15:19:32 +02:00
scrawl
8e361bb879 Make targeted spells collide with water (Fixes #1500) 2014-06-28 14:49:07 +02:00
scrawl
8b340ddd5e Implement slower movement against storms (Closes #41) 2014-06-27 03:22:00 +02:00
scrawl
07d0f4458d Rotate clouds/particles to come from red mountain (Fixes #245) 2014-06-27 03:22:00 +02:00
scrawl
9eb8addc70 Make flying creatures fall when paralyzed (Fixes #1494) 2014-06-27 03:21:50 +02:00
scrawl
865f4648b0 Fix flying creatures not falling on death 2014-06-26 17:15:07 +02:00
scrawl
7b1e1d03d8 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwrender/sky.hpp
 2014-06-26 04:29:03 +02:00
scrawl
697329f128 Fix crash for in_dagoth_bridge00.nif (Fixes #1561) 
This one is causing trouble by using an unnamed node, will need some more work.
 2014-06-26 03:33:09 +02:00
scrawl
15b486e149 Don't trigger changed flag if a script with no locals is configured 2014-06-26 01:21:15 +02:00
scrawl
2d17d8f61a Savegame: start in (0,0) cell if player's cell no longer exists 
This happens frequently when saves are loaded that were created in a different MW language.
 2014-06-26 01:19:03 +02:00
scrawl
5bd2f30a99 CellRef uninitialized fixes 2014-06-25 19:52:14 +02:00
scrawl
f6a568c995 Implement rain (Feature #41) 2014-06-25 18:20:21 +02:00
scrawl
2bcbc6ab7d Potential crash fix, either way should have a better error message now 2014-06-25 14:52:12 +02:00
Marc Zinnschlag
85965bfd47 Merge remote-tracking branch 'scrawl/master' 2014-06-25 09:58:00 +02:00
scrawl
693a097b21 Implement idlestorm animation (Feature #41) 2014-06-24 18:37:38 +02:00
scrawl
36135293e8 Fix moving object from an inactive to another inactive cell 2014-06-24 15:29:36 +02:00
scrawl
36132e054a Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41) 2014-06-24 15:00:15 +02:00
scrawl
1d46ac19ff Fix being able to activate through terrain 2014-06-24 02:24:32 +02:00
scrawl
0b34d8d2fd Add support for animated collision shapes (Fixes #1549) 2014-06-23 20:43:24 +02:00
scrawl
64a4c2785e Fix water walking 2014-06-22 22:30:30 +02:00
scrawl
e002acdeae Physics: Create actor shapes outside of BulletNifLoader 
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
 2014-06-21 23:37:16 +02:00
scrawl
11b05c352f Fix exception when casting Bound Gloves spell 2014-06-19 16:00:27 +02:00
Marc Zinnschlag
30f8e279ed Merge remote-tracking branch 'scrawl/master' 2014-06-19 10:35:28 +02:00
scrawl
4648524df4 Improve getLOS (use eye level). Also, don't crash when used with non-actors. 2014-06-19 04:53:25 +02:00
scrawl
4e71db7081 Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs. 2014-06-18 21:39:17 +02:00
scrawl
8a4227ec38 Heal player while in jail 2014-06-18 16:57:54 +02:00
scrawl
e95483c40f Fix crash for on target spells cast by non-actors (Fixes #1529) 2014-06-18 16:57:53 +02:00
scrawl
56bc5a9d39 Fix being able to steal undetected just after invisibility breaks 2014-06-18 16:57:53 +02:00
scrawl
1244da85df Make Detect Life spell detect NPCs when in werewolf form (Fixes #1527) 2014-06-17 16:27:33 +02:00
Marc Zinnschlag
2683aa9503 Merge remote-tracking branch 'filkry/bug640_luminescent_water' 2014-06-17 13:08:06 +02:00
scrawl
8ac019611d Fix Potion use action removing the potion even when the action is not executed (Fixes #1521) 2014-06-17 04:05:20 +02:00
Fil Krynicki
cfea7736d9 WIP fix 
Bug is fixed, but appears to have broken vision underwater. Notes:

+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
 2014-06-16 17:08:02 -04:00
scrawl
d11a5e19f7 Fix positionCell not properly teleporting actors from inactive to active cells (Fixes #1516) 2014-06-16 20:05:53 +02:00
scrawl
ee2b81763e Savegame: Store AiSettings and summoned creatures 
CreatureStats state is now completely stored (Closes #1174)

Also play VFX_Summon_Start and VFX_Summon_End visual effects.
 2014-06-15 21:19:37 +02:00
scrawl
fd59a4a79e Fix some doxygen typos 2014-06-15 16:11:22 +02:00
scrawl
7afd2ca614 Consider moved references in CellStore::listRefs 2014-06-15 14:18:16 +02:00
scrawl
395f98e476 Fix triggering changed flag for all references when cell is visited 
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.

Also clean up RefData interface slightly.
 2014-06-15 14:18:16 +02:00
Alexander "Ace" Olofsson
c24e08dff6 Use Ogre::Math::PI 2014-06-14 14:43:24 +02:00
Alexander "Ace" Olofsson
6ea29812ac Another way of getting M_PI 2014-06-14 13:54:01 +02:00
Alexander "Ace" Olofsson
dc2fefffc7 Fix missing M_PI define on Windows 2014-06-14 13:29:55 +02:00
scrawl
0637cde267 Bug #1417: Make sure to reset all position/rotation fields when placing items 2014-06-13 23:40:49 +02:00
scrawl
ad3a78706e Bug #1417: Use fmod to wrap local rotations (more efficient and robust) 2014-06-13 23:40:35 +02:00
scrawl
797134aa51 Handle activation scripts in AiActivate (Fixes #1478) 2014-06-13 02:26:52 +02:00
Marc Zinnschlag
2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 2014-06-12 12:54:39 +02:00
scrawl
68d6b6b2f3 Cell merge fix (reference context position was not saved correctly) 2014-06-11 21:56:10 +02:00
scrawl
013916fca3 Fix for broken physics in exteriors (Fixes #1446) 
The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.
 2014-06-11 19:01:23 +02:00
scrawl
73be457805 Merge ESM::Cell fields by subrecord 
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.

Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
 2014-06-11 16:13:33 +02:00
scrawl
10758d6297 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-06-10 19:32:49 +02:00
scrawl
6ba112619a Fix dropped items ending up inaccessible when standing in objects with no collision (Fixes #1441) 2014-06-10 18:49:42 +02:00
scrawl
881ae33b74 Don't allow Creatures with no movement abilities to move (Fixes #1457) 2014-06-10 02:15:09 +02:00
scrawl
b9dadff5a3 Recognize DELE subrecords at the end of the record (Fixes #1414) 2014-06-08 11:22:37 +02:00
slothlife
51c45796b1 Fix physics to not trigger Bullet assert in Debug 
When physics attempts to move by a very small amount, precision losses
caused Bullet to trigger an assert in debug from normalizing a zero
length vector.
 2014-06-07 19:26:12 -05:00
Marc Zinnschlag
0668019c86 Merge remote-tracking branch 'scrawl/master' 2014-06-06 19:09:24 +02:00
scrawl
c36decb855 Fix being able to place items on top of actors (Fixes #1403) 2014-06-06 00:43:24 +02:00
scrawl
d2e98c4de1 Fix forced switch to third person on death not always working 
For instance, when dying from fall damage
 2014-06-05 17:21:02 +02:00
scrawl
b6e52ae8ab Fix crash when loading a savegame after dying (Fixes #1389) 2014-06-05 17:01:22 +02:00
scrawl
c0f1449004 Cycle with equipped items if all slots are occupied (Fixes #1395) 2014-06-05 14:54:07 +02:00
Marc Zinnschlag
5313862a46 Merge remote-tracking branch 'scrawl/master' 2014-06-04 15:14:29 +02:00
scrawl
d777739425 Fix a crash on exit when projectiles were active 2014-06-03 00:44:32 +02:00
scrawl
577ed3943b Show wallpaper when loading a savegame 2014-06-02 23:26:43 +02:00
Emanuel Guevel
929aae6869 Silence a clang warning 
warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]
 2014-06-02 10:30:44 +02:00
scrawl
f6f6b5604a Fix loading a savegame when some of its content files were disabled 
Fixes #1380
 2014-06-01 23:11:38 +02:00
scrawl
16ac6e7aac Merge DialInfo objects by subrecord instead of overwriting the object 
Fixes #1360
 2014-05-31 13:01:11 +02:00
Marc Zinnschlag
f5e587f566 Merge remote-tracking branch 'puppykevin/master' 2014-05-30 11:42:19 +02:00
Marc Zinnschlag
be88168e91 Merge remote-tracking branch 'scrawl/master' 2014-05-30 10:07:18 +02:00
scrawl
95b3026c7e Fix cells being listed twice in console autocompletion when using --skip-menu=0 and loading a game 2014-05-29 16:34:05 +02:00
scrawl
e9ab7c85c6 Fix exception when there are spaces in INI-imported color settings 2014-05-28 21:29:09 +02:00
Kevin Poitra
16a6edbd0e Fix a possible crash due to a null pointer. 2014-05-28 12:58:45 -05:00
Marc Zinnschlag
f112c78858 Merge remote-tracking branch 'scrawl/master' 2014-05-28 19:47:36 +02:00
scrawl
42ea43c3d1 Fix container scripts not getting removed properly on cell change 
Broken by f99eda1a54
 2014-05-28 18:45:07 +02:00
Arthur Moore
9be219beba Fixes Bug #1348 "Evidence Chest unlocking when arrested." 2014-05-27 22:09:37 -04:00
Marc Zinnschlag
be39395ce7 Merge remote-tracking branch 'scrawl/master' 2014-05-27 21:09:24 +02:00
scrawl
2b15b85af1 Fix position adjustment not working properly for rotated objects 2014-05-27 17:58:18 +02:00
scrawl
2fe86f2b85 Consider hit normal for item drop test (Fixes #995) 2014-05-27 17:39:04 +02:00
Marc Zinnschlag
27c795483b Merge remote-tracking branch 'ace/win-build-fix' 2014-05-27 14:32:20 +02:00
Alexander "Ace" Olofsson
d3357cc279 The MSVC linker is really pedantic with this. 
Functions compiled as taking a class can't be linked with functions giving a struct, because of the name mangling I'm guessing...

unresolved external symbol "protected: void __thiscall MWWorld::LiveCellRefBase::loadImp(class ESM::ObjectState const &)" (?loadImp@LiveCellRefBase@MWWorld@@IAEXABVObjectState@ESM@@@Z)
 2014-05-27 13:27:18 +02:00
scrawl
cf68f6da96 Fix ESX dependencies not being checked except for the first one 2014-05-27 00:06:34 +02:00
scrawl
5660f283dd Fix actor models incorrectly being rotated on X/Y axes 2014-05-26 20:52:38 +02:00
scrawl
3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 2014-05-26 17:34:36 +02:00
scrawl
f629307f60 Fix frame delay for sound listener position (Fixes #1180) 2014-05-26 16:43:19 +02:00
scrawl
039398c8ae Basic RefData and CellRef change tracking 
Wrapped item charge handling in getItemHealth function
 2014-05-25 14:30:07 +02:00
scrawl
a05c8fd3ce Make applyEnchantment return the record ID instead of modifying Ptr 2014-05-24 14:58:48 +02:00
scrawl
08cf58204f Merge branch 'master' of github.com:scrawl/openmw 2014-05-23 16:45:28 +02:00
scrawl
a7d525245c Fix missing include 2014-05-23 16:07:02 +02:00
scrawl
b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
 2014-05-23 08:39:48 +02:00
scrawl
a2f156be8e Prevent magic bolts from colliding with their caster 2014-05-22 23:34:32 +02:00
Emanuel Guevel
1e4a854433 Remove static method MWWorld::Class::get(&Ptr) 
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
 2014-05-22 20:50:00 +02:00
Emanuel Guevel
20cfdd4b43 Move LiveCellRefBase ctor where it belongs to 2014-05-22 20:50:00 +02:00
scrawl
cba50c7338 Optimize ManualRef: look up correct Store instead of searching 2014-05-22 15:46:35 +02:00
scrawl
4b5f02f644 Remove useless throwing of exception 2014-05-22 15:29:36 +02:00
scrawl
b39b572c5a Moved mStartupScript to World, so that it is executed for a New game 2014-05-21 09:25:45 +02:00
scrawl
abd6b6ab33 Fix not returning to main menu on failed loads when using quickload 2014-05-20 17:11:26 +02:00
scrawl
220ab86eca Simplify new game movie player 2014-05-20 10:07:08 +02:00
scrawl
6bd0bbb8df Do not load (0,0) on new game 2014-05-19 14:09:16 +02:00
Marc Zinnschlag
aa05acd26e Merge remote-tracking branch 'scrawl/master' 2014-05-18 18:50:18 +02:00
Marc Zinnschlag
56c4367c1a Merge remote-tracking branch 'mrcheko/master' 2014-05-18 18:42:23 +02:00
scrawl
a87b64d2da Fix some ancient code 2014-05-18 16:34:58 +02:00
scrawl
1677fcf324 Dialogue merging 2014-05-18 15:25:16 +02:00
scrawl
5b76c0893a Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	components/esm/inventorystate.hpp
 2014-05-18 12:55:43 +02:00
scrawl
a872c9f83a Feature #1323: handle restocking levelled items 2014-05-18 12:53:21 +02:00
cc9cii
12dc5cf4ea Bug #1303 - resolves the bug by tweaking the slope constant (the value 49 was selected to mimic vanilla behaviour for a low level character exploring Seyda Neen). The feature to vary the climbable angle based on acrobatics is still to be implemented. 2014-05-18 12:05:08 +10:00
mrcheko
aa5647b45e merge master, resolve conflicts 2014-05-17 19:20:57 +04:00
scrawl
b4ed828e21 Feature #1323: Implement restocking items (does not handle levelled lists yet) 2014-05-17 14:30:31 +02:00
scrawl
ae66d28c87 Feature #32: Implement respawn for containers, creatures and NPCs 2014-05-17 09:09:00 +02:00
scrawl
e266aff561 Savegame: store projectiles 2014-05-17 05:24:32 +02:00
scrawl
9adb990143 Fix potentially unsafe use of MWWorld::Ptr 2014-05-17 02:52:24 +02:00
scrawl
e5a21aca53 Refactor projectiles to no longer use MW-objects 2014-05-16 13:33:30 +02:00
scrawl
028e00c98f Add missing status report for some toggle commands 2014-05-16 09:21:28 +02:00
scrawl
940a434479 Use ItemModel for moving items from a container to the world 
Fixes owner not resetting when moving an item from a corpse to the world.
 2014-05-16 03:19:38 +02:00
scrawl
6de7e16550 Fix searchPtrViaActorId not skipping over deleted references 
Fixes an issue when an actor has moved cell: searchPtrViaActorId would randomly return the deleted Ptr from the old cell.
 2014-05-15 09:57:09 +02:00
scrawl
f2c193ce3d Fix searching the player's actorId 2014-05-15 09:54:10 +02:00
scrawl
a76e391ad0 Savegame: store door movement state (Closes #747) 2014-05-15 09:54:10 +02:00
scrawl
471bbd0021 Savegame: store levelled creature state and move to actorIds 
(Closes #1332)
 2014-05-15 09:54:04 +02:00
scrawl
9b67fcc4d7 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-05-14 23:54:25 +02:00
Thomas
2425d2c2ab Added stuck mitigation for AiAvoidDoor 2014-05-14 13:38:10 -04:00
Thomas
993ef1be43 Actor avoiding door asks all surrounding actors to do the same. 2014-05-14 04:05:18 -04:00
scrawl
1141c1f3f2 Change projectiles to use actorIds 2014-05-14 09:48:16 +02:00
scrawl
61187c2fef Savegame: store actorIds 2014-05-14 09:47:49 +02:00
scrawl
dfacf8c044 Change ActiveSpells to use ActorId 2014-05-14 07:14:08 +02:00
scrawl
7697ab37e0 Fixes #1129: Change summoned creatures to use ActorId 
Gracefully handles summoned creatures that are left behind in inactive cells.
 2014-05-14 06:37:31 +02:00
Thomas
58bf7624be Made code a bit more efficient 2014-05-13 21:52:05 -04:00
scrawl
3cdbcf3c28 Merge branch 'actorid' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwmechanics/creaturestats.cpp
 2014-05-14 02:35:05 +02:00
Thomas
9dbe53c722 Merge remote-tracking branch 'upstream/master' 2014-05-13 04:11:07 -04:00
Thomas
cbfa282f8d Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work) 
Notes - When the door hits them while it's about to finish closing they will try to walk through the door.
      - Considerably more works is needed in making the NPC work out troublesome areas where they get stuck
 2014-05-13 03:58:32 -04:00
scrawl
386604bc9d Fixes #869: Added methods to control external and internal collision modes separately 
When an actor dies, we should only disable external collisions, i.e. prevent other actors from colliding with the dead body. The dead actor, however, should still have gravity and collision applied.

Also moved disableCollision to when the death animation finishes, not as soon as the actor's health is 0.
 2014-05-13 01:43:52 +02:00
mrcheko
725f6cac5e AiPursue infinite package updating bug resolved 2014-05-13 00:05:30 +04:00
scrawl
6cc691115b Savegame: store most of CreatureStats 2014-05-12 21:37:36 +02:00
mrcheko
e4fe78937a Merge remote-tracking branch 'upstream/master' 2014-05-12 22:06:26 +04:00
scrawl
117b812fb1 Fix invisibility not breaking on certain actions 2014-05-12 02:20:56 +02:00
scrawl
2bc2684a66 Fixes #275: force updating exterior cell maps even if already in cache 2014-05-11 18:01:47 +02:00
scrawl
7428511ea0 Bug #772: Do not show door markers for disabled doors 2014-05-11 18:01:47 +02:00
scrawl
961c4d4dc4 Fixes #772: Give scripts a chance to run before updating map, so that disabled objects are not visible 2014-05-11 18:01:47 +02:00
scrawl
a4a9794417 Savegame: store fog of war (Closes #1177) 2014-05-11 02:07:58 +02:00
scrawl
041319c43e Fixes #1234: Store dynamic record counter in savegame to prevent name clashes 2014-05-11 00:32:22 +02:00
scrawl
07d9845aa0 Fix a bug in ESMStore code that checks for duplicate record insertions 2014-05-11 00:10:28 +02:00
scrawl
b358cf2423 Fix a potential crash when loading script locals from savegame 2014-05-10 21:31:49 +02:00
scrawl
1444cd9051 Fix AiCombat exception when actor has a lockpick/probe equipped. 
Don't make NPCs autoEquip lockpicks/probes, since they can't use them.
 2014-05-10 00:37:36 +02:00
scrawl
136813a882 Bug #1319: Fix references not coming from a content file incorrectly overwriting each other 2014-05-10 00:01:30 +02:00
scrawl
e7a004824c Fix a search that should have been find 2014-05-09 23:58:24 +02:00
Jeffrey Haines
7d5dab214c #58 - Sneak Skill: functional sneaking 
Removed sneak checking from individual actor update.
Added sneak checking to Actors::update()
 2014-05-04 16:20:09 -04:00
Jeffrey Haines
a65e8393bb Merged files 2014-05-04 11:33:27 -04:00
mrcheko
f596b698d9 fixes to slow-down at jump startup and infinite air intertia growth 2014-05-04 18:15:07 +04:00
Jeffrey Haines
e1e23447f2 Removed initial check form setSneak 
It wasn’t needed.
 2014-05-03 13:16:07 -04:00
Jeffrey Haines
05e326bdc3 Added update sneak to actors 
Intends to check the state of a players sneak by asking the question if
each npc can see the player.
 2014-05-03 12:48:07 -04:00
scrawl
7bddfc0025 Fix some spelling mistakes. 2014-05-03 12:23:22 +02:00
scrawl
7331a64e34 Restore fix for Bug #875 (commit 602be9bbe7, was broken by 43757efdc4) 2014-05-03 11:33:20 +02:00
scrawl
92467ba6bc Fix sunlight for interiors 2014-05-02 21:20:27 +02:00
scrawl
f99eda1a54 Fixes #1302: Do not attempt to set OnPcAdd before the script has been added 2014-05-01 16:55:15 +02:00
Jeffrey Haines
5c9c467b26 Improved sneak. 2014-04-30 08:06:36 -04:00
Marc Zinnschlag
9a1b5dc1c6 a bit of cleanup 2014-04-29 15:32:00 +02:00
Marc Zinnschlag
f6a876bc3d added actor ID 2014-04-29 15:27:49 +02:00
Marc Zinnschlag
8fea2cfa2a Merge remote-tracking branch 'mrcheko/master' 2014-04-29 10:03:29 +02:00
Marc Zinnschlag
3013c34d9b Merge remote-tracking branch 'scrawl/master' 2014-04-28 21:46:05 +02:00
scrawl
518a32c19d Fixes #1195: Make NPCs equip torches in interiors under certain conditions 2014-04-28 18:33:42 +02:00
Thomas
885228ec02 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
 2014-04-28 12:27:57 -04:00
Marc Zinnschlag
421679b319 Merge remote-tracking branch 'scrawl/master' 2014-04-28 15:13:09 +02:00
scrawl
27a05027f4 Fixes #1172: Added basic loading/saving progress bar 
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
 2014-04-28 11:29:57 +02:00
Marc Zinnschlag
0b2371a05d Merge remote-tracking branch 'thoronador/fix-minor-stuff' 2014-04-28 10:59:34 +02:00
Thomas
c2127845af Added onKnockdown command 2014-04-27 20:54:22 -04:00
Thoronador
1b8c975d5b minor performance improvements in apps/openmw 
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.

For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
 2014-04-27 19:10:23 +02:00
mrcheko
82121e0401 some checks reworked 2014-04-27 16:59:21 +04:00
mrcheko
6a3dddfb9a merge master 2014-04-27 13:49:31 +04:00
scrawl
3161647809 Fix for not being able to pick up scrolls during combat 
This is the behaviour I observed in vanilla morrowind.
 2014-04-27 09:15:37 +02:00
scrawl
d92f95f5bf Fix a stacking issue 2014-04-27 06:08:15 +02:00
scrawl
93b76a603b Fixes #1100: Looting a corpse is no longer considered stealing 2014-04-27 06:08:08 +02:00
scrawl
04964595ef Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame 2014-04-26 16:44:20 +02:00
scrawl
cd1b4218e7 Fix dynamically placed objects being discarded when loading game 2014-04-26 05:01:26 +02:00
Marc Zinnschlag
c63d6437c0 Merge remote-tracking branch 'jeffreyhaines/master' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
 2014-04-25 15:29:23 +02:00
Jeffrey Haines
4a4c08946c Checks the state of the passed sneak variable 2014-04-24 23:02:11 -04:00
Thomas
f3272c941f Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat. 
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
 2014-04-24 22:47:45 -04:00
Jeffrey Haines
42b879a9a5 Reworked the accusation of actors 2014-04-24 22:41:05 -04:00
Jeffrey Haines
c3e08916da Sneak: Added support for state checking 
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
 2014-04-24 20:40:17 -04:00
Thomas
ee581f593b Fixed issue which may occur if there's no evidence chest nearby 2014-04-23 13:20:43 -04:00
Thomas
f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 2014-04-23 13:02:51 -04:00
Thomas
61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 2014-04-23 10:00:18 -04:00
Thomas
6022ffbd1f Evidence chest now locks when new evidence is added to it 2014-04-23 05:54:18 -04:00
Thomas
cac8e52154 Seperated locked and lock level, to allow for relocking doors to previous lock level. 
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
 2014-04-23 05:12:07 -04:00
mrcheko
f811abb752 pathgrid shortcutting extended 2014-04-20 20:35:07 +04:00
cc9cii
3dfd08cf2d Cleanup and little tweaking. 2014-04-20 08:31:02 +10:00
Marc Zinnschlag
86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2014-04-15 11:31:48 +02:00
Jeffrey Haines
e2fab228f9 Save state is handled correctly now. 2014-04-14 18:11:04 -04:00
cc9cii
966ed46870 Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status. 2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr). 2014-04-13 14:53:36 +10:00
cc9cii
d2a41167d0 Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075 2014-04-11 21:24:00 +10:00
Emanuel Guevel
09bd0324c9 Fail properly when a content file is not found 2014-04-08 20:19:09 +02:00
Jeffrey Haines
a274b48f2f States are saved. Crime is reacted to. 
Issues where some crime is ignored. Needs a lot more work
 2014-04-05 22:45:40 -04:00
Jeffrey Haines
940c88d2ec Cleaned up code, implemented crime ids 
There is a problem with my game freezing. ToggleAi stops my character
 2014-04-05 10:26:14 -04:00
cc9cii
f59226265a Remove redundant parameter from aStarSearch. Also update some comments. 2014-04-04 18:10:06 +11:00
Jeffrey Haines
70919ba60a Removed witnesses and minor changes 2014-04-03 16:13:14 -04:00
cc9cii
040d4f8fc4 Move PathgridGraph into separate files. 2014-04-04 06:13:47 +11:00
Jeffrey Haines
0c957a3cde Added witnesses to the mix 2014-04-03 14:53:31 -04:00
cc9cii
98f77714ce Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder. 
This version still has debugging statements and needs cleaning up.
 2014-04-03 21:43:44 +11:00
Jeffrey Haines
b1abef7a38 Cleaned up code 2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be Crime is now checked every frame call 2014-04-03 00:50:09 -04:00
Jeffrey Haines
510f2d10ac Replaces broken code with todo 2014-04-02 14:20:33 -04:00
Jeffrey Haines
6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 2014-04-02 12:23:38 -04:00
Jeffrey Haines
7c0b51fb7e Ai pursue now controls guards pursuit of crimes 
Should extend AiActivate in the future
 2014-04-02 00:18:22 -04:00
Jeffrey Haines
50dac98a2b Feature 1154 & 73: Crime and NPC reactions 2014-04-01 20:24:25 -04:00
Jeffrey Haines
4037f3705e Feature 1154 & 73: NPCs react to crime 2014-04-01 14:15:55 -04:00
Marc Zinnschlag
86e5179fd8 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-28 22:40:12 +01:00
Jeffrey Haines
9efef31bb8 Feature #953 Trader Gold - Unused code/warning resolved 
Removed unused code
getBaseGold throws proper error
 2014-03-28 17:27:23 -04:00
Marc Zinnschlag
c38812d026 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-28 19:34:40 +01:00
Jeffrey Haines
401d21b4ee getBaseGold implemented in MWWorld::Class for NPC and Creature 
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
 2014-03-28 14:21:38 -04:00
Marc Zinnschlag
2c2106205d Merge remote-tracking branch 'scrawl/master' 2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21 Bug #1224: Changed fix to potentially allow for language independent saves 2014-03-27 22:32:42 +01:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
Marc Zinnschlag
1b6b4e3442 Merge remote-tracking branch 'slothlife/weather_save' 2014-03-23 08:36:45 +01:00
cc9cii
772a49b2a6 Just some notes for future maintenance. 2014-03-23 13:38:11 +11:00
Marc Zinnschlag
87ae03b5d4 fix for previous commit 2014-03-22 16:39:24 +01:00
Marc Zinnschlag
6bd3b3ee78 include local variable state in saved games 2014-03-22 15:00:49 +01:00
slothlife
6dce3e5186 Fixed include to use C99 header, not C++11 header 2014-03-21 01:33:11 -05:00
slothlife
6eab9c5179 Move weather state save/load to a new class 2014-03-21 01:19:40 -05:00
slothlife
1acd1bd913 Feature #1173: Saved Game: include weather state 
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
 2014-03-20 01:25:52 -05:00
cc9cii
f71fb83bfc Cleaned up more inaccurate comments. 2014-03-16 20:56:11 +11:00
cc9cii
f57c11254f Revert to original variable names. 2014-03-16 20:09:18 +11:00
cc9cii
22c544d9d7 Remove unnecessary comment. 2014-03-16 12:51:12 +11:00
cc9cii
fdbd564700 Apparently fall trace needs to be done with the middle of the object. 2014-03-16 08:57:55 +11:00
cc9cii
43757efdc4 Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however. 2014-03-16 08:09:14 +11:00
Marc Zinnschlag
7bc97fb8b8 reworked code for player positioning on startup and new game 2014-03-13 13:19:32 +01:00
scrawl
072dc6d438 Feature #50: Implement marksman mechanics. 2014-03-08 06:03:45 +01:00
scrawl
12de0afb03 Feature #50: Spawn projectiles 
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
 2014-03-08 01:31:27 +01:00
cc9cii
f36bea03ab Bug #1189 fix by scrawl 2014-03-07 19:36:44 +11:00
scrawl
83b6fcf22e Bug #416: Workaround for page flipping problem 2014-03-05 22:24:05 +01:00
scrawl
1d926816b5 Terrain: background load blendmaps & layer textures. Refactor QuadTree update. 2014-03-05 21:46:37 +01:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
scrawl
195071efc7 Terrain: geometry is now loaded in background threads. 
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
 2014-03-05 21:46:37 +01:00
scrawl
8730b61362 Render maps after *all* cells have finished loading 
Still not fixing Bug #772, but at least this will allow for background loading of terrain.
 2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
Marc Zinnschlag
0ae9cc0106 removed unused function 2014-03-03 08:21:16 +01:00