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

7230 commits

Author SHA1 Message Date
cc9cii
56ae85df0c Fix 32bit Windows crash while taking the save screenshot. 2014-02-28 00:28:02 +11:00
cc9cii
8fa88f4480 sync with upstream 2014-02-28 00:13:57 +11:00
cc9cii
2421f23c2f cleanup the mess... 2014-02-27 23:59:23 +11:00
Marc Zinnschlag
8f73cc9268 added navigation mode selection 2014-02-25 14:59:46 +01:00
Marc Zinnschlag
526d75df51 inverted ctrl key 2014-02-25 14:30:38 +01:00
Marc Zinnschlag
644f5cb8de fixed mouse button release detection 2014-02-25 14:28:55 +01:00
Marc Zinnschlag
e33bd4d508 camera rotation via ctrl-left button drag 2014-02-25 14:24:35 +01:00
Marc Zinnschlag
e987199949 getting rid of some magic numbers 2014-02-25 14:14:53 +01:00
Marc Zinnschlag
07d20a2013 camera panning via left button drag 2014-02-25 14:09:07 +01:00
Marc Zinnschlag
b9107addc0 mouse wheel zooming 2014-02-25 13:39:49 +01:00
Marc Zinnschlag
b6ae521aa5 moving the camera with A and D keys 2014-02-25 13:31:15 +01:00
Marc Zinnschlag
af50575259 use shift key to speed up camera movement 2014-02-25 13:17:15 +01:00
Marc Zinnschlag
8081c067a6 moving the camera with W and S keys 2014-02-25 13:09:37 +01:00
Marc Zinnschlag
4ec4599be3 added navigation mode enum to SceneWidget 2014-02-25 12:30:45 +01:00
Marc Zinnschlag
6ec86564d1 re-enabled OGRE in OpenCS; cleaned up startup 2014-02-25 11:58:32 +01:00
cc9cii
5b48ca114f aicombat pathfinding fix - check the correct list 2014-02-25 08:31:14 +01:00
cc9cii
85c467f00f Minor cleanup for aicombat pathfinding workaround. 2014-02-25 08:30:52 +01:00
Nikolay Kasyanov
76c1d60d23 Fixed OpenCS build on OS X 2014-02-24 15:59:05 +01:00
Marc Zinnschlag
c62a352956 Merge branch 'cellstore' 2014-02-24 10:03:13 +01:00
Marc Zinnschlag
9b18e01507 keep track of which cells have state that needs to be saved 2014-02-24 10:03:04 +01:00
Marc Zinnschlag
bfcd768078 various bits of cleanup 2014-02-23 21:39:18 +01:00
Marc Zinnschlag
83ded18af0 encapsulated reference collections 2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
f220867144 make Ptr a bit more pointer-like 2014-02-23 18:17:41 +01:00
Marc Zinnschlag
b72c1c2c58 encapsulated water level 2014-02-23 17:34:18 +01:00
gus
95ff869163 Merge branch 'openmw-29' of https://github.com/zinnschlag/openmw.git into AIFix2 2014-02-23 17:07:49 +01:00
Marc Zinnschlag
79e723ad06 encapsulated mIds 2014-02-23 16:46:07 +01:00
Marc Zinnschlag
8ea686c6c8 encapsulated mState 2014-02-23 14:26:36 +01:00
cc9cii
1bd2664cb0 aicombat pathfinding workaround 2014-02-23 11:47:25 +01:00
cc9cii
1ab5948f19 merge upstream changes 2014-02-23 19:11:37 +11:00
Marc Zinnschlag
b0ae5b8ab7 Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29 2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb Revert "Allow MinGW64 compilation in Windows/msys" 
This reverts commit c3f350e3fb.

Conflicts:
	libs/platform/string.h
 2014-02-22 23:45:13 +11:00
cc9cii
ac606a865c Back out unnecessary change. 2014-02-22 23:22:23 +11:00
cc9cii
c241405d91 Fix Windows save & load. 2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb Allow MinGW64 compilation in Windows/msys 2014-02-22 12:06:50 +11:00
Nikolay Kasyanov
59508e914f Fixed OpenCS build on OS X 2014-02-22 01:17:58 +04:00
Marek Kochanowicz
e348c6baa9 accept drops from filters table. Cool. ☺ 2014-02-21 13:50:59 +01:00
Marek Kochanowicz
e2dce53543 additional check on droping to prevent exception 2014-02-21 12:55:01 +01:00
Marek Kochanowicz
fcf17805a0 Installing basic event filter 2014-02-21 12:48:39 +01:00
Marc Zinnschlag
7693f712bc started making CellStore into a proper class; encapsulated mCell member 2014-02-21 11:35:46 +01:00
Marek Kochanowicz
55e9083570 refactorisation 2014-02-21 10:27:23 +01:00
Marek Kochanowicz
1c35a85adf fixed bugs, added extra display_type 2014-02-20 19:27:51 +01:00
Marek Kochanowicz
7dff34ebf1 Features implemented. Time to debug. 2014-02-20 19:15:09 +01:00
Marek Kochanowicz
3ad6df1f92 try with the passing action 2014-02-20 17:54:18 +01:00
Marek Kochanowicz
38a86b5015 We can handle droping multiple records 2014-02-20 16:01:54 +01:00
Marek Kochanowicz
b788ab8b4c correcting 2014-02-20 14:10:03 +01:00
Marek Kochanowicz
4fe21dc38f Const correctness 2014-02-20 12:43:09 +01:00
Marc Zinnschlag
736644de05 Revert "#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()" 
This reverts commit 51fb9f65ea.
 2014-02-20 12:31:40 +01:00
