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

5300 commits

Author SHA1 Message Date
scrawl
0f2b2fabdb Implement water walking 2014-01-02 02:03:44 +01:00
scrawl
783c501d70 Some checks to prevent bound item abuse 2014-01-02 01:36:08 +01:00
scrawl
590c8cb4a0 Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again. 2014-01-02 01:03:44 +01:00
scrawl
899214a906 Use fVanityDelay 2014-01-02 00:13:23 +01:00
scrawl
c6421276bd Closes #841: Correct activation distance in third person mode 2014-01-01 23:59:17 +01:00
scrawl
24aa743573 Add function for converting feet to game units 2014-01-01 23:34:18 +01:00
scrawl
f6387d5979 Implement Telekinesis magic effect. Remove some duplicate code. 2014-01-01 23:30:58 +01:00
scrawl
531bef6193 Shorter Vector3 initialisation 2014-01-01 22:46:10 +01:00
scrawl
5729672262 Show marked position on map. Implement Detect X magic effects. 2014-01-01 22:37:52 +01:00
mrcheko
16e10cc702 error fix 2014-01-01 22:46:29 +02:00
scrawl
bfc9fcf2cd Add starting spells when building player (F_PCStart flag) 2014-01-01 21:34:00 +01:00
mrcheko
09a0a69b04 more improvements 2014-01-01 21:40:31 +02:00
Marc Zinnschlag
1f4c192bf6 Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 2014-01-01 19:47:11 +01:00
Marc Zinnschlag
e1355be47c Merge remote-tracking branch 'lgro/valgrind_warnings' 2014-01-01 19:41:52 +01:00
scrawl
eab7ffd6b4 Remove redundant finding of default exterior position height 2014-01-01 18:05:28 +01:00
scrawl
8e5cae1081 Implement mark/recall magic effects 2014-01-01 17:06:21 +01:00
Lukasz Gromanowski
2d4e06cd50 Updated comments about freeing format_ctx->pb->buffer. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-01-01 17:05:49 +01:00
Lukasz Gromanowski
722469d57b Correction to the e9844e1 commit. 
Restored interrior check in WeatherManager::update().

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-01-01 16:45:39 +01:00
scrawl
69ba8a40bf Fix weird formatting added during the merge 2014-01-01 16:13:20 +01:00
scrawl
b3cd10dbea Remove redundant setTeleported calls 2014-01-01 15:18:25 +01:00
Marc Zinnschlag
c3482b6f24 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/openmw/mwmechanics/spellcasting.cpp
 2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-01 14:57:14 +01:00
scrawl
ea3b88951a Implement divine/almsivi intervention magic effects 2014-01-01 02:22:11 +01:00
scrawl
c86760e3cd Remember the last known exterior position of the player in case we fail to map the interior to a world position. 2014-01-01 01:10:55 +01:00
Lukasz Gromanowski
101813fd0d Fixes #417: Apply weather instantly when teleporting 
Correction to previous commit - WeatherManager->update()
will always be called.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-31 21:18:10 +01:00
Lukasz Gromanowski
e9844e1b37 Fixes #417: Apply weather instantly when teleporting 
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-31 20:40:23 +01:00
scrawl
b02b966c44 Closes #994: Don't cap skills to 100 when set via console (except for modX variants) 2013-12-31 19:11:16 +01:00
Marc Zinnschlag
c34b586b65 Merge remote-tracking branch 'ace/fix' 2013-12-31 18:37:12 +01:00
scrawl
3604b9d171 Closes #566: In interior cells, update global map position marker using the first exterior teleport door 2013-12-31 18:35:46 +01:00
scrawl
be1938ee90 Closes #805: Don't add entities that are supposed to be invisible to static geometry 2013-12-31 18:32:46 +01:00
Lukasz Gromanowski
1ce4663065 Updated compiler opcodes for COE, and setHello. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-31 18:13:38 +01:00
mrcheko
a8fb1ae51c improved, added knockdown after falling 2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson
8381cad5a4 Don't try to set a cursor before one exists 2013-12-31 14:13:42 +01:00
mrcheko
d6345bce91 added npc hit reactions 2013-12-31 13:24:20 +02:00
scrawl
94cdc1efd2 Enable mipmap generator for 1.9+ 2013-12-31 00:54:40 +01:00
Lukasz Gromanowski
cb04f43384 Fixes for "Conditional jump or move depends on uninitialised value(s)" 
and memleaks reported by valgrind.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-30 23:08:53 +01:00
Lukasz Gromanowski
6107d5bad2 Updated ffmpeg decoder fix 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-30 22:16:06 +01:00
Lukasz Gromanowski
5c5f87445b Fixes for "Conditional jump or move depends on uninitialised value(s)" 
and memleaks reported by valgrind.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-30 21:47:06 +01:00
scrawl
b8ac37347c Code cleanup for Class::canBeEquipped 2013-12-30 19:04:35 +01:00
scrawl
79a440e94a Many additions to 900bc06d2c: 
- Fix indentation
 - Consider any kind of light, not just torch_infinite_time
 - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
 - Remove redundant code and don't add additional lights to the inventory
 - World::isDark returns false for interiors which are unaffected by weather
 2013-12-30 17:57:41 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
