scrawl
dbd4abd6fe
Fix ripples for D3D - added simpler effect ( Fixes #1649 )
2015-02-09 19:30:11 +01:00
Marc Zinnschlag
e9d6e4f6df
Merge remote-tracking branch 'ace/include-cleanup'
2015-02-09 18:03:28 +01:00
Marc Zinnschlag
985f7cbff9
Merge remote-tracking branch 'miroslavr/master'
2015-02-09 17:58:57 +01:00
Alexander "Ace" Olofsson
fce404acc5
Remove some including of mwbase/world.hpp
...
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
2015-02-09 17:45:48 +01:00
Alexander "Ace" Olofsson
b714e5211d
Redefinition of default template argument
...
Sometimes it's annoying how MSVC casually allows you to break C++ standards
2015-02-09 17:25:55 +01:00
Alexander "Ace" Olofsson
f77ae711e4
Fix template closer
2015-02-09 17:10:09 +01:00
Alexander "Ace" Olofsson
cfcaf4528f
Some more forward-declaring for OpenMW-CS
2015-02-09 16:50:34 +01:00
Alexander "Ace" Olofsson
f2c5060cc0
Fix cstdint issue on travis GCC build
2015-02-09 16:37:20 +01:00
Alexander "Ace" Olofsson
d3128a12b6
Remove a large include form mwbase/windowmanager.hpp
2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
8c49812d56
Remove unneeded include in obstacle.hpp
2015-02-09 15:12:10 +01:00
Alexander "Ace" Olofsson
df5a08b6de
Move manualref code out of header
2015-02-09 15:01:49 +01:00
Jordan Ayers
ec3487b669
Sun trajectory: handle mNightStart <= mSunriseTime
...
OMW Bug #781
Note: mNightStart == mSunriseTime is treated as 24-hour night.
2015-02-08 14:31:45 -06:00
scrawl
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
2015-02-08 21:28:29 +01:00
scrawl
9dbd9af31c
Adjust fix for Bug #2360 to repair affected savegames
2015-02-08 21:26:58 +01:00
scrawl
b542143e3a
Fix faction reputation case sensitivity issue ( Fixes #2360 )
2015-02-08 21:04:01 +01:00
scrawl
ad8790fba0
Fix setWaterLevel script instruction not affecting physics
2015-02-08 15:50:40 +01:00
scrawl
01e32aef79
Fix exception moving a disabled object between cells
2015-02-08 14:34:31 +01:00
MiroslavR
2223a69ab8
Fix getpcinjail returning 0 when the console is open
2015-02-07 20:13:11 +01:00
Jordan Ayers
23024d2beb
Re-work the sun's trajectory.
...
OMW Bug #781
Have the sun travel 15 degrees south of vertical.
2015-02-07 12:36:27 -06:00
MiroslavR
9bbe6f8c5e
Remove todo
2015-02-07 18:39:05 +01:00
MiroslavR
1230cf49bf
Properly center jail progress widget, fix a bug with it not disappearing if the console is open
2015-02-07 18:38:41 +01:00
Jordan Ayers
2d17eaa5ea
Fix argument name for setSunDirection.
2015-02-06 22:26:58 -06:00
MiroslavR
1d9e973573
Add training progress bar, implement jail screen, tweak wait dialog ( Fixes #1714 )
2015-02-07 04:05:28 +01:00
Marc Zinnschlag
6c4920c58e
Merge remote-tracking branch 'scrawl/master'
2015-02-06 09:23:45 +01:00
Marc Zinnschlag
ea21fbcbe6
Merge remote-tracking branch 'dteviot/master'
2015-02-06 09:22:57 +01:00
Nikolay Kasyanov
5534306eb3
Few rename fixes
2015-02-06 08:59:00 +02:00
scrawl
01b4177872
Make sure birthsign spells are added when loading savegame
2015-02-06 01:27:17 +01:00
scrawl
9ce3e4b4e1
UI consistency fix in levelup dialog
2015-02-06 01:27:17 +01:00
scrawl
61ec9196c8
Cap the displayed attribute multiplier in levelup to attribute points left to 100
2015-02-06 01:27:17 +01:00
scrawl
b5e0e45c78
Fix iLevelUpTotal not being used in the levelUp logic
2015-02-06 01:27:17 +01:00
scrawl
55cd9b526c
Skill progress bar changed to match MW
2015-02-06 01:27:17 +01:00
scrawl
5096e5dc0c
esmtool minor/major skills fix
2015-02-06 01:27:17 +01:00
scrawl
f0b1d889c0
ESSImport: import player skill progress
2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e
Skill progress refactoring
2015-02-06 01:27:16 +01:00
scrawl
dd8aab2a7f
Adjust help for --load-savegame again
2015-02-06 01:27:16 +01:00
scrawl
356d1c7657
ESSImport: convert stolen item tracker
2015-02-06 01:27:16 +01:00
scrawl
bea88c3643
Stolen item tracking overhaul part 2 ( Fixes #2338 )
2015-02-06 01:27:16 +01:00
dteviot
cac250a90d
Fixed typo in comment.
2015-02-06 12:45:15 +13:00
dteviot
9d9cabf40d
Fix: Importer creates a single Content List ( Fixes #2345 )
2015-02-06 12:24:06 +13:00
scrawl
c1862cbfc2
Clarify documentation for --load-savegame
2015-02-05 04:18:43 +01:00
scrawl
8087a7d920
Add possibility to dress up corpses ( Fixes #2221 )
2015-02-05 04:18:43 +01:00
scrawl
aa6ebcd75c
Change stolen items handling to match MW ( Fixes #1443 , Fixes #2290 )
2015-02-05 04:18:43 +01:00
scrawl
955505c167
Remove unused function
2015-02-05 04:18:43 +01:00
scrawl
27dc49a135
Rewrite game settings manager
...
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
2015-02-05 04:18:42 +01:00
scrawl
6ea59c93ab
Ignore the object scale in Move instruction ( Fixes #2275 )
2015-02-05 04:18:42 +01:00
scrawl
9825b68dfb
Fix SDL eating SIGINT signals in the launcher ( Fixes #2328 )
2015-02-05 04:18:42 +01:00
scrawl
6d097fbfbd
Normalise spelling of "levelled" throughout the code
2015-02-05 04:18:42 +01:00
scrawl
0c6e2170db
Include cleanup
2015-02-05 04:18:42 +01:00
Jordan Ayers
1f036c0381
Patch for COC Spawn Issue.
...
OMW Bug #1079
Fall back to the first static's position, if there are no door markers.
2015-02-04 12:10:56 -06:00
scrawl
fbb8998184
Account for not yet listed cells in getInteriorPtrs
2015-02-04 16:41:14 +01:00
scrawl
14923f3e8b
Fix for broken unsetRefNum
2015-02-03 23:05:06 +01:00
scrawl
0b7b627443
CMake fix for opencs rename
2015-02-03 13:57:40 +01:00
Marc Zinnschlag
0557d45bd1
renamed opencs into openmw-cs
2015-02-03 13:18:03 +01:00
MiroslavR
ee8f88fc42
Reset health modifier when actor dies ( Fixes #2330 )
2015-02-01 22:04:49 +01:00
Marc Zinnschlag
82ff737c31
Merge remote-tracking branch 'scrawl/master'
2015-02-01 12:10:28 +01:00
scrawl
7e33471edb
Fix code duplication
2015-01-31 22:40:43 +01:00
scrawl
c98b7db4c1
Fix swim height, use fSwimHeightScale GMST
2015-01-31 22:40:43 +01:00
scrawl
57a259c526
Remove references to no longer used font
2015-01-31 22:40:43 +01:00
scrawl
56799c79f4
Fix attachArrow exception when changing weapon ( Fixes #2332 )
2015-01-31 22:40:42 +01:00
scrawl
fec8cf91f5
Add exception handling to various uses of DataStream::read
2015-01-31 22:40:42 +01:00
scrawl
86165d38d2
Add exception handling in addObjectToScene
2015-01-31 22:40:42 +01:00
scrawl
73e57f53a8
Always print openmw version in the log
2015-01-31 22:40:42 +01:00
scrawl
cbe135c60f
Don't require magicka for casting spells in God Mode ( Fixes #2331 )
2015-01-31 22:40:42 +01:00
scrawl
7d76f1a113
PlaceAt count argument should spawn independent references ( Fixes #2283 )
2015-01-31 22:40:41 +01:00
scrawl
7542fb5cd9
Show map notes on door marker leading to the cell with the note ( Fixes #2284 )
2015-01-31 22:40:41 +01:00
scrawl
54e79c8c98
Use mouse pressed event for pin button instead of mouse click
2015-01-31 22:40:41 +01:00
scrawl
c093e284d9
Delegate cleanup
2015-01-31 22:40:41 +01:00
scrawl
bdcc3a4036
Add missing swish sound for thrown weapons
2015-01-31 22:40:40 +01:00
scrawl
326eaea8a6
Add missing sound for drawing throwing weapons ( Fixes #2308 )
2015-01-31 22:40:40 +01:00
scrawl
0497a40d09
Fix incorrect sound for thrown weapons
2015-01-31 22:40:40 +01:00
scrawl
2346c3528d
Remove NpcStats::mProfit and store it in the script instead
...
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
2015-01-31 22:40:40 +01:00
scrawl
bd0a0e64a9
Fix overwriting script records not working
2015-01-31 22:40:40 +01:00
scrawl
d1b5956a98
Fix crash on exit
2015-01-31 22:40:40 +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
b9acf437fd
Remove friendly hits from the save file
...
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
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
5a9b30a8ca
Don't show VFX on the map ( Fixes #2324 )
2015-01-31 22:40:38 +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
417f60f467
Use the mooncircle textures ( Fixes #1624 , Fixes #1743 )
2015-01-31 22:40:38 +01:00
scrawl
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
2015-01-31 22:40:38 +01:00
scrawl
dac1290597
Reduce size of water plane and increase subdivisions ( Fixes #969 )
2015-01-31 22:40:37 +01:00
Marc Zinnschlag
c02c72e134
Merge remote-tracking branch 'jordan-ayers/topic/dialogue-set'
2015-01-30 18:23:14 +01:00
Jordan Ayers
419046e121
Dialogue: Use std::set for known topics in the manager.
...
There were three different data structures being used for topic lists
in this code. (map< string, true >, list< string >, and vector< string >)
Switch the local topic lists to set< string >. This supports everything
the list and map were doing, reduces the variety of data structures, and
makes count (a more efficient search) available.
The vector has not changed, since it's tied to the ESM modules, and must
meet other requirements.
2015-01-29 18:28:13 -06:00
Marc Zinnschlag
1150b41c18
Merge remote-tracking branch 'scrawl/master'
2015-01-29 16:12:29 +01:00
scrawl
e712b0353b
Terrain refactoring, reduce game startup time and memory usage
2015-01-29 03:39:01 +01:00
scrawl
62a32220ff
Use low-LOD heightmap for world map rendering
...
Add vanilla-accurate colour palette (thanks Hrnchamd)
2015-01-29 03:39:01 +01:00
scrawl
201674cd70
ESSImport: convert world map overlay ( Fixes #2313 )
2015-01-29 03:39:01 +01:00
scrawl
c0a88161b2
Get rid of unneeded setSize/setCoord overrides
2015-01-29 03:38:59 +01:00
Marc Zinnschlag
05be353fec
Merge remote-tracking branch 'dteviot/master'
2015-01-28 19:22:54 +01:00
Marc Zinnschlag
fabcdf7a1a
Merge remote-tracking branch 'ace/boost-fixes'
2015-01-28 19:19:42 +01:00
scrawl
f4c8064d39
Fix camera not being attached properly when player becomes vampire ( Fixes #2319 )
2015-01-28 19:14:57 +01:00
scrawl
9bcc84ceec
Add option to stretch menu backgrounds/cutscenes to the whole screen
2015-01-28 00:22:56 +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
6367b4dc0b
Improve INFO struct naming
2015-01-27 23:12:21 +01:00
scrawl
4cbb79191f
Don't put duplicate lines in the console history
2015-01-27 23:12:20 +01:00
scrawl
6f41e0d12e
Reapply quest index when loading quest from savegame (Bug #2260 )
2015-01-27 23:12:20 +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
d34c8526f6
Enchanted arrows should not be added to victim ( Fixes #2306 )
2015-01-27 23:12:20 +01:00
scrawl
67491c7164
Fix leveled item argument issue ( Fixes #2302 )
2015-01-27 23:12:20 +01:00
scrawl
89132ff741
Add --name option to esmtool to print record with the given name
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
9d3f0b2ed5
Remove some unused code, include cleanup
2015-01-27 23:12:13 +01:00
scrawl
d34086ac8f
ESSImport: convert running global scripts
2015-01-27 23:05:20 +01:00
scrawl
4921c6ef9e
Split window caption bars so that the caption can be transparent ( Fixes #531 )
...
Fix transparent window background not applying to the header bar (Fixes #2294 )
2015-01-27 23:05:19 +01:00
scrawl
9b3728d878
ESSImport: convert weather state
2015-01-27 23:05:19 +01:00
Alexander "Ace" Olofsson
62acb03735
More Ogre + recent Boost build fixes
2015-01-27 21:07:26 +01:00
scrawl
697ab16ec5
Fix for coverity defects
2015-01-27 19:00:26 +01:00
Marc Zinnschlag
c4dd10fe49
Merge remote-tracking branch 'jordan-ayers/bugfix/1049'
2015-01-26 19:29:39 +01:00
dteviot
e298589e7f
Reorganised DataFilesPage.cpp code.
...
Removed some recursive calling of saveSettings() and loadSettings().
2015-01-26 18:46:18 +13:00
Jordan Ayers
1410819e20
Dialog fix for line breaks in the middle of words.
...
Issue 1049
Adjust the TypesetBookImpl::Typesetter to not assume a word break
at the end of write() calls.
A word break is assumed if any of the other content insertion methods
are used (section break, add/select content, etc).
2015-01-25 22:36:20 -06: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
Marc Zinnschlag
b44fc1904b
Merge remote-tracking branch 'scrawl/master'
2015-01-24 17:13:23 +01:00
scrawl
72f7c2e555
Move weather reset to clear() method
2015-01-24 16:45:36 +01: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
b0c2aec374
Add warning for missing body parts
2015-01-23 17:31:26 +01:00
scrawl
79d2eebe54
Store selected enchant item in savegame ( Fixes #1702 )
2015-01-23 16:45:47 +01:00
Alexander "Ace" Olofsson
942cf26eee
And the missing includes
2015-01-23 16:06:19 +01:00
Alexander "Ace" Olofsson
7a903b7100
Doing forward declaration instead
2015-01-23 16:05:36 +01:00
Alexander "Ace" Olofsson
0c1d762790
Fix build when using new boost with Ogre.
...
This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0
2015-01-23 15:37:32 +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
a619cff615
Implement EnableLevelupMenu to trigger level-up
2015-01-23 15:34:47 +01:00
scrawl
c883a73d30
Several warning fixes
2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0
Fix wrong magic number for JOUR in openmw savegames
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
0fd5575efe
Improve warning message in ContainerStore::readState
2015-01-23 15:34:47 +01:00
scrawl
cc7be1600d
Make missing hair/head in NpcAnimation non-fatal for consistency with addOrReplaceIndividualPart
2015-01-23 15:34:14 +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