Marek Kochanowicz
eb3cbaa4e1 Create filter on droping record. 2014-02-20 12:25:47 +01:00
Marek Kochanowicz
c7b3e139aa Propagate signal to the edit widget 2014-02-20 11:07:04 +01:00
Marek Kochanowicz
fca7701359 Column titles retrived and passed to the filterbox. 2014-02-19 16:15:51 +01:00
pvdk
b43325119a Some changes to the version retrieval: ignore shallow clones 2014-02-19 14:19:08 +01:00
Marek Kochanowicz
d7a1abb30b emit signal with types (will be connected to the tablesubview) 2014-02-19 12:55:39 +01:00
Marek Kochanowicz
dd95ed8e4c Accept drops on the filterbox 2014-02-19 12:32:48 +01:00
Marek Kochanowicz
569533eeae Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 2014-02-19 11:23:53 +01:00
scrawl
d25b3ad9cb Fix AiCombat for creatures with weapons 2014-02-19 11:23:03 +01:00
scrawl
ebc67a82cf Don't list unnamed quests in the quest book 2014-02-19 11:23:03 +01:00
scrawl
1fba5d1bb9 Terrain: change world bounds from AABB to 4 floats 2014-02-19 11:23:03 +01:00
scrawl
bc376e6649 Closes #888: Treat "Bip 01" as animation root if existing 2014-02-19 11:23:03 +01:00
scrawl
439018e706 Get rid of useless return values 2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc Moved includes to appropriate place 2014-02-19 11:23:03 +01:00
Marek Kochanowicz
e9664d80bd make convert enumns public static 2014-02-19 11:22:47 +01:00
Marc Zinnschlag
550e5eb686 Merge remote-tracking branch 'corristo/osx-music-fix' 2014-02-18 09:12:02 +01:00
gus
d8f24ac499 bug fix 2014-02-17 15:49:49 +01:00
Marc Zinnschlag
ea16f79d77 Merge remote-tracking branch 'gus/AIFix2' 2014-02-17 10:54:07 +01:00
gus
84959eea28 woops, thanks scrawl 2014-02-17 10:50:10 +01:00
gus
6e1425321b remove cout spam 2014-02-17 10:43:09 +01:00
gus
e5b19cf3c6 clean up 2014-02-17 10:37:11 +01:00
Marc Zinnschlag
02c6c65705 Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-17 09:55:50 +01:00
Marek Kochanowicz
2bb9e47507 Improvements. 2014-02-17 08:58:55 +01:00
Nikolay Kasyanov
51fb9f65ea #1041 in progress: decode first sample batch right in OpenAL_SoundStream::play() 2014-02-17 02:59:23 +04:00
Nikolay Kasyanov
5e8cb2e466 Another attempt to fix #1041. This time I'm sending real data from decoder 
once after playback started.
 2014-02-17 02:35:13 +04:00
Marek Kochanowicz
e1a0f60041 allow _foo ids without qoute 2014-02-16 20:26:22 +01:00
Marek Kochanowicz
b83817e05e May only include alphanumeric characters and underscores and may not start with a number. 2014-02-16 20:18:28 +01:00
Marek Kochanowicz
3cc23a9cb3 very basic, but safe putting down " " 2014-02-16 18:41:42 +01:00
Nikolay Kasyanov
4e28fd85a3 Fixed build on OS X 2014-02-16 20:22:46 +04:00
Marc Zinnschlag
c18c3e51ee handle IDs that don't exist anymore after loading 2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9 partially store creature state in saved game files (only attributes and dynamics for now) 2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85 store NPC state in saved game files 2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144 store list of known topics in saved game files 2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15 Merge branch 'script' 
Conflicts:
	readme.txt
 2014-02-16 12:12:56 +01:00
