Commit Graph

7433 Commits (a5f0fe7282d200a88f357b1bf9b2cca0743630a7)

Author SHA1 Message Date
Thomas 885228ec02 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
11 years ago
Lars Söderberg 04e5b9c72c Right aligned version/revision
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.

Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.

Comments?
11 years ago
scrawl 84961d7843 Fixes #1254: PcRank should return first rank if not in the faction 11 years ago
scrawl b2119441b9 Fix bug in PcRank / PcNextRank
It was using the first faction instead of the actor's faction.
11 years ago
Marc Zinnschlag 421679b319 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 7e4a0c2478 Removed asserts 11 years ago
mrcheko 35c1724d39 unblock vertical aiming for combatants 11 years ago
scrawl 0796815da0 Ignore dead actors in getActorsFollowing/Fighting
Prevents dead enemies from disallowing resting near them
11 years ago
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.
11 years ago
Marc Zinnschlag 0b2371a05d Merge remote-tracking branch 'thoronador/fix-minor-stuff' 11 years ago
Marc Zinnschlag af322a9f77 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 1da99d9fc7 Remove unused variable 11 years ago
scrawl b89463db09 Fix #1207: Remember previous choice in class creation dialog 11 years ago
scrawl 1da19585dc Remove some unneeded includes 11 years ago
Thomas dc54bd5a5f Merge remote-tracking branch 'upstream/master' 11 years ago
Thomas c2127845af Added onKnockdown command 11 years ago
Thoronador f69d61976e minor performance improvements in other apps subdirectories 11 years ago
mrcheko 22cdb166f2 warning fix, vars renaming 11 years ago
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.
11 years ago
Marc Zinnschlag ca097e146b Merge remote-tracking branch 'jeffreyhaines/master' 11 years ago
Jeffrey Haines edbc319c42 fixed logic. || 11 years ago
Jeffrey Haines 52bb7c3f69 fixed logic. ! 11 years ago
Jeffrey Haines 7599b26d30 Fixed: creatures won't witness crimes
and potential crash.
11 years ago
Jeffrey Haines 0409e18a0e revert 11 years ago
Jeffrey Haines b9bd4bc126 broken 11 years ago
Jeffrey Haines ce106d3bec Revert "NPCs detect crime exclusively"
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.

Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
11 years ago
mrcheko 82121e0401 some checks reworked 11 years ago
scrawl e42855d522 Minor fix for spell icon 11 years ago
mrcheko 6a3dddfb9a merge master 11 years ago
Marc Zinnschlag 85dbf393d2 Merge remote-tracking branch 'graffy76/master' 11 years ago
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).
11 years ago
scrawl dac0b7090a Get rid of bigbars.png and smallbars.png
Changed loading bar colour to match vanilla
11 years ago
scrawl 3161647809 Fix for not being able to pick up scrolls during combat
This is the behaviour I observed in vanilla morrowind.
11 years ago
scrawl d92f95f5bf Fix a stacking issue 11 years ago
scrawl 93b76a603b Fixes #1100: Looting a corpse is no longer considered stealing 11 years ago
graffy76 985af15a12 removed qdebug references 11 years ago
graffy76 0d711e51b0 Converted SettingType enums to indicate widget type. 11 years ago
scrawl e8210c92c6 Fixes #1240: Don't hardcode drowning time 11 years ago
graffy76 b94466dbb4 Merge branch 'master' of https://github.com/OpenMW/openmw
merge
11 years ago
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. 11 years ago
Thomas c2b692e124 getActorsFollowing/Fighting no longer returns dead actors 11 years ago
mrcheko dbe1307de0 code refining + minor fixes 11 years ago
Marc Zinnschlag 5e7cd806c4 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 04964595ef Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame 11 years ago
graffy76 ab33e78b67 Added RangeView class files 11 years ago
scrawl d5dd864404 Fixes #1236: Disable all controls while playing movie 11 years ago
scrawl 30666f2cce Fixes #1297: Store global map markers in savegame 11 years ago
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.
11 years ago
scrawl ef39b0f6ab Fixes #1291: Faction rank saving issue
A value of 0 is the first rank, -1 means not a member
11 years ago
scrawl 45d2a00717 Fixes #1293: Allow interpolation type 0 in case of 0 keys 11 years ago
scrawl b13b25dd1b Fixes #1295: Support partial matches in Cell filter 11 years ago
scrawl 6eca5ac4bb Fixes #1296: Streamlined cellChanged detection 11 years ago
scrawl cd1b4218e7 Fix dynamically placed objects being discarded when loading game 11 years ago
scrawl f05606657c Correctly insert pasted text at cursor position 11 years ago
scrawl 91e50585ff AiWander: make sure to walk, not run 11 years ago
scrawl 5b011e43a7 Fix a crash after loading game 11 years ago
mrcheko f3626adc86 remake of z-moving in combat for flying/swimming enemies 11 years ago
Marc Zinnschlag 42b332775a removed some debug statements 11 years ago
Marc Zinnschlag c63d6437c0 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
11 years ago
Marc Zinnschlag 837fd2a4c6 Merge remote-tracking branch 'graffy76/master' 11 years ago
graffy76 2e06414b43 Fixed broken delegate display modes (Display Format settings). Moved
UserSetting update functions to DataDisplayDelegate.
11 years ago
Marc Zinnschlag 1f6ed584c2 Merge remote-tracking branch 'digmaster/master'
Conflicts:
	apps/openmw/mwstate/statemanagerimp.cpp
