mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 12:45:31 +00:00
Code Issues Releases Wiki Activity
14022 commits 38 branches 54 tags 122 MiB
Commit graph

7728 commits

Author SHA1 Message Date
Stanislav Bas
377d606fc3 Load/read methods in MWWorld::Store return a pair (record ID, deleted flag) 
(cherry picked from commit c266315a35)

Conflicts:
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/store.hpp
 2015-12-05 07:17:56 +11:00
Stanislav Bas
25a8cda9ac Some fixes for ESM Dialogues and Infos 
(cherry picked from commit e0983c815c)
 2015-12-05 07:09:05 +11:00
Stanislav Bas
19acd1fada Letter case fix for MWWorld::Globals 
(cherry picked from commit 20723581a1)
 2015-12-05 07:08:30 +11:00
Stanislav Bas
a46ea70d65 Convert IDs of loaded records to lower case in MWWorld::Store 
(cherry picked from commit 00bf87b561)
 2015-12-05 07:08:17 +11:00
Stanislav Bas
f8b0cfc637 Remove NAME handling from MWWorld::Globals 
(cherry picked from commit 897a52cdda)
 2015-12-05 07:08:00 +11:00
Stanislav Bas
2564eb9841 Remove NAME handling from MWWorld::ESMStore 
(cherry picked from commit 9301bc148e)
 2015-12-05 07:07:43 +11:00
Stanislav Bas
e0d5208d26 Remove explicit record ID in load/read methods of MWWorld::Store 
(cherry picked from commit 89e44c8f1f)
 2015-12-05 07:07:14 +11:00
scrawl
fcb9068c19 Fix tab indentations in apps/ and components/ 
(cherry picked from commit a47617c21f)

Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwphysics/physicssystem.cpp
 2015-11-01 21:34:23 +11:00
Marc Zinnschlag
c4b34a077e refactored loading of land data 
(cherry picked from commit 69b9eadb52)

Conflicts:
	apps/openmw/mwworld/scene.cpp
	components/esmterrain/storage.cpp
 2015-11-01 18:54:15 +11:00
cc9cii
4f24c6a7c8 more const-ness fixes 2015-11-01 17:07:40 +11:00
Marc Zinnschlag
44020df65f made return type of ESMTerrain::Storage::getLand const 
(cherry picked from commit febf611c82)
 2015-11-01 13:40:56 +11:00
scrawl
65bd5d8492 Refuse loading save games of unknown format 
(cherry picked from commit 20d03c7e39)
 2015-10-25 11:35:53 +11:00
scrawl
05fd4e123e Use the format field instead of version field 
(cherry picked from commit a081d402c5)
 2015-10-25 11:35:32 +11:00
scrawl
b9ba1067bf Savegame loading optimization 
(cherry picked from commit 4637750601)
 2015-10-25 11:35:15 +11:00
scrawl
843afc5e24 Increment save file version and mark it as used, will be used in next commit 
(cherry picked from commit 4eaaa5e855)
 2015-10-25 11:34:50 +11:00
scrawl
f8f66bffb0 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-09-08 06:40:06 +10:00
cc9cii
b920e1bde7 Support MSVC 2015. Tested(*) with updated dependencies: 
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763

(*) only tested compilation and startup of the each app
 2015-08-12 06:50:22 +10:00
cc9cii
273ff1cccb Address review comments. 2015-06-26 07:48:48 +10:00
cc9cii
58923591cb Remove extra qualification. 2015-06-25 19:25:47 +10:00
cc9cii
b1f07ba4fb Resolve merge issues and change the getSpells() interface. 2015-06-25 18:57:32 +10:00
cc9cii
7af43a1155 Address review feedback. 2015-06-25 13:32:22 +10:00
cc9cii
0cf9832017 Add missing files for autocalc. Remove c++11 dependency. 2015-06-24 21:58:28 +10:00
cc9cii
8af12788a4 Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/util.cpp
 2015-06-24 21:16:48 +10:00
cc9cii
6b00d4ad91 Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS. 
- Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes
 2015-06-24 21:05:59 +10:00
scrawl
6f34a0501a Attempting to make a potion with no effects removes the ingredients (Fixes #2722) 2015-06-24 05:17:45 +02:00
scrawl
33a3dabc31 An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722) 2015-06-24 05:17:45 +02:00
Marc Zinnschlag
83961e9109 Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-22 15:20:58 +02:00
scrawl
2ce269c0fc Werewolf stats compatibility with old save files 2015-06-21 18:45:49 +02:00
scrawl
d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves 
Still need to deal with save files.
 2015-06-21 17:28:18 +02:00
dteviot
c65e7a31e7 Aquatic creatures no longer try to get onto land. 
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
 2015-06-21 16:23:40 +12:00
Marc Zinnschlag
5a5c2bb5bc Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-17 15:56:01 +02:00
scrawl
5347d407d8 Disallow AiWander fast-forward for water creatures 
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
 2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3 Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell 2015-06-15 20:04:36 +02:00
Marc Zinnschlag
0994893bc5 Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-14 12:05:53 +02:00
dteviot
520fbd63c4 simplified pathfinding code. 
remove mIsPathConstructed.  Instead call !mPath.empty().
 2015-06-14 15:14:02 +12:00
scrawl
28caeadef4 Improve error message for not found records 2015-06-14 02:31:00 +02:00
dteviot
bfff84ba8f replaced #include with forward class declaration, as suggested by slaugherfish. 2015-06-14 10:30:55 +12:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
dteviot
cb8ca2f03a Moved logic for building a Sync'ed path from AiCombat to PathFinding. 
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
 2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c AiTravel logic merged into AiPackage. 2015-06-11 18:28:31 +12:00
Stanislav Bas
49512a2b57 Correct the explanation for the Console::acceptCommand() 2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba Add the explanation to Console::acceptCommand() 2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f Reset Console editbox before command execution 2015-06-05 22:00:02 +03:00
Stanislav Bas
c40987338d Scrollbars don't save their positions between openings 2015-06-04 23:09:40 +03:00
Stanislav Bas
959fe3eb87 Reset the scrollbar position in the topic list when DialogueWindow is closed 2015-06-01 23:49:40 +03:00
Stanislav Bas
5dc6cdeb99 Scroll to the top of the topic list when dialog is started 2015-06-01 01:14:11 +03:00
Marc Zinnschlag
9f0ccdc37a Merge remote-tracking branch 'scrawl/master' 2015-05-31 11:05:43 +02:00
scrawl
7f2dd21c66 Fix for StartScript regression (Fixes #2590) 2015-05-30 17:20:49 +02:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00