teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
9974 commits 34 branches 0 tags 66 MiB
Commit graph

5959 commits

Author SHA1 Message Date
scrawl
8b095982e9 Don't auto equip for dead actors 2013-11-19 18:42:43 +01:00
scrawl
f3ff2e4260 Handle Unreflectable flag 2013-11-19 17:33:02 +01:00
scrawl
c03c82c78a Apply disease resistance manually as according to wiki 2013-11-19 17:15:17 +01:00
Marc Zinnschlag
8190fdb16c Merge remote-tracking branch 'scrawl/master' 2013-11-19 16:56:18 +01:00
scrawl
654b7d9ba5 Apply disease resistance manually as according to wiki 2013-11-19 16:52:26 +01:00
scrawl
e8dcd74741 Recharge enchanted items in player's inventory over time 2013-11-19 16:42:24 +01:00
Marc Zinnschlag
9487bd33c3 removed broken save function from ESMWriter 2013-11-19 16:07:36 +01:00
Marc Zinnschlag
5e64888227 added basic save slot management and connected main menu save to save function (bypassing the save GUI for now) 2013-11-19 15:38:26 +01:00
Marc Zinnschlag
11e254aac8 Merge remote-tracking branch 'gus/AICombat' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2013-11-19 09:10:48 +01:00
scrawl
74e42a2d02 Add missing skill increases for Enchant skill 2013-11-19 07:39:07 +01:00
scrawl
cab535dd69 Implement magic item recharging via soulgem use 2013-11-19 06:48:47 +01:00
scrawl
16e5477c60 Fix an uninitalized member 2013-11-19 02:17:44 +01:00
gus
dff3cf162d ToggleAI script instruction 2013-11-18 23:03:44 +01:00
Marc Zinnschlag
1c7a4d4b3a adjust availability of main menu items based on game state 2013-11-18 15:52:25 +01:00
Marc Zinnschlag
f45cff8aff flag game as ended when player dies 2013-11-18 15:38:08 +01:00
Marc Zinnschlag
82c8495338 removed boolean running flag with state enum 2013-11-18 15:15:47 +01:00
Marc Zinnschlag
e55691096c Merge remote-tracking branch 'ace/win-fixes' 2013-11-18 13:46:28 +01:00
Alexander "Ace" Olofsson
4baaf9463e Remove crashcatcher.cpp from windows builds, it can't be built or used there. 2013-11-18 12:34:25 +01:00
gus
4559e932ae AI packages have priority and combat is triggered in actor.cpp using the Hostile setting in CreaturesState 2013-11-18 12:33:09 +01:00
scrawl
6902569d03 Implement Absorb effects (AbsorbHealth, etc) 2013-11-18 05:01:36 +01:00
scrawl
a420698237 Don't try to absorb or reflect for self casted spells 2013-11-17 23:41:24 +01:00
scrawl
0dc2e829dd Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX. 2013-11-17 23:31:08 +01:00
scrawl
fc268bf302 Initialize mFallHeight 2013-11-17 23:31:08 +01:00
scrawl
47fc3f81f5 Don't update actors while paused 2013-11-17 23:31:08 +01:00
scrawl
2a11618ee7 Make sure the equipped weapon HUD icon is updated properly 2013-11-17 23:31:07 +01:00
scrawl
b8c358df63 Fix a bug with equipping using the quick keys: when item is already equipped, equipping it again would cause the slot to get unequipped first, possibly restacking and destroying the Ptr that was supposed to be equipped in the first place 2013-11-17 23:31:07 +01:00
scrawl
e7993ced69 Fix invalid casts 2013-11-17 04:33:04 +01:00
scrawl
07251f0fa4 Don't apply spells to dead actors 2013-11-17 04:32:56 +01:00
scrawl
b8f5cd6cb7 Forgot to apply the same fix to companion window 2013-11-16 23:55:54 +01:00
scrawl
eb46de54e4 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-11-16 22:48:59 +01:00
scrawl
7eb1dcb682 Fix trade windows crashing after a new game 2013-11-16 22:29:40 +01:00
scrawl
e32c73725c Merge branch 'crashcatcher' 2013-11-16 20:56:07 +01:00
scrawl
f990ba09f0 gdb detection doesn't seem to work for the forked process 2013-11-16 20:55:41 +01:00
Marc Zinnschlag
a19242b4ec fixed expression in if statement 2013-11-16 19:31:35 +01:00
vorenon
b2d2a3dd17 Closing message boxes with numpad enter 2013-11-16 19:15:47 +00:00
Marc Zinnschlag
985ce7c552 Merge remote-tracking branch 'scrawl/crashcatcher' 2013-11-16 18:34:08 +01:00
scrawl
20d806b40c Change is_debugger_attached to a different hack 2013-11-16 18:15:54 +01:00
Marc Zinnschlag
c5f81e3508 don't run udpates if no game is running 2013-11-16 17:46:48 +01:00
scrawl
883140babf Add missing include for signals to make travis happy 2013-11-16 17:00:26 +01:00
scrawl
b9899696e3 Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace. 2013-11-16 15:56:15 +01:00
scrawl
aa84ce3f0d Copy paste mistake (oops) 2013-11-16 14:44:31 +01:00
Marc Zinnschlag
ec5b2e9a7e added running flag; moved new game code to MWState 2013-11-16 12:22:28 +01:00
Marc Zinnschlag
31ec973c9c removed default value for --start 2013-11-16 12:08:00 +01:00
Marc Zinnschlag
b3a7c8c098 removed --new-game switch 2013-11-16 11:36:32 +01:00
Marc Zinnschlag
7a4b604376 added --skip-menu switch 2013-11-16 11:33:20 +01:00
Marc Zinnschlag
f19973450f moved exit game flag from Environment to StateManager 2013-11-16 11:07:23 +01:00
Marc Zinnschlag
79b7fa258b added new mwstate subsystem 2013-11-16 10:31:46 +01:00
scrawl
7474e87edc Implement RestoreHealth/Magicka/Fatigue 2013-11-16 05:06:54 +01:00
scrawl
bb43ec9b35 Implement damage tick effects 2013-11-16 03:16:21 +01:00
scrawl
b1a29eb27e Implement Resist & Weakness effects 2013-11-16 02:34:43 +01:00
scrawl
d49b6f19ff Don't advance acrobatics skill for NPCs 2013-11-16 02:11:11 +01:00
scrawl
aa4b2d9504 Fix uninitialized mSkill/mAttribute for spellmaker spells 2013-11-16 01:19:39 +01:00
scrawl
c73217627e Move code for listing effect sources to the spell management classes 2013-11-15 20:29:47 +01:00
Marc Zinnschlag
eddd6bf48d enabled load and save items in main menu 2013-11-15 10:29:53 +01:00
scrawl
d619d0fa25 Don't grab the cursor while the console is opened 2013-11-15 03:39:25 +01:00
scrawl
065f14579f Fix a container window regression (oops) 2013-11-15 02:57:21 +01:00
scrawl
f7befa3e54 Remove a no longer required method 2013-11-15 02:20:04 +01:00
scrawl
00af6b5617 Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World. 2013-11-15 02:08:36 +01:00
scrawl
427de69b79 Allow stacking enchanted items when charge is full 2013-11-14 21:02:37 +01:00
scrawl
49125fa26e Fix restacking unequipped items 2013-11-14 19:54:00 +01:00
scrawl
da85f3e575 Use the formula from the wiki for spell success. 2013-11-14 19:19:32 +01:00
scrawl
4083c55848 Make sure NpcAnimation base exists before runAnimation. Not sure yet why this is needed. 2013-11-14 19:18:27 +01:00
scrawl
5458207325 Reduce fatigue when casting. Has no effect in the vanilla game due to the GMSTs being 0. 2013-11-14 18:41:34 +01:00
scrawl
9c5847e2f4 Fix VFX not getting removed when an actor dies 2013-11-14 14:52:30 +01:00
scrawl
e26cc31e3b Disable projectiles for now 2013-11-14 14:45:08 +01:00
scrawl
992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 2013-11-14 14:41:10 +01:00
scrawl
956d8adb99 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic 
Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp
 2013-11-14 14:25:22 +01:00
scrawl
0b5f5351b5 Fix continuous FX getting removed instantly 2013-11-14 13:30:48 +01:00
Marc Zinnschlag
9f0dac00ec silenced a warning 2013-11-14 12:22:24 +01:00
Marc Zinnschlag
d49b8e7443 Merge branch 'dialogue' 2013-11-14 11:40:50 +01:00
scrawl
da5c59c8af addEffect should check effectId, not model. 2013-11-13 19:07:44 +01:00
scrawl
ff7e4174f9 Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item. 2013-11-13 18:51:28 +01:00
scrawl
a6e2f43b75 Stop continuous VFX when the effect is no longer active. 2013-11-13 15:44:43 +01:00
scrawl
9b0e82a37f Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends) 2013-11-13 14:02:15 +01:00
Marc Zinnschlag
a8274e5c86 Merge remote-tracking branch 'potatoesmaster/inventory-fix' 2013-11-13 13:55:24 +01:00
scrawl
0627e23d3c Fix wrong skill level for spell success formula. 2013-11-13 01:26:25 +01:00
Emanuel Guevel
baf13483c0 Update actor model only when in the current cell 2013-11-13 00:04:04 +01:00
scrawl
60bec03987 Rename variables called 'slots' to work around wrong code parsing in QT Creator. 2013-11-12 23:23:19 +01:00
scrawl
027f4152e4 Missing flagAsModified() 2013-11-12 23:17:03 +01:00
scrawl
3c6a391507 Rename arguments again 2013-11-12 23:12:56 +01:00
scrawl
700d06764c Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack. 2013-11-12 22:58:56 +01:00
scrawl
0dab7031c0 Make sure effects are destroyed with the animation 2013-11-12 02:22:44 +01:00
scrawl
eccb8f38ba Apply "cast when strikes" enchantments when hitting with a weapon 2013-11-12 02:07:51 +01:00
scrawl
5f209b120b Use the new ContainerStore::remove method. 2013-11-12 01:26:16 +01:00
scrawl
ffdb91bb21 Add particles for Cast + Hit. Not looking quite right yet. 2013-11-11 23:43:28 +01:00
scrawl
6f3d737498 Missing const, thanks to jeaye 2013-11-10 23:27:11 +01:00
scrawl
1773c70455 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic 2013-11-10 22:03:17 +01:00
Marc Zinnschlag
ef8360f346 silenced a warning 2013-11-10 21:45:27 +01:00
scrawl
6cd373c5c6 Only allow using powers once every 24 h. Apply on touch effects. 2013-11-10 15:40:31 +01:00
scrawl
71828351e6 Code cleanup: use enum instead of integer 2013-11-10 15:28:26 +01:00
Marc Zinnschlag
8c4303399f Merge branch 'master' into dialogue 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp
 2013-11-10 13:21:39 +01:00
Emanuel Guevel
bbfd7f4c9d Disable equipped item re-stacking when the item is removed from inventory 
The item was not removed if it was re-stacked.
 2013-11-10 02:45:17 +01:00
Emanuel Guevel
d2dcf0b203 Add a warning comment to RefData::setCount() 2013-11-10 02:45:17 +01:00
Emanuel Guevel
467bd91651 Update actor model on inventory change 2013-11-10 02:45:17 +01:00
Emanuel Guevel
f428921b93 Always update the source container view on drag&drop 
This fix the indicator not being displayed for items auto-equipped
after an other item is removed.
 2013-11-10 02:45:17 +01:00
Emanuel Guevel
4fcf427e1f InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged 
The unequipped item is also re-stacked if needed.
 2013-11-10 02:45:17 +01:00
Emanuel Guevel
37e91a278e Add InventoryStore::unequipItem() 2013-11-10 02:45:17 +01:00
Emanuel Guevel
12dbbde1e3 InvStore::unequipSlot: return an iterator to the unequipped item 2013-11-10 02:45:17 +01:00
Emanuel Guevel
59c963b6cc Auto-equip items when a clothe or an armor is removed from inventory 
This fix auto-equip on corpses.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
750f1fd760 Edit ContainerStore::stacks for clarifications and correctness 
Rename arguments and fix some potential errors (add checks).
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
26e4ccb8c2 Cosmetic changes 
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
aefa54d72d Pass item count to ManualRef constructor 
This remove the need to call setCount in multiple places.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
0691978603 Add item count to ManualRef constructor as optional argument 2013-11-10 02:45:16 +01:00
Emanuel Guevel
f4f2586e8c Remove duplicate code for PlaceAtMe/PlaceAtPC using a template 2013-11-10 02:45:16 +01:00
Emanuel Guevel
8ff747fbef Move some deleteObject logic from OpDelete to MWWorld::deleteObject 2013-11-10 02:45:16 +01:00
Emanuel Guevel
2786530430 Edit InventoryStore::equip() to call the new unequipSlot function… 
…to unequip previously equipped item.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
52cef19982 Update weapon/magic icons when items are removed from player inventory 2013-11-10 02:45:16 +01:00
Emanuel Guevel
d05baa8c22 Add method InventoryStore::unequipSlot() 
This will permit to do run a treatment when an item is unequipped.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
10abb9d297 Call ContainerStore::remove() to remove items from inventory 
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).

Enchanting an item now unequips it.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
23b8206bdc Add remove methods to MWWorld::ContainerStore 2013-11-10 02:45:16 +01:00
Marc Zinnschlag
a198751f21 Merge remote-tracking branch 'scrawl/magic' 2013-11-09 17:00:27 +01:00
scrawl
5c148a3d41 Fix effect source display 2013-11-09 11:09:44 +01:00
Marc Zinnschlag
8be3ffc2a0 Merge remote-tracking branch 'scrawl/magic' 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-11-09 10:54:51 +01:00
scrawl
3e58655a90 Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works! 2013-11-09 10:49:00 +01:00
scrawl
3ea7d58ca8 Advance skill on successfull spell cast 2013-11-09 10:34:46 +01:00
scrawl
976344f0a3 Handle CastOnce enchantments 2013-11-09 08:07:40 +01:00
scrawl
1051611ffa Added spell failure sound 2013-11-09 07:59:17 +01:00
scrawl
cbe96a2170 Refactor ActiveSpells to track range type. Added basic self range magic. 2013-11-09 07:51:46 +01:00
Jordan Ayers
3fbf918751 Chargen Review Dialog: Init fix. 
Load the starting Health/Magicka/Fatigue from the player stats when
creating the Review Dialog, and remove the extra copy of these stats.
In some cases, the old stat values were never updated from 0/0.
 2013-11-06 23:19:53 -06:00
Jordan Ayers
d48cc27a89 Chargen fix: Back sequence control. 
Related to bug #894.
Eliminate double windows when using 'Back' from the review screen.
Force consistent back behavior (handling was changing after
a individual change button had been used).
 2013-11-06 23:19:53 -06:00
Jordan Ayers
e94da61ff0 Chargen cleanup. 
Move common gui state pop out of if checks.
Move health update before gui state push (used as input for some windows).
 2013-11-06 23:19:53 -06:00