11 years ago
Jeffrey Haines 4a4c08946c Checks the state of the passed sneak variable 11 years ago
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.
11 years ago
Jeffrey Haines 42b879a9a5 Reworked the accusation of actors 11 years ago
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
11 years ago
graffy76 3f2ae950f5 Disabled view resize for open views when user setting changes. Fixed
new view size issue to match existing user settings.
11 years ago
Marc Zinnschlag 9db9ad410d fixed checks for allowing load/save and some general cleanup 11 years ago
Marc Zinnschlag 760c8c7214 removed a redundant include 11 years ago
Marc Zinnschlag 42b3233bda removed a redundant check 11 years ago
Thomas 5b681e2199 Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait. 11 years ago
Thomas 05b21c92af Moved quick save into statemanager class. Kept loader as is as it's rather specalized. 11 years ago
Thomas 6a8bf71c4c Moved autosave to before you rest, not after it. 11 years ago
Thomas a598060071 Added autosave on rest, as well as an option in the settings menu 11 years ago
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) 11 years ago
Thomas 49620968b9 Disallowed quicksave/load in character creation 11 years ago
Thomas e873135da7 Missed a debug message 11 years ago
Thomas f90810223a Added quicksave and quickload 11 years ago
graffy76 ce56669339 Fixed failed signal/slot connection between UserSettings and
CSVWorld::SubView
11 years ago
Thomas ee581f593b Fixed issue which may occur if there's no evidence chest nearby 11 years ago
Thomas f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 11 years ago
Thomas 61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 11 years ago
graffy76 8c6c70ee9c Merge branch 'master' of https://github.com/graffy76/openmw 11 years ago
Thomas 6022ffbd1f Evidence chest now locks when new evidence is added to it 11 years ago
Thomas 420163d35f Small changes to lock command (If no valid lockLevel exists, defaults to 100) 11 years ago
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.
11 years ago
Thomas e71a119c23 Made aifollowers run when long distances (800 or 10000, depending) from what they're following. 11 years ago
graffy76 4b607d658f Re-link user settings to editor main application 11 years ago
graffy76 e3384e3999 relocate support.hpp / remove support.cpp 11 years ago
graffy76 331df17b48 Added new framework files 11 years ago
graffy76 d3148555fa Delete old framework files 11 years ago
mrcheko fbd0ffe86f enable z-moving for flying/water combatants 11 years ago
scrawl 9998c2783e Fix travis
Why again do we need a unit test for something that was never used?
11 years ago
mrcheko f811abb752 pathgrid shortcutting extended 11 years ago
Marc Zinnschlag 86bd2f48dc removed an unused function 11 years ago
Marc Zinnschlag 0eed697f9a Merge remote-tracking branch 'digmaster/master' 11 years ago
Marc Zinnschlag a91b386381 Merge remote-tracking branch 'jeffreyhaines/master' 11 years ago
cc9cii 6a1435c49e Remove rotation check that was freezing NPC's. 11 years ago
cc9cii e17fab891d Suppress travis warning and one more tweak. 11 years ago
Thomas Luppi d6f1f129eb Forgot to capitalize something. whooooops
dat y do
11 years ago
Thomas Luppi 95ef874205 Gets default keybindings from scancode, not keyvalue.
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
11 years ago
cc9cii 2b544d550b Fixed the rotation animation glitch. 11 years ago
cc9cii 000afa48b7 An attempt at making turning animation smoother. Copied some code from AiCombat for rotation. 11 years ago
cc9cii 3d26702f5e Make idle actors face the player. Turning animation is not smooth. 11 years ago
cc9cii 9bd31b6236 Added reaction time and moved game setting variables init to the constructor. 11 years ago
Jeffrey Haines 3484df0743 Fixed garage value found in beta's static analysis
Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844
11 years ago
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.
11 years ago
cc9cii 3dfd08cf2d Cleanup and little tweaking. 11 years ago
cc9cii 479a94b35d Backing off closed doors working, needs cleanup and tweaking. 11 years ago
Marc Zinnschlag 7eb6a2e52d Merge remote-tracking branch 'scrawl/alarm' 11 years ago
Marc Zinnschlag 34092f9f5d Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl b3916e7744 Crime: mark witnesses as alarmed.
Fixes guard dialogue to properly detect if the player turned himself in.
11 years ago
scrawl 4625adfb7f Fix typo in a condition. 11 years ago
cc9cii 7437647f70 Forgot to add a guard :-( 11 years ago
cc9cii a0fc514df7 Suppress compiler warning. 11 years ago
cc9cii c652cb1568 More cleaning up. 11 years ago
cc9cii 2447f0f4aa Cleaned up logging statements. 11 years ago
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. 11 years ago
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. 11 years ago
cc9cii 1ceeeb4a22 Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck. 11 years ago
Marc Zinnschlag 65161c3e24 Merge remote-tracking branch 'sirherrbatka/less-signals' 11 years ago
Marc Zinnschlag ce33912980 Merge remote-tracking branch 'sirherrbatka/AngryFix' 11 years ago
Marc Zinnschlag a7cece3d30 do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit 11 years ago
Marek Kochanowicz 8fba71101c removed signals 11 years ago
Marek Kochanowicz fc1837e2ed fixed bug: regions can be dragged
ps
fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
11 years ago
Marc Zinnschlag 30d5040f2f Merge remote-tracking branch 'cc9cii/Bug-No-1260' 11 years ago
cc9cii 1fc030653f Avoid hard coding "thief.dds" string. 11 years ago
Marc Zinnschlag 86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
11 years ago
Jeffrey Haines e2fab228f9 Save state is handled correctly now. 11 years ago
mrcheko 4e7ee97050 fix for windows builds 11 years ago
cc9cii 89be1069a7 Bug #1260: show thief.dds image for a custom class level up menu 11 years ago
Marc Zinnschlag 71068ae3ad Merge branch 'regionmap' 11 years ago
Marc Zinnschlag d188e68227 added f-type hint to TableSubView 11 years ago
Marc Zinnschlag 097c063b8a added 'view in table' action to region map 11 years ago
Marc Zinnschlag 2eca9e72fd added view action to region map 11 years ago
Marc Zinnschlag 1892550833 added set/unset region actions to region map 11 years ago
Marc Zinnschlag fc4195a88f added create cell menu item to regionmap 11 years ago
Marc Zinnschlag 19b31c4146 always use the cell ID instead of the exterior coordinate fields from the original cell struct 11 years ago
Marc Zinnschlag decd4270d9 added CellId role to RegionMap model 11 years ago
cc9cii 966ed46870 Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status. 11 years ago
cc9cii 3e6e325e5b Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr). 11 years ago
cc9cii e9be6d3f42 Fix falling animation where vec.z is set to zero. 11 years ago
cc9cii 0bef754873 Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271. 11 years ago
Marc Zinnschlag 2f63eb7ca4 added missing edit lock for record reordering 11 years ago
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 11 years ago
Marc Zinnschlag d0ea23431c replaced CellIndex typedef with new CellCoordinates class 11 years ago
Marc Zinnschlag 0516d95253 added context menu with selection functions to region map 11 years ago
Marc Zinnschlag 7f12733463 Merge remote-tracking branch 'potatoesmaster/1071' 11 years ago
Emanuel Guevel 09bd0324c9 Fail properly when a content file is not found 11 years ago
Marc Zinnschlag d205d5f0af Merge branch 'cellselect' 11 years ago