mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:59:54 +00:00
Code Issues Releases Wiki Activity
34971 commits 107 branches 66 tags 133 MiB
Commit graph

215 commits

Author SHA1 Message Date
Bret Curtis
c781d1f8ed purge unnecessary imports 
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
 2017-06-09 19:08:53 +02:00
Bret Curtis
d799954ca0 replace and purge boost::math::gcd and other non-used headers 2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c purge the rest of boost::shared and any other boost related things that no longer are required 
put boost system back in, clean others up

revert Qt

add back boost fstream
 2017-06-09 19:08:53 +02:00
scrawl
29556a1802 More consistent wording of errors/warnings 
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
 2017-03-04 21:48:31 +01:00
MAtahualpa
347fb1ff4b Update converter.hpp 
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
 2017-02-12 13:51:36 +01:00
MiroslavR
c64351b3e8 ESS-import: player is no longer disabled (Bug #3246) 2017-01-21 03:39:51 +01:00
MiroslavR
c2b491cd70 ESSImporter: Convert last known exterior cell (Fixes #3693) 
+ some research
 2016-12-24 18:30:39 +01:00
MiroslavR
cd13570230 ESSImporter: Import mark location 2016-12-18 04:37:59 +01:00
Leon Krieg
c7b4b2cdd7 Fixed multiple spelling mistakes 2016-12-14 16:39:33 +01:00
Phillip Andrews
c18fc113e5 Changed missing library dependencies to simple fix 2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a Moved install commands to target-specific cmakelists so that all configurations work. 2016-11-13 22:49:01 -06:00
Phillip Andrews
59eba1dede Changed tabs to spaces, oops 2016-11-13 16:59:36 -06:00
Phillip Andrews
1861302dbd Include various libraries for Visual Studio environment 2016-11-13 14:27:59 -06:00
Allofich
c7313606f5 Fix dereference of null pointer warning 2016-11-07 22:39:20 +09:00
MiroslavR
cd9de94c0c Import teleporting and levitation disabled state from vanilla savegames (Fixes #3420) 2016-10-20 14:38:18 +02:00
MiroslavR
f3ce0840be Import controls state from vanilla savegames 2016-10-20 02:14:36 +02:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
MiroslavR
54f52f7bae Implement effect removal for abilities (Fixes #3455) 2016-07-01 18:50:28 +02:00
MiroslavR
0db3af1b89 ESSImporter: load specialization increases 2016-06-26 03:28:13 +02:00
scrawl
2ce1da688f ESS-Import: fix handling of first person camera state (Bug #3416) 2016-06-02 16:26:17 +02:00
Roman Proskuryakov
d5dfa89060 Rewrite NAME_T into FIXED_STRING. 2016-05-07 23:27:33 +03:00
scrawl
8cf91e32fa ESSImport: Correctly handle item stacks (XIDX tag). (Fixes #3340) 2016-04-12 21:39:05 +02:00
Bret Curtis
2c90b0b78d fix a few spelling mistakes 2016-04-07 11:55:49 +02:00
Tobias Kortkamp
0659687bfb Some fixes for building on FreeBSD 2016-01-25 14:13:16 +01:00
scrawl
daa94cc50e Fix cppcheck warnings 2016-01-03 20:19:38 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
scrawl
e3d3380c8c Remove return value for in-place toLowerStr 2015-12-07 22:43:08 +01:00
scrawl
b8e11cf197 Merge commit 'pull/upstream/678' into HEAD 
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
 2015-11-13 01:34:36 +01:00
scrawl
b98a076055 Add documentation for ACTN ess-record (activation flags) 2015-09-07 23:27:14 +02:00
slothlife
54fa5273dc Refactor weather transitions to act more like MW 
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
 2015-08-26 22:59:21 -05:00
scrawl
af3b0cd883 Improve some error messages 2015-08-21 00:31:43 +02:00
Stanislav Bas
0c6ab6cc94 Load methods (for ESM records) accept a deleted flag in ESSImporter 2015-07-22 22:18:08 +03:00
Stanislav Bas
6b21da7f8e Rework ESS importer code. Remove explicit NAME handling for ESM records 2015-07-19 16:07:56 +03:00
scrawl
0ed3e3e489 Fix cout/cerr mixup 2015-07-11 04:27:41 +02:00
scrawl
24ae1d5ace Fix some issues found by coverity 2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson
3655ef16af Explicitly instantiate ESM::StatState 2015-07-07 19:19:37 +02:00
scrawl
2065e0fa2d Use the correct format specifier for ess-imported savegames 2015-06-30 17:43:22 +02:00
scrawl
a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
 2015-06-22 20:09:02 +02:00
scrawl
3f54f77647 essimporter build fix 2015-06-21 22:17:06 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
364b785e8f ESSImporter image conversions port to osg::Image 2015-06-03 21:36:46 +02:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
scrawl
0e88fb3dca ESSImport: read AiPackages 2015-02-14 12:25:52 +01:00
scrawl
a1ee26922e ESSImport: note location of corpse clear countdown 2015-02-14 12:00:16 +01:00
scrawl
55cd9b526c Skill progress bar changed to match MW 2015-02-06 01:27:17 +01:00
scrawl
f0b1d889c0 ESSImport: import player skill progress 2015-02-06 01:27:17 +01:00
scrawl
356d1c7657 ESSImport: convert stolen item tracker 2015-02-06 01:27:16 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +01:00
scrawl
51c05264b0 ESSImport: note where skill progress is stored (not converted yet) 2015-01-31 22:40:39 +01:00
scrawl
c4038f7021 ESSImport: convert camera first/third person state 2015-01-31 22:40:39 +01:00
scrawl
f3c79c0aa0 ESSImport: convert player DrawState, cleanup 2015-01-31 22:40:39 +01:00
scrawl
2e4b5858e7 ESSImport: add ANSI color code highlighting for --compare switch 2015-01-31 22:40:39 +01:00
scrawl
ef3ba12cb6 Add silent mode to ConfigurationManager, used by essimporter 2015-01-31 22:40:39 +01:00
scrawl
e7056b4e27 ESSImport: convert Dead flag 2015-01-31 22:40:39 +01:00
scrawl
7e3843de42 ESSImport: convert Attacked flag 2015-01-31 22:40:38 +01:00
scrawl
081c8c8615 ESSImport: convert to utf8, based on encoding setting in openmw.cfg 2015-01-31 22:40:38 +01:00
scrawl
201674cd70 ESSImport: convert world map overlay (Fixes #2313) 2015-01-29 03:39:01 +01:00
scrawl
6c08e05fc3 ESSImport: fix for GMDT being only 92 bytes in a certain save file 2015-01-27 23:12:21 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
875df46ae9 ESSImport: convert journal indices 2015-01-27 23:12:21 +01:00
scrawl
f35c9b7a69 Clang warning fixes (thanks hemite) 2015-01-27 23:12:20 +01:00
scrawl
76820e700c ESSImport: reading used powers fix (not used, see comment) 2015-01-27 23:12:20 +01:00
scrawl
315f9a98ad ESSImport: document targeted scripts (not implemented yet) 2015-01-27 23:12:19 +01:00
scrawl
d34086ac8f ESSImport: convert running global scripts 2015-01-27 23:05:20 +01:00
scrawl
9b3728d878 ESSImport: convert weather state 2015-01-27 23:05:19 +01:00
dteviot
70e4f821ba Fix Windows warning 
warning C4244: 'initializing' : conversion from 'float' to 'int', possible loss of data
 2015-01-26 13:58:13 +13:00
dteviot
946dd16696 Fixed Windows warning. 
warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
 2015-01-26 13:57:22 +13:00
dteviot
e02bab67ba Fixed MSVC warnings. 
warning C4099: 'ESM::ESMReader' : type name first seen using 'class' now seen using 'struct'
warning C4099: 'ESM::CellId' : type name first seen using 'struct' now seen using 'class'
 2015-01-26 13:17:16 +13:00
dteviot
b0b275a936 Fix for MSVC 2013 compiler issues. 
Fixes: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\utility(199): error C2079: 'std::pair<const _Kty,_Ty>::second' uses undefined class 'boost::shared_ptr<ESSImport::Converter>'
Which cascades to 36 more errors.
 2015-01-26 12:53:01 +13:00
scrawl
b1bd236345 ESSImport: convert script local variables 
Had to add special reading code to openmw, because the variable names are not stored.
 2015-01-24 16:45:36 +01:00
scrawl
09f11fbff2 ESSImport: convert selected spell / selected enchant item 2015-01-24 00:18:17 +01:00
scrawl
bf90b86f73 ESSImport: add some missing subrecords 2015-01-23 20:09:30 +01:00
scrawl
79d2eebe54 Store selected enchant item in savegame (Fixes #1702) 2015-01-23 16:45:47 +01:00
scrawl
e484a91708 ESSImport: convert global map markers 2015-01-23 15:34:48 +01:00
scrawl
c354f48a07 ESSImport: some fixes 2015-01-23 15:34:48 +01:00
scrawl
1d29180e00 ESSImport: handle deleted cell references 2015-01-23 15:34:48 +01:00
scrawl
ba7cd04ff7 ESSImport: prevent accidental overwriting of file 2015-01-23 15:34:48 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
scrawl
af0e91c2d3 ESSImport: stolen items reading fix 2015-01-23 15:34:47 +01:00
scrawl
378e91545d Fix Tribunal/BM summon effects not working 2015-01-23 15:34:47 +01:00
scrawl
e203127952 ESSImport: read script variables (not converted yet) 2015-01-23 15:34:47 +01:00
scrawl
98402e579d ESSImport: fix non-existing items in player record causing load failure in OpenMW 2015-01-23 15:34:47 +01:00
scrawl
5ce8a931a5 ESSImport: fix a subrecord ordering issue 2015-01-23 15:34:14 +01:00
scrawl
1e92cab3e7 ESSImport: read dialogue/journal records, not converted yet 2015-01-23 15:34:14 +01:00
scrawl
acf8461841 ESSImport: some fixes 2015-01-23 15:34:14 +01:00
scrawl
69676906ae Don't clear known spells when reading from the savegame 
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
 2015-01-23 15:34:14 +01:00
scrawl
c7d15e6f74 Revert "Revert "Light charge handling fix"" 
This reverts commit b95748d044.
 2015-01-23 15:33:39 +01:00
scrawl
7ead963075 Revert "Revert "ESSImport: convert inventory equipment slots"" 
This reverts commit fe31ca0ac0.
 2015-01-23 15:33:30 +01:00
scrawl
fe31ca0ac0 Revert "ESSImport: convert inventory equipment slots" 
This reverts commit 03df659e7d.
 2015-01-23 02:32:42 +01:00
scrawl
b95748d044 Revert "Light charge handling fix" 
This reverts commit 5e0428243b.
 2015-01-23 02:32:38 +01:00
Marc Zinnschlag
cd62dbc5b7 Merge remote-tracking branch 'scrawl/essimporter' 2015-01-21 15:12:04 +01:00
scrawl
5e0428243b Light charge handling fix 2015-01-21 01:59:45 +01:00
Scott Howard
8c32b7e304 missing include in essimporter/main.cpp 
error: 'cout' is not a member of 'std'
error: 'cerr' is not a member of 'std'
https://launchpadlibrarian.net/195402684/buildlog_ubuntu-trusty-amd64.openmw_0.34.0%2Bgit20150120.442-0~ubuntu14.04.1_FAILEDTOBUILD.txt.gz
 2015-01-20 17:59:11 -05:00
scrawl
03df659e7d ESSImport: convert inventory equipment slots 2015-01-20 23:58:24 +01:00
scrawl
142a138b75 ESSImport: convert TalkedTo flag and gold pool 2015-01-20 20:19:08 +01:00
scrawl
e38d756345 ESSImport: fix NPCC indices 2015-01-20 20:18:30 +01:00
scrawl
5b705196bc ESSImport: convert level progress 2015-01-20 19:47:54 +01:00
scrawl
eede2c8e55 ESSImport: convert breath meter and skill increases 2015-01-20 19:30:39 +01:00
scrawl
0fc9221eb3 ESSImport: convert NPC disposition 2015-01-20 19:29:54 +01:00
scrawl
1375a4e4bb ESSImport: read stolen items (not converted yet) 2015-01-20 19:29:54 +01:00
scrawl
06736e9e03 ESSImport: convert faction reactions and known dialogue topics 2015-01-20 15:56:07 +01:00
scrawl
6d5bb57e00 ESSImport: fix loading item stacks in containers 2015-01-20 01:21:44 +01:00
scrawl
40c29abe20 ESSImport: convert other references (non-creature/npc/container) 2015-01-20 00:42:26 +01:00
scrawl
8e1eeccbe1 ESSImport: container state 2015-01-19 13:16:12 +01:00
scrawl
a7b82e5107 ESSImport: inventory loading works, equipment slots need more work 2015-01-19 12:22:51 +01:00
scrawl
ad398f0c65 ESSImport: convert kill counter 2015-01-19 09:29:30 +01:00
scrawl
f9cf31fcd5 ESSImport: convert custom map markers, not working for interiors yet 2015-01-19 09:29:21 +01:00
scrawl
19ed047dec ESSImport: add some subrecords to CellRef and others, most files should load now, importacdt/cellref class structure need some refactoring 2015-01-18 23:15:36 +01:00
scrawl
08ad4d73bb ESSImport: player is placed in correct cell, npc cellrefs work 2015-01-18 20:01:50 +01:00
scrawl
c8ed24cc84 ESSImport: creature CellRefs work, need probing to find ref type 2015-01-18 16:13:52 +01:00
scrawl
cbf56dbb47 ESSImport: work on cell fog of war 2015-01-17 03:07:24 +01:00
scrawl
031eec4550 Starting ESS importer for Morrowind save files 2015-01-17 00:16:49 +01:00