Marc Zinnschlag
0890fa66b0
Merge remote-tracking branch 'mrcheko/master'
2013-12-13 18:47:11 +01:00
mrcheko
8b3a393a6b
bug fix at http://bugs.openmw.org/issues/985
2013-12-13 19:33:01 +02:00
mrcheko
c8bf69b91a
Revert "bug fix http://bugs.openmw.org/issues/985 "
...
This reverts commit 7a9b64c6f4
2013-12-13 19:02:25 +02:00
scrawl
39eea24dc3
Don't try to show exceptions in a message box if SDL was not initialized
2013-12-13 03:50:01 +01:00
mrcheko
7a9b64c6f4
bug fix http://bugs.openmw.org/issues/985
2013-12-12 16:09:38 +02:00
Lukasz Gromanowski
91a4d9a2eb
Fixes #845 : NPCs hold torches during the day
...
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-10 23:48:49 +01:00
Emanuel Guevel
357ecd92b2
Do not display negative stat values
...
Display zero instead of negative values.
Also remove useless for loops and some unused attributes.
2013-12-10 00:41:36 +01:00
Emanuel Guevel
fc8bd1aacb
Allow fatigue stat to become negative when fatigue damages are taken
2013-12-09 21:53:04 +01:00
Marc Zinnschlag
77a2179d1e
Merge remote-tracking branch 'scrawl/master'
2013-12-09 18:39:34 +01:00
scrawl
0bc3a13c0f
Break invisibility on Use or Activate
2013-12-08 23:36:37 +01:00
scrawl
5fd2df5546
Ignore invisible targets for combat AI
2013-12-08 23:21:23 +01:00
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
2013-12-08 23:05:21 +01:00
Lukasz Gromanowski
594cc693b2
Fixes #1006 : Many NPCs have 0 skill
...
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-08 21:47:43 +01:00
Lukasz Gromanowski
8d63f8eea2
Fixes #998 : Setting the max health should also set the current health
...
Added setting current value of dynamic stat in OpSetDynamic class.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 21:00:46 +01:00
scrawl
1624e0fd8a
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
2013-12-07 20:15:39 +01:00
Marc Zinnschlag
ef8c0fab73
Merge remote-tracking branch 'scrawl/master'
2013-12-07 16:26:52 +01:00
scrawl
742e0e014d
Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.
2013-12-07 14:15:51 +01:00
scrawl
bb70deabb1
Add an incomplete implementation of SayAnimationValue (lip animation)
2013-12-07 14:15:45 +01:00
Lukasz Gromanowski
e01085cac5
Fixes #1015 : Player status window scroll state resets on status change
...
Removed resetting scroll state position.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 02:57:30 +01:00
Marc Zinnschlag
48b779af80
Merge remote-tracking branch 'ace/win-fix'
2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson
baacf91de4
Another windows build fix
2013-12-06 11:37:29 +01:00
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2
Merge remote-tracking branch 'scrawl/master'
2013-12-05 16:04:50 +01:00
scrawl
845bc5f7eb
Show fatal exceptions in a message box instead of cerr when running without a terminal
2013-12-05 15:51:07 +01:00
scrawl
afa71bb622
Throw an exception if a BSA is not found
2013-12-05 15:51:07 +01:00
scrawl
9ab8fe1038
Fix bsatool warning
2013-12-05 15:46:33 +01:00
scrawl
f695deb29d
Remember window positions
2013-12-05 15:46:23 +01:00
scrawl
8f4ffe4ddc
Fix new window size not being written to settings when manually resizing window
2013-12-03 15:55:31 +01:00
Marc Zinnschlag
2fe135d85f
journals subview was bound to the wrong universal ID type
2013-12-02 16:25:26 +01:00
Marc Zinnschlag
c94f006307
Merge remote-tracking branch 'scrawl/master'
2013-11-30 15:06:09 +01:00
scrawl
8391891a5b
Ignore case for content file extensions
2013-11-30 14:25:29 +01:00
pvdk
46973e8e82
Fix for Bug #982 : unchecking addons is now saved to profile
2013-11-30 12:08:37 +01:00
Marc Zinnschlag
8b3e852ffc
Merge remote-tracking branch 'scrawl/master'
2013-11-30 11:09:38 +01:00
scrawl
4b4025ed0f
Keep the player's CharacterController when changing cells. Fixes several glitches.
2013-11-30 11:01:45 +01:00
Marc Zinnschlag
016500af98
Merge remote-tracking branch 'scrawl/master'
2013-11-30 09:45:46 +01:00
Marc Zinnschlag
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
2013-11-30 09:45:41 +01:00
scrawl
e1e9de0f02
Don't hide tooltips on mouse click. Probably wasn't such a bright idea.
2013-11-30 09:04:52 +01:00
scrawl
6aa9e18915
Reset filter when starting a trade
2013-11-30 08:33:18 +01:00
scrawl
bb4bd999ba
PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.
2013-11-30 08:29:22 +01:00
scrawl
0e267b79ec
Don't heal dead actors when resting
2013-11-29 20:21:57 +01:00
scrawl
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
2013-11-29 20:06:54 +01:00
scrawl
ce2d521b8f
Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra".
...
When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.
2013-11-29 20:03:50 +01:00
scrawl
ffc885853a
Fix bolt for magic effects that don't have one specified
2013-11-29 10:39:37 +01:00
scrawl
b82ee4b44f
Fix some problems with the previous commit
2013-11-28 21:49:15 +01:00
scrawl
076cc9230b
First try at handling target magic
2013-11-28 17:31:17 +01:00
scrawl
20ccfe2324
Play sound when enchanting
2013-11-28 11:37:30 +01:00
scrawl
97fadb24ca
Update the Ptr in mObjects in Objects::updateObjectCell
2013-11-27 18:49:04 +01:00
scrawl
03c4b680ca
Fix changePointer
2013-11-27 18:49:04 +01:00
scrawl
a8c838b53a
Don't list deleted refs in CellStore::foreach
2013-11-27 18:49:04 +01:00
scrawl
49ea1aae67
Use GMST for sun damage reduction
2013-11-26 15:01:22 +01:00
scrawl
eba068149d
Fix AIWander crash
2013-11-25 15:38:18 +01:00
scrawl
14c9a4e1d3
Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.
2013-11-23 23:12:54 +01:00
scrawl
07408a4652
Don't allow selling gold (again - when did this get broken?)
2013-11-23 22:52:20 +01:00
scrawl
4aa9f3bcef
Don't set the enchanted item in HUD for "WhenStrikes" enchantments
2013-11-23 22:48:56 +01:00
scrawl
f3e89e9168
Fix arrow down in console
2013-11-23 22:48:39 +01:00
scrawl
d2ed77f3f2
Fix shields being visible during spellcasting
2013-11-23 20:24:52 +01:00
Marc Zinnschlag
d8c40562ae
Merge remote-tracking branch 'scrawl/light'
2013-11-23 12:44:42 +01:00
scrawl
a1fe07181c
Fix rotation offset of some lights (bug 955)
2013-11-23 05:55:03 +01:00
scrawl
0e254aa7c7
Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in.
2013-11-23 03:25:55 +01:00
scrawl
39de0510a0
Fix another case of container scripts not getting re-added
2013-11-22 02:12:37 +01:00
scrawl
829512ded4
Fix container scripts not getting re-added when the player changes cells
2013-11-22 01:02:12 +01:00
scrawl
b490e56ba1
Remove redundant setLocals (already done by ContainerStore::add)
2013-11-21 17:19:41 +01:00
scrawl
61ab6e1739
Use fWortChanceValue for making ingredient/potion effects visible
2013-11-21 17:19:41 +01:00
scrawl
320ba98097
Correct getDerivedDisposition according to wiki (check if player expelled)
2013-11-21 17:19:41 +01:00
scrawl
6451b687d9
Adjust value for several item types as according to wiki
2013-11-21 17:19:41 +01:00
scrawl
b6c22ad5d9
Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.
2013-11-21 17:19:30 +01:00
scrawl
bab657fe2b
Add a utility function to add items to a ContainerStore by RefID
2013-11-21 17:14:30 +01:00
scrawl
6641fd4635
Fix bug when enchanting: only the mBase pointer was updated, not the CellRef mRefID, which is used for container stacking. The new (enchanted) item was stacking with the old item when it was added, so the enchantment completely disappears.
2013-11-21 17:14:30 +01:00
scrawl
800a2845b0
Add Bound & Summon effects (will need some adjustments later)
2013-11-21 17:14:23 +01:00
scrawl
bf153e1c8e
Fix bug applying instant effects
2013-11-21 00:41:52 +01:00
scrawl
4ed4c1e319
Add Vampirism and Sun Damage effects. Some fixes.
2013-11-21 00:41:31 +01:00
scrawl
7f735c2c4c
Release and show the cursor when focus lost
2013-11-20 16:07:14 +01:00
scrawl
5a4bd9b202
Remove software cursor option, hw cursors seem to be working well enough
2013-11-20 06:20:16 +01:00
scrawl
fa63924884
Simplify message box manager, should fix a random bug with boxes not disappearing
2013-11-20 05:49:05 +01:00
scrawl
3452bd2e0b
Add glow effect for enchanted items
2013-11-20 00:13:12 +01:00
scrawl
0b9676aaa3
Fix an issue with the AI code
2013-11-19 18:43:32 +01:00
scrawl
38a82c4b0b
Add a todo comment
2013-11-19 18:43:21 +01:00
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
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
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
Marc Zinnschlag
d32fcb99b5
Merge remote-tracking branch 'scrawl/master'
2013-11-17 13:39:04 +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
Sebastian Wick
4a816b6c17
fix context menu
2013-11-16 23:08:03 +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
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
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
Marc Zinnschlag
68598f9b63
fixed handling of user directory defaultfilters file; some cleanup
2013-11-13 14:56:04 +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
Marek Kochanowicz
821d0c5c2d
Corrected filter template loading.
2013-11-13 11:38:29 +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