Marc Zinnschlag
d85360e7fd Merge remote-tracking branch 'scrawl/ui' 2013-11-06 10:21:41 +01:00
Marc Zinnschlag
418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 2013-11-06 10:21:25 +01:00
scrawl
9e2b1942fc Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found. 2013-11-05 22:50:53 +01:00
scrawl
bf5529819d Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog. 2013-11-05 19:50:24 +01:00
Marc Zinnschlag
2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88 added missing columns to topic info table 2013-11-05 11:41:48 +01:00
Marc Zinnschlag
245d7b0ae4 Merge remote-tracking branch 'scrawl/windowclosefix' 2013-11-05 08:19:53 +01:00
Marc Zinnschlag
f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 2013-11-05 08:19:29 +01:00
scrawl
c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 2013-11-05 03:02:28 +01:00
scrawl
3a827d9c12 Deleted Obliviontt.zip 2013-11-05 00:32:06 +01:00
Alexander "Ace" Olofsson
468e8e3635 Missing iostream include 2013-11-04 10:36:22 +01:00
Marc Zinnschlag
dec1483fa4 Merge branch 'saving' into openmw-27 2013-11-04 08:57:32 +01:00
Lukasz Gromanowski
afce10cf37 Fixes #597: Assertion `dialogue->mId == id' failed in esmstore.cpp 
It seems that assertion was unnecessary, after removing it, dialogs
related to moon-and-star in "Path of the Incarnate" quest were
correctly loaded (dumped DialInfo records were correct).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-11-02 16:39:05 +01:00
gus
683b8d77dd build fix (thanks travis) 2013-10-31 11:02:26 +01:00
gus
d587f3c946 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/docs/vmformat.txt
 2013-10-31 09:51:17 +01:00
gus
02ded18fc5 Linux backslash fix 2013-10-31 09:43:12 +01:00
gus
2a927f65d3 perfomances optimisations (pathfinding is computed less often, max 4 times per sec) 2013-10-30 20:52:23 +01:00
gus
650a112e2e better timer 2013-10-30 20:42:50 +01:00
scrawl
636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01:00
scrawl
4f35fd8184 Removed a workaround from Renderer, some cleanup 2013-10-30 13:05:28 +01:00
gus
a6e7c6c104 disable AI combat for creatures 2013-10-28 23:04:46 +01:00
gus
5b20cce849 CMake fix 2013-10-28 18:36:09 +01:00
gus
0e86209224 linux fix :p 2013-10-28 18:33:10 +01:00
gus
b7a9243173 fighting should stop when the target is dead 2013-10-28 18:22:36 +01:00
gus
12d8b4e0f8 bugfix 2013-10-28 18:13:07 +01:00
gus
2d84f7d33d NPC run 2013-10-28 18:10:00 +01:00
gus
d7584f9df7 getLineOfSight, no script instruction yet 2013-10-28 18:01:40 +01:00
gus
2515a1239e improved combat conditions 2013-10-27 14:22:51 +01:00
gus
968968502e NPC always face you when fighting 2013-10-27 14:03:58 +01:00
gus
a0edb55f60 only NPC with fight over 80 will attack you now 2013-10-27 13:50:29 +01:00
gus
882b136b35 bugfix of bugfix ^^ 2013-10-27 13:21:16 +01:00
Alex "rainChu" Haddad
23eaf90846 Breath meter flashes when drowning 2013-10-27 04:05:01 -04:00
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
scrawl
3a3f2a37c8 Add cut, copy & paste of text 2013-10-17 12:47:49 +02:00
Marc Zinnschlag
8c139783b7 silenced a warning 2013-10-16 21:33:11 +02:00
Marc Zinnschlag
19bd0f90b9 Merge remote-tracking branch 'rainChu/torches' 2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
65818155d8 Fixed punctuation consistency 2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad
e11da5c0a3 Added a constructor to Light CustomData 2013-10-16 15:13:36 -04:00
Alex "rainChu" Haddad
2643214ca6 Lights extinguish underwater 2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad
30ee3c5cf6 Equipped torches and lights run out of fuel 2013-10-15 21:50:14 -04:00
Emanuel Guevel
ba4b8a37e2 Remember pressed message box button longer 
Remember which button was pressed until a new interactive message box is
displayed or until the pressed button number is read.

Before that, it was not possible to get the pressed button after the
message box was hidden/destroyed.
 2013-10-14 12:55:06 +02:00
Marc Zinnschlag
ce8694c84e Merge remote-tracking branch 'scrawl/master' 2013-10-13 18:55:49 +02:00
scrawl
683ad40e21 No need for this ifdef since there is a default argument. 2013-10-13 18:28:22 +02:00
scrawl
fa264935ff We can apply vsync at runtime now that the Ogre bug is fixed. 2013-10-13 17:56:26 +02:00
scrawl
f504ab42fe Turn off vsync while in the loading screen 2013-10-13 17:52:14 +02:00
Marc Zinnschlag
fc5afe430b Merge remote-tracking branch 'potatoesmaster/fatigue-restoration' 2013-10-13 14:40:48 +02:00
Emanuel Guevel
dcfff79460 Regenerate fatigue over time 2013-10-13 00:40:27 +02:00
Marc Zinnschlag
708cde2688 Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection' 2013-10-12 23:18:19 +02:00
Jordan Ayers
141382b8c0 COC Command: Exterior cell selection fix. 
Return the northernmost cell of the easternmost matching column for Ext. cells.
 2013-10-12 14:48:37 -05:00
Marc Zinnschlag
608d154ad7 Merge remote-tracking branch 'rainChu/master' 2013-10-12 20:31:33 +02:00
Marc Zinnschlag
2606feec3a Merge remote-tracking branch 'lgro/cfg_without_data_path' 2013-10-12 13:52:38 +02:00
Marc Zinnschlag
3c580fbc59 Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat' 2013-10-12 13:40:29 +02:00
Marc Zinnschlag
458c752425 Merge remote-tracking branch 'mckibbenta/tgm' 2013-10-12 13:38:10 +02:00
Marc Zinnschlag
87cd5d4267 Merge remote-tracking branch 'potatoesmaster/DisableLevitation' 2013-10-12 13:31:06 +02:00
Marc Zinnschlag
9c4d88cd76 Merge remote-tracking branch 'potatoesmaster/acrobatics' 2013-10-12 13:20:12 +02:00
Lukasz Gromanowski
5ce1f50fab Cleanup in MWGui::WindowManager constructor initialzation list. 
Corrected order of initialization list, and added missing
member field initializations - without this openmw crashes when
installer is interrupted and there are no valid data path
in openmw.cfg, as reported by BrotherBrick in:

https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-10-10 23:06:37 +02:00
Jordan Ayers
6e4978643c Magic Effect descriptions: support feet / level modes. 
Show proper suffixes for all magnitudes.
Drop extra 'times' symbol in 'timesInt format (not consistent
with other magnitude displays).
 2013-10-09 00:08:11 -05:00
Jordan Ayers
6ab7002908 MagicEffect: Put magnitude type into ESM::MagicEffect helper. 2013-10-07 22:28:55 -05:00
Jordan Ayers
065f435225 Format fix: remove extra spaces from ranged TimesINT formatting. 2013-10-07 20:02:20 -05:00
gus
94069e3a7e bugfix 2013-10-07 20:30:12 +02:00
gus
1ac3d99c78 pathfinding now works in AICombat. 2013-10-07 10:20:02 +02:00
Jordan Ayers
6303e56ce4 Magic Effect Display cleanup: Don't put spaces in percentages. 2013-10-06 20:35:59 -05:00
Jordan Ayers
707f45aa8e Magic Effect Display improvement. 
Related to Bug #794.
Always show one decimal point precision for Fortify Max. Magicka effect.
 2013-10-06 20:26:39 -05:00
Jordan Ayers
6983a55a16 Magic effect display improvement. 
Related to Bug #794.
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
 2013-10-06 19:32:40 -05:00
Emanuel Guevel
2abe5c1c9a Acrobatics: do not apply fall damages when slowfalling spell effect is active 
If spell effect ends up in mid-air, calculate fall height from then.
 2013-10-02 23:34:25 +02:00
Emanuel Guevel
4265dddc40 Add MWWorld::isSlowFalling(Ptr) 2013-10-02 23:34:25 +02:00
Emanuel Guevel
6e09a5fb4a Acrobatics: reinit fall height at current height rather than zero 
To prevent problems.
 2013-10-02 23:34:25 +02:00
Emanuel Guevel
2b992ef3b5 Acrobatics: use calculated fatigueTerm 2013-10-02 23:34:24 +02:00
Emanuel Guevel
4c151e59a2 Acrobatics: do not touch modified stats 2013-10-02 23:34:24 +02:00
Emanuel Guevel
4860514865 Acrobatics: cosmetic changes 2013-10-02 23:34:24 +02:00
mckibbenta
857deb3723 Merge branch 'master' into tgm 2013-10-02 13:54:03 -04:00
mckibbenta
073f64c8bb stop weapon condition degredation (for the player) with tgm on 2013-10-02 13:46:33 -04:00
Emanuel Guevel
496f786c2a Implement Disable/EnableLevitation script functions 
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
 2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad
f1b4c2e400 Fixed first person offset to use world transform 
It slipped my mind that some necks might not be perfectly vertical.
 2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad
ed0c31b485 Refactored, moved logic out of NpcAnimation 
The logic is now handled by RenderingManager, and Camera sets its
animation's first person offset height. Due to how NpcAnimation seems to
be updated, it has to be the one to actually set its own nodes, in the
case of the hands. Otherwise, the hands would not move without a messier
hack.
 2013-10-02 05:16:52 -04:00
Emanuel Guevel
b8c60dabb3 Reintroduce Acrobatics changes made by Glorf 
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
 2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad
0ddb5097fc Revert "Bug #840, First Person Sneaking Camera Height" 
This reverts commit 296abfd48f.
 2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad
296abfd48f Bug #840, First Person Sneaking Camera Height 
Also, added comments to existing code in the area.
 2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad
00a776a1a8 Fixed compilation failure on my machine 
Fixed shared records not being populated before the player record is
moved.
 2013-09-30 02:54:20 -04:00
greye
4cdb57e388 workaround segfault on --new-game switch 2013-09-30 10:30:40 +04:00
Lukasz Gromanowski
9c2145eda1 Issue #913: Merge --master and --plugin switches 
Merged master/plugin switches into content in openmw
and mwiniimporter.

Extension in content files is now required.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-09-29 09:11:57 +02:00
gus
83a375b55d AI now continue to hit you. 
TODO: change the way time is handled
 2013-09-28 21:17:06 +02:00
gus
2537384c50 bug fix 2013-09-28 12:25:37 +02:00
gus
9353f4d14f WIP AI combat 2013-09-25 18:01:36 +02:00
Marc Zinnschlag
0f1c4cb00e cleanup 2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c Switched to using proper enums as opposed to ints. 2013-09-23 08:31:36 -04:00
Berulacks
0c518fb047 Replaced tabs with spaces. 2013-09-23 07:36:50 -04:00
Berulacks
c423479f20 Fixed bug #887 2013-09-23 07:31:14 -04:00
graffy76
70ac14b8ba Merge branch 'master' into esxSelector 2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
Marc Zinnschlag
94bb97e766 replacing tabs with spaces 2013-09-21 08:40:00 +02:00
Marc Zinnschlag
96b181bb54 Merge remote-tracking branch 'xethik/master' 2013-09-21 08:07:00 +02:00
Xethik
094e4d93b7 Generally speaking, you should never compare iterators from two different compilers 
http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers
It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10.
It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.
 2013-09-20 21:38:10 -04:00
Xethik
58bb0b8773 Bug #907 
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
 2013-09-20 21:26:12 -04:00
Marc Zinnschlag
99fe6e68c7 Merge remote-tracking branch 'mckibbenta/tgm' 2013-09-19 15:14:35 +02:00
scrawl
d5ef843f56 Fix a missing model update 2013-09-16 19:22:08 +02:00
mckibbenta
6bb6ba6372 added god mode comment 2013-09-15 16:12:59 -04:00
mckibbenta
3035675a26 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-09-15 15:49:18 -04:00
mckibbenta
644f081c60 minor changes 2013-09-15 15:48:32 -04:00
Marc Zinnschlag
9637e1641b fix for building with system tinyxml 2013-09-14 13:33:49 +02:00
Marc Zinnschlag
bf8a25c2c6 Merge remote-tracking branch 'mckibbenta/tgm' 2013-09-12 19:07:35 +02:00
mckibbenta
89b7d6121d Initial toggleGodMod/tgm instruction. Currently only affects player health. 2013-09-12 08:30:00 -04:00
mckibbenta
85b8af6262 Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm 2013-09-12 08:08:07 -04:00
scrawl
09e692f1f6 Fixed polish font 2013-09-10 22:11:57 +02:00
gus
f9bfbc8764 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat 2013-09-10 16:18:39 +02:00
gus
46a734852b adding script instruction getLOS + some test about AI 2013-09-10 16:16:13 +02:00
scrawl
10c21579bc Item stacking case sensitivity fix 2013-09-07 01:00:38 +02:00
mckibbenta
e545f49807 Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm 2013-09-02 18:40:37 -04:00
Marc Zinnschlag
7076ea9467 Merge remote-tracking branch 'scrawl/map' 2013-09-02 10:55:12 +02:00
scrawl
3ddeb075fb Fix a cell border seam on the map 2013-08-31 04:36:23 +02:00
Chris Robinson
82a09a988b Minor pathfinding cleanup 2013-08-29 19:17:27 -07:00
Chris Robinson
8f23b330d3 Remove unnecessary initialization 2013-08-29 17:41:20 -07:00
Chris Robinson
9499ac4fd5 Increase the distance for reaching a path node 2013-08-29 17:41:20 -07:00
Chris Robinson
f9dbce685a Avoid killing AIWander and AITravel when far away 
This fixes the problem of certain NPCs not wandering because they
happened to spawn near a cell border away from the player, which
immediately "completed" the wander package.

AIWander can't cause NPCs to cross cell boundaries, so there's no risk
of them walking into an unloaded to. AITravel will now simply stop
moving, and resume later when the cell is loaded.
 2013-08-29 17:41:20 -07:00
mckibbenta
f65172bdca Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm 2013-08-29 20:26:36 -04:00
mckibbenta
eef9df504a fiddlings 2013-08-29 20:25:36 -04:00
scrawl
c8e31725dc Fix weather sounds persisting on a new game 2013-08-29 15:16:08 +02:00
Marc Zinnschlag
ce90c2f3be Merge remote-tracking branch 'kcat/master' 2013-08-28 21:05:07 +02:00
Chris Robinson
e589d0ec91 Werewolves can't activate activators 2013-08-28 11:36:22 -07:00
Chris Robinson
84d259ab8e Avoid reconstructing strings for updating the dynamic stats 
Attributes still do this, but they change infrequently enough that it doesn't
matter.
 2013-08-28 10:50:29 -07:00
scrawl
5918b84666 Don't crash on resize events during load 2013-08-28 17:05:28 +02:00
Chris Robinson
92082dae66 Modify the current magicka and fatigue when the base changes 2013-08-27 22:44:52 -07:00
Chris Robinson
305b5fec0f Avoid needlessly copying the MagicEffects 2013-08-27 21:40:31 -07:00
Chris Robinson
281fdbd81b Cleanup some redundancy 2013-08-27 17:56:47 -07:00
Chris Robinson
33c173a23a Update the watched Ptr when changing it 2013-08-27 17:22:07 -07:00
Chris Robinson
39af9a13fa Remove some unused functions 2013-08-27 17:13:49 -07:00
Chris Robinson
189541aa72 Apply drowning damage based on the update duration 
1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid
having to track another stat.
 2013-08-27 17:08:23 -07:00
Chris Robinson
f216b25be8 Slightly randomize time between environment sounds 
We should use the "Minimum Time Between Environmental Sounds" and
"Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't
have them.
 2013-08-27 16:04:19 -07:00
