Marc Zinnschlag
2e31f01585
Merge remote-tracking branch 'maqifrnswa/bug2407'
2015-03-04 16:55:46 +01:00
scrawl
cced508916
Remove unintended 1.5 factor for damage/restore magic effects
2015-03-04 01:49:00 +01:00
scrawl
8931ddf428
Remove unneeded casts
2015-03-03 23:46:53 +01:00
Scott Howard
d01e8cc97d
PositionCell/PlaceItemCell: add console message if cell doesn't exist
2015-03-03 17:36:22 -05:00
Marc Zinnschlag
c66bf41ac2
Merge remote-tracking branch 'scrawl/master' into openmw-35-1
2015-03-03 18:23:38 +01:00
Marc Zinnschlag
bf92d5cde9
removed redundant mScript field in ESM::StartScript
2015-03-03 13:04:57 +01:00
Marc Zinnschlag
3b8d709583
Merge remote-tracking branch 'maqifrnswa/bug2407'
2015-03-03 11:26:25 +01:00
scrawl
a8cb4e807b
Warning fix
2015-03-03 11:24:23 +01:00
scrawl
f09cbfb167
Add a comment
2015-03-02 23:29:33 +01:00
scrawl
666248618e
Fix reference cell movement leaving behind deleted Ptrs for script access
2015-03-02 23:20:59 +01:00
scrawl
8eb1f4e70e
Remove more log spam
2015-03-02 22:13:50 +01:00
scrawl
e3f1cb8305
Remove "loading cell" message
...
This spams the log too much, in particular when loading a savegame.
2015-03-02 21:12:21 +01:00
scrawl
653ddd3f25
Warning fix
2015-03-02 20:16:11 +01:00
Marc Zinnschlag
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
2015-03-02 20:01:31 +01:00
Scott Howard
53213bf236
if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407
2015-03-02 11:53:59 -05:00
scrawl
730138035d
Cycle infinite loop fix ( Fixes #2421 )
2015-03-02 17:25:26 +01:00
scrawl
191c0104f6
Crash fix for creatures with no skeleton base ( Fixes #2419 )
2015-03-02 15:19:57 +01:00
scrawl
a653716e2c
Fix for damage/restore effects using the instant apply path when they have a duration
2015-03-01 22:22:20 +01:00
scrawl
239c0071f5
Armor tooltip should show the effective armor rating
2015-03-01 19:40:38 +01:00
Marc Zinnschlag
185757da43
Merge remote-tracking branch 'dteviot/Bug2367'
2015-03-01 10:24:02 +01:00
dteviot
cdee6f41fc
fix: multi effect spell with different ranges ( Fixes #2285 )
...
Applies all effects for a spell with multiple effects, where not all effects have the same range.
2015-03-01 15:34:18 +13: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
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
281e0042ab
Merge remote-tracking branch 'scrawl/master'
2015-02-26 13:23:15 +01:00
scrawl
e7989a197d
Add defaults for some required globals ( Fixes #2397 )
2015-02-25 20:35:11 +01: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
scrawl
24de6ba27e
Fix crash for LAND records without data
2015-02-24 21:42:40 +01: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
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
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
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
cc9cii
efdee19477
Suppress warning about the lack of virtual destructor.
2015-02-16 16:41:53 +11:00
slothlife
a9b74671a6
Fix various MSVC warnings
2015-02-15 20:10:21 -06: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
a139e4efb0
Grey out completed quests in journal quests list
2015-02-13 16:51:34 +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
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
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
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
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
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
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
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
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
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
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
5a9b30a8ca
Don't show VFX on the map ( Fixes #2324 )
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
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
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
c0a88161b2
Get rid of unneeded setSize/setCoord overrides
2015-01-29 03:38:59 +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
431f540791
ESSImport: fix NPC factions
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
