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

6561 commits

Author SHA1 Message Date
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
Marek Kochanowicz
be6e47bcb6 Corrections 2013-12-28 15:51:38 +01:00
Marek Kochanowicz
5406a70fdd still working on npc check 2013-12-28 11:34:51 +01:00
Marek Kochanowicz
da3dda896a Code compiles now 2013-12-27 22:57:36 +01:00
scrawl
596c9b80a9 Check if threads are joinable before joining (issue with boost 1.52) 2013-12-27 22:38:30 +01:00
Marek Kochanowicz
03235bf0a2 NPC. Still WIP. 2013-12-27 22:13:55 +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
a3ff9e5be8 Change destruction order - fixes a shutdown crash discovered with mesa 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
Marek Kochanowicz
f04a727af6 removed set sizes, consted sizes, added itemleveledlist check 2013-12-26 18:40:47 +01:00
Marek Kochanowicz
1da56e1790 checkin leveled items lists 2013-12-26 18:28:24 +01:00
Marek Kochanowicz
c2993909cf added creature leveled list check 2013-12-26 18:16:54 +01:00
Marek Kochanowicz
360a939aa0 Working on leveled lists now. 2013-12-26 15:35:58 +01:00
Marek Kochanowicz
6c95cea4c4 Added ingredient check 2013-12-26 15:24:52 +01:00
Marek Kochanowicz
c1715779fa Added door check with related methods. 2013-12-26 12:59:43 +01:00
Marek Kochanowicz
e4e7d50623 Added creatureCheck. I don't know meaning of all data fields here. 2013-12-23 12:32:35 +01:00
Marek Kochanowicz
94fcea4d4d added mCreaturesSize 2013-12-22 14:46:07 +01:00
Marek Kochanowicz
32046070d5 Added getCreatures 2013-12-22 14:44:22 +01:00
Marek Kochanowicz
16af9e6986 added container check 2013-12-22 14:42:17 +01:00
Marek Kochanowicz
1a7f023237 added mContainersSize. 2013-12-22 14:35:40 +01:00
Marek Kochanowicz
dc594da0de added getContainers 2013-12-22 14:34:29 +01:00
Marek Kochanowicz
bbcaef8e42 Added armor check and related stuff. 2013-12-22 14:32:42 +01:00
Marek Kochanowicz
97fc8acbdb Added armor check 2013-12-22 14:22:03 +01:00
Marek Kochanowicz
955fe3e8cf Added check for non-positive quality of alchemical apparatus 2013-12-22 10:00:04 +01:00
Marek Kochanowicz
1811f0a71b Works, but it seems that I miss something in referencables. I will write post on the forum. 2013-12-21 15:40:39 +01:00
Marek Kochanowicz
a27441720e Added enchantmnet check for books. 2013-12-21 12:07:40 +01:00
Marek Kochanowicz
ee5dfd1cc8 Adde potionCheck method 2013-12-21 11:15:46 +01:00
Marek Kochanowicz
21ee2a6d2e Getting size of potions. 2013-12-21 11:02:58 +01:00
Marek Kochanowicz
a6c36e2377 Small optimization. 2013-12-21 11:01:40 +01:00
Marek Kochanowicz
385824aee0 Renamed getActivator to getActivators. 2013-12-21 10:59:13 +01:00
Marek Kochanowicz
4842c56cb5 added getpotions 2013-12-21 10:58:05 +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
Marek Kochanowicz
f69465d7e0 Added aditional checks for books. Activator check. 2013-12-20 22:31:17 +01:00
Marek Kochanowicz
8085fcc792 Added Referencable checks class, added method to get refidcontainer, added method to get mBooks. 
Currently only books are checked, and only if name is present.
 2013-12-20 20:02:42 +01:00