Chris Robinson
02df8ab841 Store the underwater sound to easily stop it 2013-08-27 13:48:20 -07:00
Chris Robinson
16331bf1ed Avoid a hack to play the underwater sound properly 2013-08-27 13:26:57 -07:00
scrawl
839d251cc5 Renamed Terrain::Terrain to Terrain::World to make VC happy 2013-08-27 16:01:16 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
Marc Zinnschlag
dcc55b60c3 Merge remote-tracking branch 'kcat/misc-cleanup' 2013-08-26 08:51:19 +02:00
mckibbenta
60fa69139e minor changes 2013-08-25 19:20:14 -04:00
Chris Robinson
f2889e4bb5 Remove unused functions and parameters 2013-08-25 16:08:45 -07:00
Chris Robinson
3843357cd2 Fix actor stepping 2013-08-25 16:08:43 -07:00
Chris Robinson
0463dc0653 Use a smaller static geometry size for interior cells 2013-08-25 16:08:43 -07:00
Chris Robinson
bd6dd071aa Use the non-accumulation root's parent as the accumulation root 
This relies on the non-accumulation root not being the skeleton root. I haven't
found an instance where this isn't the case.
 2013-08-25 16:08:42 -07:00
scrawl
3f8a69b4ad Don't crash when trying to delete a reference that doesn't exist anymore 2013-08-26 00:14:02 +02:00
scrawl
5af89a9e8f Fix an AABB assert for loading empty exterior cells 2013-08-26 00:13:42 +02:00
scrawl
c6d2d1999a Fix an item duplication glitch 2013-08-25 17:40:08 +02:00
mckibbenta
06701467ab Merge branch 'master' into tgm 2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b initial do-nothing implementation; registered opcode 2013-08-24 21:19:12 -04:00
Chris Robinson
ca24a809fc Use the position of the actor to determine if they're swimming 2013-08-23 13:44:16 -07:00
Chris Robinson
3fa65f21dd Use a proper cone shape with a contact test to check for melee hits 2013-08-23 12:27:40 -07:00
Chris Robinson
f5d03a16c1 Rename getFacedObject and getFacedHandle for melee hits 2013-08-23 12:27:39 -07:00
Marc Zinnschlag
2823e5693d Merge remote-tracking branch 'scrawl/hit' 2013-08-22 15:35:17 +02:00
scrawl
22d5598082 Fix bad_cast exception when hitting creatures 2013-08-22 12:17:12 +02:00
scrawl
1adce8afb3 Fix ambient light getting set from the cell data for non-interior cells 2013-08-22 10:47:48 +02:00
Marc Zinnschlag
e03e2f0817 Merge remote-tracking branch 'scrawl/master' 2013-08-21 19:50:08 +02:00
scrawl
758d989a03 If multiple plugins have land data for the same cell, the last plugin should win 2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2 Use a proper node hierarchy; disconnect the root when entering interior 2013-08-21 17:26:11 +02:00
Chris Robinson
c855ab65cf Non-colliding objects are considered flying 2013-08-21 07:24:54 -07:00
Chris Robinson
602be9bbe7 Avoid swimming into the air from underwater 2013-08-21 07:24:54 -07:00
Chris Robinson
9f09bb6f6f Use separate inputs for swimming and flying 2013-08-21 07:24:54 -07:00
Chris Robinson
a546ace94d Remove an unused method 2013-08-21 07:24:54 -07:00
vorenon
3bf3bd4b8c Silenced some warnings 2013-08-21 13:53:49 +02:00
Chris Robinson
1a9672e31b Don't update player physics more than 60 times a second 
Bullet and/or our collision handling code doesn't like timesteps much
smaller than that. Ideally we should do physics in 60fps (or even 30fps)
steps and use prediction and interpolation to get more, but that's not
straight forward and needs a fixed timestep loop to lock physics and
logic together.
 2013-08-20 11:31:49 -07:00
Chris Robinson
0e56b2facb Merge remote-tracking branch 'zini/master' into physics 2013-08-20 04:42:28 -07:00
Chris Robinson
d9040df9d6 Increase the max number of physics iterations 
Should help with highly tessellated collision meshes with high
framerates.
 2013-08-20 04:41:52 -07:00
scrawl
ecf7786d11 terrain_num_lights was removed 2013-08-20 12:31:47 +02:00
scrawl
fa76d1631b Some terrain fixes 2013-08-20 12:08:46 +02:00
scrawl
0545622f5a Fix werewolf state not getting completely reset when starting a new game 2013-08-20 11:24:19 +02:00
Chris Robinson
a993af53e7 Merge remote-tracking branch 'zini/master' into physics 2013-08-20 02:21:44 -07:00
Chris Robinson
a17997a973 Continually add bits of input velocity to inertia when falling 2013-08-20 02:10:18 -07:00
scrawl
8c8653160d Crash fix, material fix 2013-08-20 09:52:27 +02:00
scrawl
13afcc9324 Don't link to OgreTerrain 2013-08-19 22:22:14 +02:00
scrawl
ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 2013-08-19 20:39:37 +02:00
Chris Robinson
d727b15580 Fix tracing down 2013-08-19 20:39:37 +02:00
Chris Robinson
394fc75697 Clean up the trace struct 2013-08-19 20:39:37 +02:00
Chris Robinson
b351109649 Get rid of the old newtrace method 2013-08-19 20:39:37 +02:00
Chris Robinson
14acacf401 Use a better method to do actor physics traces 2013-08-19 20:39:37 +02:00
Chris Robinson
76b812f75f Improve actor movement collision handling 2013-08-19 20:39:37 +02:00
Chris Robinson
584eec3743 Store the object class in the LiveCellRef 2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed New terrain renderer - improvements: 
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
 - Fixes several blending issues and cell border seams
 - Fix map render to use the terrain bounding box instead of an arbitrary height
 - Different LODs are now properly connected instead of using skirts
 - Support self shadowing
 - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
 - Support a fixed function fallback (though the splatting shader usually performs better)
 - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
 2013-08-19 20:34:20 +02:00
Chris Robinson
cf6e3ab933 Fix a potential divide-by-zero 2013-08-19 09:36:51 -07:00
Chris Robinson
dca599b8c5 Add NPC landing sounds for soundgen keys 2013-08-19 08:58:50 -07:00
Chris Robinson
2ec39f3622 Don't start the jump animation until after the actor is airborn 
A bit counter-intuitive, but otherwise certain jump animations will improperly
add an offset to the initial inertia.
 2013-08-19 08:24:47 -07:00
Chris Robinson
ac3d3df9fc Implement jumping animations 2013-08-19 08:10:18 -07:00
Chris Robinson
48e594b7c4 Improve stepping down when starting on the ground 2013-08-19 08:09:23 -07:00
Chris Robinson
3ca4d54bf9 Better handle animations with a 0-length loop 2013-08-19 07:26:42 -07:00
Chris Robinson
1aa92067c2 Fix tracing down 2013-08-19 04:56:02 -07:00
Chris Robinson
6e9f15793d Implement a jumping state 2013-08-18 23:42:56 -07:00
Chris Robinson
7770203dff Some physics cleanup 
Gets rid of some unneeded/unused variables, and halves the 'on ground'
offset.
 2013-08-18 08:24:39 -07:00
Chris Robinson
b0f8045c72 Improve mid-air control 2013-08-18 05:59:06 -07:00
Chris Robinson
8c3564326e Improve movement inertia 
Handles all 3 axis. Incoming velocity is only added to inertia when
leaving the ground, and does not continually add to it.
 2013-08-18 05:38:50 -07:00
