Commit graph

8255 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
d29862eac3 Merge remote-tracking branch 'emperorarthur/anim_fail' 2015-08-08 10:47:46 +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
scrawl
56b7196bea Remove incorrect implementation of "Clouds Maximum Percent" weather setting 2015-08-07 15:34:01 +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
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
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
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
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
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
slothlife
0244a9b329 Correct moon texture with respect to trajectory 2015-08-01 07:57:05 -05: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
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
scrawl
7ba399fc92 Change a message to upper case spelling
More consistent with other loading messages
2015-07-28 03:21:44 +02:00
Marc Zinnschlag
bafa86d3e9 Merge remote-tracking branch 'scrawl/master' 2015-07-27 11:10:16 +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
dteviot
b3d5b47fea extracted function UpdateActorsMovement(). 2015-07-26 17:23:45 +12:00
scrawl
dff84adf7e Fix weapon animation priority 2015-07-26 01:35:36 +02:00
dteviot
aba7225817 Removed some duplicated operations. 2015-07-26 11:15:21 +12:00
scrawl
41996b0aad Don't play turning animations in first person mode 2015-07-25 18:59:16 +02:00
scrawl
e0ee2fc01b Adjust the movement animation speed every frame (Fixes #1921) 2015-07-25 18:22:48 +02:00
scrawl
278076e609 Include cleanup 2015-07-25 04:14:22 +02:00
scrawl
3bca3e73d4 Fix GetWeaponDrawn and GetSpellReadied script functions for creatures 2015-07-25 02:11:59 +02:00
scrawl
b3f5ac5dbb Include cleanup 2015-07-25 02:11:49 +02:00
scrawl
e6b28d84f0 Outdated comment fix 2015-07-25 00:28:47 +02:00
scrawl
3f3c3d0ad3 Remove an already resolved todo comment 2015-07-24 23:28:43 +02:00
scrawl
4f6e5345cc Include cleanup 2015-07-24 23:28:36 +02:00
Pawel Kubik
47922f6c35 Changed a settings variable responsible for number of loaded exterior cells. 2015-07-24 22:01:49 +02:00
scrawl
7f66339790 Remove a redundant function 2015-07-24 20:23:27 +02:00
scrawl
71bc22401f Include cleanup 2015-07-24 18:23:23 +02:00
scrawl
7e4e59efb9 Fix excessive auto-equipping in InventoryStore::removeItem (Fixes #2792) 2015-07-23 02:29:09 +02:00
scrawl
7900631d51 Print the missing player cell to error output 2015-07-23 02:29:09 +02:00