dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb
replaced FLT_MAX with numeric_limits.
2015-08-21 19:34:28 +12:00
scrawl
af3b0cd883
Improve some error messages
2015-08-21 00:31:43 +02:00
dteviot
3b231b85bb
removed incorrect optimization.
...
Now it fixes #2871
2015-08-21 06:55:54 +12:00
Marc Zinnschlag
08325d14ca
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-20 20:42:35 +02:00
Marc Zinnschlag
d436dc332b
Merge remote-tracking branch 'jeffreyhaines/gametimetracker'
2015-08-20 20:39:44 +02:00
Marc Zinnschlag
5cb0353b5c
Merge remote-tracking branch 'jeffreyhaines/npcsdontscream'
2015-08-20 20:28:36 +02:00
dteviot
c0d3804b4f
Correctly handle disjoint pathgrid ( Fixes #2871 )
...
Bugfix:
When
1. Cell has multiple subgrids (i.e. path grid is disjoint)
2. Distance between destination and pathgrid point 0 is less than distance to points of subgrid closest to start point
Then getClosestReachablePoint() returns pathgrid point 0 as the end point.
This is invalid, this end point cannot be reached from the start point.
2015-08-20 21:50:58 +12:00
dteviot
0ee7407101
extracted common sub-expressions.
2015-08-20 18:17:02 +12:00
dteviot
ff5ef7055e
extracted function CreatureStats::isParalyzed()
2015-08-20 18:12:37 +12:00
Jeffrey Haines
f94d3237fc
Removed unused cmake import
2015-08-19 13:28:01 -04:00
Jeffrey Haines
61bb55aff4
Removed long int parameter
2015-08-19 13:23:40 -04:00
Jeffrey Haines
d91f197119
Time played display setting
2015-08-19 11:31:43 -04:00
Jeffrey Haines
69729046bf
Updated parameter name to reflect units
2015-08-19 10:11:40 -04:00
Jeffrey Haines
e86891d6e1
Time played displayed in save/load menus
2015-08-19 10:05:08 -04:00
Marc Zinnschlag
9918b57341
Merge remote-tracking branch 'origin/master'
2015-08-19 16:03:01 +02:00
Jeffrey Haines
e1baf1ea48
NPCs scream when they die
2015-08-19 09:51:04 -04:00
scrawl
232dfdc07e
Make an error message slightly more helpful
2015-08-19 01:24:54 +02:00
scrawl
681183df31
Restore handling of fog depth == 0 values (Bug #1549 )
2015-08-19 01:13:14 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
dca08b0b42
Remove a firing assert ( Fixes #2871 )
2015-08-18 14:51:32 +02:00
Marc Zinnschlag
e888fd7034
Merge remote-tracking branch 'scrawl/delete_noop'
2015-08-17 18:21:56 +02:00
Marc Zinnschlag
4f4429151f
Merge remote-tracking branch 'scrawl/editor_flickertypo'
2015-08-17 14:11:46 +02:00
Marc Zinnschlag
3992125b61
Merge remote-tracking branch 'scrawl/master'
2015-08-17 14:05:51 +02:00
Marc Zinnschlag
dc72b24f4e
Merge remote-tracking branch 'dteviot/PathfindingRefactorDraft'
2015-08-17 14:04:56 +02:00
Marc Zinnschlag
b5f3f0522a
Merge remote-tracking branch 'slothlife/weather-settings-fix'
2015-08-17 14:03:54 +02:00
scrawl
b583a2ec33
Make SetDelete a no-op for items in containers ( Fixes #2864 )
2015-08-17 00:06:26 +02:00
Jordan Ayers
be7bd9529d
Classes shouldn't use MWBase::Environment to access their own members.
2015-08-16 16:56:44 -05:00
scrawl
d1e1c0f38b
Editor: fix a typo in ESM::Light flag mappings
2015-08-16 23:42:08 +02:00
Marc Zinnschlag
47dd9505a9
copy meta data from game file when merging
2015-08-16 18:27:17 +02:00
scrawl
9fad33cd14
Don't reset the item model's sort/filter options in updatePlayer ( Fixes #2863 )
2015-08-16 17:49:53 +02:00
scrawl
c8d6679a25
Remove an unused function
2015-08-16 17:40:20 +02:00
Marc Zinnschlag
1b663f01af
create merged document and open a view for it (document is still empty at this point)
2015-08-16 15:24:48 +02:00
Marc Zinnschlag
5558962b14
Merge remote-tracking branch 'scrawl/editor_creatureflag'
2015-08-16 10:13:11 +02:00
Marc Zinnschlag
8bb28c3236
Merge remote-tracking branch 'corristo/osx-hidpi'
2015-08-16 10:06:38 +02:00
dteviot
4d9d8a060d
Pathing bugfix.
...
When path contains one one point from path grid, point is no longer being discarded.
2015-08-16 18:56:28 +12:00
dteviot
942a987d52
centralize the world/cell coordinate conversion logic.
2015-08-16 18:55:02 +12:00
dteviot
5049c9ab6a
removed unnecessary tests.
2015-08-16 17:41:33 +12:00
slothlife
3d419a612a
Corrected some weather transition calculations
...
Reversed some formulas for Transition Delta and Clouds Maximum Percent
and implemented them. Refactored Weather some to encapsulate those
formulas (to more closely match MoonModel). Did some small cleanup of
WeatherManager.
2015-08-15 23:38:49 -05:00
scrawl
8426d376f0
Use separate touch spell raycasts for actors and objects ( Fixes #2849 )
2015-08-16 02:06:04 +02:00
scrawl
afb3d94ba4
Fix cell names in the save/load menu not being localised ( Fixes #2840 )
2015-08-16 01:55:14 +02:00
scrawl
c25dacb480
Fix "Level" string in the save/load menu not being localised (Bug #2840 )
2015-08-16 01:53:58 +02:00
scrawl
8241976368
Don't attempt to play non-existing hit animations ( Fixes #2856 )
2015-08-15 23:27:37 +02:00
Nikolay Kasyanov
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
2015-08-15 22:37:09 +02:00
scrawl
7dd09dd637
Fix being able to flip journal pages with the mousewheel when the options overlay is active ( Fixes #2855 )
2015-08-15 20:44:15 +02:00
scrawl
58cd2b1a84
Remove "Tri Bip*" nodes in creature meshes (meant for debugging)? ( Fixes #2148 )
2015-08-15 19:01:21 +02:00
scrawl
e36ebc77d5
Editor: remove creature flag of unknown purpose from the UI
2015-08-15 18:39:00 +02:00
scrawl
c57e72fe03
Adjust the sleep interruption chance ( Fixes #2781 )
2015-08-15 16:09:53 +02:00
scrawl
d76fb2d266
Apply disintegrate only to weapons and armor ( Fixes #2853 )
2015-08-14 13:38:39 +02:00
Marc Zinnschlag
5aeabe22f0
Merge remote-tracking branch 'dteviot/PathfindingRefactor'
2015-08-14 10:13:04 +02:00
scrawl
e8c9d3ea2a
Fix cell names on world map not always being translated ( Fixes #2832 )
2015-08-13 17:08:21 +02:00
scrawl
1e18a73b1c
Don't play magic effect sounds & visual effects for unsuitable targets ( Fixes #2811 )
2015-08-13 17:08:21 +02:00
scrawl
211deeb63e
Don't attempt to lock or unlock unsuitable objects ( Fixes #2826 )
2015-08-13 17:08:21 +02:00
scrawl
0d8f07d563
Properly apply changes when backing out of chargen dialogs ( Fixes #2627 )
2015-08-13 17:08:21 +02:00
scrawl
86f0e505e9
Add a fixPosition for the --start exterior cell ( Fixes #2790 )
2015-08-13 17:08:20 +02:00
scrawl
c07ced4c8f
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
2015-08-13 17:01:25 +02:00
Marc Zinnschlag
d8655f2ff8
forgot to connect merge operation signals
2015-08-13 14:49:32 +02:00
Marc Zinnschlag
e2377396a7
inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)
2015-08-13 12:53:00 +02:00
Marc Zinnschlag
904ad94952
added merge operation (doesn't do anything yet)
2015-08-13 12:03:20 +02:00
Marc Zinnschlag
d511772534
Merge remote-tracking branch 'rohit-n/gamepad'
2015-08-13 10:15:27 +02:00
Rohit Nirmal
d9b11f963a
Gamepad: Slow down simulated mouse with right trigger
...
in menus.
2015-08-11 21:46:54 -05:00
dteviot
55e3aaaa35
made variable const.
2015-08-10 20:30:43 +12:00
dteviot
e42a2478dc
Removed tests that are not necessary.
2015-08-09 17:58:40 +12:00
dteviot
2b9e22f593
extracted function stopAttack().
2015-08-09 14:29:38 +12:00
dteviot
0884a3796f
extracted function isTargetMagicallyHidden().
2015-08-09 14:20:55 +12:00
dteviot
038851420d
Removed unneeded temp variables.
...
Corrected case of function names.
2015-08-09 14:18:55 +12:00
dteviot
50ddcd1953
more attack logic moved into AiCombatStorage.
2015-08-09 14:10:08 +12:00
dteviot
0735e3e06e
move start attack logic to AiCombatStorage.
...
Basically, copied from mrchenko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:08:42 +12:00
dteviot
1676bf917e
CombatMove logic moved into AiCombatStorage.
...
Basically, copied from mrcheko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:06:52 +12:00
Marc Zinnschlag
708cacdec4
disable merge menu item when a merge is already in progress
2015-08-08 16:47:58 +02:00
Marc Zinnschlag
23ccee0124
Merge remote-tracking branch 'dieho/master'
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-08-08 11:00:44 +02:00
Marc Zinnschlag
7f10a7f24f
Merge remote-tracking branch 'smbas/feature-mgef-verifier'
2015-08-08 10:50:38 +02:00
Marc Zinnschlag
d29862eac3
Merge remote-tracking branch 'emperorarthur/anim_fail'
2015-08-08 10:47:46 +02:00
Marc Zinnschlag
be6a85c7aa
Merge remote-tracking branch 'emperorarthur/nif_tester_updates'
2015-08-08 10:47:12 +02:00
Marc Zinnschlag
b74a14211f
Merge remote-tracking branch 'origin/master'
2015-08-08 10:42:02 +02:00
Marc Zinnschlag
1eed1c4d23
Merge remote-tracking branch 'dteviot/AiCombatPerFrameUpdate'
2015-08-08 10:35:58 +02:00
Arthur Moore
20078c41c3
Removed now unneeded script
2015-08-07 20:53:43 -04:00
Arthur Moore
c7b97ee9ba
Cleaned up niftest's output
...
A bad file inside of a bsa archive now looks like:
<game dir>/Data Files/TR_Data.bsa/meshes/tr/x/tr_act_ind_mark_alm.nif
2015-08-07 20:52:34 -04:00
Arthur Moore
3d78ee0c2b
niftest now scans BSA files in directories for nif errors
...
The program is explicit so the user knows exactly where the bad file is.
2015-08-07 20:52:25 -04:00
Arthur Moore
6a6da42b85
Updated niftest's help message
2015-08-07 20:52:04 -04:00
Arthur Moore
efadce3e90
Have niftest handle directories as well
...
Note: BSA files within the directory must be passed manually.
2015-08-07 20:51:44 -04:00
Arthur Moore
865491d101
Added a help message to niftest
...
Now using the boost argument parser.
2015-08-07 20:51:25 -04:00
scrawl
56b7196bea
Remove incorrect implementation of "Clouds Maximum Percent" weather setting
2015-08-07 15:34:01 +02:00
scrawl
52dbb24bb9
Merge pull request #708 from slothlife/sky-render-fixes
...
Fix several sky rendering bugs, maybe also #639
2015-08-07 12:47:51 +02:00
slothlife
3235cecddf
Use Glare View for visibility of celestial bodies
...
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
2015-08-07 00:08:18 -05:00
Stanislav Bas
ff2dab8d56
Remove check for an empty Particle from Magic effects verifier
2015-08-06 14:17:42 +03:00
Marc Zinnschlag
4fd3097c1c
improved adjuster widget problem reporting
2015-08-06 12:58:52 +02:00
Marc Zinnschlag
b83f9445a9
added UI for merge tool (merge tool itself is still missing)
2015-08-06 12:52:10 +02:00
Marc Zinnschlag
469a896ca1
make non-editable fields in dialogue sub view selectable ( Fixes #2818 )
2015-08-06 08:45:38 +02:00
slothlife
238ae419a3
Fix use of incorrect material for Sun
2015-08-05 22:02:54 -05:00
slothlife
f2e51b0579
Use diffuse alpha to fade Sun
2015-08-05 21:03:21 -05:00
scrawl
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
2015-08-06 02:54:47 +02:00
slothlife
ea2f88a355
Fix several sky rendering bugs, maybe also #639
...
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
2015-08-04 21:07:42 -05:00
taras.kudryavtsev
8ae7c63c45
#2730 and #2725
2015-08-04 16:58:44 +03:00
Stanislav Bas
cbc8309289
Don't allow empty value of School field in Magic Effects table
2015-08-04 16:19:00 +03:00
dteviot
58f732ebc9
Update path following checks each frame in AiCombat.
2015-08-04 18:20:05 +12:00
dteviot
ad9bab0b68
Removed redundant if.
2015-08-04 18:17:08 +12:00
dteviot
4256e151b1
Fixed error in deciding type of attack
2015-08-04 18:15:58 +12:00
dteviot
21e249cb92
pass parameters as const &
2015-08-04 18:14:36 +12:00
Stanislav Bas
8da9eecea7
Correct comparison of enum values in IdTableProxyModel
2015-08-03 19:24:00 +03:00
Stanislav Bas
0ea4d1981a
Add magic effect verifier
2015-08-03 19:08:01 +03:00
Marc Zinnschlag
06f170a8e1
Merge remote-tracking branch 'origin/master'
2015-08-03 10:52:32 +02:00
Marc Zinnschlag
9ba85f697c
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
2015-08-03 10:42:06 +02:00
Stanislav Bas
6b3de5c720
Activate editing of nested table cells by a double click
2015-08-02 22:53:40 +03:00
Stanislav Bas
1590a04d03
Close EditWidget when a proper row removed
2015-08-02 22:39:41 +03:00
Stanislav Bas
33042c1464
Restore Modified status of a record when adding/removing nested rows
2015-08-02 21:52:55 +03:00
scrawl
664ae079db
Improve setting of culling mask for the savegame screenshot camera
2015-08-02 18:05:15 +02:00
scrawl
88c61ed2b6
Fix NotifyDrawCompletedCallback in single threaded mode
2015-08-02 17:57:50 +02:00
Stanislav Bas
25b653e316
Inform about Modified status change when modifying a value of a model
2015-08-02 15:06:56 +03:00
Stanislav Bas
afb36b73eb
Proper index for Modified column in ModifyCommand
2015-08-02 15:03:27 +03:00
Marc Zinnschlag
e73c115ff5
Merge remote-tracking branch 'origin/master'
2015-08-02 13:44:17 +02:00
Marc Zinnschlag
529041f6f6
Merge remote-tracking branch 'slothlife/moon-settings'
2015-08-02 13:43:55 +02:00
Marc Zinnschlag
9ee3f1bfe7
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
2015-08-02 13:42:39 +02:00
slothlife
0244a9b329
Correct moon texture with respect to trajectory
2015-08-01 07:57:05 -05:00
Marc Zinnschlag
9392e426c0
Merge remote-tracking branch 'origin/master' into mergetool
2015-08-01 10:16:20 +02:00
Marc Zinnschlag
15e8275443
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
2015-08-01 10:14:28 +02:00
Arthur Moore
08d5aaf0fc
Remove more comments
2015-07-31 18:23:07 -04:00
Arthur Moore
6fce49bfb5
Don't warn twice when unable to play an idle animation
2015-07-31 18:01:02 -04:00
Arthur Moore
61c3835637
Don't try to play animations we know are bad
...
Prevents log spam
2015-07-31 18:01:02 -04:00
scrawl
7644a46ded
Creatures with no movement should not attempt to start combat ( Fixes #2786 )
2015-07-31 01:26:26 +02:00
scrawl
f326b8e5d2
Fix weapon animations playing on the lowerbody when swimming
2015-07-31 00:52:34 +02:00
scrawl
e8cbdcfb1e
Play swimming animation fallback on the upper body when possible
2015-07-31 00:35:41 +02:00
scrawl
1f755a2bc0
Don't use a shared Material in AlphaFader
2015-07-31 00:03:01 +02:00
slothlife
67a63cc662
Add some const correctness to MoonModel
2015-07-30 14:00:08 -05:00
Arthur Moore
5ea596f38d
Refactor onChooseActionStatePerFrameActions
...
This prevents playIdle errors from tyring to play idleAnimation 0
2015-07-30 08:15:45 -04:00
Arthur Moore
f69de1f263
Alert the user if trying to play a non-idle animation
...
Continue to propagate success/failure up the call stack.
2015-07-30 08:08:58 -04:00
Arthur Moore
5e6fcc2aef
Alert the user if attempting to play an animation fails
...
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
2015-07-30 08:00:26 -04:00
Marc Zinnschlag
6a9218ee07
replaced State_Compiling (not requried anymore) with State_Merging
2015-07-30 11:49:24 +02:00
Marc Zinnschlag
26ea3aa1ad
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-30 10:26:40 +02:00
slothlife
a4e1630ec2
Remove unreferenced member in MoonModel
2015-07-30 00:41:30 -05:00
slothlife
8dc7e158c6
Fix forward declaration of MoonState
2015-07-30 00:18:56 -05:00
slothlife
24ba54f4fe
Implement accurate moon settings ( fixes #672 )
2015-07-29 23:57:45 -05:00
Arthur Moore
2a653e45fd
(Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
...
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
2015-07-28 06:51:47 -04:00
Marc Zinnschlag
2c1cee38b4
Merge remote-tracking branch 'smbas/feature-extended-configurator'
2015-07-28 07:56:12 +02:00
scrawl
7ba399fc92
Change a message to upper case spelling
...
More consistent with other loading messages
2015-07-28 03:21:44 +02:00
Stanislav Bas
03c2e11961
Update to upstream/master. Resolve merge conflicts
2015-07-27 13:54:13 +03:00
Marc Zinnschlag
420503d5fc
Merge remote-tracking branch 'smbas/fix-bug-2728'
2015-07-27 11:23:49 +02:00
Marc Zinnschlag
bafa86d3e9
Merge remote-tracking branch 'scrawl/master'
2015-07-27 11:10:16 +02:00
Stanislav Bas
812fffbadc
Don't inform about a nested row addition in proxy models for top-level tables
2015-07-26 20:25:46 +03:00
Stanislav Bas
2471e4d67a
Rework Table to use rowAdded() signal of a proxy model
2015-07-26 20:09:31 +03:00
Stanislav Bas
86b7d2a43d
Inform about a row addition after re-sorting in InfoTableProxyModel
2015-07-26 20:07:36 +03:00
Stanislav Bas
37fd733deb
Create a custom signal to inform about a row addition in IdTableProxyModel
2015-07-26 20:06:30 +03:00
Marc Zinnschlag
b2fdfbcfe4
Merge remote-tracking branch 'pkubik/distance-setting'
2015-07-26 11:01:12 +02:00
dteviot
04aee1fe20
extracted function reactionTimeActions().
2015-07-26 17:32:29 +12:00
dteviot
c7aacaee70
extracted function returnToStartLocation().
2015-07-26 17:29:32 +12:00
dteviot
5e519ef550
extract function isPackageFinished().
2015-07-26 17:29:01 +12:00
dteviot
ad0d807103
extracted function reactionTimeActions().
2015-07-26 17:28:32 +12:00
dteviot
9c0e3d6c28
extracted functions doPerFrameActionsForState() and onChooseActionStatePerFrameActions().
2015-07-26 17:25:44 +12:00
dteviot
76f95eafe7
extract function onWalkingStatePerFrameActions().
2015-07-26 17:25:00 +12:00
dteviot
5ec310dfba
extract function onIdleStatePerFrameActions().
2015-07-26 17:24:33 +12:00
