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
Marc Zinnschlag
85dbf393d2
Merge remote-tracking branch 'graffy76/master'
2014-04-27 11:44:15 +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
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
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
scrawl
d5dd864404
Fixes #1236 : Disable all controls while playing movie
2014-04-26 14:33:45 +02:00
scrawl
30666f2cce
Fixes #1297 : Store global map markers in savegame
2014-04-26 13:42:32 +02:00
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.
2014-04-26 12:04:37 +02:00
scrawl
ef39b0f6ab
Fixes #1291 : Faction rank saving issue
...
A value of 0 is the first rank, -1 means not a member
2014-04-26 11:41:44 +02:00
scrawl
45d2a00717
Fixes #1293 : Allow interpolation type 0 in case of 0 keys
2014-04-26 11:36:27 +02:00
scrawl
b13b25dd1b
Fixes #1295 : Support partial matches in Cell filter
2014-04-26 11:03:17 +02:00
scrawl
6eca5ac4bb
Fixes #1296 : Streamlined cellChanged detection
2014-04-26 07:46:19 +02:00
scrawl
cd1b4218e7
Fix dynamically placed objects being discarded when loading game
2014-04-26 05:01:26 +02:00
scrawl
f05606657c
Correctly insert pasted text at cursor position
2014-04-26 05:01:26 +02:00
scrawl
91e50585ff
AiWander: make sure to walk, not run
2014-04-26 05:01:26 +02:00
scrawl
5b011e43a7
Fix a crash after loading game
2014-04-26 05:01:26 +02:00
Marc Zinnschlag
42b332775a
removed some debug statements
2014-04-25 15:30:46 +02:00
Marc Zinnschlag
c63d6437c0
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
2014-04-25 15:29:23 +02:00
Marc Zinnschlag
837fd2a4c6
Merge remote-tracking branch 'graffy76/master'
2014-04-25 15:11:19 +02:00
graffy76
2e06414b43
Fixed broken delegate display modes (Display Format settings). Moved
...
UserSetting update functions to DataDisplayDelegate.
2014-04-25 07:16:40 -05:00
Marc Zinnschlag
1f6ed584c2
Merge remote-tracking branch 'digmaster/master'
...
Conflicts:
apps/openmw/mwstate/statemanagerimp.cpp
2014-04-25 08:39:40 +02:00
Jeffrey Haines
4a4c08946c
Checks the state of the passed sneak variable
2014-04-24 23:02:11 -04:00
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.
2014-04-24 22:47:45 -04:00
Jeffrey Haines
42b879a9a5
Reworked the accusation of actors
2014-04-24 22:41:05 -04:00
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
2014-04-24 20:40:17 -04:00
graffy76
3f2ae950f5
Disabled view resize for open views when user setting changes. Fixed
...
new view size issue to match existing user settings.
2014-04-24 12:50:10 -05:00
Marc Zinnschlag
9db9ad410d
fixed checks for allowing load/save and some general cleanup
2014-04-24 10:14:17 +02:00
Marc Zinnschlag
760c8c7214
removed a redundant include
2014-04-24 09:56:51 +02:00
Marc Zinnschlag
42b3233bda
removed a redundant check
2014-04-24 09:54:47 +02:00
Thomas
5b681e2199
Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.
2014-04-24 03:14:47 -04:00
Thomas
05b21c92af
Moved quick save into statemanager class. Kept loader as is as it's rather specalized.
2014-04-24 03:06:36 -04:00
Thomas
6a8bf71c4c
Moved autosave to before you rest, not after it.
2014-04-23 23:33:57 -04:00
Thomas
a598060071
Added autosave on rest, as well as an option in the settings menu
2014-04-23 23:12:30 -04:00
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)
2014-04-23 21:39:25 -04:00
Thomas
49620968b9
Disallowed quicksave/load in character creation
2014-04-23 21:21:11 -04:00
Thomas
e873135da7
Missed a debug message
2014-04-23 21:04:52 -04:00
Thomas
f90810223a
Added quicksave and quickload
2014-04-23 21:02:09 -04:00
graffy76
ce56669339
Fixed failed signal/slot connection between UserSettings and
...
CSVWorld::SubView
2014-04-23 17:02:37 -05:00
Thomas
ee581f593b
Fixed issue which may occur if there's no evidence chest nearby
2014-04-23 13:20:43 -04:00