Lukasz Gromanowski
c65f018760 Fixes #417: Apply weather instantly when teleporting 
Corrected constant name.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-29 15:09:49 +01:00
Marc Zinnschlag
6de39a7329 Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day' 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2013-12-29 15:00:31 +01:00
Lukasz Gromanowski
faf8011c48 Fixes #417: Apply weather instantly when teleporting 
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-29 12:47:44 +01:00
scrawl
04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 2013-12-29 00:58:48 +01:00
scrawl
17ff8165d2 Closes #1065: Don't apply fall damage when landing in water 2013-12-29 00:36:36 +01:00
scrawl
2a8ab932ef Bug #951: Only recalculate derived stats when attributes change 2013-12-28 17:19:35 +01:00
Lukasz Gromanowski
100edda8c0 Fixes #417: Apply weather instantly when teleporting 
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-28 16:15:34 +01:00
scrawl
596c9b80a9 Check if threads are joinable before joining (issue with boost 1.52) 2013-12-27 22:38:30 +01:00
scrawl
85ec80100c Bug #1005: Hide torches/shields during spellcasting and hand-to-hand combat 2013-12-27 22:00:16 +01:00
scrawl
7265b427fe Bug #1013: Rewrote fall height detection 2013-12-27 21:21:18 +01:00
scrawl
02277db685 Bug #1052: Don't use set/getOnlyText which discards escape characters 2013-12-27 19:52:10 +01:00
scrawl
686d9efac3 Bug #1060: Fix incorrect spell type checks 2013-12-27 18:58:35 +01:00
scrawl
27092a4494 flagAsModified should be private 2013-12-27 18:58:35 +01:00
scrawl
6400f23ab0 Use the material controller manager for effects with overridden texture 2013-12-27 14:54:36 +01:00
scrawl
d262d9e6b0 Bug #1054: Set render queue group for effects 2013-12-27 14:51:59 +01:00
scrawl
1c60a781a5 Add header to CMakeLists 2013-12-27 14:42:22 +01:00
scrawl
561c661156 Reset starting angle / position when adding world item to a container 2013-12-27 01:57:08 +01:00
scrawl
608bd0f525 Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028 2013-12-27 01:34:56 +01:00
scrawl
30b1da996b Issue #1029 - Quick keys menu: Select compatible replacement when tool used up 2013-12-27 00:51:29 +01:00
scrawl
5a287a7e01 Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData. 2013-12-27 00:41:19 +01:00
scrawl
d09a86e208 Issue #1018: Don't allow view mode switching while performing an action 2013-12-27 00:36:06 +01:00
scrawl
a3017e16d4 Don't allow changing the spell that is being cast mid-animation 2013-12-26 22:32:39 +01:00
scrawl
5054d8e6c1 Bug #1055: Check power use and mana before starting cast animation 2013-12-26 22:06:13 +01:00
scrawl
71d9755ef1 Bug #991: Don't autoequip items with harmful permanent enchantments 2013-12-26 21:26:59 +01:00
scrawl
5931fdcbde Implement NiBillboardNode. Flags not handled yet. 2013-12-26 20:53:52 +01:00
scrawl
fb845e81a4 Rename nosound to no-sound for consistency 2013-12-26 20:53:52 +01:00
scrawl
85ed21dbd2 Remove unused command line option 2013-12-26 20:53:51 +01:00
scrawl
33389b9b63 XDG compliant paths 2013-12-26 20:53:51 +01:00
scrawl
a9e1e89bbc Bug #1007: Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible 2013-12-26 20:53:51 +01:00
scrawl
31c1f484ed Slight performance improvement for WindowManager::updateVisible 2013-12-26 20:53:51 +01:00
scrawl
b6bad969a0 Fix an issue with items that have no UI icon 2013-12-26 20:53:51 +01:00
scrawl
81ec8c2f55 Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense 2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6 Integrate AddGlow with material controllers 2013-12-26 20:53:45 +01:00
Lukasz Gromanowski
900bc06d2c Fixes #845: NPCs hold torches during the day 
Moved 'equipping torches at night and unequipping at day' code from Character
to Actors class.

Removed unneeded showLights method (introduced in previous commits)
from animation/npcanimation classes.

Since this commit autoEquip() method doesn't automatically equip lights.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-20 22:38:23 +01:00
Lukasz Gromanowski
abc126e2af Fixes #845: NPCs hold torches during the day 
Added check for Player character so it won't be affected by showing,
or hidding torches.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-20 01:01:30 +01:00
Lukasz Gromanowski
6eb674e4e5 Fixes #845: NPCs hold torches during the day 
Added equipping/unequipping torches.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-20 00:18:34 +01:00
Lukasz Gromanowski
92072d968b Fixes #845: NPCs hold torches during the day 
Simplified a bit code which shows and hides light.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-19 21:11:07 +01:00
scrawl
9afdf71af3 Fix crash with player->position command 2013-12-19 00:37:57 +01:00
scrawl
a0d38dfb63 Fix highlighted topics being selectable when in a choice 2013-12-19 00:26:08 +01:00
scrawl
876fb9a899 Addition to bb4bd999ba : adjust position for objects placed from inventory 2013-12-19 00:11:14 +01:00
scrawl
eb5e4ecec2 Remove more unused code 2013-12-16 15:35:38 +01:00
scrawl
19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/main.cpp
 2013-12-16 13:35:31 +01:00
scrawl
56893a097d Don't stack used torches 2013-12-16 13:31:03 +01:00
scrawl
cd756a8a39 Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips. 2013-12-16 13:22:27 +01:00
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
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
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
scrawl
8391891a5b Ignore case for content file extensions 2013-11-30 14:25:29 +01:00
scrawl
4b4025ed0f Keep the player's CharacterController when changing cells. Fixes several glitches. 2013-11-30 11:01:45 +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
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
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