Marc Zinnschlag
|
ca097e146b
|
Merge remote-tracking branch 'jeffreyhaines/master'
|
11 years ago |
Jeffrey Haines
|
edbc319c42
|
fixed logic. ||
|
11 years ago |
|
Jeffrey Haines
|
52bb7c3f69
|
fixed logic. !
|
11 years ago |
|
Jeffrey Haines
|
7599b26d30
|
Fixed: creatures won't witness crimes
and potential crash.
|
11 years ago |
|
Jeffrey Haines
|
0409e18a0e
|
revert
|
11 years ago |
|
Jeffrey Haines
|
b9bd4bc126
|
broken
|
11 years ago |
|
Jeffrey Haines
|
ce106d3bec
|
Revert "NPCs detect crime exclusively"
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.
Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
|
11 years ago |
|
Marc Zinnschlag
|
85dbf393d2
|
Merge remote-tracking branch 'graffy76/master'
|
11 years ago |
graffy76
|
985af15a12
|
removed qdebug references
|
11 years ago |
|
graffy76
|
0d711e51b0
|
Converted SettingType enums to indicate widget type.
|
11 years ago |
|
graffy76
|
b94466dbb4
|
Merge branch 'master' of https://github.com/OpenMW/openmw
merge
|
11 years ago |
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.
|
11 years ago |
|
Marc Zinnschlag
|
5e7cd806c4
|
Merge remote-tracking branch 'scrawl/master'
|
11 years ago |
scrawl
|
04964595ef
|
Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame
|
11 years ago |
|
graffy76
|
ab33e78b67
|
Added RangeView class files
|
11 years ago |
Jeffrey Haines
|
13416a3501
|
Merge pull request #1 from OpenMW/master
merge into my branch
|
11 years ago |
|
Jeffrey Haines
|
b28dfa94cd
|
Revert 4a4c089..f0c5d1a
This rolls back to commit 4a4c08946c.
|
11 years ago |
|
Jeffrey Haines
|
f0c5d1a7e1
|
Revert "Checks the state of the passed sneak variable"
This reverts commit 4a4c08946c.
|
11 years ago |
|
scrawl
|
d5dd864404
|
Fixes #1236: Disable all controls while playing movie
|
11 years ago |
|
Jeffrey Haines
|
48b2c0073b
|
fix, sorry for being sloppy..
|
11 years ago |
|
Jeffrey Haines
|
afe624bd07
|
Cleaned up update in Actors.cpp
Removed unnecessary for loops
|
11 years ago |
|
scrawl
|
30666f2cce
|
Fixes #1297: Store global map markers in savegame
|
11 years ago |
|
scrawl
|
f921f2e7db
|
Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
|
11 years ago |
|
scrawl
|
ef39b0f6ab
|
Fixes #1291: Faction rank saving issue
A value of 0 is the first rank, -1 means not a member
|
11 years ago |
|
scrawl
|
45d2a00717
|
Fixes #1293: Allow interpolation type 0 in case of 0 keys
|
11 years ago |
|
scrawl
|
b13b25dd1b
|
Fixes #1295: Support partial matches in Cell filter
|
11 years ago |
|
scrawl
|
6eca5ac4bb
|
Fixes #1296: Streamlined cellChanged detection
|
11 years ago |
|
scrawl
|
cd1b4218e7
|
Fix dynamically placed objects being discarded when loading game
|
11 years ago |
|
scrawl
|
f05606657c
|
Correctly insert pasted text at cursor position
|
11 years ago |
|
scrawl
|
91e50585ff
|
AiWander: make sure to walk, not run
|
11 years ago |
|
scrawl
|
5b011e43a7
|
Fix a crash after loading game
|
11 years ago |
|
Marc Zinnschlag
|
42b332775a
|
removed some debug statements
|
11 years ago |
|
Marc Zinnschlag
|
c63d6437c0
|
Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
|
11 years ago |
|
Marc Zinnschlag
|
837fd2a4c6
|
Merge remote-tracking branch 'graffy76/master'
|
11 years ago |
|
graffy76
|
2e06414b43
|
Fixed broken delegate display modes (Display Format settings). Moved
UserSetting update functions to DataDisplayDelegate.
|
11 years ago |
|
Marc Zinnschlag
|
1f6ed584c2
|
Merge remote-tracking branch 'digmaster/master'
Conflicts:
apps/openmw/mwstate/statemanagerimp.cpp
|
11 years ago |
|
Jeffrey Haines
|
4a4c08946c
|
Checks the state of the passed sneak variable
|
11 years ago |
Thomas
|
f3272c941f
|
Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
|
11 years ago |
|
Jeffrey Haines
|
42b879a9a5
|
Reworked the accusation of actors
|
11 years ago |
|
Jeffrey Haines
|
c3e08916da
|
Sneak: Added support for state checking
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
|
11 years ago |
|
graffy76
|
3f2ae950f5
|
Disabled view resize for open views when user setting changes. Fixed
new view size issue to match existing user settings.
|
11 years ago |
|
Marc Zinnschlag
|
9db9ad410d
|
fixed checks for allowing load/save and some general cleanup
|
11 years ago |
|
Marc Zinnschlag
|
760c8c7214
|
removed a redundant include
|
11 years ago |
|
Marc Zinnschlag
|
42b3233bda
|
removed a redundant check
|
11 years ago |
|
Thomas
|
5b681e2199
|
Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.
|
11 years ago |
|
Thomas
|
05b21c92af
|
Moved quick save into statemanager class. Kept loader as is as it's rather specalized.
|
11 years ago |
|
Thomas
|
6a8bf71c4c
|
Moved autosave to before you rest, not after it.
|
11 years ago |
|
Thomas
|
a598060071
|
Added autosave on rest, as well as an option in the settings menu
|
11 years ago |
|
Thomas
|
682c395488
|
Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts)
|
11 years ago |
|
Thomas
|
49620968b9
|
Disallowed quicksave/load in character creation
|
11 years ago |