Marek Kochanowicz
17af865a9f checking for the source of the drop, reject those from other files for now 2014-02-16 09:51:33 +01:00
Marc Zinnschlag
9cdfca6c26 Merge remote-tracking branch 'potatoesmaster/disable-crash' 2014-02-15 22:55:00 +01:00
Marek Kochanowicz
cbe1fe2f95 removed misplaced bracket 2014-02-15 22:38:59 +01:00
Marek Kochanowicz
45d9364195 Put the id in the quote. 2014-02-15 22:14:27 +01:00
Marek Kochanowicz
ec8c8a9d88 -journalinfo +topic 2014-02-15 22:05:42 +01:00
Marek Kochanowicz
41606a67e4 implemented whitelist of allowed types in the scripts 2014-02-15 20:49:09 +01:00
Marek Kochanowicz
930b77e60a allow drag and drop into the script edit window. 2014-02-15 19:52:40 +01:00
Marc Zinnschlag
01a7918124 Merge remote-tracking branch 'potatoesmaster/selected-spell' 2014-02-15 18:38:10 +01:00
Marek Kochanowicz
97fe5465bf created new files 2014-02-15 17:55:18 +01:00
Emanuel Guevel
3d8ca02479 Fix breaking of enchanted items casting 2014-02-15 17:39:57 +01:00
Marc Zinnschlag
0afa61eed5 fixed referenceable-loading in case of more than one content file 2014-02-15 15:50:17 +01:00
Marc Zinnschlag
2007a3e902 improved script check error messages 2014-02-15 13:25:38 +01:00
Marek Kochanowicz
56be62b956 small reformatting 2014-02-15 13:23:51 +01:00
Marek Kochanowicz
4ee90c24e5 more readable code. 2014-02-15 13:22:14 +01:00
Marc Zinnschlag
4e04131957 fixing case broke sorting in script context 2014-02-15 13:09:43 +01:00
Marc Zinnschlag
2130ec39d6 disable warnings by default in script verifier 2014-02-15 12:58:34 +01:00
Marek Kochanowicz
b1f63947e8 Checking if the drop comes from same document. 2014-02-15 12:40:07 +01:00
Marek Kochanowicz
d6820b977e store const ref to the document in the table. 2014-02-15 12:22:32 +01:00
Marek Kochanowicz
f3dc45f1ec long line split. 2014-02-14 15:29:10 +01:00
Marek Kochanowicz
37d262b147 Splited very long line. 2014-02-14 15:12:34 +01:00
Marc Zinnschlag
7b8802588e Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-14 14:28:30 +01:00
Marek Kochanowicz
aafde926d3 Documentation, corrections. 2014-02-14 14:04:36 +01:00
Marc Zinnschlag
e17af4231a added script verifier 2014-02-14 13:38:30 +01:00
Marc Zinnschlag
0ff744c2ff fixed CSMWorld::ScriptContext::isJournalId 2014-02-14 12:56:05 +01:00
gus
a315d5cc2b aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp 2014-02-14 12:55:14 +01:00
Marek Kochanowicz
ae418f2538 nicer formatting 2014-02-14 12:51:50 +01:00
Marc Zinnschlag
0a8ffbfb1d added missing implementation for CSMWorld::ScriptContext::getMemberType 2014-02-14 12:46:54 +01:00
Marc Zinnschlag
910d62e4b8 added missing implementation for CSMWorld::ScriptContext::getGlobalType 2014-02-14 11:59:33 +01:00
Marc Zinnschlag
451e1f413b instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly 2014-02-14 11:15:16 +01:00
Emanuel Guevel
7c981587fc When searching object by id, search in active cells before searching in the player's inventory 2014-02-13 22:58:12 +01:00
Marc Zinnschlag
053b3dc371 Merge branch 'openmw-28' 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:57:28 +01:00
Emanuel Guevel
e597328b6b Make enable/disable a no-op for items in containers 2014-02-13 20:24:27 +01:00
Marek Kochanowicz
40cc108e54 drag and drop works. 2014-02-13 20:19:51 +01:00
Marek Kochanowicz
1bcc6d6918 using new icon. 2014-02-13 19:14:17 +01:00
Marek Kochanowicz
2afe3f3e57 Introduced multitype icon. 2014-02-13 19:00:35 +01:00
Marek Kochanowicz
6662560cbc new displays for referencable table columns 2014-02-13 15:43:19 +01:00
Marc Zinnschlag
d6e212a02b Merge branch 'master' into script 2014-02-13 15:02:02 +01:00
Marc Zinnschlag
e9238b456d use case-insensitive sorting in columns 2014-02-13 15:01:10 +01:00
Marek Kochanowicz
09d3c7a446 Attempt to match types. Does not work at the moment. 2014-02-13 13:54:09 +01:00
gus
7c6e27e4f9 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aitravel.cpp
 2014-02-13 12:59:04 +01:00
Marek Kochanowicz
71b2fc1c70 Introduced method to access display type. 2014-02-13 10:55:31 +01:00
Marc Zinnschlag
9c52820754 Merge remote-tracking branch 'scrawl/master' 2014-02-13 10:54:51 +01:00
Marek Kochanowicz
5f3f867a10 Implemented convertEnums function 2014-02-13 10:21:49 +01:00
scrawl
c6fb0f2d9b Removed terrain component's dependency on ESM 2014-02-13 10:13:53 +01:00
Marc Zinnschlag
dde4fbd818 allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away 2014-02-13 09:52:44 +01:00
Marc Zinnschlag
b3412b7eec another case fix (remote member access again) 2014-02-12 15:22:17 +01:00
Marc Zinnschlag
dc433a3c09 fixed case handling problem for local variable access 2014-02-12 13:38:16 +01:00
Marc Zinnschlag
388735046f fixed broken remote member variable access 2014-02-12 13:35:24 +01:00
Marek Kochanowicz
c142089bfe Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 2014-02-12 13:13:32 +01:00
Marek Kochanowicz
c00834a8de added some iostream garbage. 2014-02-12 13:12:58 +01:00
Marek Kochanowicz
8dfdd87a07 Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop 
Conflicts:
	apps/opencs/view/world/table.cpp
 2014-02-12 12:12:53 +01:00
