eroen
d4b8ac5b49
don't dpkg on windows and macos
...
No need to clutter windows and macos configuration with dpkg options, as it is
unlikely to ever be useful.
2013-11-15 16:53:05 +01:00
eroen
67284e2f9d
Introduce -DBUILD_WITH_DPKG to toggle dpkg based install
...
The current system automagically chooses between the dpkg-based install method
(for debian-derived distributions) and a "traditional" install and sets
install paths based on whether cmake can find a 'dpkg' executable.
This is not ideal, since dpkg is occasionally installed on linux distributions
unrelated to debian for purposes other than package management. In particular,
Arch and Gentoo carry it in their repositories.
2013-11-15 15:59:38 +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
1c020b74c8
hid ID column in info tables (not relevant for the user)
2013-11-14 13:14:37 +01:00
Marc Zinnschlag
9f0dac00ec
silenced a warning
2013-11-14 12:22:24 +01:00
Marc Zinnschlag
2af7f60488
flag reordered records as modified
2013-11-14 12:21:10 +01:00
Marc Zinnschlag
a44fad4c59
disabled revert for info tables (no easy way to make this work)
2013-11-14 11:55:02 +01:00
Marc Zinnschlag
d49b8e7443
Merge branch 'dialogue'
2013-11-14 11:40:50 +01:00
Marc Zinnschlag
780ea3a41f
added support for record reordering to model (only implemented in info collection)
2013-11-14 11:39:14 +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
Marc Zinnschlag
2fff7fc843
save info records
2013-11-11 12:21:26 +01:00
scrawl
6f3d737498
Missing const, thanks to jeaye
2013-11-10 23:27:11 +01:00
scrawl
afafaf73e8
Fix a build error
2013-11-10 22:40:46 +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
Marc Zinnschlag
cfbf444628
Merge remote-tracking branch 'potatoesmaster/inventory-remove'
2013-11-10 21:30:19 +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
Marc Zinnschlag
583f1ae9c2
fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection
2013-11-10 13:00:46 +01:00
Marc Zinnschlag
ec6018928c
some fixes to info record sorting (doesn't address the main problem)
2013-11-10 12:09:49 +01:00
Marc Zinnschlag
b7bb7d6902
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/opencs/editor.cpp
2013-11-10 11:49:48 +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
