cc9cii
c4625b94e5
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
2015-03-01 12:52:43 +11:00
dteviot
41e15e0c2d
Limit maximum attribute damage ( Fixes #2367 )
...
Maximum damage that an attribute can have = base + fortify.
2015-03-01 10:27:51 +13:00
scrawl
2f2a95f735
Fix crash for terrain without data, part 2
2015-02-28 19:33:49 +01:00
scrawl
f82751422d
Fix constant effect restore enchantments being applied incorrectly ( Fixes #2408 )
2015-02-28 16:31:22 +01:00
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
2015-02-27 22:37:22 +01:00
Digmaster
84ff11d0ab
check if v2 exists before attemping to copy it
2015-02-27 22:21:33 +01:00
Digmaster
464bbe4d6f
if v2 doesn't exist, don't erroneously set keyboardUserExists to true.
2015-02-27 22:21:07 +01:00
Digmaster
5d77ebdc60
If v3 doesn't exist, copy from v2
2015-02-27 22:21:07 +01:00
scrawl
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
df5513da7c
uses v3 input bindings, not v2
2015-02-27 22:19:13 +01:00
Digmaster
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
2015-02-27 22:19:13 +01:00
Digmaster
796b4b01b0
Fix activating every frame when action is bound to a trigger
2015-02-27 22:19:13 +01:00
Digmaster
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f
Minor code cleanup
2015-02-27 22:19:08 +01:00
Marc Zinnschlag
44d1f43b2b
Merge remote-tracking branch 'sandstranger/fixes-for-android'
2015-02-27 10:34:41 +01:00
Marc Zinnschlag
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
2015-02-26 19:05:30 +01:00
sylar
cda3782cf2
fix crash game on Android after start loading
2015-02-26 18:30:38 +04:00
sylar
1bb29f610f
enable mipmapping for Android again
2015-02-26 18:29:38 +04:00
Marc Zinnschlag
70a482b3e8
Merge remote-tracking branch 'dteviot/Bug2346'
2015-02-26 13:26:45 +01:00
Marc Zinnschlag
80e6df6092
Merge remote-tracking branch 'scrawl/opencs'
2015-02-26 13:25:56 +01:00
Marc Zinnschlag
281e0042ab
Merge remote-tracking branch 'scrawl/master'
2015-02-26 13:23:15 +01:00
dteviot
72e94380be
fix: boost::filesystem::canonical() available from version 1.48.
2015-02-26 20:07:23 +13:00
scrawl
e7989a197d
Add defaults for some required globals ( Fixes #2397 )
2015-02-25 20:35:11 +01:00
scrawl
3158d34abb
Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all.
2015-02-25 20:25:41 +01:00
Marc Zinnschlag
a77fbdc965
Merge remote-tracking branch 'jordan-ayers/bugfix/2400'
2015-02-25 20:14:33 +01:00
dteviot
931c95d0b1
workaround for not building on Linux version of Travis.
2015-02-26 06:17:29 +13:00
Jordan Ayers
659a8ba279
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash on confiscating items if a prison marker cannot be found.
2015-02-24 21:10:01 -06:00
Jordan Ayers
691ebd2372
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash when finding the closest marker to an exterior position.
2015-02-24 20:51:57 -06:00
Bret Curtis
5672c86924
Rename window title for OpenMW-CS
2015-02-24 23:37:53 +01:00
scrawl
24de6ba27e
Fix crash for LAND records without data
2015-02-24 21:42:40 +01:00
dteviot
cc815c63f1
Fix: no longer loose changes when run install wizard or iniimport.
2015-02-24 20:14:18 +13:00
Marc Zinnschlag
da9bd09a8c
Merge remote-tracking branch 'miroslavr/master'
2015-02-23 20:53:44 +01:00
Marc Zinnschlag
9109162030
Merge remote-tracking branch 'scrawl/master'
2015-02-23 20:51:18 +01:00
scrawl
77bb77b367
Fix for instant restore effects ( Fixes #2392 )
2015-02-23 19:07:12 +01:00
dteviot
84762c4eb8
Progress bar at 0% shows no text.
2015-02-23 19:30:46 +13:00
MiroslavR
47c053444f
Make the jail progress last one second
2015-02-23 00:23:09 +01:00
Marc Zinnschlag
8e007c91fd
Merge remote-tracking branch 'jordan-ayers/bugfix/1533'
2015-02-22 21:58:01 +01:00
Marc Zinnschlag
07c27065d6
Merge remote-tracking branch 'slothlife/msvc-warning-fixes'
2015-02-22 21:34:46 +01:00
Jordan Ayers
5edafc2a4c
Cleanup: Add const to read-only CellRefList access.
...
OMW Bug #1533
2015-02-22 12:25:10 -06:00
Jordan Ayers
399259a95c
Improve CellStore exception messages.
2015-02-22 12:12:54 -06:00
dteviot
f6128a85b2
resolve symlinks when searching for file's last modified time.
2015-02-22 13:48:44 +13:00
Jordan Ayers
c21b59ecff
Teleportation: Avoid marking searched cells as changed.
...
OMW Bug #1533
Only mark cells with the target marker / evidence chest as 'changed'.
2015-02-21 17:55:05 -06:00
scrawl
5eadffd0c4
Make launcher's version label selectable so it can be copy-pasted into issue reports
2015-02-22 00:13:03 +01:00
dteviot
514fba5f73
On Windows content list imported from morrowind.ini is sorted by file modified time stamps.
2015-02-22 10:02:25 +13:00
dteviot
9708e8529f
Removed unneeded include.
2015-02-22 08:58:17 +13:00
dteviot
accc078e0e
Morrowind.ini import progress bar. ( Fixes #2344 )
...
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
2015-02-22 08:46:12 +13:00
Nathan Aclander
6d7e1242cc
Fixed incorrect casting
...
Only cast to strings things that are ints. Also I missed an mFactionRank to cast.
2015-02-20 20:18:31 -08:00
Nathan Aclander
539e8276c8
Silenced clang warning by converting int to string
2015-02-19 19:05:19 -08:00
scrawl
a5847afdac
Fix ignored clicks on HUD mini-map ( Fixes #2388 )
2015-02-20 00:00:13 +01:00
scrawl
6d62aa7544
Don't prompt for spell deletion when using cycling keys ( Fixes #2382 )
2015-02-18 19:06:36 +01:00
Marc Zinnschlag
4c5bba2947
Merge remote-tracking branch 'dteviot/SpellCastingFixes'
2015-02-17 16:44:14 +01:00
Marc Zinnschlag
8686ffcedb
Merge remote-tracking branch 'scrawl/master'
2015-02-17 11:55:12 +01:00
dteviot
6e2d6a0282
Minor correction, MWWorld::getMaxActivationDistance() is now public.
2015-02-17 22:51:30 +13:00
dteviot
8d7de7d1ec
Telekinesis allows safe opening of traps ( Fixes #1916 )
...
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
2015-02-17 22:14:25 +13:00
Marc Zinnschlag
1b91bc73f6
Merge remote-tracking branch 'cc9cii/suppress-msvc-warning'
2015-02-16 15:54:24 +01:00
cc9cii
efdee19477
Suppress warning about the lack of virtual destructor.
2015-02-16 16:41:53 +11:00
cc9cii
e5c1c31648
Ignore case when detecting legacy extensions (.esm or .exp). Should resolve bug #2227 .
2015-02-16 14:27:25 +11:00
slothlife
a9b74671a6
Fix various MSVC warnings
2015-02-15 20:10:21 -06:00
Marc Zinnschlag
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
2015-02-15 09:52:13 +01:00
Alexander "Ace" Olofsson
a61019dfa8
Update referencecheck.cpp
...
MSVC does not allow for the usage of 'and' or 'or' literals
2015-02-15 04:47:25 +01:00
Jordan Ayers
6d1aec6970
Confiscate stolen goods: Support Mournhold prisons.
...
OMW Bug #1533
2015-02-14 16:09:17 -06:00
Jordan Ayers
5ef78903dc
Teleportation: Support markers in Mournhold.
...
OMW Bug #1533
Note: the 'stolen goods' search is not yet correct for Mournhald.
2015-02-14 15:43:09 -06:00
scrawl
81925645a3
Unreachable enemies combat AI fix ( Fixes #2271 )
2015-02-14 16:51:54 +01:00
scrawl
37a85e31d6
Ripples fix
2015-02-14 16:51:47 +01:00
scrawl
93ffdb427c
Small tweak to ripples
2015-02-14 15:53:01 +01: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
a139e4efb0
Grey out completed quests in journal quests list
2015-02-13 16:51:34 +01:00
Kamil Bar
3b7a23aa72
Fixed charge checks for light and other objects, corrected CellRef charge union comments
2015-02-13 13:11:10 +01:00
Kamil Bar
9628415e21
Missing change & changed comments to represent actual code
2015-02-13 12:16:46 +01:00
Kamil Bar
52a064afc3
Fixed charges checking
2015-02-13 12:13:40 +01:00
Jordan Ayers
1d18d3ff4c
Add a full search to findInteriorPositionInWorldSpace.
...
Part of OMW Bug #1533
Implement a search for one of the 'nearest' exterior cells. In this
case, 'nearest' means the fewest number of cells away via door markers.
This causes the world map position to update immediately after teleporting,
unless the new cell has no connecting path to an exterior. Intervention
spells and Jail travel will be much closer to vanialla Morrowind,
except for in Mournhold.
2015-02-12 22:38:08 -06:00
Kamil Bar
e1314d6211
Implement OpenCS reference validation (Feature #831 )
2015-02-13 04:45:18 +01:00
slothlife
cfe81bafe8
Remove setting CMAKE_BUILD_TYPE to Debug
...
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
2015-02-11 21:46:00 -06:00
scrawl
75db4d6473
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
2015-02-11 12:11:59 +01:00
scrawl
dfaab1188f
Fix for broken levelled creature spawning ( Fixes #2365 )
2015-02-11 12:10:46 +01:00
Marc Zinnschlag
2b619296d7
Merge remote-tracking branch 'scrawl/master'
2015-02-11 11:30:44 +01:00
scrawl
bf1839b370
Always print the exception to stderr
2015-02-10 22:01:57 +01:00
scrawl
3ccf4642b4
Implement ToggleScripts
2015-02-10 20:25:57 +01:00
Alexander "Ace" Olofsson
1a19253158
Fix MSVC build due to missing M_PI define
...
Apparently the header guard on cmath only adds the defines if _USE_MATH_DEFINES is defined when cmath is included for the first time.
So enabling that define and moving cmath up to be the first include, so that nothing else includes it without the define set.
2015-02-10 15:32:54 +01:00
scrawl
218f789d88
Fix player DrawState reset when selecting enchanted item ( Fixes #2356 )
2015-02-09 20:16:29 +01:00
scrawl
03257ecae5
QString encoding fix
2015-02-09 20:15:41 +01:00
scrawl
801c0eb57c
Detect Creature should detect alive creatures only ( Fixes #2353 )
2015-02-09 20:15:41 +01:00
scrawl
c27c20a859
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
files/materials/water.shader
2015-02-09 19:40:59 +01:00
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
Marc Zinnschlag
7f905470fa
fixed moved reference loading
2015-01-24 15:01:38 +01:00
Marc Zinnschlag
89998a6a03
save MVRF subrecords
2015-01-24 14:22:29 +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
scrawl
7ead963075
Revert "Revert "ESSImport: convert inventory equipment slots""
...
This reverts commit fe31ca0ac0
2015-01-23 15:33:30 +01:00
scrawl
d13335ba40
Ensure the item can be equipped in the given slot when loading inventory
2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0
Revert "Change save format to store relative equipment index"
...
This reverts commit 89d9649b50
2015-01-23 02:32:43 +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
a97f599e65
fixed ref num saving in non-wide format
2015-01-22 13:41:09 +01:00
Marc Zinnschlag
fa4718283d
Merge remote-tracking branch 'scrawl/contentselector'
2015-01-21 15:23: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
89d9649b50
Change save format to store relative equipment index
...
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
2015-01-20 23:55:26 +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
Alexander "Ace" Olofsson
3a88f4ebd5
Fix windows build, MessageBox is a defined symbol
...
Windows and its stupid defines...
2015-01-20 17:07:26 +01:00
scrawl
06736e9e03
ESSImport: convert faction reactions and known dialogue topics
2015-01-20 15:56:07 +01:00
Marc Zinnschlag
a266dffb4b
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-20 15:53:48 +01:00
scrawl
6d5bb57e00
ESSImport: fix loading item stacks in containers
2015-01-20 01:21:44 +01:00
scrawl
5104a5a023
Add missing setFactionReaction instruction, use absolute storage instead of difference
...
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).
This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
scrawl
40c29abe20
ESSImport: convert other references (non-creature/npc/container)
2015-01-20 00:42:26 +01:00
scrawl
9014dc48ee
Don't require the object type id for reading references from savegames
...
This is redundant, since we can look it up from the RefID.
2015-01-20 00:42:25 +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
235683e449
Remove LightState from openmw save format to streamline inventory loading
2015-01-19 11:36:00 +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
scrawl
14aacf9a72
Add comment
2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc
Remove unused mLastDrowningHit
2015-01-17 00:10:45 +01:00
Marc Zinnschlag
9670e0881d
update reference's current cell when x/y-coordinates are modified
2015-01-16 15:17:52 +01:00
Marc Zinnschlag
561ddfa0c5
make column type accessable via the regular table model
2015-01-16 11:29:44 +01:00
scrawl
714b19015c
Fix unknown record error message
2015-01-15 20:31:08 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
640d473866
Merge remote-tracking branch 'scrawl/master'
2015-01-15 17:33:08 +01:00
scrawl
fc6aa256bf
Add comment
2015-01-15 16:05:25 +01:00
scrawl
6146a3843c
Merge remote-tracking branch 'upstream/coverity_scan' into HEAD
2015-01-15 15:59:57 +01:00
Marc Zinnschlag
c55e9b9c58
one more potential 0-pointer fix
2015-01-15 15:00:16 +01:00
Marc Zinnschlag
7615cbafce
create modify commands through command dispatcher
2015-01-15 14:24:33 +01:00
Marc Zinnschlag
706df3f881
silenced a coverity warning
2015-01-15 12:13:53 +01:00
Marc Zinnschlag
7b8e6f9dda
addressed potential 0-pointer issue
2015-01-15 12:04:23 +01:00
Marc Zinnschlag
f3c7532660
cleaned up some enum confusion
2015-01-15 12:01:59 +01:00
scrawl
bf915d929a
Update idle voices according to research
2015-01-15 03:35:46 +01:00
scrawl
b39cc0c8c8
Fix OpenCS window opening issue when config file doesn't exist
...
It would attempt to create a zero-sized window (or even negative-sized, after subtracting the frame dimensions).
2015-01-15 02:49:54 +01:00
scrawl
6b2df95167
Fix for some coverity defects
2015-01-15 02:03:27 +01:00
scrawl
edbac30a57
Change another dynamic_cast to static_cast (coverity)
2015-01-15 01:23:58 +01:00
scrawl
cef72385d4
Fix extreme frame drop when running into certain corners ( Fixes #2023 )
2015-01-15 00:58:12 +01:00
scrawl
52ed3d92a8
Fix btCompoundShape scaling ( Fixes #1683 )
2015-01-14 17:59:04 +01:00
scrawl
a3c861b7fa
Idle voice fix
2015-01-14 00:07:14 +01:00
scrawl
2ac4a74a34
Fix running AI for dead actors
2015-01-13 18:13:02 +01:00
scrawl
f11ec653d0
Add setting for showing MRK nodes to NIF loaders
...
This makes marker objects show up in OpenCS.
2015-01-13 17:29:25 +01:00
scrawl
883f7ec7ce
Move workaround for hiding markers from NIF loader to Scene
2015-01-13 17:19:39 +01:00
scrawl
3ce22d31d8
Fix cursor issue when loading savegame from within mouselook-mode and a warning pops up
2015-01-13 05:37:44 +01:00
scrawl
fafc14d5a0
Add proper air movement mechanics ( Fixes #2077 )
2015-01-13 05:37:43 +01:00
scrawl
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
2015-01-13 05:37:37 +01:00
scrawl
4ed3e7bbb7
Enchanting code cleanup
2015-01-12 23:29:58 +01:00
scrawl
bb718f216d
Initialize ENAMstruct in SpellCreationDialog (Coverity)
2015-01-12 23:29:58 +01:00