Marek Kochanowicz
62c9c77ddf Compiles now. 2014-02-12 11:42:19 +01:00
gus
6cf561f713 get index to where we are dropping 2014-02-12 11:32:01 +01:00
gus
2e33ab3a13 droping somewhat works 2014-02-12 11:16:12 +01:00
Marek Kochanowicz
e1a39b8388 Replaced some display_string with specific type. Damn, i wish this is correct ;-) 2014-02-12 09:24:08 +01:00
Marek Kochanowicz
fc135fbfee Added new Display types 2014-02-12 09:04:52 +01:00
Emanuel Guevel
8824af30b4 Allow to display message box outside of dialogue window 2014-02-11 18:26:57 +01:00
Marc Zinnschlag
ffd1783690 Merge remote-tracking branch 'mrcheko/master' 2014-02-11 17:03:50 +01:00
Marc Zinnschlag
e44a7268fc Merge remote-tracking branch 'potatoesmaster/selected-spell' 2014-02-11 17:00:41 +01:00
Emanuel Guevel
a3eea4f6b6 Do not allow spellcasting stance without spell selected 2014-02-11 16:34:51 +01:00
Emanuel Guevel
70d35da116 Unset selected spell when removed 2014-02-11 16:34:23 +01:00
Emanuel Guevel
6a4820c0f7 Show a message when the player attempts to cast a disabled spell 2014-02-11 14:52:58 +01:00
Marc Zinnschlag
9de2922d22 fixed case problem in remote member variable access 2014-02-11 13:56:56 +01:00
Marek Kochanowicz
53e2e8415d replaced start with exec 2014-02-11 12:25:21 +01:00
gus
df46218acc try droping 2014-02-10 16:48:04 +01:00
Marc Zinnschlag
3b990795c4 added access to remote access of local variables of global scripts 2014-02-10 14:45:55 +01:00
gus
b5006c5dbd compile fix 2014-02-09 15:33:00 +01:00
mrcheko
a6be72673c improves animation-controlled velocity check 2014-02-08 16:59:15 +02:00
scrawl
8f949c6ae2 Fix lockpicks 2014-02-08 07:35:34 +01:00
scrawl
6ce499f0e6 Fixes #848: Use hardcoded animation velocity for first person movement 2014-02-06 04:05:22 +01:00
scrawl
ff11d85a62 Fix wrong assertion 2014-02-06 03:15:01 +01:00
gus
632834ce10 WIP 2014-02-05 16:12:50 +01:00
scrawl
4a26909172 Fixes #1159: Don't allow quick keys menu in chargen 2014-02-05 12:15:49 +01:00
Marek Kochanowicz
3b8f04c0f3 Allow multi-item drag. 2014-02-05 11:44:08 +01:00
Marek Kochanowicz
f01b02c42d Changed format. 2014-02-05 11:24:33 +01:00
Marek Kochanowicz
76b729ac9b Removed getUniversalid interface. 2014-02-05 11:19:55 +01:00
scrawl
677fc84223 Refactor actors update 2014-02-05 09:50:21 +01:00
scrawl
0cc1cd8f7e Fix message box formatting bug 2014-02-05 05:18:11 +01:00
scrawl
7907181c0c Fix uninitialized member 2014-02-05 05:18:11 +01:00
scrawl
ffe19e7a52 Feature #50: Handle attach & release of projectiles 2014-02-05 05:18:11 +01:00
scrawl
8b8fb931a0 Feature #50: Don't allow ranged weapon attack when ammunition is empty 2014-02-05 05:18:10 +01:00
scrawl
a07eaa0c0d Feature #50: Allow body pitch in third person for ranged weapon aiming 2014-02-05 05:18:10 +01:00
scrawl
5ee105c812 Fix typo 2014-02-05 05:18:10 +01:00
scrawl
7cf22391a5 Feature #50: Handle weapon controllers (i.e. bowstring animations, etc) 2014-02-05 05:18:10 +01:00
scrawl
e1e7a492e2 Fix movement speed formula for flying creatures 2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc Fixes #1158 (Armor rating label issues) 2014-02-05 05:18:10 +01:00
scrawl
8aed4fcfa4 Correction for marksman weapon inventory preview 2014-02-05 05:18:10 +01:00
scrawl
5b076aa570 Revert "Bug #1074: Inventory paperdoll obscures armour rating" 
This reverts commit b017a3be3e.
 2014-02-05 05:18:10 +01:00