Chris Robinson
9d56e2d86d Apply movement by queueing it to do later 2013-08-17 22:34:38 -07:00
Chris Robinson
96bab88da6 Add physics methods to queue and apply movements 2013-08-17 07:48:45 -07:00
Chris Robinson
0481e64b02 Fix tracing down 2013-08-17 05:09:34 -07:00
Chris Robinson
8bcce0fb55 Clean up the trace struct 2013-08-17 05:09:33 -07:00
Chris Robinson
62c7b3698d Get rid of the old newtrace method 2013-08-17 05:09:33 -07:00
Chris Robinson
65ce3c6ba5 Use a better method to do actor physics traces 2013-08-17 05:09:32 -07:00
Chris Robinson
d82f54c771 Improve actor movement collision handling 2013-08-17 05:09:30 -07:00
Chris Robinson
21121d5ba5 Store the object class in the LiveCellRef 2013-08-16 04:18:48 -07:00
Chris Robinson
08d1d486a4 Merge remote-tracking branch 'zini/master' into ptr-improvements 2013-08-15 17:42:16 -07:00
Marc Zinnschlag
d122699b2f and another fix for the same issue :( 2013-08-15 18:29:09 +02:00
Chris Robinson
58481ec7c3 Merge remote-tracking branch 'zini/master' into ptr-improvements 2013-08-15 07:11:38 -07:00
Marc Zinnschlag
7b4d8afde7 fix to previous commit 2013-08-15 15:53:50 +02:00
Chris Robinson
fdbf09ed40 Merge remote-tracking branch 'zini/master' into ptr-improvements 
Conflicts:
	apps/openmw/mwworld/containerstore.cpp
 2013-08-15 05:56:24 -07:00
Marc Zinnschlag
e94fcce622 accessing references via their ID now also works for references in containers in active cells 2013-08-15 14:45:13 +02:00
Chris Robinson
2853b56ed5 Throw an exception when trying to get an empty Ptr's type 2013-08-15 04:52:01 -07:00
Chris Robinson
0f2b2ff1ce Small header cleanup 2013-08-15 01:21:43 -07:00
Chris Robinson
86f2cd5848 Use dynamic_cast to get the LiveCellRef 2013-08-14 20:26:50 -07:00
Chris Robinson
48c07fbd98 Remove some unnecessary fields from Ptr 2013-08-14 17:05:42 -07:00
Chris Robinson
74f855e948 Move common LiveCellRef fields to the base class 2013-08-14 01:55:51 -07:00
Chris Robinson
11166a1a17 Don't store the type name string in the Ptr 
This should get rid of all heap allocations caused by constructing or copying
Ptr objects.
 2013-08-14 00:45:28 -07:00
Chris Robinson
b6d2888c48 Avoid using boost::any in MWWorld::Ptr 
Reduces dependency on Boost, and should improve performance a bit when
copying or constructing Ptr objects.
 2013-08-14 00:45:27 -07:00
Marc Zinnschlag
aee0336780 Merge remote-tracking branch 'kcat/script-functions' 2013-08-14 09:05:40 +02:00
Chris Robinson
73437dfdca GetEffect can accept an effect ID string as well 2013-08-13 19:18:21 -07:00
Chris Robinson
c1dfa980bf Combine ShowVarsImplicit and ShowVarsExplicit 
Also removes an unnecessary else statement
 2013-08-13 17:31:15 -07:00
Marc Zinnschlag
e2e76147c8 Merge remote-tracking branch 'potatoesmaster/magic' 2013-08-13 15:36:43 +02:00
Chris Robinson
30973352e8 Implement ShowVars (SV) console function 2013-08-13 04:54:41 -07:00
Chris Robinson
2353ac1739 Properly implement SetWerewolfAcrobatics 2013-08-13 04:54:41 -07:00
Emanuel Guevel
ad3646cb15 Fix spell icons displayed when effect ended 2013-08-13 04:57:45 +02:00
Emanuel Guevel
a47c76001c Apply trap magic effects 2013-08-13 04:56:15 +02:00
Emanuel Guevel
37ea0f3fb9 Display refusal message when weapon/magic icons are clicked as werewolf 2013-08-12 15:36:16 +02:00
Emanuel Guevel
997f37700d Display HUD icons for hidden windows 2013-08-12 15:06:09 +02:00
Emanuel Guevel
c27c33f542 Fix pinned windows hiding 
They were always displayed in console mode and in game (even if they
were force hidden).
 2013-08-12 15:04:41 +02:00
Chris Robinson
6fd4cdb5fb Play randomized werewolf sounds 2013-08-11 00:53:17 -07:00
Chris Robinson
00d6690b4d Ignore encumbrance in werewolf form 
According to UESP, inventory weight is ignored. Not sure if this
includes feather and burden effects.
 2013-08-10 20:25:18 -07:00
Chris Robinson
180f0d0fe9 Restart from the loop point if replaying the same animation 2013-08-09 21:25:28 -07:00
Chris Robinson
5968165de0 Merge remote-tracking branch 'zini/master' into werewolf 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2013-08-09 07:00:00 -07:00
Chris Robinson
a28c36de17 Don't count as running if not actually moving along (local) X/Y 2013-08-09 06:53:07 -07:00
Chris Robinson
c2d8eb377f Play some appropriate sounds in werewolf form 2013-08-09 06:40:16 -07:00
Chris Robinson
db1036e5e5 Handle SetWerewolfAcrobatics 2013-08-09 05:37:56 -07:00
Chris Robinson
ae183cb3e4 Handle werewolf stats 2013-08-09 05:14:58 -07:00
Chris Robinson
72a399054f Don't assume only players activate doors 2013-08-09 01:35:29 -07:00
Chris Robinson
46bc7bd9c8 Some cleanup since NpcStats is now also CreatureStats 
This isn't a thorough cleaning, so keep an eye out for more
 2013-08-09 01:14:08 -07:00
Marc Zinnschlag
fb0b57efaa Merge remote-tracking branch 'vorenon/bug876' 2013-08-09 09:38:10 +02:00
Chris Robinson
75b6515915 Inherit NpcStats from CreatureStats 2013-08-08 23:28:02 -07:00
Chris Robinson
89c7f5bc70 Handle object activation as a werewolf 2013-08-08 22:34:53 -07:00
Chris Robinson
6110a0ee3b Don't allow resting as a werewolf 2013-08-08 18:30:47 -07:00
Chris Robinson
75131e6a48 Rebuild the actor after switching between werewolf forms 2013-08-08 17:16:24 -07:00
Chris Robinson
5fbfce6d1e Don't show WerewolfRobe objects in the inventory 
Pretty ugly hard-coding, but this is likely what vanilla does since it
has no option to mark clothes or armor as unplayable like Oblivion does.
 2013-08-08 16:05:26 -07:00
Chris Robinson
d77d60cbc2 Remove an unneeded forceUpdate method 2013-08-08 15:37:08 -07:00
vorenon
a718a62ef5 Fix for bug 876 2013-08-09 00:06:34 +02:00
PLkolek
86020ad94d Added underwater and drowning sounds. 2013-08-08 20:57:15 +02:00
Chris Robinson
e3d5a1b38d Dialog function 72 is not player-specific 
It's used to force any NPC in werewolf form to play the appropriate
growls for combat.
 2013-08-08 06:02:16 -07:00
Chris Robinson
960ea3d96c Add/remove a WerewolfRobe when werewolf form is toggled 2013-08-08 04:40:31 -07:00
Chris Robinson
3cff7b1e42 Don't assume icons have a period in their filename 2013-08-08 04:40:31 -07:00
Chris Robinson
1f6055d54b Don't try to apply body skins for werewolves 
They instead use a hidden WerewolfRobe object for their body
 2013-08-08 04:40:31 -07:00
Chris Robinson
946ca7f931 Return the appropriate name for werewolf NPCs 2013-08-08 04:40:31 -07:00
Chris Robinson
dfdd2dc308 Handle swimleft and swimright soundgen keys 2013-08-08 04:40:31 -07:00
Chris Robinson
109df46590 Fix werewolf claw damage multiplier 2013-08-08 04:40:31 -07:00
Chris Robinson
9694b18d1b Update part skeletons immediately when added 2013-08-08 04:40:30 -07:00
Chris Robinson
f73578a832 Remove unnecessary mBodyPrefix field 2013-08-08 04:40:30 -07:00
Chris Robinson
5051544144 Remove some duplicate code 2013-08-08 04:40:30 -07:00
Chris Robinson
ceed2e30b8 Handle NPCs being a werewolf in NpcAnimation 
Note that the body mesh comes from having a WerewolfRobe force-equipped.
 2013-08-08 04:40:30 -07:00
Chris Robinson
5ac82a50b7 Remove unused function 2013-08-08 04:40:30 -07:00
Marc Zinnschlag
e9521dc8f1 Merge remote-tracking branch 'potatoesmaster/pinning' 2013-08-08 13:06:58 +02:00
Emanuel Guevel
1cbfcc3910 Fix HUD weapon icon when turning from werewolf to normal 
The werewolf hand icon remained until the inventory menu was opened.
 2013-08-08 10:56:44 +02:00
Chris Robinson
2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
 2013-08-08 00:09:29 -07:00
Chris Robinson
4985e17865 Fix werewolf claw damage multiplier 2013-08-07 19:15:36 -07:00
Chris Robinson
4641737fc4 Update part skeletons immediately when added 2013-08-07 19:15:36 -07:00
Chris Robinson
dc0360b1f6 Remove unnecessary mBodyPrefix field 2013-08-07 19:15:36 -07:00
Chris Robinson
0f52ed9a9b Remove some duplicate code 2013-08-07 19:15:36 -07:00
Chris Robinson
deee14ccfd Handle NPCs being a werewolf in NpcAnimation 
Note that the body mesh comes from having a WerewolfRobe force-equipped.
 2013-08-07 19:15:36 -07:00
Chris Robinson
ab44cd63a1 Remove unused function 2013-08-07 19:15:35 -07:00
Emanuel Guevel
b2e5e8dd0d Saner inventory window pinning/hiding 
Hide inventory window pin button in container, companion and barter mode.
Restore the pinned inventory window position when exiting these modes.
Allow toggling windows visibility in inventory mode only.
 2013-08-07 23:30:08 +02:00
Alex
b9579e085f cleanup 2013-08-07 15:40:57 -04:00
Alex
a0931b01fe Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg 2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32 mild cleanup 2013-08-07 13:16:20 -04:00
PLkolek
8f4506f5b6 Implemented drowning. 
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
 2013-08-07 16:46:46 +02:00
Emanuel Guevel
48d2554ac3 Auto-equip when items are added to the inventory 
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
 2013-08-07 15:17:55 +02:00
Emanuel Guevel
e0d0cdd18a Do not auto-equip items continuously 
This was called every couple of frames.
 2013-08-07 14:30:13 +02:00
Chris Robinson
076e7d8e16 Make insertBegin internal 2013-08-07 03:56:07 -07:00
Chris Robinson
2b2101958d Destroy the scene node we create 2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531 Remove unused/unneeded parameters 2013-08-07 03:56:06 -07:00
Emanuel Guevel
fd0a159a64 MWScript: update first unused opcode number 2013-08-07 12:05:53 +02:00
Emanuel Guevel
47b8a31317 Fixes suggested by KittyCat 2013-08-07 12:05:53 +02:00
Marc Zinnschlag
932fffd1a7 Merge remote-tracking branch 'kcat/light-objects' 2013-08-07 11:21:01 +02:00
Chris Robinson
b4b095ca72 Don't try to get the center of a null bounding box 2013-08-07 01:32:36 -07:00
Chris Robinson
80d271aeb1 Remove unused stuff 2013-08-07 01:31:01 -07:00
Chris Robinson
3555476dfd Use Animation-derived objects for generic objects 2013-08-06 19:49:07 -07:00
Chris Robinson
a9dca21d05 Create the Animation SceneNode in the constructor 2013-08-06 19:49:05 -07:00
Chris Robinson
48784c7e2f Use for_each and functors to avoid some for loops 2013-08-06 19:49:05 -07:00
Chris Robinson
de95926e9f Use controllers to animate lights in ObjectLists 2013-08-06 19:49:04 -07:00
Chris Robinson
8984d8f8ee Use a map to simplify NPC part referencing 2013-08-06 19:49:02 -07:00
Chris Robinson
e976bb16c5 Add a light for torches 2013-08-06 19:49:02 -07:00
Chris Robinson
57fb065a86 Add Ogre::Light objects to the object list 
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
 2013-08-06 19:49:01 -07:00
Chris Robinson
a9cc3a2844 Ensure a valid CellStore for Ptr::isInCell 2013-08-06 19:49:01 -07:00
Chris Robinson
1f436f9886 Render torches 2013-08-06 19:49:01 -07:00
Chris Robinson
8f69c51b24 Avoid some unnecessary references 2013-08-06 19:49:00 -07:00
Chris Robinson
2c03fec4bb Use the fatigue term for jumping 2013-08-06 19:49:00 -07:00
Chris Robinson
eab4e09566 Handle the pick/probe in the character controller 2013-08-06 19:48:59 -07:00
scrawl
3f7daa4884 Forgot to change initTerrainTextures 2013-08-07 02:58:03 +02:00
Alex
de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 2013-08-06 20:38:41 -04:00
scrawl
76e538c22a Unused variable fix 2013-08-07 02:03:23 +02:00
scrawl
726c93c365 Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10 2013-08-07 01:34:17 +02:00
Marc Zinnschlag
03af7175dd Merge remote-tracking branch 'potatoesmaster/bug-839' 2013-08-06 17:39:29 +02:00
Emanuel Guevel
c59ad62c57 Fix UndoWerewolf script instruction 2013-08-06 14:30:01 +02:00
Emanuel Guevel
5188a1c2cd Implement script instructions Become/UndoWerewolf 2013-08-06 12:34:35 +02:00
Emanuel Guevel
20d40c4368 Implement MWWorld::World::setWerewolf() 2013-08-06 12:34:35 +02:00
Emanuel Guevel
aa563e947e Implement MWWorld::InventoryStore::unequipAll() 2013-08-06 12:34:35 +02:00
Emanuel Guevel
ddc92d1fbd Set appropriate weapon icon when player is a werewolf 2013-08-06 12:34:35 +02:00
Emanuel Guevel
d054366460 Permit to force hiding GUI windows 2013-08-06 12:34:35 +02:00
scrawl
4caac0d859 Fix idle animations repeating 2013-08-05 02:06:23 +02:00
vorenon
76a1abe9fa Don't allow the use of the "jump" key while sneaking - Update 2013-08-04 20:10:33 +02:00
vorenon
56cb36caf1 Don't allow the use of the "jump" key while sneaking 2013-08-04 19:45:41 +02:00
Emanuel Guevel
71da2f0a12 Do not allow magic/combat stance unless magic/inventory window are accessible 2013-08-04 00:21:27 +02:00
Marc Zinnschlag
41b2fa985b silenced some warnings 2013-08-03 15:26:53 +02:00
Marc Zinnschlag
9123afa863 Merge remote-tracking branch 'gus/MeleeCombat2' 2013-08-03 15:23:36 +02:00
gus
a23e7fac93 clean up 2013-08-03 13:58:16 +02:00
scrawl
982f743ddd Fix wrong idle animations played 2013-08-03 13:13:33 +02:00
gus
c8bb32c40d small maths correction 2013-08-03 12:29:18 +02:00
gus
a25ee360dc use angles and GMST. not sure this work as it should 2013-08-03 12:16:51 +02:00
gus
830762722d first attempt: hit detection with a sphere (not finished) 2013-08-03 11:26:36 +02:00
Emanuel Guevel
a9483dbdf1 Show sneak indicator when sneaking 
Temporary solution, as the indicator should be shown only when the
player is not detected by any other actor.
 2013-08-03 03:03:29 +02:00
Emanuel Guevel
8f8362d2c4 Expose sneak indicator widget through WindowManager 2013-08-03 03:03:29 +02:00
Emanuel Guevel
9757694060 Update sneaking indicator position with other widgets 2013-08-03 02:43:56 +02:00
vorenon
aa45127895 Adjusted swish sounds 
Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.
 2013-08-02 16:33:39 +02:00
Chris Robinson
f57c829cba Play the appropriate swish sound and follow-up animation 2013-08-02 00:21:02 -07:00
Chris Robinson
b70975a74d Move getEvasion to CreatureStats 2013-08-02 00:21:01 -07:00
Chris Robinson
9e7d670745 Inline Class::get(const Ptr& ptr) 2013-08-02 00:20:59 -07:00
Marc Zinnschlag
ca94d1a2fb Merge remote-tracking branch 'swick/inventorypos' 
Conflicts:
	apps/openmw/mwgui/inventorywindow.cpp
 2013-07-31 22:16:56 +02:00
Marc Zinnschlag
24273f338b Merge remote-tracking branch 'scrawl/master' 2013-07-31 22:12:07 +02:00
Sebastian Wick
7ed763262f GUI mode dependent position 2013-07-31 21:40:29 +02:00
scrawl
fe51a00112 Fix the initial player inventory being added twice when starting a new game 2013-07-31 21:00:58 +02:00
scrawl
f1f6336a4a Fixed screenshot keybinding, and make it bindable 2013-07-31 20:24:44 +02:00
Marc Zinnschlag
5cafe65cd7 Merge remote-tracking branch 'scrawl/cppcheck' 2013-07-31 20:00:35 +02:00
scrawl
d106ed3b08 Fixed alchemy 2013-07-31 19:03:51 +02:00
Marc Zinnschlag
4dfd5282ab Merge remote-tracking branch 'kolek/enchantingwindow' 2013-07-31 19:01:49 +02:00
Marc Zinnschlag
25917b00ec Merge remote-tracking branch 'scrawl/master' 2013-07-31 19:00:24 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
scrawl
43e0df479e Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping 2013-07-31 16:30:22 +02:00
PLkolek
f297c21e4d Old door sound fades out on door open/close. Door sound is synchronised to angle on action. 2013-07-31 15:46:23 +02:00
PLkolek
8bc8c38f2d Spell cost is updatedon every change in enchanting and spellmaking. 2013-07-31 13:33:30 +02:00
PLkolek
7fd7621458 Fixed area slider in self enchantments. 2013-07-31 12:26:34 +02:00
Marc Zinnschlag
6ce2b962e1 Merge remote-tracking branch 'scrawl/inventory' 2013-07-31 09:15:22 +02:00
Marc Zinnschlag
eedced729f Merge remote-tracking branch 'scrawl/master' 2013-07-31 09:14:12 +02:00
Marc Zinnschlag
7639506e49 Merge remote-tracking branch 'scrawl/ai' 2013-07-31 09:07:46 +02:00
scrawl
16cacb338a Initialize MWMechanics::AiSequence from ESM::AiPackageList 2013-07-31 00:55:08 +02:00
scrawl
45006ea193 Fix inventory/container content loading so that it's done for dynamically spawned objects as well 2013-07-31 00:02:24 +02:00
scrawl
90a5d8b6f5 Fix uninitialized AL listener position/orientation when the game is paused during the first frame 2013-07-30 23:24:18 +02:00
Marc Zinnschlag
958b0c4915 Merge remote-tracking branch 'scrawl/untilhealed' 2013-07-30 22:41:05 +02:00
scrawl
da01ec4f52 Only show the "Rest until healed" button when stats are not full 2013-07-30 22:07:27 +02:00
scrawl
04b90b7d14 Other actors no longer collide with an actor that has collision disabled 2013-07-30 22:00:48 +02:00
scrawl
472a381263 Fix health meter (again) 2013-07-30 16:09:12 +02:00
Marc Zinnschlag
3642562959 Merge remote-tracking branch 'scrawl/master' 2013-07-30 08:11:40 +02:00
scrawl
426e3ec6c6 Fix enemy health meter for creatures 2013-07-30 06:17:21 +02:00
scrawl
3961c276b8 Added enemy health meter 2013-07-30 06:00:20 +02:00
Marc Zinnschlag
e27ba55541 Merge remote-tracking branch 'swick/countdialog' 2013-07-29 21:38:04 +02:00
Sebastian Wick
40d3efc671 use cancel methid 2013-07-29 18:35:23 +02:00
Sebastian Wick
7b40e57ba1 Allow the 'Activate' key to close the countdialog window; cleanups 2013-07-29 18:27:00 +02:00
Marc Zinnschlag
90ab7b2bf5 Merge remote-tracking branch 'swick/viewmodetransission' 2013-07-29 17:08:49 +02:00
Sebastian Wick
7c24c0a64e fix uninitialized variables 2013-07-29 16:45:35 +02:00
Sebastian Wick
d2b7cb5bb2 First/Third person transitions with mouse wheel 2013-07-29 16:43:16 +02:00
Sebastian Wick
1b310c5c5b use SDL resolutions in the ingame settings 2013-07-29 13:34:56 +02:00
Marc Zinnschlag
3fa4a194a7 Merge remote-tracking branch 'scrawl/master' 2013-07-29 09:59:23 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
Chris Robinson
3744850545 Fix hand-to-hand health damage reduction 2013-07-28 16:07:09 -07:00
Chris Robinson
39507e3f0f Decrease armor condition on successful hits 2013-07-28 15:51:17 -07:00
Chris Robinson
1af48ab6e0 Decrease weapon condition on successful hits 2013-07-28 15:17:01 -07:00
Chris Robinson
465f4d2063 Properly handle starting an animation at the end 2013-07-28 09:56:03 -07:00
Chris Robinson
54f91d4b3a Implement hand-to-hand attacks 2013-07-28 06:48:25 -07:00
Chris Robinson
a34f0de3e1 Play the correct medium armor foot sounds 2013-07-28 04:17:36 -07:00
Chris Robinson
db4f34b332 Play hit sounds when hitting creatures and NPCs 2013-07-27 11:20:39 -07:00
Chris Robinson
1a40d01afa Fix NPC armor rating calculation and reduce redundant lookups 2013-07-27 09:31:16 -07:00
Chris Robinson
f73008546f Keep a sound updated with its object's position 2013-07-27 07:24:18 -07:00
Chris Robinson
c94653dc49 Implement the ModRegion script function 2013-07-27 07:10:18 -07:00
Chris Robinson
1174b85ac8 Implement Disable/EnableTeleporting script functions 2013-07-27 00:14:55 -07:00
Chris Robinson
3298eb1b37 Implement HitOnMe script function 2013-07-26 10:50:23 -07:00
Chris Robinson
5379e607cb Handle the OnPCHitMe script variable 2013-07-26 10:50:23 -07:00
Chris Robinson
f215d2cc30 Only raise weapon skills for the player 2013-07-26 10:50:23 -07:00
Chris Robinson
bec420c69b Add Class::onHit for creatures 2013-07-26 10:50:23 -07:00
Chris Robinson
dd6edd21f8 Add a separate on-hit method to handle objects being hit 2013-07-26 10:50:23 -07:00
Marc Zinnschlag
3fbbbdc64b Merge remote-tracking branch 'scrawl/master' 2013-07-26 08:06:53 +02:00
Chris Robinson
a569ae367e Fix hit chance calculation 2013-07-25 13:09:26 -07:00
Chris Robinson
6195062d72 Try to figure out what gets hit 
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
 2013-07-25 12:58:43 -07:00
Chris Robinson
b3a057d679 Handle hit chance and damage calculation 
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
 2013-07-25 08:15:42 -07:00
Chris Robinson
1dcc893703 Merge remote-tracking branch 'zini/master' into combat 2013-07-25 01:16:49 -07:00
Chris Robinson
4ad28ed369 Don't play a weapon-down sound when unreadying a spell 2013-07-25 00:46:20 -07:00
Chris Robinson
92cc566fdc Rename the Class::attack method to Class::hit 2013-07-25 00:30:01 -07:00
Chris Robinson
0db02af807 Set up the weapon state in the CharacterController constructor 2013-07-24 21:08:16 -07:00
Chris Robinson
d9a9c3d6bd Handle the "land" soundgen type 2013-07-24 10:36:04 -07:00
Chris Robinson
705498ec24 Play a swish sound when attacking 2013-07-24 10:34:53 -07:00
Chris Robinson
d8ec813939 Say something from the "hit" dialog topic when losing health 2013-07-24 10:02:50 -07:00
Chris Robinson
59f1bc7542 Use time values for the aniamtion's start, stop, and loop points 
This seems to be closer to the expected behavior. This more cleanly handles 0-
length animations, especially where the start marker comes after the stop
marker while still being on the same time key.
 2013-07-24 08:38:36 -07:00
Chris Robinson
bf1d907d07 Don't play casting animations for enchantments 2013-07-24 05:39:15 -07:00
Chris Robinson
cc8e8c1272 Use the attack strength as determined by how long the attack was held 2013-07-24 03:18:53 -07:00
Chris Robinson
0c8d4d9be2 Add beginnings of melee hits 2013-07-24 02:51:42 -07:00
Chris Robinson
45302f9e25 Handle controllers in the NPC's bound object parts 2013-07-23 22:05:03 -07:00
Chris Robinson
11b094559f Play the appropriate casting animation sound 2013-07-23 11:12:19 -07:00
Emanuel Guevel
70a5a83419 Change the formula used to calculate initial NPC health 2013-07-23 16:48:54 +02:00
Chris Robinson
17282c69b1 Handle spell-casting animation sequences 2013-07-23 07:30:54 -07:00
Chris Robinson
4d157cb19a Handle marksmen weapon attack sequences 2013-07-23 06:13:08 -07:00
Chris Robinson
fecb8c1cc4 Fix the completion amount for 0-length anims 2013-07-23 05:30:37 -07:00
Chris Robinson
d5d832846e Rename the follow-up upper character state enum 2013-07-23 04:56:49 -07:00
Chris Robinson
537d5c4934 Avoid trying to play animations without any animation sources 2013-07-23 04:36:25 -07:00
Chris Robinson
ad6d663e09 Remove some unnecessary debug messages 2013-07-23 03:44:52 -07:00
Chris Robinson
24567294ff Move NPC state update handling into a separate method 2013-07-23 03:26:24 -07:00
Chris Robinson
22e07968af Store the current weapon group name 2013-07-23 02:50:52 -07:00
Chris Robinson
0240efa6cf Improve weapon attack logic to better handle picks, probes, and h2h 2013-07-23 02:28:58 -07:00
Chris Robinson
ef17fdeb15 Remove some unused methods 2013-07-23 01:37:41 -07:00
Marc Zinnschlag
ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2' 
Conflicts:
	apps/openmw/mwrender/animation.cpp
 2013-07-23 09:12:23 +02:00
Emanuel Guevel
48f0e64ec3 Fix health calculation at character creation 2013-07-21 11:02:03 +02:00
Emanuel Guevel
1c330fc899 Use the correct formula for NPC health initialization 2013-07-21 10:13:46 +02:00
Emanuel Guevel
2356e6218e Complete health increase on level up 2013-07-20 22:14:10 +02:00
Emanuel Guevel
2a0644a7c3 Move some levelup logic from mwgui to mwmechanics 2013-07-20 22:14:10 +02:00
Emanuel Guevel
7837dcdc19 Calculate NPC health on loading instead of updating it continually 
Only NPC with auto-calculated stats are concerned.
 2013-07-20 22:14:10 +02:00
Emanuel Guevel
074e241c32 MWMechanics::DynamicStat: fix members initialization 2013-07-20 22:14:09 +02:00
Marc Zinnschlag
a8168c58c2 Merge remote-tracking branch 'kolek/thirdpersonzoom' 2013-07-20 18:29:59 +02:00
Kolzi
d12bac2d9e Third person zoom - fixed code review issues. 2013-07-20 16:55:35 +02:00
Kolzi
1b7966ca27 Can zoom in and out in third person view. 2013-07-19 16:12:01 +02:00
Chris Robinson
0cb7d186e7 Use Play_TypeFoot for 'left' and 'right' soundgen keys 2013-07-18 21:50:11 -07:00
Chris Robinson
14e0c182f3 Allow specifying the sound type to playSound and playSound3D 2013-07-18 21:50:11 -07:00
Chris Robinson
ac4dfd3b39 Play the appropriate foot sound based on footwear 2013-07-18 21:50:11 -07:00
scrawl
bf332b633e Make VideoPlayer::playVideo block until the video finishes 2013-07-18 14:14:10 +02:00
Marc Zinnschlag
fdd47e5b73 silenced a warning 2013-07-18 13:50:12 +02:00
Chris Robinson
9c13568bb7 Remove idles from the state list and rename it 2013-07-18 01:49:53 -07:00
Chris Robinson
e803cdbe7f Handle swimdeath and missing death animations 2013-07-18 01:13:53 -07:00
Chris Robinson
f01b0b48cc Don't start with an idle state if dead 2013-07-18 00:35:03 -07:00
Chris Robinson
e78bdd2a5d Clear 'swim' from the animation name as a backup instead of 'sneak' 2013-07-18 00:22:40 -07:00
Chris Robinson
9ea6b22a83 Handle soundgen animation keys 2013-07-17 23:58:21 -07:00
Chris Robinson
d6324d71bf Ensure mechanics actors/objects are cleared before adding them 2013-07-17 21:39:21 -07:00
Chris Robinson
c7692acb79 Update the player's Ptr in mwrender when changing cells 2013-07-17 19:11:03 -07:00
Chris Robinson
0cd4df3edf Stop playing idles on death 2013-07-17 02:19:22 -07:00
Chris Robinson
e2e278d06d Fix some animations not playing properly 
Default movement animation speed multiplier should be 1, not 0. Only
randomize death1...death5 for NPCs.
 2013-07-17 02:06:31 -07:00
scrawl
dfe912dcab Enum renaming 2013-07-16 23:38:55 +02:00
scrawl
91e95e1404 Use the correct slash, chop or thrust animation 2013-07-16 23:32:41 +02:00
gugus
9043fe427f Merge pull request #4 from scrawl/melee 
Fixes weapon input to use A_Use instead of hardcoding to mouse button
 2013-07-16 07:35:21 -07:00
scrawl
9536b5050b Fixes weapon input to use A_Use instead of hardcoding to mouse button 2013-07-16 16:25:41 +02:00
gus
66e3eacace fix bows 2013-07-16 15:14:34 +01:00
gus
701ff94887 bugfix for lockpick 2013-07-16 14:46:44 +01:00
gus
20341ae8b7 simplification + taking into account weapon speed. Seems too fast, but i'm not sure 2013-07-16 14:10:14 +01:00
gus
8fc6e73649 post-merge fix 2013-07-16 11:51:18 +01:00
gus
ee47e99dad Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
	apps/openmw/mwmechanics/character.hpp
 2013-07-16 11:40:19 +01:00
gus
f6e3445414 Jittering gone + bugfix: chop animation works! 
TODO: fix this unequip stuff
 2013-07-16 09:50:59 +01:00
Chris Robinson
e5e9c83ed5 Merge remote-tracking branch 'zini/master' into animation-state 2013-07-16 01:33:46 -07:00
Chris Robinson
a932a89e02 Specify the velocity-based animation speed multiplier when playing it 2013-07-16 01:30:03 -07:00
Chris Robinson
f296d13c20 Add a speed multiplier to the animation state 2013-07-16 00:43:31 -07:00
Chris Robinson
3a1facefdf Store a pointer to the character controller for non-actor objects 2013-07-15 23:47:04 -07:00
Chris Robinson
06e631f213 Track death separately in the character controller 2013-07-15 23:43:33 -07:00
Chris Robinson
4ae65c20e6 Separate movement and idle states 
This allows us to better handle cases of "missing" animations. Mainly for
first-person, but also for spells and certain weapon types.
 2013-07-15 22:56:23 -07:00
scrawl
94d45e1518 Fix twohanded weapons not unequipping when equipping a torch 2013-07-15 23:21:01 +02:00
scrawl
daf9dca121 Fix exception when starting a new game 2013-07-15 20:37:36 +02:00
gus
f7f23ac5d8 improvement of the chop animation. Still some jittering. 2013-07-15 17:18:16 +01:00
gus
f7b711aabe bugfix 2013-07-15 16:37:32 +01:00
gus
076f98cbba change way animations keys are handled (thanks KittyCat!) 2013-07-15 16:37:25 +01:00
Marc Zinnschlag
fd9cc1c282 Merge remote-tracking branch 'vorenon/container' 2013-07-15 09:33:16 +02:00
Marc Zinnschlag
a0022e711b Merge remote-tracking branch 'scrawl/raycast' 2013-07-15 09:20:16 +02:00
vorenon
66eb82b363 oops again 2013-07-15 02:26:22 +02:00
vorenon
33779ae23c oops 2013-07-15 02:23:18 +02:00
vorenon
d4739a451a added ability to close container windows with the activation key 2013-07-15 02:18:24 +02:00
scrawl
c81b852071 Fixes inaccurate ray casts; rely on getCameraToViewportRay 2013-07-15 00:39:37 +02:00
scrawl
8407e2b3aa Fixes the console sometimes receiving text after it was closed 2013-07-14 23:54:28 +02:00
scrawl
fa5198d7b2 Fix an assertion 2013-07-14 14:59:24 +02:00
scrawl
61661c8653 Fix first person meshes casting shadows 2013-07-14 14:55:07 +02:00
scrawl
a049638e7f Fixes character previews getting shadowed randomly 2013-07-14 14:54:40 +02:00
Chris Robinson
3771e5839e Allow some more third person fallbacks in first person 2013-07-13 17:03:10 -07:00
Chris Robinson
5ee889e8b6 Attach the camera to the Head node in first-person 2013-07-13 16:12:38 -07:00
gus
3947f44aa3 Porting old work 2013-07-13 22:24:52 +01:00
Chris Robinson
2d7620e774 Rotate the neck when looking up and down in first-person 2013-07-13 12:39:06 -07:00
Chris Robinson
4df1f198a7 Avoid a map lookup for every skin body part when updating 2013-07-12 22:32:09 -07:00
Chris Robinson
6de56615aa Avoid casting shadows in first-person view 2013-07-12 22:32:05 -07:00
Chris Robinson
025fa4e0d5 Use a multimap for the bodypart map 2013-07-12 22:32:04 -07:00
Chris Robinson
a5e4faaed2 Show arms and body parts in first person 
This isn't yet fully correct. The arms need to rotate up and down with
the camera, and the mesh's bounding box is causing them to blink out at
certain angles since they don't fit the animation.
 2013-07-12 22:31:59 -07:00
Chris Robinson
908f010c74 Reset the NPC object root when switching POV 
When in first person, the skeleton in the .1st.nif file is used. In
particular, these have extra finger bones that are used by the first
person models.
 2013-07-12 22:31:57 -07:00
Chris Robinson
7883087586 Store a pointer to the character controller in the map 2013-07-12 22:31:50 -07:00
scrawl
bbb5d2b98a Change tooltip positioning to resemble vanilla 2013-07-10 03:40:13 +02:00
Marc Zinnschlag
71a6955182 Merge remote-tracking branch 'scrawl/master' 2013-07-08 09:46:00 +02:00
scrawl
91f6d87126 Fix an uninitialized variable 2013-07-07 16:57:46 +02:00
Marc Zinnschlag
602e40e19d Merge remote-tracking branch 'greye/coc' 2013-07-07 13:34:28 +02:00
greye
e553f285b8 update player position on engine start 2013-07-07 15:06:05 +04:00
greye
f3d54a7ba4 move finding default cell positions to World 2013-07-07 15:03:06 +04:00
greye
0c303aa285 fix fading on cell transition when cell is loaded 2013-07-07 14:30:11 +04:00
greye
6bb3942288 use Land height data for position in coc 2013-07-07 13:47:58 +04:00
greye
a3094b808e update coc behaviour for interior cells 2013-07-07 13:47:58 +04:00
scrawl
744c5804ed Simplified doors, now they will stop after hitting an obstacle instead of trying to back off. 2013-07-07 03:52:17 +02:00
scrawl
72600a16cf Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea 2013-07-06 17:02:40 +02:00
scrawl
58fce74620 Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders 2013-07-06 16:40:57 +02:00
scrawl
5c8950f91c Merge branch 'master' of git://github.com/zinnschlag/openmw 2013-07-06 16:08:29 +02:00
Marc Zinnschlag
f9d7c7574e Merge remote-tracking branch 'swick/scrollbar' 2013-07-06 13:13:27 +02:00
Marc Zinnschlag
3dc42fb948 Merge remote-tracking branch 'greye/master' 2013-07-06 12:28:01 +02:00
greye
76d95dffb6 special case for loading StartScript records 2013-07-05 23:52:46 +04:00
Sebastian Wick
26bd2a5301 use the new scrollbar; range dependent step size; fix 2013-07-05 20:28:46 +02:00
Sebastian Wick
b43f41c2bd use a mygui controller for scrollbar repeat 2013-07-05 19:17:00 +02:00
Sebastian Wick
e3d8bdbafe autorepeat scrollbar 2013-07-02 17:29:47 +02:00
Marc Zinnschlag
847ec9fa56 Merge remote-tracking branch 'swick/master' 2013-07-01 10:16:39 +02:00
Sebastian Wick
8bdc9ff3ae set position of the window for multiple monitors 2013-07-01 03:56:33 +02:00
Marc Zinnschlag
56637a39a3 Merge remote-tracking branch 'vheuken/master' 2013-06-29 12:27:01 +02:00
Marc Zinnschlag
cd538538b5 fixed weather code 2013-06-28 09:00:21 +02:00
Vincent Heuken
f43b48015e remove actor's collisionbox on death 2013-06-27 19:42:27 -07:00
Vincent Heuken
b095c24854 resize actor collision boxes on death 2013-06-27 14:11:20 -07:00
scrawl
123a60581f Only link to SDL2main on windows 2013-06-27 21:45:32 +02:00
Glorf
88f8637145 Bugfix #795 2013-06-26 22:20:24 +02:00
Miroslav Puda
743b3dec99 Correction of libavutil version 2013-06-26 07:17:29 +02:00
Alexander "Ace" Olofsson
0a2ed8b0d7 Make OpenMW able to initialize SDL in windows builds 2013-06-25 15:05:10 +02:00
eroen
d75391de8e libav-9 - fix missing includes 
With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the
AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h
for a long time prior to this.
 2013-06-24 21:08:28 +02:00
Vincent Heuken
09cca0bf80 more detailed error message when SDL fails to initialize 2013-06-23 16:45:23 -07:00
Marc Zinnschlag
f5ba2b37e7 Merge remote-tracking branch 'vorenon/fixes' 2013-06-21 20:28:45 +02:00
vorenon
efdcd9649c Fading for Exterior->Interior cell transitions 2013-06-21 20:19:35 +02:00
Marc Zinnschlag
8b909ff838 killed a stray srand 2013-06-21 08:58:52 +02:00
Miroslav Puda
8da3494d74 Revert "Type of weather changed from string to enum." 
This reverts commit 04d90b4c47.

Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/weather.hpp
 2013-06-20 21:51:07 +02:00
Miroslav Puda
26a6bdb27d Correction of sigsegv. 2013-06-19 20:06:02 +02:00
Miroslav Puda
f9940413fd Static for nextWeather() 2013-06-19 16:49:43 +02:00
Miroslav Puda
bf31e5385c Removal of duplicit exterior checking and unneded string copiing. 2013-06-19 16:18:43 +02:00
Miroslav Puda
8a45686e0a WeatherResult added as member variable. 2013-06-19 06:50:36 +02:00
Miroslav Puda
f01aa8f55e Simpler statistical calculation of next weather; minus before parens. 2013-06-19 04:57:36 +02:00
Miroslav Puda
04d90b4c47 Type of weather changed from string to enum. 2013-06-19 03:24:30 +02:00
vorenon
4e8e048968 Added missing click sounds to dialogue 2013-06-19 01:46:38 +02:00
Marc Zinnschlag
b5926257f5 Merge remote-tracking branch 'scrawl/sdl_input2' 2013-06-16 21:23:35 +02:00
scrawl
b16bc69479 Removed the no longer needed --debug switch 2013-06-16 20:39:40 +02:00
Marc Zinnschlag
57ce87bf12 Merge remote-tracking branch 'scrawl/sdl_input2' 2013-06-16 20:37:15 +02:00
scrawl
4fd7891d2c Fix a message box issue 2013-06-16 20:26:27 +02:00
vorenon
76a2abcbe3 added missing line break in front of multiple choice questions 2013-06-16 19:46:55 +02:00
scrawl
b16c92c2f5 Better handle SDL_TEXTINPUT events 2013-06-16 19:43:59 +02:00
vorenon
ed6098388f return false instead of std::exit 2013-06-16 18:13:14 +02:00
vorenon
b97a051dc6 Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813 2013-06-16 18:12:09 +02:00
scrawl
03682184c6 Enable SDL_TEXTINPUT events only when a text input widget currently has key focus 2013-06-16 18:06:55 +02:00
Marc Zinnschlag
3e29506d5c Merge remote-tracking branch 'vorenon/dialogue' 2013-06-16 17:03:50 +02:00
vorenon
9ac4a9c5eb Don't start OpenMW if no master file is selected. This fixes bug #813 2013-06-16 04:59:34 +02:00
vorenon
4c0086b54c Workaround for bug #820 2013-06-16 01:09:03 +02:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
scrawl
5252ffa104 More cleanup 2013-06-15 17:06:27 +02:00
scrawl
289587b1a9 Cleanup 2013-06-15 16:29:25 +02:00
scrawl
f1ff9b69b3 Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches 2013-06-15 15:33:47 +02:00
scrawl
9331a6380c Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2 2013-06-15 13:25:27 +02:00
scrawl
4fb32f7f05 Moved window resize messages to sdlinputwrapper 2013-06-15 13:22:29 +02:00
Nikolay Kasyanov
9807eacb58 Removed obsolete OIS workaround 2013-06-15 15:17:29 +04:00
Nikolay Kasyanov
5984a15846 We don't need Carbon on OS X anymore 2013-06-15 14:47:33 +04:00
Rohit Nirmal
e5ddaaf676 Fix wrong indenting from my last commits. 2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be Merge remote-tracking branch 'rohitnirmal/journal-open-sound' 2013-06-13 18:04:38 +02:00
scrawl
0880805559 Minor cleanup 2013-06-13 12:13:40 +02:00
Rohit Nirmal
9d4ecc3e73 replace tabs with spaces. 2013-06-13 00:52:26 -05:00
Rohit Nirmal
aac3ada14b Use mousewheel to turn book pages. 2013-06-13 00:50:07 -05:00
scrawl
fcf35d3871 Removed the UI cursor sensitivity slider 2013-06-12 20:27:55 +02:00
scrawl
ab3634d692 Removed some remains of OIS 2013-06-12 20:13:19 +02:00
scrawl
14a2a26a56 Fullscreen resizing fix 2013-06-12 20:08:55 +02:00
scrawl
403704b92a Use openmw.png for SDL_SetWindowIcon 2013-06-12 16:15:04 +02:00
scrawl
705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 2013-06-12 16:07:46 +02:00
scrawl
cc077eaba6 Fix mouse wheel triggering a click event in mygui 2013-06-12 15:10:04 +02:00
scrawl
918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
 2013-06-12 12:34:33 +02:00
Marc Zinnschlag
bd08677a7f Merge branch 'openmw24' 2013-06-12 10:37:33 +02:00
darkf
fc0f04324c Remove some superfluous mSkyManager NULL checks 2013-06-11 20:56:40 -07:00
Rohit Nirmal
fdeac21f22 Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound 2013-06-11 21:36:00 -05:00
Rohit Nirmal
b5caa25e5c Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu. 2013-06-10 19:42:38 -05:00
fstp
98e5cb6d7b Added ifdef to keep backward compatibility with the FFmpeg library. 2013-06-10 15:10:39 +02:00
Rohit Nirmal
4eede86ce6 Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal. 2013-06-09 23:27:47 -05:00
fstp
a3b2a76e60 Added virtual destructors to classes LocalMapBase and EffectEditorBase. 2013-06-09 23:08:57 +02:00
Marc Zinnschlag
48496a644f Merge remote-tracking branch 'scrawl/master' 2013-06-06 23:42:21 +02:00
scrawl
daab4f55a3 Use Morrowind's fonts 2013-06-06 22:26:06 +02:00
Marc Zinnschlag
f586eef604 Merge remote-tracking branch 'torben/pathfindingoverhaul' 2013-06-01 10:44:23 +02:00
Torben Carrington
09beafd044 Pathfinding Overhaul - Master cleanup! Cleaned pathfinding entirely, all AI packages that are implemented as well, Increased buffer! This makes the intro guard no longer walk into you or go to far into the room (not tested against vanilla distances but it seems accurate enough until the next itteration of pathfinding fixes). 2013-05-31 17:49:52 -07:00
Torben Carrington
a4caec56cf Pathfinding Overhaul - Fixed selecting cells that are inaccessable from AIWander and pathfinding in general (sadly requires minor effort on the AI Packages implementation but it is the quickest way I can see), minor cleanup again (there is a lot to cleanup, this will prolly be in every commit). 2013-05-31 17:01:42 -07:00
scrawl
8bd712cc95 Fix being able to move slowly when over encumbered 2013-05-31 04:08:44 +02:00
Torben Carrington
73a9671742 Pathfinding Overhaul - Changed the name of checkIfNextPointReached to a more intuitive name considering what it does (checkPathCompleted) and fixed a minor bug in it, modified buildPath() to take one final parameter, a bool which dictates whether or not to always use pathfinding (like AIWander should be doing) or to allow for "shortcuts", modified all ai packages to work with these two changes. 2013-05-29 20:05:17 -07:00
Torben Carrington
c080785235 Pathfinding Overhaul - Finished cleaning, removed unnecessary parameter in one function, fixed use of the function in ai packages and added use of clearPath() function in aiwander, fixed algorithms and got rid of excess subtractions in getDistance functions (thanks to Chris!). 2013-05-29 19:26:45 -07:00
Torben Carrington
7b465ae4f1 Pathfinding Overhaul - Even more cleanup and spacing corrections, small renaming (more to come), removed a few unnecessary actions that wasted CPU time and tmp RAM. 2013-05-29 17:33:33 -07:00
Torben Carrington
96fdaf7410 Pathfinding Overhaul - More cleanup. 2013-05-29 16:10:15 -07:00
Torben Carrington
4838678944 Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding. 2013-05-29 15:59:23 -07:00
Miroslav Puda
dc17fa1636 Removal of duplicit enumeration and unnecessary conditions. 2013-05-29 00:01:18 +02:00
Marc Zinnschlag
bbec3680c6 Merge remote-tracking branch 'pakanek/enchanting-mechanics' 2013-05-28 10:02:03 +02:00
Marc Zinnschlag
6e7416d8c5 Merge remote-tracking branch 'scrawl/master' 2013-05-28 09:59:41 +02:00
scrawl
9a43927078 Fix weapons not appearing in Enchantable filter 2013-05-28 03:15:13 +02:00
Miroslav Puda
7a4a386cbe Removal of tab characters. 2013-05-27 20:47:53 +02:00
Torben Carrington
dbbc96f600 AIWander Segmentation Fault Fix - Fixes the segmentation fault that used to occur when there was no pathgrid in the cell and a range was passed to AIWander. 2013-05-27 11:44:46 -07:00
Miroslav Puda
b40e24c50c Refactorization 2013-05-27 20:23:04 +02:00
Miroslav Puda
4e17bc1499 Fix for display of cast cost decimal value 2013-05-27 20:16:57 +02:00
Marc Zinnschlag
7927ac818c Merge remote-tracking branch 'torben/aiwanderpatchpotential' 2013-05-27 18:29:15 +02:00
Miroslav Puda
9a9b075a02 Correct cast cost for enchantments. 2013-05-27 18:08:12 +02:00
Torben Carrington
ebc1fdd017 AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens. 2013-05-27 09:05:42 -07:00
scrawl
0c7f48ec8a Implement movement for creatures (formula is a stub) 2013-05-27 18:03:06 +02:00
Miroslav Puda
1c7b94e94f Switching in nextCastStyle() is now based on enum CastingStyle. 2013-05-27 16:08:58 +02:00
Miroslav Puda
252a1d9223 Replacement of some magical constants 2013-05-27 15:50:47 +02:00
Miroslav Puda
9e1eb8b3b1 Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics 2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226 Better formula for enchantment cost and code refactorization. 2013-05-27 14:42:08 +02:00
Miroslav Puda
56edc1b213 Correction of getting spell range "Target". 2013-05-27 12:26:06 +02:00
Torben Carrington
bd6d54cc8f AIWander Minor Patch - Forgot an else statement and another check on an empty node vector, previously no nodes in range or only one would cause the AIWander to not do anything, now they will play idles correctly still. 2013-05-27 03:24:41 -07:00
Marc Zinnschlag
86dd6d0847 Merge remote-tracking branch 'eroen/libcxx' 2013-05-27 10:27:31 +02:00
Marc Zinnschlag
fa63ebce78 Merge remote-tracking branch 'scrawl/master' 2013-05-27 10:19:02 +02:00
Marc Zinnschlag
bd8344b387 Merge remote-tracking branch 'torben/aiwander' 2013-05-27 10:16:37 +02:00
Torben Carrington
3b43ee751e AI Execute Fix - May as well not create the object either to save extra time. 2013-05-26 19:54:59 -07:00
Torben Carrington
feb180724c AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior. 2013-05-26 19:33:45 -07:00
scrawl
3a6e54c4f5 Sell owned items in the cell 2013-05-27 02:18:36 +02:00
Torben Carrington
fd96d47fe4 AIWander Completed. Replicates vanilla as best possible, pathfinding needs fixing before this looks correct but once the pathfinding files are edited this will behave pretty much exactly as vanilla. Major credit to Hrnchamd for major research. 2013-05-26 11:30:42 -07:00
Torben Carrington
96daad7a22 AIWander - shortened some if statements and made super minor optimizations to others, now using proper GMST to load proper idlechance instead of hacky set value." 2013-05-26 09:31:56 -07:00
Torben Carrington
e37324b967 AIWander everything works. only two things to do: Implement limiting selection on z axis, and correcting decision algorithm. 2013-05-26 08:49:44 -07:00
eroen
2850032d9e libc++ fixes: avcodec/avformat workaround 
With libc++, string includes stdint.h, which breaks the fragile avformat.h
workaround, which depends on __STDC_CONSTANT_MACROS being defined before
stdint.h is included.

Moving the string inclusion after that eyesore shouldn't break anything.
 2013-05-26 12:01:01 +02:00
Marc Zinnschlag
5fac75845c Merge remote-tracking branch 'torben/aiescortclean' 2013-05-25 15:35:56 +02:00
Torben Carrington
ddf28ca201 AIEscort Cleanup - Fixed spacing, removed unnecessary includes, fixed branch itself. The other pull requests were fine, it was just this one with the problem. 2013-05-25 04:36:21 -07:00
Marc Zinnschlag
94474e8952 Merge remote-tracking branch 'torben/checkidlecomplete' 2013-05-25 12:35:34 +02:00
Marc Zinnschlag
81cd1c6e30 Merge remote-tracking branch 'torben/aitravelcleanup' 2013-05-25 12:35:00 +02:00
Torben Carrington
c8c1ddd927 Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander. 2013-05-24 20:10:07 -07:00
scrawl
1e7cf4ae1c GLES2 experiment 2013-05-25 04:15:24 +02:00
Torben Carrington
56b1384c90 AITravel Cleanup - Removed unnecessary includes and other varius cleanups. 2013-05-24 18:16:35 -07:00
riothamus
d9350be8da Console Object Selection Fix 2013-05-24 09:31:56 -04:00
Marc Zinnschlag
b1a8dc35e0 minor adjustments 2013-05-24 15:03:46 +02:00
Marc Zinnschlag
62479cd885 Merge remote-tracking branch 'torben/aiwanderrepeat' 2013-05-24 14:58:10 +02:00
Torben Carrington
1cfe037d6b AIWander - Added support for the Repeat parameter to mimic vanilla. 2013-05-24 04:49:20 -07:00
scrawl
32e90bb733 Fix chargen statssheet 2013-05-23 17:28:45 +02:00
riothamus
7187f50c40 Bug 788 2013-05-23 09:13:21 -04:00
Miroslav Puda
3cebb41459 missing break 2013-05-21 21:04:15 +02:00
Edmondo Tommasina
f0482dd796 dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘" 
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:
In constructor ‘MWGui::DialogueWindow::DialogueWindow()’:
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44:
error: ‘bind’ is not a member of ‘boost’
 2013-05-20 23:51:01 +02:00
scrawl
d3effdf34c Fix exception when trying to equip a shield while a lockpick is equipped 2013-05-20 13:32:38 +02:00
scrawl
d9dd02c610 Security fixes 2013-05-20 12:42:11 +02:00
scrawl
2715520d6f Cleanup Security class 2013-05-19 23:19:48 +02:00
scrawl
5173779f4b Add sounds for security skill 2013-05-19 19:48:51 +02:00
scrawl
7a2d1cd8ce Security skill 2013-05-19 18:40:37 +02:00
scrawl
c7805e7dd2 Fix sun glare persisting after changing to an interior cell 2013-05-18 23:10:37 +02:00
scrawl
4983d08fe4 Fix a problem with statics disappearing sometimes on the map 
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
 2013-05-18 22:55:30 +02:00
scrawl
60563afc10 Fix a new game crash, reset camera 2013-05-17 22:53:43 +02:00
Chris Robinson
53d1c3939c Merge remote-tracking branch 'zini/master' into animations 2013-05-17 06:26:34 -07:00
Chris Robinson
e8bbb755c3 Play the left-arm torch animation when it's equipped 2013-05-17 06:21:59 -07:00
scrawl
d096b19307 Fix not being able to equip arrows/bolts 2013-05-17 14:11:19 +02:00
scrawl
3cadb5918f Fix containers showing random items from my commit earlier 2013-05-17 14:11:02 +02:00
Chris Robinson
ee585046ac Don't show weapons in first-person 2013-05-17 01:56:16 -07:00
Chris Robinson
4b9a888d74 Use the PickProbe animation group as appropriate 2013-05-17 01:46:51 -07:00
Marc Zinnschlag
cc42b1ef48 Merge remote-tracking branch 'riothamus/riothamus-b752' 2013-05-16 20:07:48 +02:00
riothamus
d89dbde940 Bug 752, spacing fix 2013-05-16 14:05:22 -04:00
Marc Zinnschlag
9fe5ff46cd Merge remote-tracking branch 'riothamus/riothamus-b752' 2013-05-16 19:52:14 +02:00
riothamus
36f1197b51 Bug 752, cleanup 2013-05-16 13:51:54 -04:00
riothamus
db981a72fe Bug 752 2013-05-16 13:40:00 -04:00
Marc Zinnschlag
2c8a511179 Merge remote-tracking branch 'scrawl/persistence' 2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
Chris Robinson
6201cb0093 Add a method to clear the animation queue 2013-05-16 06:59:41 -07:00
Glorf
af28be915f Use fallback video name 2013-05-16 13:47:27 +02:00
Glorf
0539ca6a9c Bugfix #778 2013-05-16 13:35:28 +02:00
Chris Robinson
6c6200efef Merge remote-tracking branch 'zini/master' into animations 2013-05-15 16:34:51 -07:00
Marc Zinnschlag
9fee99d56c Merge remote-tracking branch 'scrawl/master' 2013-05-15 22:43:00 +02:00
scrawl
aaa9aba999 Some fixes 2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Chris Robinson
71d39c2fa0 Merge remote-tracking branch 'zini/master' into animations 2013-05-15 06:36:06 -07:00
Chris Robinson
e069215583 Don't clear the last queued animation when it stops 2013-05-15 06:32:20 -07:00
Chris Robinson
66f55b3178 Play the item up/down sound when readying/unreadying weapons 2013-05-15 01:45:47 -07:00
Chris Robinson
b459a010b0 Fix vec.z being applied while not in the air 2013-05-14 23:03:28 -07:00
Chris Robinson
3c5c10144a Remove a duplicate showWeapons call 2013-05-14 19:38:57 -07:00
Marc Zinnschlag
56b2b05f9a Merge remote-tracking branch 'glorf/weather' 2013-05-14 22:56:26 +02:00
Glorf
39c7bc8363 Corrected celestical object sizes 2013-05-14 20:34:40 +02:00
Glorf
9fa2dd5277 Playing with moons part 2 2013-05-14 19:58:08 +02:00
Chris Robinson
e8661794fe Avoid trying to find a state for non-actors. 
They're only ever play idles, unless PlayGroup is called.
 2013-05-14 07:29:07 -07:00
Chris Robinson
355f653614 Use AnimationAlloc instead of AnimationAllocatedObject 2013-05-14 01:30:01 -07:00
Chris Robinson
47a9a4cdff Clean up a for loop 2013-05-14 01:29:15 -07:00
scrawl
96e3b3b7c2 Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject 2013-05-13 21:03:53 +02:00
Marc Zinnschlag
d684120f7a Merge remote-tracking branch 'scrawl/master' 2013-05-13 20:47:50 +02:00
scrawl
ac4fa1941d Fix the frame update not getting called on the first frame 2013-05-13 20:08:12 +02:00
Chris Robinson
822f130f79 Merge remote-tracking branch 'zini/master' into animations 2013-05-13 04:09:56 -07:00
Chris Robinson
8ec722ac92 Use std::find_if instead of ugly for loops 2013-05-13 04:08:36 -07:00
Chris Robinson
f83ee5d316 Play ready/unready animations on the upper body 2013-05-13 03:32:00 -07:00
Torben Carrington
4d10a1c407 Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris) 2013-05-13 02:57:52 -07:00
Marc Zinnschlag
af191c7382 fixed AiWander arguments 2013-05-13 11:27:36 +02:00
Chris Robinson
a9928bb842 Split up the UpperBody group 
Also recognize the [un]equip start and stop text keys.
 2013-05-13 02:09:22 -07:00
