1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Commit graph

7484 commits

Author SHA1 Message Date
scrawl
84961d7843 Fixes #1254: PcRank should return first rank if not in the faction 2014-04-28 15:31:18 +02:00
scrawl
b2119441b9 Fix bug in PcRank / PcNextRank
It was using the first faction instead of the actor's faction.
2014-04-28 15:26:40 +02:00
Marc Zinnschlag
421679b319 Merge remote-tracking branch 'scrawl/master' 2014-04-28 15:13:09 +02:00
scrawl
7e4a0c2478 Removed asserts 2014-04-28 15:00:52 +02:00
mrcheko
35c1724d39 unblock vertical aiming for combatants 2014-04-28 16:34:49 +04:00
scrawl
0796815da0 Ignore dead actors in getActorsFollowing/Fighting
Prevents dead enemies from disallowing resting near them
2014-04-28 11:44:56 +02:00
scrawl
27a05027f4 Fixes #1172: Added basic loading/saving progress bar
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
2014-04-28 11:29:57 +02:00
Marc Zinnschlag
0b2371a05d Merge remote-tracking branch 'thoronador/fix-minor-stuff' 2014-04-28 10:59:34 +02:00
Marc Zinnschlag
af322a9f77 Merge remote-tracking branch 'scrawl/master' 2014-04-28 10:48:57 +02:00
scrawl
1da99d9fc7 Remove unused variable 2014-04-28 10:26:24 +02:00
scrawl
b89463db09 Fix #1207: Remember previous choice in class creation dialog 2014-04-28 09:12:03 +02:00
scrawl
1da19585dc Remove some unneeded includes 2014-04-28 07:49:08 +02:00
Thomas
dc54bd5a5f Merge remote-tracking branch 'upstream/master' 2014-04-27 20:56:45 -04:00
Thomas
c2127845af Added onKnockdown command 2014-04-27 20:54:22 -04:00
Thoronador
f69d61976e minor performance improvements in other apps subdirectories 2014-04-27 23:25:02 +02:00
mrcheko
22cdb166f2 warning fix, vars renaming 2014-04-27 22:38:04 +04:00
Thoronador
1b8c975d5b minor performance improvements in apps/openmw
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.

For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
2014-04-27 19:10:23 +02:00
Marc Zinnschlag
ca097e146b Merge remote-tracking branch 'jeffreyhaines/master' 2014-04-27 17:35:10 +02:00
Jeffrey Haines
edbc319c42 fixed logic. || 2014-04-27 10:05:34 -04:00
Jeffrey Haines
52bb7c3f69 fixed logic. ! 2014-04-27 09:55:38 -04:00
Jeffrey Haines
7599b26d30 Fixed: creatures won't witness crimes
and potential crash.
2014-04-27 09:37:43 -04:00
Jeffrey Haines
0409e18a0e revert 2014-04-27 09:35:49 -04:00
Jeffrey Haines
b9bd4bc126 broken 2014-04-27 09:34:59 -04:00
Jeffrey Haines
ce106d3bec Revert "NPCs detect crime exclusively"
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.

Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2014-04-27 09:34:33 -04:00
mrcheko
82121e0401 some checks reworked 2014-04-27 16:59:21 +04:00
scrawl
e42855d522 Minor fix for spell icon 2014-04-27 12:54:18 +02:00
mrcheko
6a3dddfb9a merge master 2014-04-27 13:49:31 +04:00
Marc Zinnschlag
85dbf393d2 Merge remote-tracking branch 'graffy76/master' 2014-04-27 11:44:15 +02:00
scrawl
3eb1e4e117 Fixes #1241: Removed disposition-based combat conditions
The information for this code came from UESP, which in turn cites a (extremely vague) section from the TES-CS help text, so no surprise that it wasn't accurate.

The guard on the boat has a fight rating of 70, so with the old code it would attack on sight if the disposition is low enough. BTB-Character.esp includes something (not sure what) that drops his disposition to 35 when playing as a Khajiit, making him attack.

Testing in Vanilla it appears that disposition has no effect on combat engagement at all. Even with disposition 0 and fight 70 the NPCs don't attack.