scrawl
df78357e05 Handle knockout separately (Closes #1151) 2014-02-05 05:18:09 +01:00
Marek Kochanowicz
04287cb87a Provide method to return whole data vector from tablemimedata. 2014-02-04 19:42:52 +01:00
Marek Kochanowicz
8b799683c1 Display QPixMap with dragged object. 2014-02-04 18:48:18 +01:00
Marek Kochanowicz
3439940a8e Tablemimedata able to handle vector of objects and return icon. 2014-02-04 18:38:31 +01:00
Marek Kochanowicz
423b2906be Yes, you can drag. But not drop. 2014-02-04 11:40:48 +01:00
Marek Kochanowicz
dc80bfff55 Attempt to get basic tablemimedata subclass. 2014-02-04 09:13:40 +01:00
mrcheko
688f359a33 discard creatures speed and negative fatique changes 2014-02-03 23:09:26 +02:00
Marc Zinnschlag
c5b92ed6c8 Merge remote-tracking branch 'pvdk/versioninfo' 2014-02-03 11:21:11 +01:00
Marc Zinnschlag
21f502df34 compatibility fix 2014-02-03 11:20:55 +01:00
pvdk
f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson
e50a393de4 Fix linking issues on Windows using MSVC. 2014-02-02 23:59:57 +01:00
pvdk
4e03e9cf87 Changed development version info text and the tooltip now works on all platforms 2014-02-02 20:10:47 +01:00
Marc Zinnschlag
32860a05e3 added dummy implementations for getPcInJail and getPcTraveling 2014-02-02 15:35:18 +01:00
mrcheko
761f13d3ce activate whole-body attack animations 2014-02-02 16:29:51 +02:00
Marc Zinnschlag
914ab1b8ab allow 'x' instead of 'getjournalindex x' 2014-02-02 15:08:27 +01:00
Marc Zinnschlag
4ee43612f6 added new switch: --script-warn 2014-02-02 14:09:59 +01:00
mrcheko
b85a4dd35e pos accum without conformity with animation bug/creature speed 2014-02-02 15:01:49 +02:00
Alexander "Ace" Olofsson
e3d85af70a Fix an issue with int32_t being unknown on windows. 2014-02-02 13:57:19 +01:00
Marek Kochanowicz
a36cc26434 Created new files for TableMimeData class. 2014-02-01 19:06:41 +01:00
scrawl
1deb0a7cdf Savegame dialog: Set key focus to editbox 2014-02-01 18:42:01 +01:00
scrawl
ec46575671 Overwriting saves fixes - copy description of overwritten slot, ask for confirmation 2014-02-01 18:42:01 +01:00
scrawl
6d37cd7e86 Savegame dialog: Don't allow empty save names 2014-02-01 18:42:01 +01:00
scrawl
63284d21a0 Savegame dialog: 'Enter' while editing a name is equivalent to pressing the ok button 2014-02-01 18:42:01 +01:00
scrawl
dea9d21db6 Some additional safety checks for global map loading 2014-02-01 18:42:01 +01:00
scrawl
f89b3cac02 Feature #764: Store the actor that gave the dialog response 2014-02-01 18:42:01 +01:00
scrawl
a988a0d6dc Don't add duplicate topic responses to the journal 2014-02-01 18:42:00 +01:00
scrawl
37ef8ec908 Savegame dialog: support loading saves using Enter key or double-click 2014-02-01 18:42:00 +01:00
scrawl
49e26415be Don't call loadGame() from within the MWMechanics::Actors update sequence 2014-02-01 18:42:00 +01:00
Marc Zinnschlag
1b5301eec0 Merge branch 'savedgame' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
 2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d added creature/NPC state to saved games (only container/inventory for now) 2014-02-01 17:36:23 +01:00
Marc Zinnschlag
d2ec3ffdc8 handle equipped items when serialising inventory state 2014-02-01 17:31:05 +01:00
Marc Zinnschlag
bcc5894e2d changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later) 2014-02-01 15:24:01 +01:00
Marc Zinnschlag
dd674566a2 store content of containers in saved game files 2014-01-31 13:25:32 +01:00
scrawl
4ec86d1c68 Bug #1147: Fix the inventory preview pose used for ranged weapons 2014-01-31 05:06:35 +01:00
scrawl
60bbab52fe Support keyframe controllers for bones that aren't in the skeleton base 2014-01-31 05:06:34 +01:00
scrawl
da34f8bda1 Fix LastHitObject 2014-01-31 04:43:35 +01:00
scrawl
067c2bc2ec Disable combat movements for creatures without weapons 2014-01-31 04:43:35 +01:00
scrawl
7820ea5806 "Always best attack" should only affect the player 2014-01-31 04:43:35 +01:00
scrawl
d0c6ecd03a Bug #1148: Workaround for broken images in some MW versions 2014-01-31 04:43:35 +01:00
scrawl
52f89e9a17 Don't play "idle" voice entries for NPCs with Hello 0 
Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.
 2014-01-31 04:43:35 +01:00