Chris Robinson
70dc2f77ad Move the priority enum to MWMechanics 2013-05-13 00:54:44 -07:00
Chris Robinson
7ba2508556 add a priority for death animations, and store it in the state list 2013-05-12 19:19:21 -07:00
Chris Robinson
4e389b5a8f Store whether a given animation loops in the state table 2013-05-12 05:59:39 -07:00
Chris Robinson
bbb38c61cc Fix queued animations 2013-05-12 05:08:01 -07:00
Chris Robinson
3988866ecd Make sure active groups are updated after a state is auto-disabled 2013-05-12 04:34:37 -07:00
Chris Robinson
2c556e4036 Be smarter about handling non-moving animations 
Don't rely on being told by the play method, so the animation can
automatically change without impacting the character controller.
 2013-05-12 04:29:42 -07:00
Marc Zinnschlag
9835c6df11 Merge remote-tracking branch 'scrawl/tradefix' 2013-05-12 12:58:32 +02:00
Chris Robinson
4ea347ac52 Use shared pointers to store animation sources 
This ensures references to the sources stay valid as long it the object
is, rather than becoming invalidated whenever one is added or removed.
 2013-05-11 19:38:23 -07:00
scrawl
b56d50287e Barter mechanic fix 2013-05-11 22:56:36 +02:00
Marc Zinnschlag
e14cb6853f Merge remote-tracking branch 'scrawl/containerui' 2013-05-11 19:23:02 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
Chris Robinson
6b8a687a79 Add methods to disable an animation 
And rename WeaponState to WeaponType
 2013-05-10 22:22:39 -07:00
