scrawl
136813a882
Bug #1319 : Fix references not coming from a content file incorrectly overwriting each other
2014-05-10 00:01:30 +02:00
scrawl
e7a004824c
Fix a search that should have been find
2014-05-09 23:58:24 +02:00
scrawl
872d9be1b4
Fix potential issue with dialogue globals
...
Make sure they are updated throughout the conversation
2014-05-09 19:19:21 +02:00
scrawl
731bc9c275
Fix broken isClass check and renamed variable for clarity
2014-05-09 18:45:49 +02:00
scrawl
6e9458c076
Small fix for dropping items from inventory
...
Some widgets prevented clicking through
2014-05-08 21:04:11 +02:00
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.
2014-05-08 20:40:45 +02:00
Marc Zinnschlag
21142711f0
Merge remote-tracking branch 'graffy76/master'
2014-05-07 10:35:11 +02:00
graffy76
e47e3de3d2
Removed unneeded includes, cleaned up code, added comments
2014-05-06 21:58:50 -05:00
graffy76
8fb96e1be3
Removed error code for missing opencs.ini files.
2014-05-06 19:22:45 -05:00
Marc Zinnschlag
729e079b0b
Merge remote-tracking branch 'scrawl/master'
2014-05-06 20:18:19 +02:00
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 )
2014-05-06 19:15:43 +02:00
scrawl
d2beb814e7
Remove superfluous attack phrases (already done by startCombat)
2014-05-06 18:05:53 +02:00
graffy76
042670fc73
Merge remote-tracking branch 'origin'
...
merge
2014-05-06 07:38:29 -05:00
graffy76
a17cb1f389
Fixed opencs.ini formatting
2014-05-06 07:37:52 -05:00
graffy76
79b13a74a3
Incorporated SettingManager into UserSettings class. Other minor code
...
changes to support QSettings integration
2014-05-06 07:33:32 -05:00
scrawl
dd9117809d
Say an attack phrase when combat starts
...
Move combat start to a helper method
Added some todo comments
2014-05-06 00:13:31 +02:00
scrawl
d4492b56db
Added header file missing from CMakeLists
2014-05-05 23:52:09 +02:00
scrawl
536fc5e192
Fix autosaves
2014-05-05 22:38:08 +02:00
graffy76
5cba828cc9
Removed unneeded code from setting manager. Moved some code to user
...
settings
2014-05-05 06:26:00 -05:00
graffy76
74fa115d20
fixed check for missing ini files
2014-05-05 06:07:41 -05:00
graffy76
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
2014-05-05 05:56:03 -05:00
Jeffrey Haines
d4812c3af9
fixed placement of else statement
2014-05-04 17:54:33 -04:00
Jeffrey Haines
78f76842a6
Added else statement
...
Its still dodgy though
2014-05-04 16:56:30 -04:00
Jeffrey Haines
7d5dab214c
#58 - Sneak Skill: functional sneaking
...
Removed sneak checking from individual actor update.
Added sneak checking to Actors::update()
2014-05-04 16:20:09 -04:00
Jeffrey Haines
a65e8393bb
Merged files
2014-05-04 11:33:27 -04:00
Marc Zinnschlag
df97a1b57f
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
2014-05-04 17:11:43 +02:00
Marek Kochanowicz
f51f826dad
fixed compilation
2014-05-04 15:13:03 +02:00
Jeffrey Haines
a469444e53
Player can't detect self
2014-05-04 08:05:32 -04:00
Marc Zinnschlag
7f78c29bb5
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
...
Conflicts:
apps/opencs/view/world/table.cpp
2014-05-04 14:03:56 +02:00
Marek Kochanowicz
4a502226e6
added flag to distingiush widgets
2014-05-04 12:41:06 +02:00
Marc Zinnschlag
e43913e7c2
Merge remote-tracking branch 'graffy76/master'
2014-05-04 12:17:44 +02:00
graffy76
3f737bbb44
implemented QDial into RangeView class
2014-05-03 22:02:16 -05:00
graffy76
4f876574c1
Implemented slider widget in rangeView class
2014-05-03 21:50:08 -05:00
graffy76
306c9e840c
Merge branch 'master' of https://github.com/graffy76/openmw
...
fixed conflict
Conflicts:
apps/opencs/model/settings/usersettings.cpp
2014-05-03 19:49:01 -05:00
graffy76
0a3ab3dcd1
Commented out "proxy selection test" demo page in user settings
2014-05-03 19:48:04 -05:00
graffy76
c4a9c18045
Commented out "proxy selection test" demo page in user settings
2014-05-03 19:36:52 -05:00
graffy76
35d1502308
Merge branch 'master' of https://github.com/OpenMW/openmw
...
merge
2014-05-03 19:16:42 -05:00
graffy76
1c26741c56
Implemented rangeview with spinbox as only control. Simplified setting
...
class constructor.
2014-05-03 18:58:43 -05:00
graffy76
bc6197c552
Added custom spin box class
2014-05-03 18:57:34 -05:00
Thoronador
be89654eef
remove audiere_decoder + mpgsnd_decoder from CMake file for openmw
2014-05-03 22:05:21 +02:00
Thoronador
620a8ccaf3
remove Audiere and MPG123+Sndfile decoder sources
2014-05-03 21:49:57 +02:00
Thoronador
688d556510
remove references to Audiere and MPG123 from top-level CMake file
2014-05-03 21:20:22 +02:00
Thoronador
320411f5b3
remove unused CMake files for Audiere, MPG123 and Sndfile
2014-05-03 21:05:45 +02:00
Marek Kochanowicz
00b21449a2
replaced type_cell with type_scene
2014-05-03 19:47:13 +02:00
Jeffrey Haines
e1e23447f2
Removed initial check form setSneak
...
It wasn’t needed.
2014-05-03 13:16:07 -04:00
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.
2014-05-03 12:48:07 -04:00
Marc Zinnschlag
72b4945128
Merge remote-tracking branch 'scrawl/master'
2014-05-03 18:38:00 +02:00
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.
2014-05-03 17:17:00 +02:00
scrawl
eff648e3ab
Show unhandled SDL events in hexadecimal (easier to compare with the enum)
2014-05-03 16:16:27 +02:00
Marek Kochanowicz
5e99381019
Drag and drop works.
2014-05-03 14:00:30 +02:00
