Commit Graph

7765 Commits (8419002393d89bd20222773a1872efb858f7ea32)

Author SHA1 Message Date
scrawl 90ec19c3ac Remove unneeded MWScrollView 11 years ago
scrawl 150b920ef1 Fix long journal entries not being displayed 11 years ago
scrawl 5fc2b1a41b Allow setting a journal index even if there's no related journal entry
This is used by the MV_SlaveMule quest.
11 years ago
scrawl e1458453f3 Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group
Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts.

Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.
11 years ago
cc9cii 12dc5cf4ea Bug #1303 - resolves the bug by tweaking the slope constant (the value 49 was selected to mimic vanilla behaviour for a low level character exploring Seyda Neen). The feature to vary the climbable angle based on acrobatics is still to be implemented. 11 years ago
mrcheko aa5647b45e merge master, resolve conflicts 11 years ago
cc9cii 8971db8962 SceneWidget windowHandle fix for Windows. 11 years ago
scrawl b4ed828e21 Feature #1323: Implement restocking items (does not handle levelled lists yet) 11 years ago
Marc Zinnschlag f7c89015f9 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl ae66d28c87 Feature #32: Implement respawn for containers, creatures and NPCs 11 years ago
scrawl 92c5bb56e0 Un-reverted actorId for AiPursue 11 years ago
scrawl e266aff561 Savegame: store projectiles 11 years ago
scrawl 9adb990143 Fix potentially unsafe use of MWWorld::Ptr 11 years ago
scrawl e5a21aca53 Refactor projectiles to no longer use MW-objects 11 years ago
scrawl 18852c09d0 Manually re-added AiCombat portion of actorid changes. This is the only one that really matters, and will not suffer from the infinite recursion because it's not included in AiSequence::fill. 11 years ago
scrawl 36d9ae17cc Revert "Change all AI packages (except AiActivate) to use ActorIds"
Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..)

This reverts commit 2e9985c1a3.
11 years ago
scrawl 028e00c98f Add missing status report for some toggle commands 11 years ago
scrawl 868e38a07c Fix Assault crimes being reported when striking in self-defense
Last missing fix for Bug #1134.
11 years ago
scrawl 940a434479 Use ItemModel for moving items from a container to the world
Fixes owner not resetting when moving an item from a corpse to the world.
11 years ago
scrawl d70306382e Don't create the player object until the game starts
Fixes a crash introduced in e591d23 when using --skip-menu=0.
11 years ago
mrcheko 5be37f04ef Feature 1314: make npc fight creatures 11 years ago
scrawl b3735981d6 Remove unused file_finder 11 years ago
Marc Zinnschlag 3b2ba4f6cd Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 0bc33fa86a Revert "AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)"
Apparently not working for AiCombat due to its higher getPriority(). What should we do here?