scrawl
39d86a9468 Improvements to smooth NPC steering 2014-01-31 04:43:29 +01:00
mrcheko
80d8aa4030 bug with sequence of knockouts; giving sense to some hit state code 2014-01-30 23:54:26 +02:00
Marc Zinnschlag
900532a6ca store additional state of lights in saved game files 2014-01-30 12:37:33 +01:00
Marc Zinnschlag
ec7cb90ca4 added support for serialisation of CustomData state 2014-01-30 11:50:13 +01:00
scrawl
2b15b8b484 Fix gold bugs (Fixes #1145, Fixes #1146) 2014-01-29 15:37:27 +01:00
scrawl
305e78c981 Fix creature attack bug 2014-01-29 15:37:27 +01:00
scrawl
e717694b36 Reset Run stance in AiWander 2014-01-29 15:37:27 +01:00
scrawl
23ffb8a4dc Fixes #1143: Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame. 
This makes the Mehra Milo script work properly.
 2014-01-29 15:37:27 +01:00
scrawl
434fd21584 Don't set journal index if a higher index is currently set 
This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.
 2014-01-29 15:37:27 +01:00
scrawl
edff88542b Allow double click / Enter key for accepting race/class/birthsign 2014-01-29 15:37:27 +01:00
scrawl
a8a09762ce Don't crash when deleting or disabling a moving door 2014-01-29 15:37:26 +01:00
scrawl
190512156d Use some more GMSTs for enchanting 2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2 Move WhenStrikes skill success to a more appropriate place 2014-01-29 15:37:26 +01:00
scrawl
b8db151da7 Add missing skill increases for armor hits 2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d Use GMSTs for levelup 2014-01-29 15:37:26 +01:00
scrawl
cc40cec395 Move levelup to NpcStats 
The code came from back in the days where NpcStats did not derive from CreatureStats.
 2014-01-29 15:37:26 +01:00
scrawl
ba67bf45f8 Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail. 
This caused an exception when looting a creature that had moved cells.
 2014-01-29 15:37:26 +01:00
scrawl
365ae15532 Drag&Drop: auto-hide windows that can't be drop targets on mouseover 2014-01-29 15:37:26 +01:00
mrcheko
3a5da7e6e8 merged with master 2014-01-29 00:03:00 +02:00
mrcheko
5ee1dc6be8 attacktypes error fix 2014-01-28 21:07:26 +02:00
Marc Zinnschlag
1d34f5e096 Merge remote-tracking branch 'sirherrbatka/cloning' 
Conflicts:
	apps/opencs/model/world/refiddata.cpp
 2014-01-28 12:40:14 +01:00
Marc Zinnschlag
a473c3f619 some cleanup 2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a Merge remote-tracking branch 'gus/AIFix2' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/actors.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2014-01-28 12:33:31 +01:00
Marek Kochanowicz
2bd98a69ab Corrections, according to the comments. Thanks for the review. :-) 2014-01-28 11:16:48 +01:00
mrcheko
e50e94af0b remove CreatureStats::mAttackType, set/getAttackType() 2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d merge with master 2014-01-27 22:38:01 +02:00
Marek Kochanowicz
d3000ce099 whitespaces removed again. 2014-01-27 19:47:54 +01:00
Marek Kochanowicz
62ea0bb066 Cleared whitespaces. 2014-01-27 19:40:05 +01:00
Marek Kochanowicz
c82db915f1 Removed needless includes 2014-01-27 19:32:51 +01:00
Marek Kochanowicz
d0b07de7ef Corrected bug mentioned by zini. 2014-01-27 16:59:18 +01:00
gus
846276f747 clean up 2014-01-27 15:14:24 +01:00
Marek Kochanowicz
ed0ba906cf removed needless include 2014-01-27 15:05:29 +01:00
Marek Kochanowicz
9c579dbd6c ok, that should be enough 2014-01-27 15:03:29 +01:00
Marek Kochanowicz
84e07c95b1 formatting 2014-01-27 15:02:29 +01:00
Marek Kochanowicz
51115fa5be spaces around operators 2014-01-27 14:56:57 +01:00
Marek Kochanowicz
c91ae86084 is there something that can generate diff from two git branches? Using github for this is kinda annoying. 2014-01-27 14:53:39 +01:00
Marek Kochanowicz
52176d6435 reforfucking 2014-01-27 14:51:57 +01:00
Marek Kochanowicz
2b71568bb6 still reformating 2014-01-27 14:50:36 +01:00
Marek Kochanowicz
316debb827 reformating 2014-01-27 14:46:58 +01:00
Marek Kochanowicz
4d6fb31610 reformating 2014-01-27 14:45:07 +01:00
Marek Kochanowicz
2899f04a3f reformatting 2014-01-27 14:43:12 +01:00
Marek Kochanowicz
6a0b5defd7 removed needless member value. 2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8 Removed pointless includes. 2014-01-27 13:36:01 +01:00
Marc Zinnschlag
29c3a288e3 load and save of reference in cells (without CustomData state) 2014-01-27 13:27:42 +01:00
Marek Kochanowicz
71d6364754 Chaninging variables name to follow our policy. 2014-01-27 13:13:39 +01:00
Marek Kochanowicz
aa6d1ff4c3 removed needless argument for cloning 2014-01-27 13:08:14 +01:00
Marek Kochanowicz
be8b978a89 corrected mistake in data 2014-01-27 12:23:03 +01:00
Marek Kochanowicz
62c2259c87 removing coordinates handling 2014-01-27 10:10:23 +01:00
mrcheko
45b3aa3d93 corrected things connected to determining attack type 2014-01-26 23:32:57 +02:00
gus
f5d589388c bug fix 2014-01-26 22:06:54 +01:00
gus
764011dd1b clean up 2014-01-26 21:53:55 +01:00
gus
7cb47aa635 new implementation of pathfinding. Works, but need clean up 2014-01-26 21:26:19 +01:00
scrawl
eba6c9a8fd Fix massive console spam regarding the scrib's idle3 animation 2014-01-26 02:49:32 +01:00
scrawl
b1066de81d Revert "Merge remote-tracking branch 'mrcheko/master'" 
This reverts commit 4e360136b1, reversing
changes made to 047bbe43b2.