Chris Robinson
6605aa7dec Create three bone groups 
This still won't work as expected. Currently there is only one priority level,
and only one animation state per priority level can be active at a time.

It's close, though.
 2013-05-10 20:45:09 -07:00
Chris Robinson
abc676eedd Allow specifying which bone groups to play an animation on 2013-05-10 20:05:09 -07:00
Chris Robinson
56eede2610 Search more aggressively for an animation velocity 2013-05-10 19:31:33 -07:00
Chris Robinson
5a9c1e1245 Don't explicitly track the last position 2013-05-10 18:58:14 -07:00
Chris Robinson
7c3b014193 Figure out which animations to play based on priority 
Bone group will also be taken into account later.
 2013-05-10 18:37:44 -07:00
Chris Robinson
921f534980 Parameterize the number of bone groups 2013-05-10 16:35:43 -07:00
Chris Robinson
8a9b0eb5f7 Store the AnimSource in the animation state 2013-05-10 15:27:29 -07:00
Glorf
6aaa8d6dc0 Fixed fading problem 2013-05-10 19:33:43 +02:00
Glorf
9cc85cbe81 Playing with moons part 1 2013-05-10 18:55:56 +02:00
Chris Robinson
58efce5008 Rename animation layers to animation states 2013-05-10 04:01:30 -07:00
Chris Robinson
ccff364b52 Use a map of active layers instead of an array 
A bit of an upheaval. Each animation is now a "layer", instead of each layer
having an animation. Incidentally, this is much closer to how Ogre handles
animation states.