Marc Zinnschlag
18e7e83585 Merge remote-tracking branch 'mrcheko/savedgame' into savedgame 2013-12-20 13:13:06 +01:00
mrcheko
8eb2696f6c using gmst string 2013-12-20 14:04:59 +02: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
mrcheko
3816a09c6f bug 428 ask to load recent saved game 2013-12-19 22:08:34 +02:00
Marc Zinnschlag
16b3927f17 Merge remote-tracking branch 'scrawl/master' 2013-12-19 14:26:41 +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
Marc Zinnschlag
c22e38f825 removing 255 content file limitation 2013-12-17 21:19:05 +01:00
Marc Zinnschlag
09fadd446b Merge remote-tracking branch 'mrcheko/savedgame' into savedgame 2013-12-17 19:33:32 +01:00
pvdk
da9b67b6d2 Fix for Bug #922: Launcher writing merged openmw.cfg files 2013-12-16 20:40:58 +01:00
mrcheko
a854eb73db StateRunning check returns 2013-12-16 21:02:21 +02:00
scrawl
eb5e4ecec2 Remove more unused code 2013-12-16 15:35:38 +01:00
mrcheko
f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 2013-12-16 15:40:47 +02: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
1cf1d49bc4 fix to content file reading error reporting in case of missing dependency 2013-12-16 11:39:24 +01:00
mrcheko
fd9f8c34f6 bug fix http://bugs.openmw.org/issues/428 2013-12-15 18:50:25 +02:00
Marc Zinnschlag
3590fa40bd store global script state in saved game files 2013-12-15 16:16:50 +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
Marc Zinnschlag
2a35c7d33a fixed running global scripts a second time after they have been stopped 2013-12-12 13:16:32 +01:00
Marc Zinnschlag
74793c1c2f globals script cleanup; fixed potential case folding bug 2013-12-12 13:15:38 +01:00
Marc Zinnschlag
fc37c77a91 store global variables in saved game files 2013-12-12 12:19:25 +01: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
Marc Zinnschlag
b38bfe1f21 removed a redundant function for listing global variables 2013-12-10 15:22:38 +01:00
Marc Zinnschlag
51bfa5cde3 rewrote global variable storage (using ESM variant type now) 2013-12-10 15:09:58 +01:00
Marc Zinnschlag
1fdd43bbb7 removed a redundant new 2013-12-10 12:31:18 +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
Marc Zinnschlag
1c13a9037a save and load dynamic records 2013-12-07 13:17:28 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +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
Marc Zinnschlag
14eff87339 removed some junk from ESM store 2013-12-06 11:34:24 +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
Marc Zinnschlag
ee6ddc3404 block saving while chargen is in progress 2013-12-05 14:56:30 +01:00
Marc Zinnschlag
8b7889f8e5 setup player after loading a saved game 2013-12-05 14:22:08 +01:00
Marc Zinnschlag
a7b42b867b more cleanup 2013-12-05 14:18:43 +01:00
Marc Zinnschlag
ce624e024b make sure player record stays in place across cleanups 2013-12-05 14:03:25 +01:00
Marc Zinnschlag
e818d43bc3 removed an outdated typedef and some dead code 2013-12-05 13:21:26 +01:00
Marc Zinnschlag
537b2efe8e first round of cleaning up world cleanup 2013-12-05 12:49:25 +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
63721682f6 GUI fix: previous character was selected when saving new character 2013-12-03 15:19:13 +01:00
Marc Zinnschlag
34cdd2bb1f deal with dialogue/info records that don't exist anymore 2013-12-03 14:39:54 +01:00
Marc Zinnschlag
2293b92efe storing and loading the journal 2013-12-03 14:28:46 +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
0f971163f7 use Entry instead of plain string for topic and quest entries 2013-12-01 14:50:25 +01:00
Marc Zinnschlag
b273f9e387 splitting JournalEntry into Entry and JournalEntry 2013-12-01 14:44:27 +01:00
Marc Zinnschlag
16e2d67b1f added overloaded start/endRecord functions to ESMWriter 2013-12-01 13:32:11 +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
Marc Zinnschlag
43f5f16731 removed a todo comment 2013-11-30 12:54:44 +01:00
Marc Zinnschlag
177aab536d storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1) 2013-11-30 12:41:18 +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
eed46960fe some spelling fixes 2013-11-30 12:02:56 +01:00
Marc Zinnschlag
9d64c92d33 store text in journal entries 2013-11-30 11:57:33 +01:00
Marc Zinnschlag
8b3e852ffc Merge remote-tracking branch 'scrawl/master' 2013-11-30 11:09:38 +01:00
Marc Zinnschlag
aebc2791a5 fixed selecting current character based on value stored in settings 2013-11-30 11:08:41 +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
Marc Zinnschlag
5aea6ef80f some clean up for the cleanup code 2013-11-28 11:22:34 +01:00
Marc Zinnschlag
35e8e23037 keep track of total play time per character 2013-11-28 09:33:50 +01:00
Marc Zinnschlag
7e2819c62e store year in saved game profile 2013-11-28 09:27:10 +01:00
Marc Zinnschlag
b0eb5938bf removed some redundant code 2013-11-28 09:13:54 +01:00
Marc Zinnschlag
71436b1160 changed interface for global variable access 2013-11-28 09:10:38 +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
Marc Zinnschlag
99ea63dc4a factored out code for generating month names 2013-11-26 12:47:30 +01:00
Marc Zinnschlag
e6dc927f11 removed duplicates of the cell name function 2013-11-26 11:49:07 +01:00
Marc Zinnschlag
bc6fe682c9 replaced getCurrentCellName function with a more general getCellName function 2013-11-26 11:39:58 +01:00
Marc Zinnschlag
eea433f141 restore last played character selection across sessions 2013-11-26 10:37:58 +01:00
scrawl
eba068149d Fix AIWander crash 2013-11-25 15:38:18 +01:00
Marc Zinnschlag
ad143e0524 case fix (content file names) 2013-11-25 14:56:05 +01:00
Marc Zinnschlag
616e3aa32f store content file list in saved games and reject saved games not matching the current game 2013-11-25 13:00:05 +01:00
Marc Zinnschlag
55544e931c reject newer formats when scanning saved games 2013-11-25 10:21:49 +01:00
Marc Zinnschlag
e3670cff8a improved character selection logic 2013-11-24 16:58:41 +01:00
Marc Zinnschlag
67cd0887e6 added description field to saved game record; make use of description in GUI 2013-11-24 15:19:56 +01:00
Marc Zinnschlag
7efac4c9a5 fixed handling of characters without a valid slot 2013-11-24 15:05:00 +01:00
Marc Zinnschlag
18a3b38fb4 when scanning saved game directory, reject characters without a valid saved game 2013-11-24 14:42:58 +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
2e87cbc231 Add basic functionality to SaveGameDialog 2013-11-21 20:34:34 +01:00
scrawl
cf79a83d4f Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate. 2013-11-21 19:07:54 +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
Marc Zinnschlag
2702d10911 more comments 2013-11-21 12:31:04 +01:00
Marc Zinnschlag
b5f99522c7 added a few comments 2013-11-21 12:29:24 +01:00
Marc Zinnschlag
c165894869 load saved game record 2013-11-21 12:24:24 +01:00
Marc Zinnschlag
5ba56a5ea5 character signatures 2013-11-21 11:18:56 +01:00
Marc Zinnschlag
cbbdf390ad added function for inspection of saved characters and character slots 2013-11-21 11:10:18 +01:00
Marc Zinnschlag
fc1501a510 store character profile information in saved game file 2013-11-21 10:53:42 +01:00
Marc Zinnschlag
e938c5a0ee changed character creation logic (create on save instead of on new game) 2013-11-21 10:20:50 +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
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
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
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
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
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
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
Nikolay Kasyanov
05e19b37e3 Removed obsolete comment 2013-11-10 22:25:29 +04:00
Nikolay Kasyanov
dafe80874a Added empty line 2013-11-10 22:24:31 +04:00
Nikolay Kasyanov
96714fc2c1 OpenCS: proper working dir & library path on OS X 2013-11-10 22:19:32 +04:00
Nikolay Kasyanov
fa13818360 OS X: OpenCS packaging 2013-11-10 22:04:13 +04:00
Nikolay Kasyanov
dfa900e4e3 OS X: Fixed “macro redefined” warning 2013-11-10 20:59:10 +04:00
Nikolay Kasyanov
0494fa543f OpenCS: set current directory to bundle location on OS X, like in OpenMW binary 2013-11-10 20:39:35 +04:00
Nikolay Kasyanov
df5b52b45b OpenCS.app icon & bundle properties 2013-11-10 20:11:53 +04:00
Nikolay Kasyanov
04edd25add OpenCS as a separate app bundle 2013-11-10 19:09:05 +04: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
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
Marc Zinnschlag
935d9241d8 first attempt at proper info record loading: partially incorrect and way too slow 2013-11-09 11:42:19 +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
Marc Zinnschlag
3d8da2b9e0 proper sorting for newly created records and some case smashing fixes 2013-11-08 12:16:41 +01:00
Marc Zinnschlag
a06aa881cb make sure case handling in info IDs is consistent 2013-11-08 12:03:03 +01:00
Marc Zinnschlag
982024a328 Topic range access in InfoCollection 2013-11-08 11:52:30 +01:00