Setting an NPCs fight rating to 70 or less still has a meaning, because the higher it is, the easier it becomes to raise the fight rating to 80 (by taunting, for example).
2014-04-27 09:43:54 +02:00
scrawl
dac0b7090a Get rid of bigbars.png and smallbars.png
Changed loading bar colour to match vanilla
2014-04-27 09:43:48 +02:00
scrawl
3161647809 Fix for not being able to pick up scrolls during combat
This is the behaviour I observed in vanilla morrowind.
2014-04-27 09:15:37 +02:00
scrawl
d92f95f5bf Fix a stacking issue 2014-04-27 06:08:15 +02:00
scrawl
93b76a603b Fixes #1100: Looting a corpse is no longer considered stealing 2014-04-27 06:08:08 +02:00
graffy76
985af15a12 removed qdebug references 2014-04-26 21:43:59 -05:00
graffy76
0d711e51b0 Converted SettingType enums to indicate widget type. 2014-04-26 21:32:36 -05:00
scrawl
e8210c92c6 Fixes #1240: Don't hardcode drowning time 2014-04-27 04:27:26 +02:00
graffy76
b94466dbb4 Merge branch 'master' of https://github.com/OpenMW/openmw
merge
2014-04-26 21:24:02 -05:00
cc9cii
1fb2c8d87b NPC turning is less hacky but still not perfect. NPC's should walk away after a period of non-action by the player (vanilla behaviour) - not yet implemented. 2014-04-27 07:38:31 +10:00
Thomas
c2b692e124 getActorsFollowing/Fighting no longer returns dead actors 2014-04-26 17:21:53 -04:00
mrcheko
dbe1307de0 code refining + minor fixes 2014-04-26 22:21:20 +04:00
Marc Zinnschlag
5e7cd806c4 Merge remote-tracking branch 'scrawl/master' 2014-04-26 18:05:04 +02:00
scrawl
04964595ef Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame 2014-04-26 16:44:20 +02:00
graffy76
ab33e78b67 Added RangeView class files 2014-04-26 09:40:58 -05:00
scrawl
d5dd864404 Fixes #1236: Disable all controls while playing movie 2014-04-26 14:33:45 +02:00
scrawl
30666f2cce Fixes #1297: Store global map markers in savegame 2014-04-26 13:42:32 +02:00
Marc Zinnschlag
ddb0496dca replaced return value of removeDocument with a signal 2014-04-26 13:11:27 +02:00
scrawl
f921f2e7db Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
2014-04-26 12:04:37 +02:00
scrawl
ef39b0f6ab Fixes #1291: Faction rank saving issue
A value of 0 is the first rank, -1 means not a member
2014-04-26 11:41:44 +02:00
scrawl
45d2a00717 Fixes #1293: Allow interpolation type 0 in case of 0 keys 2014-04-26 11:36:27 +02:00
scrawl
b13b25dd1b Fixes #1295: Support partial matches in Cell filter 2014-04-26 11:03:17 +02:00
scrawl
6eca5ac4bb Fixes #1296: Streamlined cellChanged detection 2014-04-26 07:46:19 +02:00
scrawl
cd1b4218e7 Fix dynamically placed objects being discarded when loading game 2014-04-26 05:01:26 +02:00
scrawl
f05606657c Correctly insert pasted text at cursor position 2014-04-26 05:01:26 +02:00
scrawl
91e50585ff AiWander: make sure to walk, not run 2014-04-26 05:01:26 +02:00
scrawl
5b011e43a7 Fix a crash after loading game 2014-04-26 05:01:26 +02:00
mrcheko
f3626adc86 remake of z-moving in combat for flying/swimming enemies 2014-04-26 00:20:55 +04:00
Marc Zinnschlag
42b332775a removed some debug statements 2014-04-25 15:30:46 +02:00
Marc Zinnschlag
c63d6437c0 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
2014-04-25 15:29:23 +02:00
Marc Zinnschlag
837fd2a4c6 Merge remote-tracking branch 'graffy76/master' 2014-04-25 15:11:19 +02:00
graffy76
2e06414b43 Fixed broken delegate display modes (Display Format settings). Moved
UserSetting update functions to DataDisplayDelegate.
2014-04-25 07:16:40 -05:00
Marc Zinnschlag
1f6ed584c2 Merge remote-tracking branch 'digmaster/master'
Conflicts:
	apps/openmw/mwstate/statemanagerimp.cpp