In the future, each layer will have a priority, which will be used to determine
which one affects a given bone group (which we currently only have one of).
 2013-05-10 03:08:07 -07:00
kpp
24d619d6b4 Changes the logic of WindowManager::messageBox() 
Fixes removeItem
Fixes addItem
 2013-05-10 14:06:25 +04:00
Chris Robinson
d5490b0f8f Fix an outdated comment 2013-05-09 23:07:50 -07:00
Chris Robinson
74ed1f73b4 Merge remote-tracking branch 'zini/master' into animations 2013-05-09 13:53:38 -07:00
Marc Zinnschlag
5c99f15ad3 Merge remote-tracking branch 'torben/aiescort' 2013-05-09 14:27:22 +02:00
Glorf
6417fa504e Fixed constness 2013-05-09 13:56:13 +02:00
Torben Carrington
4928c9d079 Removed sqrt function call (minor optimization thanks to Chris) 2013-05-08 20:47:31 -07:00
Torben Carrington
d20178dd56 Removed unnecessary std::cout messages 2013-05-08 20:05:45 -07:00
Torben Carrington
133964f0e4 AIEscort complete 2013-05-08 20:02:24 -07:00
Torben Carrington
c03dca47f5 AIEscort implemented and working - only touchups are needed. 2013-05-08 17:19:47 -07:00
Glorf
c605f15a15 Another weather cleanup 2013-05-09 00:36:58 +02:00
Torben Carrington
10840765d9 Framework - duration and pathing implemented, no waiting for follower yet. 2013-05-08 15:27:20 -07:00
Marc Zinnschlag
51067698a8 minor cleanup 2013-05-08 21:26:39 +02:00
Marc Zinnschlag
c80ffa0a16 Merge remote-tracking branch 'gus/AIFix' 2013-05-08 20:31:57 +02:00
scrawl
90b7df439f Fix image buttons 2013-05-08 13:55:15 +02:00
Chris Robinson
8e38dc410f Allow loading multiple animation sources 
Animation sources are treated differently from base objects. When given
"path\file.nif", base objects will look for "path\xfile.nif" and use that
if it exists (falling back to the original name if not found). Animation
sources will instead use "path\xfile.kf", ignoring it if the file doesn't
exist.
 2013-05-07 16:59:32 -07:00
gus
603af21715 little interface improvement 2013-05-07 19:42:21 +01:00
gus
a328a03bd3 more fix. Fargoth quest almost work as in vanilla now. 2013-05-07 19:35:10 +01:00
scrawl
301efb411e Fix exit crash 2013-05-07 19:15:28 +02:00
scrawl
8845c0cee1 Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera. 2013-05-07 17:38:24 +02:00
Glorf
68f249e8f4 Small weather cleanup 2013-05-07 10:27:37 +02:00
Chris Robinson
e85bc8b2cd Only load one Nif for Animation objects 
This breaks quite a bit, but it's needed for the transition to using the
.kf files.
 2013-05-06 23:11:26 -07:00
Chris Robinson
6a3ba41170 Don't store camera nodes, we don't need them. 2013-05-06 21:46:11 -07:00
Chris Robinson
90e29c83c0 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2013-05-06 19:17:39 -07:00
scrawl
007a3cf9bd rename IInterface to Interface 2013-05-06 16:05:56 +02:00
scrawl
b5071ced23 Removed using namespace 2013-05-06 16:04:28 +02:00
scrawl
757a26794a Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-06 15:35:38 +02:00
scrawl
c6edb0288a Remove unused file 2013-05-06 15:30:23 +02:00
scrawl
1315432322 Handle @# links in journal 2013-05-06 15:14:39 +02:00
scrawl
d43adbaa7c Topic link fixes for russian version, thanks to greye for testing 2013-05-06 13:13:14 +02:00
scrawl
166eac2e25 Cleanup 2013-05-06 11:31:34 +02:00
gus
006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 2013-05-06 00:46:50 +01:00
scrawl
38c399a698 Fix duplicate sounds 2013-05-05 10:51:17 +02:00
scrawl
062ff189a2 Merge branch 'master' into memory 2013-05-04 23:04:33 +02:00
scrawl
0f2866dc15 Text replace fix 2013-05-04 18:49:51 +02:00
scrawl
48c5e33c79 Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly. 2013-05-04 17:40:00 +02:00
scrawl
a33e6b9c35 Fast forward to the last page in the journal when opening it 2013-05-04 16:06:48 +02:00
scrawl
d16bb26a48 Added text colors, goodbye, message 2013-05-04 15:15:44 +02:00
scrawl
f07497bbde Fix lockup 2013-05-04 14:18:13 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
6cd28d1156 Fix a bug in getPCNextRank 2013-05-04 12:28:12 +02:00
scrawl
0bb51fd91d Retrieve the correct case for topics in the journal 2013-05-03 22:53:29 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
gus
7fe7111c19 Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding... 2013-05-03 17:09:09 +01:00
Marc Zinnschlag
2e6594f8f7 Merge remote-tracking branch 'glorf/bugfix-5' 2013-05-03 14:55:00 +02:00
scrawl
75dcf52552 Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made) 2013-05-03 13:55:57 +02:00
Glorf
517dfb4d75 Bugfix #732 part 2 2013-05-03 13:24:34 +02:00
Glorf
57f22c77c0 Bugfix #732 part 1 2013-05-03 12:44:27 +02:00
greye
a8b1706678 init pointer value to prevent segfault 2013-05-03 10:51:42 +04:00
kpp
dcccfd9f22 Initialize values 2013-05-02 22:43:21 +04:00
kpp
28ef4d97da Fixes Bug #734 'Book empty line problem' 
Hides buttons 'Next' and 'Prev' at the last and at the first page
 2013-05-02 07:35:25 +04:00
Chris Robinson
03a6190c5a Merge remote-tracking branch 'zini/master' into animations 2013-05-01 10:20:42 -07:00
Chris Robinson
a120653c38 Implement handling weapon states 2013-05-01 10:19:16 -07:00
Marc Zinnschlag
d5741c7141 Merge remote-tracking branch 'scrawl/master' 2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'" 
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
 2013-05-01 16:56:16 +02:00
scrawl
1acfd849a2 Fix a case folding bug 2013-05-01 16:38:16 +02:00
Marc Zinnschlag
6f0ccb6e38 Merge remote-tracking branch 'scrawl/insertrecords' 2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0 Merge remote-tracking branch 'glorf/acrobatics' 2013-05-01 13:44:23 +02:00
scrawl
40a0969055 Insert records that may not exist in vanilla MW 2013-05-01 12:47:50 +02:00
Glorf
b8630239d7 Code cleanup 2013-05-01 12:25:02 +02:00
Glorf
236ec3409f Finished acrobatics 2013-05-01 12:21:59 +02:00
scrawl
67422c397c GetWindSpeed 2013-05-01 11:42:24 +02:00
scrawl
5063d90dda GetStartingAngle was implemented, but not registered 2013-05-01 11:22:46 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
scrawl
3c68c87923 Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries 2013-05-01 10:28:59 +02:00
scrawl
8bc59f8fe6 Merge branch 'master' into journal 2013-05-01 08:27:42 +02:00
Chris Robinson
d01351431c Merge remote-tracking branch 'zini/master' into animations 2013-04-30 19:27:55 -07:00
Chris Robinson
4b15da076b Move getStateInfo into the character controller 2013-04-30 19:26:41 -07:00
Glorf
d30e43784a Fatigue decrease when jumping, live decrease when falling 2013-04-30 23:39:56 +02:00
Glorf
5a8c1661be Jump acrobatics working, started falling acrobatics implementation 2013-04-30 20:44:17 +02:00
scrawl
1420a2cb33 Tweaked adjustPosition. Now uses a very thin box for tracing the feet only. 2013-04-30 20:43:38 +02:00
scrawl
91c89e5db4 Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace 2013-04-30 20:26:59 +02:00
Glorf
add3cd6456 Advance acrobatics on jump 2013-04-30 18:22:59 +02:00
scrawl
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
Marc Zinnschlag
61e476118d Merge remote-tracking branch 'kcat/animations' 2013-04-30 10:25:26 +02:00
Marc Zinnschlag
2cb7e1f3d5 Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-30 10:24:02 +02:00
scrawl
c0dd383cd0 Fix door collision to work with all possible movement directions 2013-04-30 09:43:32 +02:00
Chris Robinson
05060e57ec Add a weapon state to the character controller 2013-04-29 13:07:49 -07:00
Glorf
d283f8d85f Bugfix #748 2013-04-29 21:19:13 +02:00
Chris Robinson
020e3e8a8e Show the equipped weapon in the inventory screen 
And use the proper pose based on what's equipped.
 2013-04-29 12:08:43 -07:00
Chris Robinson
854de1c6c1 Make sure the weapon is in the proper group 2013-04-29 11:43:37 -07:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
Chris Robinson
063322b081 Declare some variables closer to where they're used 2013-04-29 10:12:50 -07:00
Chris Robinson
0cf531ba12 Make sure to update parts when the weapon changes 2013-04-29 09:53:36 -07:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
Marc Zinnschlag
bab899513a Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-29 18:04:22 +02:00
Glorf
74de8b83b6 Enabled collision when new game 2013-04-29 17:56:16 +02:00
Chris Robinson
a15758ac85 Fix preview and vanity cameras 2013-04-29 08:48:45 -07:00
Glorf
6222b3f52a Bugfix #744 2013-04-29 17:19:20 +02:00
Chris Robinson
d17e1e83d5 Rename MWRender's Player to Camera 2013-04-29 05:50:40 -07:00
Chris Robinson
dbba126344 Use a method to check if the view should be first person 2013-04-29 04:40:28 -07:00
Chris Robinson
bb8277920b Manage the player's NpcAnimation object in the RenderingManager 
It may be more appropriate to manage it in MWRender::Actors with the other
Animation-based objects, but that will need some (minor) interface changes.
 2013-04-29 03:31:46 -07:00
