Commit Graph

9973 Commits (3718847ffc0c77db9d979d1a4aed7f351c92a96e)
 

Author SHA1 Message Date
cc9cii 3718847ffc Disable video for Windows until the crash issues are fixed. 11 years ago
Marc Zinnschlag a5f0fe7282 incremented version number 11 years ago
cc9cii 8971db8962 SceneWidget windowHandle fix for Windows. 11 years ago
Marc Zinnschlag 7500895519 updated changelog 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
Marc Zinnschlag 199f030d38 adjusted cmake file for opencs user settings file rename 11 years ago
cc9cii cf23721f1b Windows debug build crash fix. 11 years ago
scrawl 6e9458c076 Small fix for dropping items from inventory
Some widgets prevented clicking through
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 3dfd239b83 updated changelog 11 years ago
Marc Zinnschlag af14bca5aa Merge branch 'master' into openmw-30 11 years ago
Marc Zinnschlag cf90da6cd8 minor fix 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 224f5cf7db updated changelog 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
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 042670fc73 Merge remote-tracking branch 'origin'
merge
11 years ago
graffy76 a17cb1f389 Fixed opencs.ini formatting 11 years ago
graffy76 79b13a74a3 Incorporated SettingManager into UserSettings class. Other minor code
changes to support QSettings integration
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
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
graffy76 3f737bbb44 implemented QDial into RangeView class 11 years ago