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

5014 commits

Author SHA1 Message Date
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
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
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