scrawl
6c5ea1ea7a Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes 2013-04-29 12:05:10 +02:00
scrawl
5ff098b8fb Fix quick keys being triggered when in UI mode 2013-04-29 11:55:30 +02:00
scrawl
867c7db014 Fix wrong door sounds 2013-04-29 11:00:15 +02:00
scrawl
9648804af5 Fix terrain material leak, this should in theory allow the terrain to free its temporary resources 2013-04-29 10:20:38 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
Chris Robinson
ba3a67f84b Don't store the player base node in MWRender::Player 2013-04-28 23:44:44 -07:00
Chris Robinson
24e503330b Merge remote-tracking branch 'zini/master' into animations 2013-04-28 09:41:31 -07:00
Marc Zinnschlag
11a45b3034 Merge remote-tracking branch 'scrawl/doors' 2013-04-28 18:22:09 +02:00
scrawl
67e5e939a1 Fix some doors 2013-04-28 17:57:36 +02:00
Marc Zinnschlag
f2a5377b2b Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-28 16:52:48 +02:00
Marc Zinnschlag
116ac05677 Merge remote-tracking branch 'scrawl/doors' 2013-04-28 16:44:11 +02:00
Glorf
98baf9fac1 Bugfix #718 2013-04-28 16:36:12 +02:00
scrawl
6ecd88af14 More fixes 2013-04-28 15:59:59 +02:00
scrawl
4ee1a6ee02 Put door physics in a separate method, some fixes 2013-04-28 15:36:37 +02:00
Marc Zinnschlag
cd61177eed Merge remote-tracking branch 'gus/renderWeaponShield' 2013-04-28 15:00:47 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
Marc Zinnschlag
a6b7f8e904 Merge remote-tracking branch 'scrawl/fall' 2013-04-28 14:14:10 +02:00
Marc Zinnschlag
93c98e1df4 Merge remote-tracking branch 'scrawl/athletics' 2013-04-28 14:11:12 +02:00
Marc Zinnschlag
738a54337d removed redundant case smashing 2013-04-28 14:07:53 +02:00
gus
3d9ceede77 little fix (weapons disapeared when tab was pressed) 2013-04-28 12:33:41 +01:00
gus
5388c25e64 Fix or lockpicks. 2013-04-28 11:55:50 +01:00
gus
766d1efa84 Render weapon and shield. Only shield can be seen right now as weapons need to be drawed out. 2013-04-28 11:41:01 +01:00
scrawl
7d61459ccd Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway. 2013-04-28 11:13:21 +02:00
scrawl
fdf80c1c4f Fix unused variable 2013-04-28 11:05:01 +02:00
scrawl
db78d15fc4 Fix changeWeather 2013-04-28 11:02:30 +02:00
Chris Robinson
ce7bc20fa1 Avoid special-casing player rotation 2013-04-28 01:14:58 -07:00
scrawl
07891fa213 Athletics skill increase 2013-04-28 07:53:04 +02:00
Glorf
3669d0a998 Bugfix #742 2013-04-27 20:57:44 +02:00
Chris Robinson
ab52e68c05 Merge remote-tracking branch 'zini/master' into animations 2013-04-27 05:16:15 -07:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
Glorf
ade871ce12 Corrected unused opcodes 2013-04-26 17:31:58 +02:00
Glorf
89f7ef2472 Move, moveworld script instructions 2013-04-26 17:28:19 +02:00
Marc Zinnschlag
32138dbb0f silenced a warning 2013-04-26 13:33:47 +02:00
Chris Robinson
2822f431c4 Merge remote-tracking branch 'zini/master' into animations 2013-04-26 01:38:51 -07:00
Chris Robinson
b666f1d551 Work around a problem with MWRender::Player::renderPlayer 
NpcAnimation::setViewMode makes a call to the character controller, in the
mechanics manager, to forcefully update the character's state. This in turn
makes a call to the player's old NpcAniamtion object that was just deleted.

The mechanics manager will eventually remove and reinsert the player, so the
old character controller will be removed and a new one will get the right
Animation object again, but not in time for the setViewMode call.

There's many factors that all contribute to this run-around, which needs
discussion on how to best fix.
 2013-04-26 01:30:36 -07:00
Chris Robinson
55ee4e65a9 Clean up the slotlist struct 2013-04-25 23:42:20 -07:00
scrawl
7821610ec6 Make OnDeath work with explicit reference 2013-04-26 02:08:53 +02:00
scrawl
a373f53988 Added SetAtStart 2013-04-26 02:02:51 +02:00
Marc Zinnschlag
4e45222a63 Merge remote-tracking branch 'glorf/rotate-update1' 2013-04-25 20:57:24 +02:00
Glorf
240217ae42 Fixed rotations more than 360 degrees 2013-04-25 20:52:38 +02:00
Marc Zinnschlag
1e9656ee9c Merge remote-tracking branch 'glorf/rotate-update1' 2013-04-25 20:22:40 +02:00
Glorf
7cd4dd0c91 Improved local rotations 2013-04-25 19:14:10 +02:00
Chris Robinson
274f3c7b77 Force character state to update after switching view modes 2013-04-25 07:08:11 -07:00
Chris Robinson
e4eb4b7e30 Keep track of the character looping state 2013-04-25 06:29:17 -07:00
Chris Robinson
9da2c9153e Don't store the animation group string in the character controller 2013-04-25 06:12:37 -07:00
Chris Robinson
2769adcee0 Implement switching to and from first-person animations 
Note that the current animation gets interrupted, so switching to first person
may break movement until you stop and try to move again. This can be fixed by
alerting the character controller in the mechanics manager to force a state
update when switching POV.
 2013-04-25 05:23:05 -07:00
Chris Robinson
9a2a32f2a5 Add a method to clear all Animation sources except the first 
The first needs to remain, since that's where any mSkelBase entity comes from,
and where any retrieved nodes are from.
 2013-04-25 05:02:11 -07:00
Chris Robinson
9be20b90f1 Fix potential infinite loop when layer 0 is empty 2013-04-25 03:35:40 -07:00
Chris Robinson
76c8e81908 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-25 01:35:21 -07:00
Marc Zinnschlag
247a76766d fixed a typo in a doxygen comment 2013-04-25 10:27:43 +02:00
Marc Zinnschlag
71fc8f5830 Merge remote-tracking branch 'scrawl/item' into next 2013-04-25 10:21:14 +02:00
Chris Robinson
86fda1bff6 Only set mSkelBase from the first objectlist 2013-04-25 00:52:26 -07:00
Chris Robinson
7eac37be23 Make sure the old layer is cleared before starting the next 2013-04-25 00:18:02 -07:00
Chris Robinson
09fc50948b Add methods to disable and get info for a layer 2013-04-25 00:08:16 -07:00
Chris Robinson
24f1eba902 Keep track of whether an animation supplies movement 
Also handle it when it doesn't.
 2013-04-24 22:45:43 -07:00
Nathan Jeffords
7db6447a00 dropped the I infront of the journal view model interfaces 2013-04-24 21:53:25 -07:00
Nathan Jeffords
36a6806faf drop the leading 'I' from the book page control interfaces 2013-04-24 21:44:29 -07:00
Nathan Jeffords
4c22afc29b made a pass at conforming to established naming convention 2013-04-24 20:22:57 -07:00
Nathan Jeffords
c7ede9b523 port code to C++03 2013-04-24 20:22:57 -07:00
Nathan Jeffords
718af692c9 reworked journal to match bethesda's implemenation 2013-04-24 20:20:01 -07:00
Nathan Jeffords
f02a53b121 Created a helper class to format books for display from the journal 
view-model data.
 2013-04-24 20:20:01 -07:00
Nathan Jeffords
50d688c2fc Created a view-model to present journal data to the UI in the form it 
intends to display it.
 2013-04-24 20:20:00 -07:00
Nathan Jeffords
55ca037411 Created a MyGUI widget to present a page of formatted text. 2013-04-24 20:20:00 -07:00
Nathan Jeffords
8dad04eef1 hid JournalWindow behind IJournalWindow interface, and put its entire 
implementation, class definition and all, into journalwindow.cpp
 2013-04-24 20:20:00 -07:00
scrawl
9e3917881d Don't fail on nonexistent items in a levelled list 2013-04-25 04:44:30 +02:00
Chris Robinson
0817d59f23 Allow specifying where to start in an animation 2013-04-24 19:09:36 -07:00
scrawl
933f894148 Added Blind and Night Eye effects 2013-04-25 02:31:51 +02:00
scrawl
baa7a9160c Rank condition should always fail if NPC is not in a faction 2013-04-25 02:31:39 +02:00
scrawl
a7092ef2d7 Fix activation not working sometimes 
The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
 2013-04-25 02:31:39 +02:00
Nathan Jeffords
2dc01fe56b fixed the type of iterator uses in MWWorld::Store 
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
 2013-04-25 02:31:39 +02:00
scrawl
51580ead4f Fix consecutive dialogue choices 2013-04-25 02:31:39 +02:00
Marc Zinnschlag
87ce2110dc hotfix for CharacterPreview destructor 2013-04-25 02:31:38 +02:00
scrawl
cd57e3f896 Auto calculate attributes if there are not specified in the NPC record 2013-04-25 02:31:38 +02:00
Glorf
53fb17da10 Rotation system fixes 2013-04-24 21:42:04 +02:00
Chris Robinson
333354fe62 Remove the character controller from the Animation class 2013-04-24 07:10:41 -07:00
Chris Robinson
b80891099e Don't use the character controller to handle text keys 
The Animation class has the Ptr and can call to whatever subsystem is needed.
 2013-04-24 06:48:34 -07:00
Chris Robinson
e8cabc9434 Pass the loop count from loopgroup to the play method 
Instead of queueing each iteration separately.
 2013-04-24 06:32:11 -07:00
Chris Robinson
b482d5be09 Add a method to check if a given layer is playing 2013-04-24 05:23:45 -07:00
Chris Robinson
c58dfbe921 Specify the loop count to Animation::play 2013-04-24 04:56:39 -07:00
Chris Robinson
7241267d5c Make an AnimationValue for each animation layer 2013-04-24 04:41:52 -07:00
Chris Robinson
102b3bdef9 Update position by reference 2013-04-24 01:57:51 -07:00
Chris Robinson
9e05ee53da Avoid looking for the controller if there is no NonAccum node 
Also, make sure there is a controller before updating the position.
 2013-04-24 01:18:08 -07:00
Chris Robinson
544011e096 Fix 'start' text key fallback lookup 2013-04-24 00:40:58 -07:00
Chris Robinson
7e2995bc2f Fix setting up active controllers 2013-04-23 19:43:26 -07:00
Chris Robinson
6a67a5e650 Merge remote-tracking branch 'zini/next' into nifogre 2013-04-23 16:57:48 -07:00
Chris Robinson
8c9e2e0ee9 Improve handling of reaching the stop animation text key 2013-04-23 05:34:08 -07:00
Chris Robinson
c4806f01f8 Use a separate list of controllers to update 
This should make it easier to figure out what controllers need to be updated
for various animation sources and layers.
 2013-04-23 04:08:09 -07:00
greye
cfccf0981d update IndexedStore::setUp() for multiple datafile support 2013-04-23 14:36:38 +04:00
Chris Robinson
e4c5aac966 Keep track of the animation layers a given object list is animating on 
This only tracks layers they explicitly animate on. They may animate on other
layers as well, if nothing else is animating on them.
 2013-04-23 02:48:11 -07:00
Chris Robinson
e378176937 Don't update controllers that have already been updated 2013-04-23 00:15:31 -07:00
Chris Robinson
8782ae6976 Separate some Animation fields into a separate AnimLayer class 2013-04-22 23:52:28 -07:00
Chris Robinson
c3ce49798a Fix animation velocity calculation 2013-04-22 21:34:39 -07:00
Chris Robinson
7279e015e9 Search the textkeys to check if an animation group exists 2013-04-22 20:59:55 -07:00
Chris Robinson
a2fc43c7df Use reset to check that the animation exists and has the right markers 2013-04-22 20:41:54 -07:00
Chris Robinson
507d72ede5 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-22 18:44:28 -07:00
Chris Robinson
bb64efc18e Improve looping behavior 2013-04-22 05:08:52 -07:00
Chris Robinson
cc70c6263b Use the NodeTargetValue for the NonAccum root 2013-04-22 04:10:46 -07:00
Chris Robinson
9485a4aa6d Look through the whole animation stack to find the "velocity" 2013-04-22 01:40:41 -07:00
Marc Zinnschlag
29cb076113 Merge remote-tracking branch 'scrawl/rank' 2013-04-22 09:52:28 +02:00
Marc Zinnschlag
3fa35af796 Merge remote-tracking branch 'scrawl/master' 2013-04-22 09:52:24 +02:00
Chris Robinson
a7776e124c Only set mNonAccumRoot from mSkelBase 2013-04-22 00:22:31 -07:00
Chris Robinson
a3511c62cf Don't store textkeys in user object bindings 
It's a bit unwieldy to have them stored in the 'skeleton master' instead
of the skeleton instance. And although the text keys are extracted for
each created instance now, this shouldn't be much worse than the
multimap copying going on before.

Plus, proper serialization can help for future optimizations.
 2013-04-22 00:01:30 -07:00
scrawl
56b871e362 Rank condition should always fail if NPC is not in a faction 2013-04-22 07:57:53 +02:00
Chris Robinson
2345b5e8b3 Avoid storing text keys for each animation 2013-04-21 22:56:40 -07:00
Chris Robinson
7d59340ed6 Don't clip out the group name from the textkeys 2013-04-21 22:13:49 -07:00
Chris Robinson
6c85d6763a Pass "loop stop" to the character controller 2013-04-21 18:38:25 -07:00
Chris Robinson
d7c9df16f8 Store the current animation group 2013-04-21 18:32:34 -07:00
scrawl
8bf1149cec Fix activation not working sometimes 
The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
 2013-04-21 21:24:48 +02:00
Nathan Jeffords
19325f9d40 fixed the type of iterator uses in MWWorld::Store 
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
 2013-04-21 11:41:09 -07:00
Chris Robinson
835ff8eb1e Avoid creating an AnimationValue per ObjectList 2013-04-20 17:13:27 -07:00
Chris Robinson
4122b0b55f Merge remote-tracking branch 'zini/master' into nifogre 2013-04-20 00:25:00 -07:00
scrawl
a8e3acd6c4 Fix consecutive dialogue choices 2013-04-19 17:57:22 +02:00
Marc Zinnschlag
f13b0c884f hotfix for CharacterPreview destructor 2013-04-19 14:41:26 +02:00
Chris Robinson
50bb92beb3 Use a method to set the visibility flags and render queue. 2013-04-19 02:01:50 -07:00
Marc Zinnschlag
9c1e280614 Merge remote-tracking branch 'scrawl/master' 2013-04-19 00:23:24 +02:00
Chris Robinson
434f3ac8c8 Merge remote-tracking branch 'zini/next' into nifogre 2013-04-18 15:14:28 -07:00
scrawl
ef9afeb53e Auto calculate attributes if there are not specified in the NPC record 2013-04-18 23:51:43 +02:00
Marc Zinnschlag
1b764e5d3c Merge remote-tracking branch 'gus/AI' 2013-04-18 22:17:49 +02:00
Glorf
f9deb593d1 Bugfix #578 2013-04-18 21:37:58 +02:00
gus
c753eb4c28 another way to do pathfinding. Slightly less powerfull algorithme in theory, but morrowind pathgrids are so simple it shouldn't be a problem. Hope it solves the bug for KittyCat 2013-04-18 18:35:01 +01:00
scrawl
3c5e4ceefd Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9) 2013-04-18 16:46:32 +02:00
Chris Robinson
6d59325bff Merge remote-tracking branch 'zini/master' into nifogre 2013-04-17 23:21:17 -07:00