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
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
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
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
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
306c9e840c
Merge branch 'master' of https://github.com/graffy76/openmw
...
fixed conflict
Conflicts:
apps/opencs/model/settings/usersettings.cpp
11 years ago
graffy76
0a3ab3dcd1
Commented out "proxy selection test" demo page in user settings
11 years ago
graffy76
c4a9c18045
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
Thoronador
688d556510
remove references to Audiere and MPG123 from top-level CMake file
11 years ago
Thoronador
320411f5b3
remove unused CMake files for Audiere, MPG123 and Sndfile
11 years ago
Marek Kochanowicz
00b21449a2
replaced type_cell with type_scene
11 years ago