2014-04-25 08:39:40 +02:00
Jeffrey Haines
4a4c08946c Checks the state of the passed sneak variable 2014-04-24 23:02:11 -04:00
Thomas
f3272c941f Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
2014-04-24 22:47:45 -04:00
Jeffrey Haines
42b879a9a5 Reworked the accusation of actors 2014-04-24 22:41:05 -04:00
Jeffrey Haines
c3e08916da Sneak: Added support for state checking
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
2014-04-24 20:40:17 -04:00
graffy76
3f2ae950f5 Disabled view resize for open views when user setting changes. Fixed
new view size issue to match existing user settings.
2014-04-24 12:50:10 -05:00
Marc Zinnschlag
dbb192f084 moved loading to a separate thread 2014-04-24 15:09:25 +02:00
Marc Zinnschlag
9db9ad410d fixed checks for allowing load/save and some general cleanup 2014-04-24 10:14:17 +02:00
Marc Zinnschlag
760c8c7214 removed a redundant include 2014-04-24 09:56:51 +02:00
Marc Zinnschlag
42b3233bda removed a redundant check 2014-04-24 09:54:47 +02:00
Thomas
5b681e2199 Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait. 2014-04-24 03:14:47 -04:00
Thomas
05b21c92af Moved quick save into statemanager class. Kept loader as is as it's rather specalized. 2014-04-24 03:06:36 -04:00
Thomas
6a8bf71c4c Moved autosave to before you rest, not after it. 2014-04-23 23:33:57 -04:00
Thomas
a598060071 Added autosave on rest, as well as an option in the settings menu 2014-04-23 23:12:30 -04:00
Thomas
682c395488 Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts) 2014-04-23 21:39:25 -04:00
Thomas
49620968b9 Disallowed quicksave/load in character creation 2014-04-23 21:21:11 -04:00
Thomas
e873135da7 Missed a debug message 2014-04-23 21:04:52 -04:00
Thomas
f90810223a Added quicksave and quickload 2014-04-23 21:02:09 -04:00
graffy76
ce56669339 Fixed failed signal/slot connection between UserSettings and
CSVWorld::SubView
2014-04-23 17:02:37 -05:00
Thomas
ee581f593b Fixed issue which may occur if there's no evidence chest nearby 2014-04-23 13:20:43 -04:00
Thomas
f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 2014-04-23 13:02:51 -04:00
Thomas
61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 2014-04-23 10:00:18 -04:00
graffy76
8c6c70ee9c Merge branch 'master' of https://github.com/graffy76/openmw 2014-04-23 07:05:34 -05:00
Thomas
6022ffbd1f Evidence chest now locks when new evidence is added to it 2014-04-23 05:54:18 -04:00
Thomas
420163d35f Small changes to lock command (If no valid lockLevel exists, defaults to 100) 2014-04-23 05:19:34 -04:00
Thomas
cac8e52154 Seperated locked and lock level, to allow for relocking doors to previous lock level.
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
2014-04-23 05:12:07 -04:00
Thomas
e71a119c23 Made aifollowers run when long distances (800 or 10000, depending) from what they're following. 2014-04-23 02:57:48 -04:00
graffy76
4b607d658f Re-link user settings to editor main application 2014-04-22 22:19:53 -05:00
graffy76
e3384e3999 relocate support.hpp / remove support.cpp 2014-04-22 22:19:03 -05:00
graffy76
331df17b48 Added new framework files 2014-04-22 22:17:19 -05:00
graffy76
d3148555fa Delete old framework files 2014-04-22 22:16:14 -05:00
mrcheko
fbd0ffe86f enable z-moving for flying/water combatants 2014-04-22 22:59:39 +04:00
scrawl
9998c2783e Fix travis
Why again do we need a unit test for something that was never used?
2014-04-21 17:37:06 +02:00
Marc Zinnschlag
e324450118 replaced return value of DocumentManager::addDocument with a signal 2014-04-21 09:02:58 +02:00
mrcheko
f811abb752 pathgrid shortcutting extended 2014-04-20 20:35:07 +04:00
Marc Zinnschlag
86bd2f48dc removed an unused function 2014-04-20 17:28:10 +02:00
Marc Zinnschlag
0eed697f9a Merge remote-tracking branch 'digmaster/master' 2014-04-20 13:36:39 +02:00
Marc Zinnschlag
a91b386381 Merge remote-tracking branch 'jeffreyhaines/master' 2014-04-20 13:34:58 +02:00
cc9cii
6a1435c49e Remove rotation check that was freezing NPC's. 2014-04-20 17:59:08 +10:00
cc9cii
e17fab891d Suppress travis warning and one more tweak. 2014-04-20 16:49:57 +10:00
Thomas Luppi
d6f1f129eb Forgot to capitalize something. whooooops
dat y do
2014-04-20 00:39:50 -04:00
Thomas Luppi
95ef874205 Gets default keybindings from scancode, not keyvalue.
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
2014-04-20 00:34:58 -04:00
cc9cii
2b544d550b Fixed the rotation animation glitch. 2014-04-20 14:27:18 +10:00
cc9cii
000afa48b7 An attempt at making turning animation smoother. Copied some code from AiCombat for rotation. 2014-04-20 11:59:47 +10:00
cc9cii
3d26702f5e Make idle actors face the player. Turning animation is not smooth. 2014-04-20 10:36:01 +10:00
cc9cii
9bd31b6236 Added reaction time and moved game setting variables init to the constructor. 2014-04-20 10:06:03 +10:00
Jeffrey Haines
3484df0743 Fixed garage value found in beta's static analysis
Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844
2014-04-19 19:42:49 -04:00
Jeffrey Haines
6733a1541e Fixes to Crime System
Victimless crimes were removed because victims may not exist in the
case of stealing items.

