Marc Zinnschlag
0b309d9ef4
Merge branch 'master' into load
...
Conflicts:
apps/opencs/view/doc/viewmanager.cpp
2014-05-03 14:36:06 +02:00
Marek Kochanowicz
5e99381019
Drag and drop works.
2014-05-03 14:00:30 +02:00
Marc Zinnschlag
e0e2ad8316
content file loading progress bar
2014-05-03 13:01:29 +02:00
scrawl
7bddfc0025
Fix some spelling mistakes.
2014-05-03 12:23:22 +02:00
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).
2014-05-03 12:17:44 +02:00
Marc Zinnschlag
e09218f164
moved load code from Document to Loader class
2014-05-03 12:07:05 +02:00
scrawl
7331a64e34
Restore fix for Bug #875 (commit 602be9bbe7, was broken by 43757efdc4)
2014-05-03 11:33:20 +02:00
scrawl
1b074e5524
Call setAttacked even if the attack missed. Unsuccessful hits should also evoke a response.
2014-05-02 22:38:39 +02:00
scrawl
df1694c27b
Console autocompletion: List candidates when repeatedly pressing tab (bash-style)
2014-05-02 22:19:02 +02:00
scrawl
92467ba6bc
Fix sunlight for interiors
2014-05-02 21:20:27 +02:00
Marek Kochanowicz
7f1df878f6
make getDropType static and public.
2014-05-02 20:28:28 +02:00
scrawl
8560b43464
Move to esm component
2014-05-02 12:48:07 +02:00
scrawl
f8cc328b5e
Slightly prettier backdrop when loading game from main menu.
2014-05-02 12:48:01 +02:00
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.
2014-05-02 11:20:43 +02:00
scrawl
17bb8d7f9a
Fixes #1252 : Add item/magic keybindings to savegame
2014-05-01 21:16:32 +02:00
Marek Kochanowicz
c2b070f097
trying to do it right.
2014-05-01 19:17:33 +02:00
Marek Kochanowicz
ea1aaef8ca
replace paged with unpaged (and vice versa)
2014-05-01 18:25:28 +02:00
scrawl
fc7e79027a
Fixes #1144 : Don't refreshCurrentAnims when adding already dead actors
2014-05-01 16:55:16 +02:00
scrawl
64a30ad182
Fix another leak
2014-05-01 16:55:16 +02:00
scrawl
6f7fbc867f
Fix several leaks
2014-05-01 16:55:15 +02:00
scrawl
f99eda1a54
Fixes #1302 : Do not attempt to set OnPcAdd before the script has been added
2014-05-01 16:55:15 +02:00
scrawl
5415ca6a63
Fix exception when shift+click on empty space in save dialog
2014-05-01 16:55:15 +02:00
Marek Kochanowicz
d00dbf47d5
working on worldspace drops
2014-05-01 15:09:47 +02:00
Marc Zinnschlag
ab94e70724
more cleanup of document setup
2014-05-01 13:04:48 +02:00
Marek Kochanowicz
57131332f4
fixing minor issues
2014-05-01 12:34:54 +02:00
Marc Zinnschlag
6a809064df
Merge remote-tracking branch 'mrcheko/master'
2014-05-01 10:07:43 +02:00
mrcheko
9e79fb5b87
fix to broken aiwander logic
2014-05-01 11:41:25 +04:00
Marc Zinnschlag
634311c86c
Merge remote-tracking branch 'mrcheko/master'
2014-04-30 22:45:26 +02:00
mrcheko
e8f7d12c01
uninit bool and invalid iterator bugs fixes
2014-04-30 23:57:19 +04:00
Marek Kochanowicz
9e01a54d72
minor correction
2014-04-30 15:17:20 +02:00
Marek Kochanowicz
6aaa15b2e8
paged worldspace drop
2014-04-30 15:03:46 +02:00
Marek Kochanowicz
19dac9dc86
that would be it
2014-04-30 14:27:11 +02:00
Jeffrey Haines
5c9c467b26
Improved sneak.
2014-04-30 08:06:36 -04:00
Jeffrey Haines
14ebd8b110
Fixed logic in commit crime
2014-04-30 07:44:29 -04:00
Marek Kochanowicz
4d79f00e28
enable dragging on the region map cells
2014-04-30 13:32:54 +02:00
Marek Kochanowicz
eeb18b533e
moved editlock to the dragrecordtable
2014-04-29 21:41:57 +02:00
Marek Kochanowicz
d376efe30b
handle dragging not-existing records
2014-04-29 19:34:06 +02:00
cc9cii
7d990abd37
OpenCS changes to allow compilation with MSVC 11.0.
2014-04-29 22:46:55 +10:00
Marc Zinnschlag
8dc6ad5059
moved new flag from setupData function to Document constructor
2014-04-29 14:27:44 +02:00
Marc Zinnschlag
5f1d2f72f6
added basic loading GUI
2014-04-29 14:17:25 +02:00
Marc Zinnschlag
2906ade531
string fix
2014-04-29 13:16:58 +02:00
Marc Zinnschlag
4eeed4e2c7
Merge remote-tracking branch 'scrawl/return'
2014-04-29 12:27:27 +02:00
Marek Kochanowicz
18fc8acc71
able to drag existing cells from the regionmap
2014-04-29 12:27:26 +02:00
Marek Kochanowicz
853abb65c3
added new, later common, base for the regionmap and the table
2014-04-29 11:44:21 +02:00
scrawl
28ef236f0e
Don't allow setting a new return position if there already is one and we haven't reached it yet
2014-04-29 11:17:07 +02:00
Marc Zinnschlag
8fea2cfa2a
Merge remote-tracking branch 'mrcheko/master'
2014-04-29 10:03:29 +02:00
scrawl
1fd7a07b5e
Merge branch 'master' of https://github.com/OpenMW/openmw into return
...
Conflicts:
apps/openmw/mwmechanics/aisequence.cpp
apps/openmw/mwmechanics/aiwander.cpp
2014-04-29 09:14:13 +02:00
scrawl
9b36a13821
Feature #1289 : NPCs return to default position
...
Make stationary NPCs return to their previous position once combat/crime AI finishes.
2014-04-29 09:09:51 +02:00
scrawl
3780503275
Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar
2014-04-29 07:07:03 +02:00
Marc Zinnschlag
3013c34d9b
Merge remote-tracking branch 'scrawl/master'
2014-04-28 21:46:05 +02:00
scrawl
7a0aeeaa38
Allow to delete savegames (shift + click)
2014-04-28 20:57:45 +02:00
scrawl
7f37f2c2be
Fixes #1187 : Make GetDistance handle actors in remote cells gracefully
2014-04-28 19:23:25 +02:00
Marc Zinnschlag
2e7b4e798e
Merge remote-tracking branch 'digmaster/master'
2014-04-28 19:22:54 +02:00
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.
2014-04-28 18:40:29 +02:00
scrawl
518a32c19d
Fixes #1195 : Make NPCs equip torches in interiors under certain conditions
2014-04-28 18:33:42 +02:00
Thomas
885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
2014-04-28 12:27:57 -04:00
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?
2014-04-28 16:23:07 +02:00
scrawl
84961d7843
Fixes #1254 : PcRank should return first rank if not in the faction
2014-04-28 15:31:18 +02:00
scrawl
b2119441b9
Fix bug in PcRank / PcNextRank
...
It was using the first faction instead of the actor's faction.
2014-04-28 15:26:40 +02:00
Marc Zinnschlag
421679b319
Merge remote-tracking branch 'scrawl/master'
2014-04-28 15:13:09 +02:00
scrawl
7e4a0c2478
Removed asserts
2014-04-28 15:00:52 +02:00
mrcheko
35c1724d39
unblock vertical aiming for combatants
2014-04-28 16:34:49 +04:00
scrawl
0796815da0
Ignore dead actors in getActorsFollowing/Fighting
...
Prevents dead enemies from disallowing resting near them
2014-04-28 11:44:56 +02:00
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.
2014-04-28 11:29:57 +02:00
Marc Zinnschlag
0b2371a05d
Merge remote-tracking branch 'thoronador/fix-minor-stuff'
2014-04-28 10:59:34 +02:00
Marc Zinnschlag
af322a9f77
Merge remote-tracking branch 'scrawl/master'
2014-04-28 10:48:57 +02:00
scrawl
1da99d9fc7
Remove unused variable
2014-04-28 10:26:24 +02:00
scrawl
b89463db09
Fix #1207 : Remember previous choice in class creation dialog
2014-04-28 09:12:03 +02:00
scrawl
1da19585dc
Remove some unneeded includes
2014-04-28 07:49:08 +02:00
Thomas
dc54bd5a5f
Merge remote-tracking branch 'upstream/master'
2014-04-27 20:56:45 -04:00
Thomas
c2127845af
Added onKnockdown command
2014-04-27 20:54:22 -04:00
Thoronador
f69d61976e
minor performance improvements in other apps subdirectories
2014-04-27 23:25:02 +02:00
mrcheko
22cdb166f2
warning fix, vars renaming
2014-04-27 22:38:04 +04:00
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.
2014-04-27 19:10:23 +02:00
Marc Zinnschlag
ca097e146b
Merge remote-tracking branch 'jeffreyhaines/master'
2014-04-27 17:35:10 +02:00
Jeffrey Haines
edbc319c42
fixed logic. ||
2014-04-27 10:05:34 -04:00
Jeffrey Haines
52bb7c3f69
fixed logic. !
2014-04-27 09:55:38 -04:00
Jeffrey Haines
7599b26d30
Fixed: creatures won't witness crimes
...
and potential crash.
2014-04-27 09:37:43 -04:00
Jeffrey Haines
0409e18a0e
revert
2014-04-27 09:35:49 -04:00
Jeffrey Haines
b9bd4bc126
broken
2014-04-27 09:34:59 -04:00
Jeffrey Haines
ce106d3bec
Revert "NPCs detect crime exclusively"
...
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.
Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2014-04-27 09:34:33 -04:00
mrcheko
82121e0401
some checks reworked
2014-04-27 16:59:21 +04:00
scrawl
e42855d522
Minor fix for spell icon
2014-04-27 12:54:18 +02:00
mrcheko
6a3dddfb9a
merge master
2014-04-27 13:49:31 +04:00
Marc Zinnschlag
85dbf393d2
Merge remote-tracking branch 'graffy76/master'
2014-04-27 11:44:15 +02:00
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).
2014-04-27 09:43:54 +02:00
scrawl
dac0b7090a
Get rid of bigbars.png and smallbars.png
...
Changed loading bar colour to match vanilla
2014-04-27 09:43:48 +02:00
scrawl
3161647809
Fix for not being able to pick up scrolls during combat
...
This is the behaviour I observed in vanilla morrowind.
2014-04-27 09:15:37 +02:00
scrawl
d92f95f5bf
Fix a stacking issue
2014-04-27 06:08:15 +02:00
scrawl
93b76a603b
Fixes #1100 : Looting a corpse is no longer considered stealing
2014-04-27 06:08:08 +02:00
graffy76
985af15a12
removed qdebug references
2014-04-26 21:43:59 -05:00
graffy76
0d711e51b0
Converted SettingType enums to indicate widget type.
2014-04-26 21:32:36 -05:00
scrawl
e8210c92c6
Fixes #1240 : Don't hardcode drowning time
2014-04-27 04:27:26 +02:00
graffy76
b94466dbb4
Merge branch 'master' of https://github.com/OpenMW/openmw
...
merge
2014-04-26 21:24:02 -05:00
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.
2014-04-27 07:38:31 +10:00
Thomas
c2b692e124
getActorsFollowing/Fighting no longer returns dead actors
2014-04-26 17:21:53 -04:00
mrcheko
dbe1307de0
code refining + minor fixes
2014-04-26 22:21:20 +04:00
Marc Zinnschlag
5e7cd806c4
Merge remote-tracking branch 'scrawl/master'
2014-04-26 18:05:04 +02:00
scrawl
04964595ef
Fixes #1270 , Fixes #1201 : Update active weapon/spell icons every frame
2014-04-26 16:44:20 +02:00
graffy76
ab33e78b67
Added RangeView class files
2014-04-26 09:40:58 -05:00