This reverts commit a6e1d7ffd6.
11 years ago
scrawl b16d444f0f Fix never clearing graveyard. Oops 11 years ago
scrawl 6de7e16550 Fix searchPtrViaActorId not skipping over deleted references
Fixes an issue when an actor has moved cell: searchPtrViaActorId would randomly return the deleted Ptr from the old cell.
11 years ago
scrawl b6a7aee42e Fix player not being allowed to use his own items 11 years ago
scrawl eb40032bde Fix item owner not resetting when dragging an item from a corpse to the player avatar 11 years ago
scrawl bac4d875df Fix a potential exploit that made it possible to reset the owner of any item 11 years ago
scrawl a6e1d7ffd6 AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor) 11 years ago
scrawl 2e9985c1a3 Change all AI packages (except AiActivate) to use ActorIds
More robust in case the target changes cell or there are multiple targets with the same RefId
11 years ago
scrawl 2f13a17a39 Add some more safety checks to spellcasting 11 years ago
scrawl f2c193ce3d Fix searching the player's actorId 11 years ago
scrawl a609dc5674 Fix exception when getting hit by a trap 11 years ago
scrawl a76e391ad0 Savegame: store door movement state (Closes #747) 11 years ago
scrawl 37b9d2fb0c Fix a wrong use of reference that causes potential crash 11 years ago
scrawl 471bbd0021 Savegame: store levelled creature state and move to actorIds
(Closes #1332)
11 years ago
Marc Zinnschlag d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
Conflicts:
	apps/openmw/mwrender/localmap.cpp
11 years ago
slothlife f33559fead Fixes for MSVC warnings, less overall changes
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
11 years ago
scrawl 9b67fcc4d7 Merge branch 'master' of https://github.com/OpenMW/openmw 11 years ago
scrawl 9052cc4a57 Savegame: store ActiveSpells 11 years ago
Marc Zinnschlag 2116f16289 Merge remote-tracking branch 'digmaster/master' 11 years ago
Thomas d2aada95b4 Fixed AiPursue by fixing underlying issue is Pathto() 11 years ago
Thomas 2425d2c2ab Added stuck mitigation for AiAvoidDoor 11 years ago
Marc Zinnschlag c2ea92b93a Merge remote-tracking branch 'sirherrbatka/Feature#1274' 11 years ago
Marek Kochanowicz 3439900239 ignore all drops that will not create usefull filter 11 years ago
Thomas 993ef1be43 Actor avoiding door asks all surrounding actors to do the same. 11 years ago
scrawl 1141c1f3f2 Change projectiles to use actorIds 11 years ago
scrawl 61187c2fef Savegame: store actorIds 11 years ago
Thomas cbcf0f6039 Changed AiEScort to use new PathTo function 11 years ago
scrawl dfacf8c044 Change ActiveSpells to use ActorId 11 years ago
scrawl 67e942e733 Bug #869: Some fixes to the previous fix 11 years ago
slothlife c160a04ede Revert "Fixes for warnings when building with MSVC"
This reverts commit 46eb20b98c.
11 years ago
scrawl 7697ab37e0 Fixes #1129: Change summoned creatures to use ActorId
Gracefully handles summoned creatures that are left behind in inactive cells.
11 years ago
Thomas 7cd4c93fa4 Changed getNearbyDoor to use MWWorld::Ptr 11 years ago
scrawl 99b4bc721b Don't attempt to inflict spells on dead actors 11 years ago
scrawl 6c7b3074f5 Fix self-defense for creatures when attacked with a spell 11 years ago
Thomas 58bf7624be Made code a bit more efficient 11 years ago
scrawl 3cdbcf3c28 Merge branch 'actorid' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwmechanics/creaturestats.cpp
11 years ago
Thomas 203ef580cf Fixed moving activatable object being incorrectly activated. 11 years ago
scrawl 365ca6c7e1 Fixes #1331: Manually disable movement state for dead actors.
For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
11 years ago
Thomas 6d540c4e07 Removed merging error 11 years ago
Thomas 680890c846 Clarification on some documentation points 11 years ago
Thomas d6d4d9f75d Removed destructor documentation 11 years ago
Thomas ee36ace00b Undid some code clean up changes, and changed how some includes work 11 years ago
Thomas 598221a8e7 Forgot some files 11 years ago
scrawl e591d23880 Fixes #894: Make sure the player's CharacterController is updated when the player is rebuilt. Necessary if the race is changed while we are still in a GUI (e.g. in the review dialog), and an update normally wouldn't occur. 11 years ago
Thomas 9dbe53c722 Merge remote-tracking branch 'upstream/master' 11 years ago
Thomas 2db3c89a9e Ensures destination is far enough to care about getting stuck 11 years ago
Marc Zinnschlag 6c8e4b27d3 Merge remote-tracking branch 'scrawl/master' 11 years ago
Thomas cbfa282f8d Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work)
Notes - When the door hits them while it's about to finish closing they will try to walk through the door.
      - Considerably more works is needed in making the NPC work out troublesome areas where they get stuck
11 years ago
Thomas 2c74ea381e Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue 11 years ago
scrawl 386604bc9d Fixes #869: Added methods to control external and internal collision modes separately
When an actor dies, we should only disable external collisions, i.e. prevent other actors from colliding with the dead body. The dead actor, however, should still have gravity and collision applied.

Also moved disableCollision to when the death animation finishes, not as soon as the actor's health is 0.
11 years ago
mrcheko 725f6cac5e AiPursue infinite package updating bug resolved 11 years ago
scrawl 6cc691115b Savegame: store most of CreatureStats 11 years ago
Thomas 645d174a96 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwmechanics/aisequence.hpp
11 years ago
mrcheko e4fe78937a Merge remote-tracking branch 'upstream/master' 11 years ago
Marc Zinnschlag 3c5fe28857 Merge branch 'config' 11 years ago
Marc Zinnschlag 8279d307c4 text encoding configuration (was using hardcoded settings before) 11 years ago
scrawl 117b812fb1 Fix invisibility not breaking on certain actions 11 years ago
scrawl b0fbea9d57 Removed a wrong assertion. Max drowning time is defined by GMST. 11 years ago
scrawl 2bc2684a66 Fixes #275: force updating exterior cell maps even if already in cache 11 years ago
scrawl 54a893994a Also update local map when paused, to make it update properly when teleporting via GUI/console 11 years ago
scrawl 7428511ea0 Bug #772: Do not show door markers for disabled doors 11 years ago
scrawl 961c4d4dc4 Fixes #772: Give scripts a chance to run before updating map, so that disabled objects are not visible 11 years ago
scrawl ac8abd3398 assert -> exception to gracefully handle corrupted savegames 11 years ago
Marc Zinnschlag 368c868623 Merge remote-tracking branch 'scrawl/master' 11 years ago
Marc Zinnschlag a85c73cf35 Merge remote-tracking branch 'filkry/bug1047dialoglinks' 11 years ago
scrawl c39a0368cf Bug #618: Make local map textures static in an attempt to fix the disappearing maps with D3D.
Also removed problematic DISCARDABLE flag for fog of war textures.
11 years ago
scrawl c98bea2a88 Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip 11 years ago
scrawl a4a9794417 Savegame: store fog of war (Closes #1177) 11 years ago
scrawl 7b46e9f914 Get rid of no longer needed widget names 11 years ago
scrawl 041319c43e Fixes #1234: Store dynamic record counter in savegame to prevent name clashes 11 years ago
scrawl 07d9845aa0 Fix a bug in ESMStore code that checks for duplicate record insertions 11 years ago
Fil Krynicki eb5ef270ba Bug 1047 update - defaults and edge case
Handles edge case where it was possible to highlight adjacent
sub-terms without whitespace between them.

Also makes ignoring words not prefixed by whitespace the
assumed behaviour.
11 years ago
scrawl dab4db87ff Fix a bug in marker placement for interior maps 11 years ago
Fil Krynicki 9095a45ba7 Bug 1047 Fix
Dialog links can no longer be highlighted if they appear in the
middle of the word. This is achieved by confirming that the
character before a match is not alphabetic, so that words
following hyphens can still potentially match.
11 years ago
scrawl b358cf2423 Fix a potential crash when loading script locals from savegame 11 years ago
scrawl 9fb5cef287 Oops, committed debug code 11 years ago
Marc Zinnschlag 8f5acf4741 Merge branch 'openmw-30' 11 years ago
Marc Zinnschlag 5b5bf6f37e removed a redundant (and unsufficiently configured) copy of ConfigurationManager 11 years ago
Marc Zinnschlag 804bf523ba removed two unused files 11 years ago
Marc Zinnschlag 5b9e90744e Merge branch 'load' 11 years ago
Marc Zinnschlag 6fdbd4d3f9 minor adjustment to UniversalId 11 years ago
Marc Zinnschlag 96ca9500ca generate error messages when encounting non-critical problems during load 11 years ago
Marc Zinnschlag 79d59153c1 improved layout of loading window 11 years ago
Marc Zinnschlag 95d24492de display load error messages in loading window 11 years ago
Marc Zinnschlag aadaf7827d added load error log 11 years ago
Marc Zinnschlag 31b8dad4e0 Merge remote-tracking branch 'scrawl/master' 11 years ago
Marc Zinnschlag 2009cf9ad7 Merge remote-tracking branch 'scrawl/master' into openmw-30 11 years ago
scrawl 242e19a136 Fix crash when exiting OpenMW while dialogue/journal is opened and mouse cursor on a topic
(Fixes #1300)
11 years ago
scrawl 5163358478 Fix a crash when exiting OpenMW while the mouse cursor is over a local map marker 11 years ago
scrawl d86585b153 Fix clearing of local map markers
destroyWidget changes the child count, so the for loop is flawed.
11 years ago
scrawl 1444cd9051 Fix AiCombat exception when actor has a lockpick/probe equipped.
Don't make NPCs autoEquip lockpicks/probes, since they can't use them.
11 years ago
scrawl 136813a882 Bug #1319: Fix references not coming from a content file incorrectly overwriting each other 11 years ago
scrawl e7a004824c Fix a search that should have been find 11 years ago
scrawl 872d9be1b4 Fix potential issue with dialogue globals
Make sure they are updated throughout the conversation
11 years ago
scrawl 731bc9c275 Fix broken isClass check and renamed variable for clarity 11 years ago
slothlife 46eb20b98c Fixes for warnings when building with MSVC
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
11 years ago
cc9cii cf23721f1b Windows debug build crash fix. 11 years ago
scrawl 312dc84fa4 Fix a bug where the player's inventory could be opened as a container
If an NPC uses AiActivate on the player (i.e. to activate dialogue) precisely in the frame where the player just died, the player's inventory would be opened as a container instead.
11 years ago
Marc Zinnschlag cf90da6cd8 minor fix 11 years ago
Marc Zinnschlag 6eff5ecaad Merge branch 'operations' into load
Conflicts:
	apps/opencs/main.cpp
	apps/opencs/model/doc/document.cpp
11 years ago
Marc Zinnschlag 205306ee3d changed message passing format from QString to a UniversalId/std::string pair 11 years ago
graffy76 0e7d40de6a Merge branch 'master' of https://github.com/OpenMW/openmw
upstream merge
11 years ago
graffy76 cd7983adb5 Decoupled setting definitions from the Setting class. QSettings
implementation is now fully responsible for managing user settings.
11 years ago
Marc Zinnschlag 21142711f0 Merge remote-tracking branch 'graffy76/master' 11 years ago
graffy76 e47e3de3d2 Removed unneeded includes, cleaned up code, added comments 11 years ago
graffy76 8fb96e1be3 Removed error code for missing opencs.ini files. 11 years ago
mrcheko 01810f24b0 A* misses 1st closest node fix 11 years ago
Marc Zinnschlag 729e079b0b Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 1c8c26072d Crime and self defense fixes
- NPCs should still shout messages such as "thief" even if they did not report the crime
 - Fixed self defense for NPCs (they no longer attack the player when they were attacked by a non-player actor)
 - Fixed self defense for creatures (Fixes #1203)
11 years ago
scrawl d2beb814e7 Remove superfluous attack phrases (already done by startCombat) 11 years ago
graffy76 a17cb1f389 Fixed opencs.ini formatting 11 years ago
Marc Zinnschlag a30d816982 fixed a mixup in CSMTools::Tools constructor/destructor 11 years ago
Marc Zinnschlag 492620c8cf handle exceptions thrown during loading and report them to the user 11 years ago
scrawl dd9117809d Say an attack phrase when combat starts
Move combat start to a helper method

Added some todo comments
11 years ago
scrawl d4492b56db Added header file missing from CMakeLists 11 years ago
scrawl 536fc5e192 Fix autosaves 11 years ago
graffy76 5cba828cc9 Removed unneeded code from setting manager. Moved some code to user
settings
11 years ago
graffy76 74fa115d20 fixed check for missing ini files 11 years ago
graffy76 475214ab62 Implmented QSettings for loading / saving file definitions. Also
renamed opencs.cfg to opencs.ini to follow Ini format standards
11 years ago
Jeffrey Haines d4812c3af9 fixed placement of else statement 11 years ago
Jeffrey Haines 78f76842a6 Added else statement
Its still dodgy though
11 years ago
Jeffrey Haines 7d5dab214c #58 - Sneak Skill: functional sneaking
Removed sneak checking from individual actor update.
Added sneak checking to Actors::update()
11 years ago
Jeffrey Haines a65e8393bb Merged files 11 years ago
Marc Zinnschlag df97a1b57f Merge remote-tracking branch 'sirherrbatka/Feature#1274' 11 years ago
mrcheko f596b698d9 fixes to slow-down at jump startup and infinite air intertia growth 11 years ago
Marek Kochanowicz f51f826dad fixed compilation 11 years ago
Jeffrey Haines a469444e53 Player can't detect self 11 years ago
Marc Zinnschlag 7f78c29bb5 Merge remote-tracking branch 'sirherrbatka/Feature#1274'
Conflicts:
	apps/opencs/view/world/table.cpp
11 years ago
Marek Kochanowicz 4a502226e6 added flag to distingiush widgets 11 years ago
Marc Zinnschlag e43913e7c2 Merge remote-tracking branch 'graffy76/master' 11 years ago
Thomas dbf06d8c8b Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwmechanics/aipursue.hpp
	apps/openmw/mwmechanics/aisequence.hpp
11 years ago
graffy76 3f737bbb44 implemented QDial into RangeView class 11 years ago
graffy76 4f876574c1 Implemented slider widget in rangeView class 11 years ago
graffy76 0a3ab3dcd1 Commented out "proxy selection test" demo page in user settings 11 years ago
graffy76 35d1502308 Merge branch 'master' of https://github.com/OpenMW/openmw
merge
11 years ago
graffy76 1c26741c56 Implemented rangeview with spinbox as only control. Simplified setting
class constructor.
11 years ago
graffy76 bc6197c552 Added custom spin box class 11 years ago
Thoronador be89654eef remove audiere_decoder + mpgsnd_decoder from CMake file for openmw 11 years ago
Thoronador 620a8ccaf3 remove Audiere and MPG123+Sndfile decoder sources 11 years ago
Marek Kochanowicz 00b21449a2 replaced type_cell with type_scene 11 years ago
Jeffrey Haines e1e23447f2 Removed initial check form setSneak
It wasn’t needed.
11 years ago
Jeffrey Haines 05e326bdc3 Added update sneak to actors
Intends to check the state of a players sneak by asking the question if
each npc can see the player.
11 years ago
scrawl 658c37a299 AiPursue: If we reached the path end, that does not mean we reached the target. Rebuild the path if the target has moved in the meantime.
Fixes guards in pursuit activating the dialogue too early.

Also tweaked the activation distance.
11 years ago
Marc Zinnschlag e9c2f24faa intercept close button clicks in loading window 11 years ago
Marc Zinnschlag 3fdd72f204 added cancel button to loading window 11 years ago
Marc Zinnschlag 6bc5869222 record loading progress bar 11 years ago
Marc Zinnschlag 6692d2dc72 split up load function in a start and continue part 11 years ago
Marc Zinnschlag 0b309d9ef4 Merge branch 'master' into load
Conflicts:
	apps/opencs/view/doc/viewmanager.cpp
11 years ago
Marek Kochanowicz 5e99381019 Drag and drop works. 11 years ago
Marc Zinnschlag e0e2ad8316 content file loading progress bar 11 years ago
scrawl 7bddfc0025 Fix some spelling mistakes. 11 years ago
scrawl 122e606e30 Crime: improvement to arrest on sight for large bounties
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
11 years ago
Marc Zinnschlag e09218f164 moved load code from Document to Loader class 11 years ago
scrawl 7331a64e34 Restore fix for Bug #875 (commit 602be9bbe7, was broken by 43757efdc4) 11 years ago
scrawl 1b074e5524 Call setAttacked even if the attack missed. Unsuccessful hits should also evoke a response. 11 years ago
scrawl df1694c27b Console autocompletion: List candidates when repeatedly pressing tab (bash-style) 11 years ago
scrawl 92467ba6bc Fix sunlight for interiors 11 years ago
Marek Kochanowicz 7f1df878f6 make getDropType static and public. 11 years ago
scrawl 8560b43464 Move to esm component 11 years ago
scrawl f8cc328b5e Slightly prettier backdrop when loading game from main menu. 11 years ago
scrawl 6381b1e938 Fixes #1309: Do not allow saving while dialogs are opened, just like vanilla
This limitation could be removed post-1.0 by serializing the state of open windows.
11 years ago
scrawl 17bb8d7f9a Fixes #1252: Add item/magic keybindings to savegame 11 years ago
Marek Kochanowicz c2b070f097 trying to do it right. 11 years ago
Marek Kochanowicz ea1aaef8ca replace paged with unpaged (and vice versa) 11 years ago
scrawl fc7e79027a Fixes #1144: Don't refreshCurrentAnims when adding already dead actors 11 years ago
scrawl 64a30ad182 Fix another leak 11 years ago
scrawl 6f7fbc867f Fix several leaks 11 years ago
scrawl f99eda1a54 Fixes #1302: Do not attempt to set OnPcAdd before the script has been added 11 years ago
scrawl 5415ca6a63 Fix exception when shift+click on empty space in save dialog 11 years ago
Marek Kochanowicz d00dbf47d5 working on worldspace drops 11 years ago
Marc Zinnschlag ab94e70724 more cleanup of document setup 11 years ago
Marek Kochanowicz 57131332f4 fixing minor issues 11 years ago
Marc Zinnschlag 6a809064df Merge remote-tracking branch 'mrcheko/master' 11 years ago
mrcheko 9e79fb5b87 fix to broken aiwander logic 11 years ago
Marc Zinnschlag 634311c86c Merge remote-tracking branch 'mrcheko/master' 11 years ago
mrcheko e8f7d12c01 uninit bool and invalid iterator bugs fixes 11 years ago
Marek Kochanowicz 9e01a54d72 minor correction 11 years ago
Marek Kochanowicz 6aaa15b2e8 paged worldspace drop 11 years ago
Marek Kochanowicz 19dac9dc86 that would be it 11 years ago
Jeffrey Haines 5c9c467b26 Improved sneak. 11 years ago
Jeffrey Haines 14ebd8b110 Fixed logic in commit crime 11 years ago
Marek Kochanowicz 4d79f00e28 enable dragging on the region map cells 11 years ago
Thomas 10a5bb9464 Made code a bit more standardized and added a good bit of documentation. 11 years ago
Marek Kochanowicz eeb18b533e moved editlock to the dragrecordtable 11 years ago
Marc Zinnschlag 0c2843b0f7 some missing cleanup 11 years ago
Marek Kochanowicz d376efe30b handle dragging not-existing records 11 years ago
Marc Zinnschlag 9a1b5dc1c6 a bit of cleanup 11 years ago
Marc Zinnschlag f6a876bc3d added actor ID 11 years ago
cc9cii 7d990abd37 OpenCS changes to allow compilation with MSVC 11.0. 11 years ago
Marc Zinnschlag 8dc6ad5059 moved new flag from setupData function to Document constructor 11 years ago
Marc Zinnschlag 5f1d2f72f6 added basic loading GUI 11 years ago
Marc Zinnschlag 2906ade531 string fix 11 years ago
Marc Zinnschlag 4eeed4e2c7 Merge remote-tracking branch 'scrawl/return' 11 years ago
Marek Kochanowicz 18fc8acc71 able to drag existing cells from the regionmap 11 years ago
Marek Kochanowicz 853abb65c3 added new, later common, base for the regionmap and the table 11 years ago
scrawl 28ef236f0e Don't allow setting a new return position if there already is one and we haven't reached it yet 11 years ago
Marc Zinnschlag 8fea2cfa2a Merge remote-tracking branch 'mrcheko/master' 11 years ago
scrawl 1fd7a07b5e Merge branch 'master' of https://github.com/OpenMW/openmw into return
Conflicts:
	apps/openmw/mwmechanics/aisequence.cpp
	apps/openmw/mwmechanics/aiwander.cpp
11 years ago
scrawl 9b36a13821 Feature #1289: NPCs return to default position
Make stationary NPCs return to their previous position once combat/crime AI finishes.
11 years ago
scrawl 3780503275 Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar 11 years ago
Marc Zinnschlag 3013c34d9b Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 7a0aeeaa38 Allow to delete savegames (shift + click) 11 years ago
scrawl 7f37f2c2be Fixes #1187: Make GetDistance handle actors in remote cells gracefully 11 years ago
Marc Zinnschlag 2e7b4e798e Merge remote-tracking branch 'digmaster/master' 11 years ago
scrawl a35f7c73ae Fixes #1286 (Dialogue topic list clips with window frame)
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
11 years ago
scrawl 518a32c19d Fixes #1195: Make NPCs equip torches in interiors under certain conditions 11 years ago
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