Is class now uses case insensitive comparison.

Fixed issue with confiscation of stolen items.
2014-04-19 19:03:31 -04:00
cc9cii
3dfd08cf2d Cleanup and little tweaking. 2014-04-20 08:31:02 +10:00
cc9cii
479a94b35d Backing off closed doors working, needs cleanup and tweaking. 2014-04-20 08:14:54 +10:00
Marc Zinnschlag
7eb6a2e52d Merge remote-tracking branch 'scrawl/alarm' 2014-04-18 16:19:28 +02:00
Marc Zinnschlag
34092f9f5d Merge remote-tracking branch 'scrawl/master' 2014-04-18 15:08:30 +02:00
scrawl
b3916e7744 Crime: mark witnesses as alarmed.
Fixes guard dialogue to properly detect if the player turned himself in.
2014-04-18 13:44:09 +02:00
scrawl
4625adfb7f Fix typo in a condition. 2014-04-18 11:43:37 +02:00
cc9cii
7437647f70 Forgot to add a guard :-( 2014-04-18 16:45:31 +10:00
cc9cii
a0fc514df7 Suppress compiler warning. 2014-04-18 15:45:39 +10:00
cc9cii
c652cb1568 More cleaning up. 2014-04-18 15:19:22 +10:00
cc9cii
2447f0f4aa Cleaned up logging statements. 2014-04-18 14:41:44 +10:00
cc9cii
aad13d315c Fixed issue where allowed nodes were being erased. PathFinder was returning an empty path if the closest pathgrid point to the start was also the closest pathgrid point to the goal. Still need to clean up and remove logging statements. 2014-04-18 14:41:44 +10:00
cc9cii
d3be725ee7 Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points. 2014-04-18 14:41:43 +10:00
cc9cii
1ceeeb4a22 Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck. 2014-04-18 14:41:43 +10:00
Marc Zinnschlag
65161c3e24 Merge remote-tracking branch 'sirherrbatka/less-signals' 2014-04-16 10:22:20 +02:00
Marc Zinnschlag
ce33912980 Merge remote-tracking branch 'sirherrbatka/AngryFix' 2014-04-16 10:21:59 +02:00
Marc Zinnschlag
a7cece3d30 do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit 2014-04-15 22:34:15 +02:00
Marek Kochanowicz
8fba71101c removed signals 2014-04-15 20:39:19 +02:00
Marek Kochanowicz
fc1837e2ed fixed bug: regions can be dragged
ps
fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
2014-04-15 19:26:43 +02:00
Marc Zinnschlag
30d5040f2f Merge remote-tracking branch 'cc9cii/Bug-No-1260' 2014-04-15 15:26:58 +02:00
cc9cii
1fc030653f Avoid hard coding "thief.dds" string. 2014-04-15 22:30:41 +10:00
Marc Zinnschlag
86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Jeffrey Haines
e2fab228f9 Save state is handled correctly now. 2014-04-14 18:11:04 -04:00
mrcheko
4e7ee97050 fix for windows builds 2014-04-14 17:18:29 +04:00
cc9cii
89be1069a7 Bug #1260: show thief.dds image for a custom class level up menu 2014-04-14 18:31:46 +10:00
Marc Zinnschlag
71068ae3ad Merge branch 'regionmap' 2014-04-13 17:24:08 +02:00
Marc Zinnschlag
d188e68227 added f-type hint to TableSubView 2014-04-13 16:40:41 +02:00
Marc Zinnschlag
097c063b8a added 'view in table' action to region map 2014-04-13 16:40:16 +02:00
Marc Zinnschlag
2eca9e72fd added view action to region map 2014-04-13 15:46:31 +02:00
Marc Zinnschlag
1892550833 added set/unset region actions to region map 2014-04-13 15:32:49 +02:00
Marc Zinnschlag
fc4195a88f added create cell menu item to regionmap 2014-04-13 14:17:18 +02:00
Marc Zinnschlag
19b31c4146 always use the cell ID instead of the exterior coordinate fields from the original cell struct 2014-04-13 14:16:59 +02:00
Marc Zinnschlag
decd4270d9 added CellId role to RegionMap model 2014-04-13 13:59:27 +02:00
cc9cii
966ed46870 Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status. 2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr). 2014-04-13 14:53:36 +10:00
cc9cii
e9be6d3f42 Fix falling animation where vec.z is set to zero. 2014-04-13 11:34:59 +10:00
cc9cii
0bef754873 Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271. 2014-04-13 08:46:02 +10:00
Marc Zinnschlag
2f63eb7ca4 added missing edit lock for record reordering 2014-04-12 20:07:09 +02:00
cc9cii
d2a41167d0 Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075 2014-04-11 21:24:00 +10:00
Marc Zinnschlag
d0ea23431c replaced CellIndex typedef with new CellCoordinates class 2014-04-11 10:06:16 +02:00
Marc Zinnschlag
0516d95253 added context menu with selection functions to region map 2014-04-10 22:12:09 +02:00
Marc Zinnschlag
7f12733463 Merge remote-tracking branch 'potatoesmaster/1071' 2014-04-08 21:08:59 +02:00
Emanuel Guevel
09bd0324c9 Fail properly when a content file is not found 2014-04-08 20:19:09 +02:00
Marc Zinnschlag
d205d5f0af Merge branch 'cellselect' 2014-04-08 09:58:00 +02:00
Marc Zinnschlag
e0550ba336 allow multiple cell coordinates in c-type hint for scene subviews 2014-04-07 15:23:14 +02:00
Marc Zinnschlag
0d352cb883 replaced rectangular cell selection with a CellSelection object 2014-04-07 14:16:02 +02:00
Marc Zinnschlag
67965ec10c added CellCoordinates and CellSelection classes 2014-04-07 13:44:43 +02:00
Marc Zinnschlag
324b2743d4 removed grid button (discarding the first attempt at a cell selector) 2014-04-07 10:21:26 +02:00
Marc Zinnschlag
03b3487f1b minor cleanup 2014-04-07 09:56:36 +02:00
Marc Zinnschlag
fafb7501e3 Merge remote-tracking branch 'cc9cii/PathFinder-split' 2014-04-07 09:48:15 +02:00
Emanuel Guevel
ce7aa96371 Fix visual glitch happening when closing inventory while sneaking
(bug #1255)
2014-04-06 22:21:28 +02:00
Marc Zinnschlag
c7f2cfeca0 Merge remote-tracking branch 'gus/AIFix2' 2014-04-06 15:13:30 +02:00
Jeffrey Haines
a274b48f2f States are saved. Crime is reacted to.
Issues where some crime is ignored. Needs a lot more work
2014-04-05 22:45:40 -04:00
Jeffrey Haines
940c88d2ec Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
2014-04-05 10:26:14 -04:00
Marc Zinnschlag
0fe67b586a increased scene toolbar button size 2014-04-05 13:16:13 +02:00
Jeffrey Haines
df5cbe5dec Minor changes 2014-04-04 08:10:35 -04:00
cc9cii
28f7c42fb7 One more comment fix. 2014-04-04 18:17:42 +11:00
cc9cii
f59226265a Remove redundant parameter from aStarSearch. Also update some comments. 2014-04-04 18:10:06 +11:00
Jeffrey Haines
70919ba60a Removed witnesses and minor changes 2014-04-03 16:13:14 -04:00
cc9cii
5cf8e7e933 Remove logging. 2014-04-04 06:16:26 +11:00
cc9cii
040d4f8fc4 Move PathgridGraph into separate files. 2014-04-04 06:13:47 +11:00
Jeffrey Haines
0c957a3cde Added witnesses to the mix 2014-04-03 14:53:31 -04:00
Marc Zinnschlag
baf30ba292 added grid tool (does not work yet) 2014-04-03 14:44:48 +02:00
cc9cii
a8b2eb1fe9 Make Travis happy. 2014-04-03 22:49:22 +11:00
Marc Zinnschlag
3a58da9ad7 size adjustment 2014-04-03 13:30:22 +02:00
cc9cii
325d0616bb Cleanup debug statements. 2014-04-03 22:17:45 +11:00
Marc Zinnschlag
5d422fec8a fixed scene toolbar layout problems 2014-04-03 13:00:19 +02:00
cc9cii
98f77714ce Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder.
This version still has debugging statements and needs cleaning up.
2014-04-03 21:43:44 +11:00
Jeffrey Haines
b1abef7a38 Cleaned up code 2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be Crime is now checked every frame call 2014-04-03 00:50:09 -04:00
cc9cii
f597d3e88b Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors). 2014-04-03 07:46:26 +11:00
Jeffrey Haines
510f2d10ac Replaces broken code with todo 2014-04-02 14:20:33 -04:00
Jeffrey Haines
6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 2014-04-02 12:23:38 -04:00
Jeffrey Haines
7c0b51fb7e Ai pursue now controls guards pursuit of crimes
Should extend AiActivate in the future
2014-04-02 00:18:22 -04:00
Jeffrey Haines
50dac98a2b Feature 1154 & 73: Crime and NPC reactions 2014-04-01 20:24:25 -04:00
Jeffrey Haines
4037f3705e Feature 1154 & 73: NPCs react to crime 2014-04-01 14:15:55 -04:00
Marc Zinnschlag
5b5069535e keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly 2014-04-01 10:04:14 +02:00
Marc Zinnschlag
12e46c5dc7 Merge remote-tracking branch 'megaton/master' 2014-03-31 10:24:12 +02:00
Marc Zinnschlag
4ee1069baa Merge remote-tracking branch 'scrawl/master' 2014-03-31 10:11:54 +02:00
scrawl
f5810b8e1c Consider aspect ratio for loading screen background
More consistent with the main menu.
2014-03-30 23:07:49 +02:00
scrawl
1265131203 Set the selected index after all items are added (workaround for MyGUI bug) 2014-03-30 20:07:43 +02:00
megaton
50af9bc0d3 General perfomance optimizations. 2014-03-30 19:45:27 +04:00
cc9cii
d04bb3befb MSVC uses C version of locale. 2014-03-30 17:23:22 +11:00
Jeffrey Haines
8ce938c6f1 Revert 6b28c06..98fd381
This rolls back to commit 6b28c06b2c.
2014-03-29 22:26:53 -04:00
Jeffrey Haines
98fd381564 Feature #1154 Not all NPCs get aggressive when one is attacked
Compiling fix
2014-03-29 21:25:20 -04:00
Jeffrey Haines
6c866deb1b Feature #1154 Not all NPCs get aggressive when one is attacked
Partially implemented
2014-03-29 21:23:34 -04:00
scrawl
5eeed03f5b Only exchange bribe gold if the bribe was accepted 2014-03-30 00:12:31 +01:00
scrawl
72df9e77c6 Don't show version text in the pause menu 2014-03-30 00:07:32 +01:00
gus
d9ea7107b7 compile fix. 2014-03-29 18:36:32 +01:00
gus
bee057346b Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
2014-03-29 18:05:56 +01:00
Marc Zinnschlag
adab85eeb7 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-29 13:29:06 +01:00
Jeffrey Haines
6b28c06b2c Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe 2014-03-29 07:47:41 -04:00
Jeffrey Haines
ad9286a30f Revert "Revert "made mReceiver private""
This reverts commit 33aecc5218.
2014-03-29 07:45:56 -04:00