Conflicts:

	apps/openmw/mwmechanics/aicombat.cpp
 2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8 Revert "Merge remote-tracking branch 'mrcheko/master'" 
This reverts commit df7c139e2f, reversing
changes made to fec26342cd.
 2014-01-26 00:14:49 +01:00
scrawl
e0de76a6f7 Save/load global map 2014-01-25 19:06:14 +01:00
scrawl
e62bf8fca9 Remove some garbage 2014-01-25 16:41:26 +01:00
scrawl
79a9c4e048 Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame. 2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2 Fix crash when loading another game after dying 2014-01-25 16:13:45 +01:00
scrawl
28185e2017 Death/godmode fixes: Revive player *after* character update, since there might be fall damage. 2014-01-25 15:54:24 +01:00
scrawl
f09328ca84 Clear global map overlay when starting/loading a game 2014-01-25 13:34:56 +01:00
Marek Kochanowicz
032c542396 improving the cell cloning. 2014-01-24 20:34:33 +01:00
gus
707e579dfe Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
 2014-01-24 19:16:50 +01:00
gus
5ca5946760 WIP 2014-01-24 19:13:23 +01:00
scrawl
03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-24 18:28:35 +01:00
scrawl
295aed3533 Implement savegame screenshots 2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b Include some required Ogre headers explicitely 2014-01-24 15:02:34 +01:00
scrawl
ac1859fb77 Merge branch 'savedgame' of https://github.com/zinnschlag/openmw into savedgame 2014-01-24 15:02:13 +01:00
scrawl
9b9c39af7a Fix being able to activate magic bolts mid-flight 2014-01-24 13:22:39 +01:00
scrawl
ac4c904e62 Fix projectile bug 2014-01-24 13:22:30 +01:00
Marek Kochanowicz
01be9386d6 Id to the coordinates with the boost and explicit specialisations of template member functions. 2014-01-24 11:22:20 +01:00
mrcheko
87e83a92f8 refactoring of setting an attack type 2014-01-23 23:14:20 +02:00
Marek Kochanowicz
f390c7f4b0 Disable widgets in the cell creator. 2014-01-23 16:24:03 +01:00
Marek Kochanowicz
c87d9ff38d Disable reference creator widget when in the clone mode. 2014-01-23 16:17:04 +01:00
Marek Kochanowicz
dda7ddb6f8 Disable not needed referencable creator widget when in cloning mode. 2014-01-23 16:00:44 +01:00
Marek Kochanowicz
1b1ecafdd8 introduced missing columns to data 2014-01-23 15:13:37 +01:00
pvdk
19bef4fce8 Distinguish between release and development builds 2014-01-23 13:18:05 +01:00
scrawl
70264eae3b Feature #764: Quest completetion status in quest book 2014-01-23 13:08:56 +01:00
scrawl
849ee54399 Feature #764: Show quest names in quest book if present 2014-01-23 12:54:37 +01:00
Marc Zinnschlag
460089c0aa ignore deleted references that did not came from a content file 2014-01-23 12:53:55 +01:00
Marc Zinnschlag
419e3a7d30 write references in cells to saved game file 2014-01-23 12:51:42 +01:00
scrawl
358cc3c62f Closes #1060: Fix incorrect message box size 2014-01-23 12:24:06 +01:00
Marc Zinnschlag
22cb4784b5 store cell state in saved game files (no references yet) 2014-01-23 11:29:40 +01:00
Marek Kochanowicz
4d9d31b25e refrences cloning does not work 2014-01-23 09:41:09 +01:00
pvdk
c354cd52be Added compile date and time to the version info in the launcher 2014-01-22 18:37:49 +01:00
pvdk
fa186f5ec1 Added version information to the launcher 2014-01-22 17:51:10 +01:00
pvdk
c95b8bcb39 Moved the generated version header stuff into components 2014-01-22 17:33:55 +01:00
scrawl
cf378ec31e Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors 2014-01-22 15:25:03 +01:00
scrawl
2e6e0fd0a0 Fix GetPcCell bug 2014-01-22 14:45:36 +01:00
scrawl
ea21d8fec3 Fix CreatureTargetted function 2014-01-22 13:30:45 +01:00
scrawl
4c94289b1f Fix PC Health Percent function 2014-01-22 13:30:07 +01:00
scrawl
f27701cbe8 Detect selling stolen items or enchanting with stolen items 2014-01-22 13:04:55 +01:00
scrawl
264226dfe3 Handle iWereWolfBounty 2014-01-22 12:33:47 +01:00
scrawl
194413c955 Feature #1119: Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult. 2014-01-22 12:26:53 +01:00
scrawl
f89c400305 Don't complain about greetings with no sound 2014-01-22 00:02:43 +01:00
scrawl
16f5f5862d Feature #956: Implement blocking melee attacks 2014-01-21 23:25:24 +01:00
Marek Kochanowicz
b3b51992ef copying references. 2014-01-21 21:37:21 +01:00
Marc Zinnschlag
9ebe66e693 improved cleanup; failed loads will now drop back into the main menu instead of crashing 2014-01-21 14:50:58 +01:00
Marc Zinnschlag
0f60898517 adding missing cleanup for SoundManager 2014-01-21 14:13:13 +01:00
scrawl
82a07af72c Fix typo (should be Strength, not Luck). Use GMSTs for strength damage. 2014-01-21 12:30:23 +01:00
scrawl
1617a4f7d9 Use fCombatDistance 2014-01-21 12:30:23 +01:00
scrawl
a4404054bb Feature #1130: Add race power spells for NPCs as well, not just the player 2014-01-21 12:30:23 +01:00
scrawl
5de8c7fe29 Feature #1130: Add auto-calculated NPC spells 2014-01-21 12:30:23 +01:00
scrawl
851a7d5014 Feature #957: Handle area effects for "on touch" range 2014-01-21 12:30:15 +01:00
Marek Kochanowicz
bc0130f8d8 do not double check if record is deleted 2014-01-21 10:35:08 +01:00
Marek Kochanowicz
9b56b6585b Cloning works for referencables as well. 2014-01-21 09:43:02 +01:00
Marek Kochanowicz
7594bcf97a Small refactoring. 2014-01-21 08:27:29 +01:00
Marek Kochanowicz
d0a52b7b24 mostly refreshing view. 2014-01-20 18:28:06 +01:00
Marek Kochanowicz
92ee252eef Small correction. 2014-01-20 16:39:42 +01:00
Marek Kochanowicz
d82f272e05 Properly check if clone is deleted. 2014-01-20 16:17:49 +01:00
Marek Kochanowicz
5a52715701 implemented check for deletion. But it seems flawed. 2014-01-20 15:58:19 +01:00
Marek Kochanowicz
38636fab9a added setId to adapter 2014-01-20 14:38:20 +01:00
Marek Kochanowicz
a45339bbe6 lower case in command, not in the collection 2014-01-20 14:14:59 +01:00
Marek Kochanowicz
33620a001b Cloning works for single record type tables. Well, kinda. 2014-01-20 13:59:00 +01:00
scrawl
c8a9e9f7fa Stop AiCombat when the target is dead 2014-01-20 13:54:10 +01:00
scrawl
42284603f7 Properly handle on target effects with mArea=0 2014-01-20 13:44:38 +01:00
scrawl
9cedd3bb2e Fix spell area not displaying in tooltip 2014-01-20 13:11:34 +01:00
scrawl
205e8aa4e9 Feature #957: Implement area magic 2014-01-20 13:11:29 +01:00
scrawl
ba5300b071 Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted. 2014-01-20 12:05:13 +01:00
scrawl
5dd3cfa09a Loop projectile sounds 2014-01-20 11:50:52 +01:00
scrawl
df7c139e2f Merge remote-tracking branch 'mrcheko/master' 2014-01-19 21:23:04 +01:00
scrawl
fec26342cd Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..) 2014-01-19 21:11:48 +01:00
mrcheko
339399f8b1 bug fix/logic fix/future suggestion 2014-01-19 22:09:51 +02:00
scrawl
05e75e1214 Closes #1127: Fix for subtitles for idle dialogue appearing outside of hearing range 2014-01-19 20:54:05 +01:00
scrawl
bea161331c Play 'hello' voiced dialogue entries in AIWander 2014-01-19 20:53:58 +01:00
Marek Kochanowicz
0ea2bb7c4c Working on commands 2014-01-19 16:49:39 +01:00
scrawl
0adc0f56ed Issue #777: Consider weapons in Creature::hit 2014-01-19 16:13:16 +01:00
scrawl
9723263730 Bug #1126: Tweak creature attack distance a bit (still no idea where this should come from) 2014-01-19 14:47:58 +01:00
scrawl
1a00f26390 Bug #1126: Golden saints and many other creatures only have "Bip01 Head" 2014-01-19 14:33:41 +01:00
scrawl
4e360136b1 Merge remote-tracking branch 'mrcheko/master' 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/character.cpp
	apps/openmw/mwmechanics/character.hpp
 2014-01-19 14:01:39 +01:00
scrawl
047bbe43b2 Don't complain about missing jump animations 2014-01-19 13:46:40 +01:00
scrawl
13646a651b Issue #777: Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats. 2014-01-19 13:32:58 +01:00
scrawl
198bb0de60 Issue #777: Add CreatureAnimation variant for creatures with weapons/shields 2014-01-19 13:05:26 +01:00
Marek Kochanowicz
b3e45c55bc progressing with the cloning 2014-01-19 11:44:47 +01:00
scrawl
589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 2014-01-19 11:43:23 +01:00
scrawl
69ca03c308 Issue #777: Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons. 2014-01-19 09:43:41 +01:00
scrawl
947b6c9645 kOgrePi unused 2014-01-18 22:16:31 +01:00
scrawl
4c0045b418 Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time) 2014-01-18 21:11:12 +01:00
Marc Zinnschlag
14e64c180f on load check player record for dangling ID references 2014-01-18 15:06:58 +01:00
Marc Zinnschlag
6584a01d01 reset reference to player NPC record during cleanup 2014-01-18 14:53:25 +01:00
mrcheko
969340d61b fixed StartCombat script 2014-01-18 12:55:17 +02:00