Marc Zinnschlag
37f1a49352
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 22:36:40 +02:00
mrcheko
fa14df62b7
fix crash on disappeared target
2014-05-18 23:15:22 +04:00
Marc Zinnschlag
aa05acd26e
Merge remote-tracking branch 'scrawl/master'
2014-05-18 18:50:18 +02:00
Marc Zinnschlag
56c4367c1a
Merge remote-tracking branch 'mrcheko/master'
2014-05-18 18:42:23 +02:00
mrcheko
e1249f6a31
actor handle and id confusing fix
2014-05-18 20:13:46 +04:00
scrawl
a87b64d2da
Fix some ancient code
2014-05-18 16:34:58 +02:00
scrawl
1677fcf324
Dialogue merging
2014-05-18 15:25:16 +02:00
mrcheko
66307dd889
travis fix #3 :(
2014-05-18 16:10:14 +04:00
mrcheko
74697f8116
travis fix #2
2014-05-18 15:41:15 +04:00
scrawl
5b76c0893a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
components/esm/inventorystate.hpp
2014-05-18 12:55:43 +02:00
greye
e02b04536f
fix most vexing parse issue
2014-05-18 14:55:05 +04:00
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
2014-05-18 14:55:05 +04:00
greye
18b3cfebdb
fix importer crash on empty lines (thanks to Ace)
2014-05-18 14:55:05 +04:00
greye
b4950509bc
use converted widechars in ini importer
2014-05-18 14:55:05 +04:00
greye
cd990a665a
create QString from utf-8 when expected
2014-05-18 14:55:05 +04:00
scrawl
a872c9f83a
Feature #1323 : handle restocking levelled items
2014-05-18 12:53:21 +02:00
mrcheko
69c1eb28c5
travis compile fix
2014-05-18 14:39:04 +04:00
scrawl
90ec19c3ac
Remove unneeded MWScrollView
2014-05-18 10:30:03 +02:00
scrawl
150b920ef1
Fix long journal entries not being displayed
2014-05-18 10:14:03 +02:00
scrawl
5fc2b1a41b
Allow setting a journal index even if there's no related journal entry
...
This is used by the MV_SlaveMule quest.
2014-05-18 07:39:16 +02:00
scrawl
e1458453f3
Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group
...
Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts.
Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.
2014-05-18 06:52:15 +02:00
cc9cii
12dc5cf4ea
Bug #1303 - resolves the bug by tweaking the slope constant (the value 49 was selected to mimic vanilla behaviour for a low level character exploring Seyda Neen). The feature to vary the climbable angle based on acrobatics is still to be implemented.
2014-05-18 12:05:08 +10:00
mrcheko
aa5647b45e
merge master, resolve conflicts
2014-05-17 19:20:57 +04:00
cc9cii
8971db8962
SceneWidget windowHandle fix for Windows.
2014-05-17 23:53:33 +10:00
scrawl
b4ed828e21
Feature #1323 : Implement restocking items (does not handle levelled lists yet)
2014-05-17 14:30:31 +02:00
Marc Zinnschlag
f7c89015f9
Merge remote-tracking branch 'scrawl/master'
2014-05-17 11:50:31 +02:00
scrawl
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
2014-05-17 09:09:00 +02:00
scrawl
92c5bb56e0
Un-reverted actorId for AiPursue
2014-05-17 05:34:54 +02:00
scrawl
e266aff561
Savegame: store projectiles
2014-05-17 05:24:32 +02:00
scrawl
9adb990143
Fix potentially unsafe use of MWWorld::Ptr
2014-05-17 02:52:24 +02:00
scrawl
e5a21aca53
Refactor projectiles to no longer use MW-objects
2014-05-16 13:33:30 +02:00
scrawl
18852c09d0
Manually re-added AiCombat portion of actorid changes. This is the only one that really matters, and will not suffer from the infinite recursion because it's not included in AiSequence::fill.
2014-05-16 12:28:23 +02:00
scrawl
36d9ae17cc
Revert "Change all AI packages (except AiActivate) to use ActorIds"
...
Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..)
This reverts commit 2e9985c1a3
2014-05-16 12:11:34 +02:00
scrawl
028e00c98f
Add missing status report for some toggle commands
2014-05-16 09:21:28 +02:00
scrawl
868e38a07c
Fix Assault crimes being reported when striking in self-defense
...
Last missing fix for Bug #1134 .
2014-05-16 08:32:00 +02:00
scrawl
940a434479
Use ItemModel for moving items from a container to the world
...
Fixes owner not resetting when moving an item from a corpse to the world.
2014-05-16 03:19:38 +02:00
scrawl
d70306382e
Don't create the player object until the game starts
...
Fixes a crash introduced in e591d23
2014-05-16 00:58:12 +02:00
mrcheko
5be37f04ef
Feature 1314: make npc fight creatures
2014-05-16 00:03:48 +04:00
scrawl
b3735981d6
Remove unused file_finder
2014-05-15 21:36:24 +02:00
Marc Zinnschlag
3b2ba4f6cd
Merge remote-tracking branch 'scrawl/master'
2014-05-15 14:25:36 +02:00
scrawl
0bc33fa86a
Revert "AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)"
...
Apparently not working for AiCombat due to its higher getPriority(). What should we do here?
This reverts commit a6e1d7ffd6
2014-05-15 10:14:47 +02:00
scrawl
b16d444f0f
Fix never clearing graveyard. Oops
2014-05-15 10:05:35 +02:00
scrawl
6de7e16550
Fix searchPtrViaActorId not skipping over deleted references
...
Fixes an issue when an actor has moved cell: searchPtrViaActorId would randomly return the deleted Ptr from the old cell.
2014-05-15 09:57:09 +02:00
scrawl
b6a7aee42e
Fix player not being allowed to use his own items
2014-05-15 09:54:10 +02:00
scrawl
eb40032bde
Fix item owner not resetting when dragging an item from a corpse to the player avatar
2014-05-15 09:54:10 +02:00
scrawl
bac4d875df
Fix a potential exploit that made it possible to reset the owner of any item
2014-05-15 09:54:10 +02:00
scrawl
a6e1d7ffd6
AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)
2014-05-15 09:54:10 +02:00
scrawl
2e9985c1a3
Change all AI packages (except AiActivate) to use ActorIds
...
More robust in case the target changes cell or there are multiple targets with the same RefId
2014-05-15 09:54:10 +02:00
scrawl
2f13a17a39
Add some more safety checks to spellcasting
2014-05-15 09:54:10 +02:00
scrawl
f2c193ce3d
Fix searching the player's actorId
2014-05-15 09:54:10 +02:00
scrawl
a609dc5674
Fix exception when getting hit by a trap
2014-05-15 09:54:10 +02:00
scrawl
a76e391ad0
Savegame: store door movement state ( Closes #747 )
2014-05-15 09:54:10 +02:00
scrawl
37b9d2fb0c
Fix a wrong use of reference that causes potential crash
2014-05-15 09:54:10 +02:00
scrawl
471bbd0021
Savegame: store levelled creature state and move to actorIds
...
(Closes #1332 )
2014-05-15 09:54:04 +02:00
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
scrawl
9b67fcc4d7
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-05-14 23:54:25 +02:00
scrawl
9052cc4a57
Savegame: store ActiveSpells
2014-05-14 23:54:15 +02:00
Marc Zinnschlag
2116f16289
Merge remote-tracking branch 'digmaster/master'
2014-05-14 21:16:24 +02:00
Thomas
d2aada95b4
Fixed AiPursue by fixing underlying issue is Pathto()
2014-05-14 14:11:34 -04:00
Thomas
2425d2c2ab
Added stuck mitigation for AiAvoidDoor
2014-05-14 13:38:10 -04:00
Marc Zinnschlag
c2ea92b93a
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
2014-05-14 14:41:04 +02:00
Marek Kochanowicz
3439900239
ignore all drops that will not create usefull filter
2014-05-14 11:56:23 +02:00
Thomas
993ef1be43
Actor avoiding door asks all surrounding actors to do the same.
2014-05-14 04:05:18 -04:00
scrawl
1141c1f3f2
Change projectiles to use actorIds
2014-05-14 09:48:16 +02:00
scrawl
61187c2fef
Savegame: store actorIds
2014-05-14 09:47:49 +02:00
Thomas
cbcf0f6039
Changed AiEScort to use new PathTo function
2014-05-14 01:44:11 -04:00
scrawl
dfacf8c044
Change ActiveSpells to use ActorId
2014-05-14 07:14:08 +02:00
scrawl
67e942e733
Bug #869 : Some fixes to the previous fix
2014-05-14 07:13:12 +02:00
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05:00
scrawl
7697ab37e0
Fixes #1129 : Change summoned creatures to use ActorId
...
Gracefully handles summoned creatures that are left behind in inactive cells.
2014-05-14 06:37:31 +02:00
Thomas
7cd4c93fa4
Changed getNearbyDoor to use MWWorld::Ptr
2014-05-13 23:46:00 -04:00
scrawl
99b4bc721b
Don't attempt to inflict spells on dead actors
2014-05-14 05:37:53 +02:00
scrawl
6c7b3074f5
Fix self-defense for creatures when attacked with a spell
2014-05-14 05:31:19 +02:00
Thomas
58bf7624be
Made code a bit more efficient
2014-05-13 21:52:05 -04:00
scrawl
3cdbcf3c28
Merge branch 'actorid' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwmechanics/creaturestats.cpp
2014-05-14 02:35:05 +02:00
Thomas
203ef580cf
Fixed moving activatable object being incorrectly activated.
2014-05-13 20:32:29 -04:00
scrawl
365ca6c7e1
Fixes #1331 : Manually disable movement state for dead actors.
...
For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
2014-05-13 21:47:45 +02:00
Thomas
6d540c4e07
Removed merging error
2014-05-13 14:24:48 -04:00
Thomas
680890c846
Clarification on some documentation points
2014-05-13 14:21:59 -04:00
Thomas
d6d4d9f75d
Removed destructor documentation
2014-05-13 14:08:08 -04:00
Thomas
ee36ace00b
Undid some code clean up changes, and changed how some includes work
2014-05-13 13:43:50 -04:00
Thomas
598221a8e7
Forgot some files
2014-05-13 13:07:27 -04:00
scrawl
e591d23880
Fixes #894 : Make sure the player's CharacterController is updated when the player is rebuilt. Necessary if the race is changed while we are still in a GUI (e.g. in the review dialog), and an update normally wouldn't occur.
2014-05-13 19:01:02 +02:00
Thomas
9dbe53c722
Merge remote-tracking branch 'upstream/master'
2014-05-13 04:11:07 -04:00
Thomas
2db3c89a9e
Ensures destination is far enough to care about getting stuck
2014-05-13 04:09:21 -04:00
Marc Zinnschlag
6c8e4b27d3
Merge remote-tracking branch 'scrawl/master'
2014-05-13 10:00:18 +02:00
Thomas
cbfa282f8d
Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work)
...
Notes - When the door hits them while it's about to finish closing they will try to walk through the door.
- Considerably more works is needed in making the NPC work out troublesome areas where they get stuck
2014-05-13 03:58:32 -04:00
Thomas
2c74ea381e
Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue
2014-05-12 21:05:32 -04:00
scrawl
386604bc9d
Fixes #869 : Added methods to control external and internal collision modes separately
...
When an actor dies, we should only disable external collisions, i.e. prevent other actors from colliding with the dead body. The dead actor, however, should still have gravity and collision applied.
Also moved disableCollision to when the death animation finishes, not as soon as the actor's health is 0.
2014-05-13 01:43:52 +02:00
mrcheko
725f6cac5e
AiPursue infinite package updating bug resolved
2014-05-13 00:05:30 +04:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
Thomas
645d174a96
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aisequence.hpp
2014-05-12 14:49:08 -04:00
mrcheko
e4fe78937a
Merge remote-tracking branch 'upstream/master'
2014-05-12 22:06:26 +04:00
Marc Zinnschlag
3c5fe28857
Merge branch 'config'
2014-05-12 10:33:10 +02:00
Marc Zinnschlag
8279d307c4
text encoding configuration (was using hardcoded settings before)
2014-05-12 10:32:57 +02:00
scrawl
117b812fb1
Fix invisibility not breaking on certain actions
2014-05-12 02:20:56 +02:00
scrawl
b0fbea9d57
Removed a wrong assertion. Max drowning time is defined by GMST.
2014-05-11 21:03:27 +02:00
scrawl
2bc2684a66
Fixes #275 : force updating exterior cell maps even if already in cache
2014-05-11 18:01:47 +02:00
scrawl
54a893994a
Also update local map when paused, to make it update properly when teleporting via GUI/console
2014-05-11 18:01:47 +02:00
scrawl
7428511ea0
Bug #772 : Do not show door markers for disabled doors
2014-05-11 18:01:47 +02:00
scrawl
961c4d4dc4
Fixes #772 : Give scripts a chance to run before updating map, so that disabled objects are not visible
2014-05-11 18:01:47 +02:00
scrawl
ac8abd3398
assert -> exception to gracefully handle corrupted savegames
2014-05-11 18:01:47 +02:00
Marc Zinnschlag
368c868623
Merge remote-tracking branch 'scrawl/master'
2014-05-11 11:10:51 +02:00
Marc Zinnschlag
a85c73cf35
Merge remote-tracking branch 'filkry/bug1047dialoglinks'
2014-05-11 11:07:23 +02:00
scrawl
c39a0368cf
Bug #618 : Make local map textures static in an attempt to fix the disappearing maps with D3D.
...
Also removed problematic DISCARDABLE flag for fog of war textures.
2014-05-11 02:40:15 +02:00
scrawl
c98bea2a88
Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip
2014-05-11 02:27:43 +02:00
scrawl
a4a9794417
Savegame: store fog of war ( Closes #1177 )
2014-05-11 02:07:58 +02:00
scrawl
7b46e9f914
Get rid of no longer needed widget names
2014-05-11 01:05:49 +02:00
scrawl
041319c43e
Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes
2014-05-11 00:32:22 +02:00
scrawl
07d9845aa0
Fix a bug in ESMStore code that checks for duplicate record insertions
2014-05-11 00:10:28 +02:00
Fil Krynicki
eb5ef270ba
Bug 1047 update - defaults and edge case
...
Handles edge case where it was possible to highlight adjacent
sub-terms without whitespace between them.
Also makes ignoring words not prefixed by whitespace the
assumed behaviour.
2014-05-10 17:47:21 -04:00
scrawl
dab4db87ff
Fix a bug in marker placement for interior maps
2014-05-10 23:47:00 +02:00
Fil Krynicki
9095a45ba7
Bug 1047 Fix
...
Dialog links can no longer be highlighted if they appear in the
middle of the word. This is achieved by confirming that the
character before a match is not alphabetic, so that words
following hyphens can still potentially match.
2014-05-10 17:05:15 -04:00
scrawl
b358cf2423
Fix a potential crash when loading script locals from savegame
2014-05-10 21:31:49 +02:00
scrawl
9fb5cef287
Oops, committed debug code
2014-05-10 21:31:49 +02:00
Marc Zinnschlag
8f5acf4741
Merge branch 'openmw-30'
2014-05-10 17:49:02 +02:00
Marc Zinnschlag
5b5bf6f37e
removed a redundant (and unsufficiently configured) copy of ConfigurationManager
2014-05-10 17:46:10 +02:00
Marc Zinnschlag
804bf523ba
removed two unused files
2014-05-10 17:35:11 +02:00
Marc Zinnschlag
5b9e90744e
Merge branch 'load'
2014-05-10 13:49:25 +02:00
Marc Zinnschlag
6fdbd4d3f9
minor adjustment to UniversalId
2014-05-10 13:49:19 +02:00
Marc Zinnschlag
96ca9500ca
generate error messages when encounting non-critical problems during load
2014-05-10 13:47:22 +02:00
Marc Zinnschlag
79d59153c1
improved layout of loading window
2014-05-10 13:29:28 +02:00
Marc Zinnschlag
95d24492de
display load error messages in loading window
2014-05-10 13:18:40 +02:00
Marc Zinnschlag
aadaf7827d
added load error log
2014-05-10 12:04:36 +02:00
Marc Zinnschlag
31b8dad4e0
Merge remote-tracking branch 'scrawl/master'
2014-05-10 10:52:47 +02:00
Marc Zinnschlag
2009cf9ad7
Merge remote-tracking branch 'scrawl/master' into openmw-30
2014-05-10 10:48:40 +02:00
scrawl
242e19a136
Fix crash when exiting OpenMW while dialogue/journal is opened and mouse cursor on a topic
...
(Fixes #1300 )
2014-05-10 01:37:34 +02:00
scrawl
5163358478
Fix a crash when exiting OpenMW while the mouse cursor is over a local map marker
2014-05-10 01:14:12 +02:00
scrawl
d86585b153
Fix clearing of local map markers
...
destroyWidget changes the child count, so the for loop is flawed.
2014-05-10 01:07:40 +02:00
scrawl
1444cd9051
Fix AiCombat exception when actor has a lockpick/probe equipped.
...
Don't make NPCs autoEquip lockpicks/probes, since they can't use them.
2014-05-10 00:37:36 +02:00
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
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
cc9cii
cf23721f1b
Windows debug build crash fix.
2014-05-09 20:43:24 +10: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
cf90da6cd8
minor fix
2014-05-08 15:23:29 +02:00
Marc Zinnschlag
6eff5ecaad
Merge branch 'operations' into load
...
Conflicts:
apps/opencs/main.cpp
apps/opencs/model/doc/document.cpp
2014-05-08 13:17:24 +02:00
Marc Zinnschlag
205306ee3d
changed message passing format from QString to a UniversalId/std::string pair
2014-05-08 12:42:29 +02:00
graffy76
0e7d40de6a
Merge branch 'master' of https://github.com/OpenMW/openmw
...
upstream merge
2014-05-07 22:00:08 -05:00
graffy76
cd7983adb5
Decoupled setting definitions from the Setting class. QSettings
...
implementation is now fully responsible for managing user settings.
2014-05-07 21:59:26 -05: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
mrcheko
01810f24b0
A* misses 1st closest node fix
2014-05-06 23:29:39 +04: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
a17cb1f389
Fixed opencs.ini formatting
2014-05-06 07:37:52 -05:00
Marc Zinnschlag
a30d816982
fixed a mixup in CSMTools::Tools constructor/destructor
2014-05-06 11:44:20 +02:00
Marc Zinnschlag
492620c8cf
handle exceptions thrown during loading and report them to the user
2014-05-06 09:39:39 +02: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
mrcheko
f596b698d9
fixes to slow-down at jump startup and infinite air intertia growth
2014-05-04 18:15:07 +04: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
Thomas
dbf06d8c8b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aipursue.hpp
apps/openmw/mwmechanics/aisequence.hpp
2014-05-04 02:06:43 -04: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
0a3ab3dcd1
Commented out "proxy selection test" demo page in user settings
2014-05-03 19:48:04 -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
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
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
Marc Zinnschlag
e9c2f24faa
intercept close button clicks in loading window
2014-05-03 17:14:17 +02:00
Marc Zinnschlag
3fdd72f204
added cancel button to loading window
2014-05-03 16:44:50 +02:00
Marc Zinnschlag
6bc5869222
record loading progress bar
2014-05-03 15:33:35 +02:00
Marc Zinnschlag
6692d2dc72
split up load function in a start and continue part
2014-05-03 15:05:02 +02:00
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
Thomas
10a5bb9464
Made code a bit more standardized and added a good bit of documentation.
2014-04-29 23:40:59 -04:00
Marek Kochanowicz
eeb18b533e
moved editlock to the dragrecordtable
2014-04-29 21:41:57 +02:00
Marc Zinnschlag
0c2843b0f7
some missing cleanup
2014-04-29 19:56:33 +02:00
Marek Kochanowicz
d376efe30b
handle dragging not-existing records
2014-04-29 19:34:06 +02:00
Marc Zinnschlag
9a1b5dc1c6
a bit of cleanup
2014-04-29 15:32:00 +02:00
Marc Zinnschlag
f6a876bc3d
added actor ID
2014-04-29 15:27:49 +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
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
Marc Zinnschlag
ddb0496dca
replaced return value of removeDocument with a signal
2014-04-26 13:11:27 +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
mrcheko
f3626adc86
remake of z-moving in combat for flying/swimming enemies
2014-04-26 00:20:55 +04: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
dbb192f084
moved loading to a separate thread
2014-04-24 15:09:25 +02: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
Thomas
f6deca7c80
Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors
2014-04-23 13:02:51 -04:00
Thomas
61341d4206
Removed mLocked, kept it as "Negative lock level means unlocked"
2014-04-23 10:00:18 -04:00
graffy76
8c6c70ee9c
Merge branch 'master' of https://github.com/graffy76/openmw
2014-04-23 07:05:34 -05:00
Thomas
6022ffbd1f
Evidence chest now locks when new evidence is added to it
2014-04-23 05:54:18 -04:00
Thomas
420163d35f
Small changes to lock command (If no valid lockLevel exists, defaults to 100)
2014-04-23 05:19:34 -04:00
Thomas
cac8e52154
Seperated locked and lock level, to allow for relocking doors to previous lock level.
...
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
2014-04-23 05:12:07 -04:00
Thomas
e71a119c23
Made aifollowers run when long distances (800 or 10000, depending) from what they're following.
2014-04-23 02:57:48 -04:00
graffy76
4b607d658f
Re-link user settings to editor main application
2014-04-22 22:19:53 -05:00
graffy76
e3384e3999
relocate support.hpp / remove support.cpp
2014-04-22 22:19:03 -05:00
graffy76
331df17b48
Added new framework files
2014-04-22 22:17:19 -05:00
graffy76
d3148555fa
Delete old framework files
2014-04-22 22:16:14 -05:00
mrcheko
fbd0ffe86f
enable z-moving for flying/water combatants
2014-04-22 22:59:39 +04:00
scrawl
9998c2783e
Fix travis
...
Why again do we need a unit test for something that was never used?
2014-04-21 17:37:06 +02:00
Marc Zinnschlag
e324450118
replaced return value of DocumentManager::addDocument with a signal
2014-04-21 09:02:58 +02:00
mrcheko
f811abb752
pathgrid shortcutting extended
2014-04-20 20:35:07 +04:00
Marc Zinnschlag
86bd2f48dc
removed an unused function
2014-04-20 17:28:10 +02:00
Marc Zinnschlag
0eed697f9a
Merge remote-tracking branch 'digmaster/master'
2014-04-20 13:36:39 +02:00
Marc Zinnschlag
a91b386381
Merge remote-tracking branch 'jeffreyhaines/master'
2014-04-20 13:34:58 +02:00
cc9cii
6a1435c49e
Remove rotation check that was freezing NPC's.
2014-04-20 17:59:08 +10:00
cc9cii
e17fab891d
Suppress travis warning and one more tweak.
2014-04-20 16:49:57 +10:00
Thomas Luppi
d6f1f129eb
Forgot to capitalize something. whooooops
...
dat y do
2014-04-20 00:39:50 -04:00
Thomas Luppi
95ef874205
Gets default keybindings from scancode, not keyvalue.
...
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
2014-04-20 00:34:58 -04:00
cc9cii
2b544d550b
Fixed the rotation animation glitch.
2014-04-20 14:27:18 +10:00
cc9cii
000afa48b7
An attempt at making turning animation smoother. Copied some code from AiCombat for rotation.
2014-04-20 11:59:47 +10:00
cc9cii
3d26702f5e
Make idle actors face the player. Turning animation is not smooth.
2014-04-20 10:36:01 +10:00
cc9cii
9bd31b6236
Added reaction time and moved game setting variables init to the constructor.
2014-04-20 10:06:03 +10:00
Jeffrey Haines
3484df0743
Fixed garage value found in beta's static analysis
...
Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844
2014-04-19 19:42:49 -04:00
Jeffrey Haines
6733a1541e
Fixes to Crime System
...
Victimless crimes were removed because victims may not exist in the
case of stealing items.
Is class now uses case insensitive comparison.
Fixed issue with confiscation of stolen items.
2014-04-19 19:03:31 -04:00
cc9cii
3dfd08cf2d
Cleanup and little tweaking.
2014-04-20 08:31:02 +10:00
cc9cii
479a94b35d
Backing off closed doors working, needs cleanup and tweaking.
2014-04-20 08:14:54 +10:00
Marc Zinnschlag
7eb6a2e52d
Merge remote-tracking branch 'scrawl/alarm'
2014-04-18 16:19:28 +02:00
Marc Zinnschlag
34092f9f5d
Merge remote-tracking branch 'scrawl/master'
2014-04-18 15:08:30 +02:00
scrawl
b3916e7744
Crime: mark witnesses as alarmed.
...
Fixes guard dialogue to properly detect if the player turned himself in.
2014-04-18 13:44:09 +02:00
scrawl
4625adfb7f
Fix typo in a condition.
2014-04-18 11:43:37 +02:00
cc9cii
7437647f70
Forgot to add a guard :-(
2014-04-18 16:45:31 +10:00
cc9cii
a0fc514df7
Suppress compiler warning.
2014-04-18 15:45:39 +10:00
cc9cii
c652cb1568
More cleaning up.
2014-04-18 15:19:22 +10:00
cc9cii
2447f0f4aa
Cleaned up logging statements.
2014-04-18 14:41:44 +10:00
cc9cii
aad13d315c
Fixed issue where allowed nodes were being erased. PathFinder was returning an empty path if the closest pathgrid point to the start was also the closest pathgrid point to the goal. Still need to clean up and remove logging statements.
2014-04-18 14:41:44 +10:00
cc9cii
d3be725ee7
Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points.
2014-04-18 14:41:43 +10:00
cc9cii
1ceeeb4a22
Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck.
2014-04-18 14:41:43 +10:00
Marc Zinnschlag
65161c3e24
Merge remote-tracking branch 'sirherrbatka/less-signals'
2014-04-16 10:22:20 +02:00
Marc Zinnschlag
ce33912980
Merge remote-tracking branch 'sirherrbatka/AngryFix'
2014-04-16 10:21:59 +02:00
Marc Zinnschlag
a7cece3d30
do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit
2014-04-15 22:34:15 +02:00
Marek Kochanowicz
8fba71101c
removed signals
2014-04-15 20:39:19 +02:00
Marek Kochanowicz
fc1837e2ed
fixed bug: regions can be dragged
...
ps
fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
2014-04-15 19:26:43 +02:00
Marc Zinnschlag
30d5040f2f
Merge remote-tracking branch 'cc9cii/Bug-No-1260'
2014-04-15 15:26:58 +02:00
cc9cii
1fc030653f
Avoid hard coding "thief.dds" string.
2014-04-15 22:30:41 +10:00
Marc Zinnschlag
86e65944b8
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Jeffrey Haines
e2fab228f9
Save state is handled correctly now.
2014-04-14 18:11:04 -04:00
mrcheko
4e7ee97050
fix for windows builds
2014-04-14 17:18:29 +04:00
cc9cii
89be1069a7
Bug #1260 : show thief.dds image for a custom class level up menu
2014-04-14 18:31:46 +10:00
Marc Zinnschlag
71068ae3ad
Merge branch 'regionmap'
2014-04-13 17:24:08 +02:00
Marc Zinnschlag
d188e68227
added f-type hint to TableSubView
2014-04-13 16:40:41 +02:00
Marc Zinnschlag
097c063b8a
added 'view in table' action to region map
2014-04-13 16:40:16 +02:00
Marc Zinnschlag
2eca9e72fd
added view action to region map
2014-04-13 15:46:31 +02:00
Marc Zinnschlag
1892550833
added set/unset region actions to region map
2014-04-13 15:32:49 +02:00
Marc Zinnschlag
fc4195a88f
added create cell menu item to regionmap
2014-04-13 14:17:18 +02:00
Marc Zinnschlag
19b31c4146
always use the cell ID instead of the exterior coordinate fields from the original cell struct
2014-04-13 14:16:59 +02:00
Marc Zinnschlag
decd4270d9
added CellId role to RegionMap model
2014-04-13 13:59:27 +02:00
cc9cii
966ed46870
Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status.
2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b
Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr).
2014-04-13 14:53:36 +10:00
cc9cii
e9be6d3f42
Fix falling animation where vec.z is set to zero.
2014-04-13 11:34:59 +10:00
cc9cii
0bef754873
Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271 .
2014-04-13 08:46:02 +10:00
Marc Zinnschlag
2f63eb7ca4
added missing edit lock for record reordering
2014-04-12 20:07:09 +02:00
cc9cii
d2a41167d0
Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075
2014-04-11 21:24:00 +10:00
Marc Zinnschlag
d0ea23431c
replaced CellIndex typedef with new CellCoordinates class
2014-04-11 10:06:16 +02:00
Marc Zinnschlag
0516d95253
added context menu with selection functions to region map
2014-04-10 22:12:09 +02:00
Marc Zinnschlag
7f12733463
Merge remote-tracking branch 'potatoesmaster/1071'
2014-04-08 21:08:59 +02:00
Emanuel Guevel
09bd0324c9
Fail properly when a content file is not found
2014-04-08 20:19:09 +02:00
Marc Zinnschlag
d205d5f0af
Merge branch 'cellselect'
2014-04-08 09:58:00 +02:00
Marc Zinnschlag
e0550ba336
allow multiple cell coordinates in c-type hint for scene subviews
2014-04-07 15:23:14 +02:00
Marc Zinnschlag
0d352cb883
replaced rectangular cell selection with a CellSelection object
2014-04-07 14:16:02 +02:00
Marc Zinnschlag
67965ec10c
added CellCoordinates and CellSelection classes
2014-04-07 13:44:43 +02:00
Marc Zinnschlag
324b2743d4
removed grid button (discarding the first attempt at a cell selector)
2014-04-07 10:21:26 +02:00
Marc Zinnschlag
03b3487f1b
minor cleanup
2014-04-07 09:56:36 +02:00
Marc Zinnschlag
fafb7501e3
Merge remote-tracking branch 'cc9cii/PathFinder-split'
2014-04-07 09:48:15 +02:00
Emanuel Guevel
ce7aa96371
Fix visual glitch happening when closing inventory while sneaking
...
(bug #1255 )
2014-04-06 22:21:28 +02:00
Marc Zinnschlag
c7f2cfeca0
Merge remote-tracking branch 'gus/AIFix2'
2014-04-06 15:13:30 +02:00
Jeffrey Haines
a274b48f2f
States are saved. Crime is reacted to.
...
Issues where some crime is ignored. Needs a lot more work
2014-04-05 22:45:40 -04:00
Jeffrey Haines
940c88d2ec
Cleaned up code, implemented crime ids
...
There is a problem with my game freezing. ToggleAi stops my character
2014-04-05 10:26:14 -04:00
Marc Zinnschlag
0fe67b586a
increased scene toolbar button size
2014-04-05 13:16:13 +02:00
Jeffrey Haines
df5cbe5dec
Minor changes
2014-04-04 08:10:35 -04:00
cc9cii
28f7c42fb7
One more comment fix.
2014-04-04 18:17:42 +11:00
cc9cii
f59226265a
Remove redundant parameter from aStarSearch. Also update some comments.
2014-04-04 18:10:06 +11:00
Jeffrey Haines
70919ba60a
Removed witnesses and minor changes
2014-04-03 16:13:14 -04:00
cc9cii
5cf8e7e933
Remove logging.
2014-04-04 06:16:26 +11:00
cc9cii
040d4f8fc4
Move PathgridGraph into separate files.
2014-04-04 06:13:47 +11:00
Jeffrey Haines
0c957a3cde
Added witnesses to the mix
2014-04-03 14:53:31 -04:00
Marc Zinnschlag
baf30ba292
added grid tool (does not work yet)
2014-04-03 14:44:48 +02:00
cc9cii
a8b2eb1fe9
Make Travis happy.
2014-04-03 22:49:22 +11:00
Marc Zinnschlag
3a58da9ad7
size adjustment
2014-04-03 13:30:22 +02:00
cc9cii
325d0616bb
Cleanup debug statements.
2014-04-03 22:17:45 +11:00
Marc Zinnschlag
5d422fec8a
fixed scene toolbar layout problems
2014-04-03 13:00:19 +02:00
cc9cii
98f77714ce
Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder.
...
This version still has debugging statements and needs cleaning up.
2014-04-03 21:43:44 +11:00
Jeffrey Haines
b1abef7a38
Cleaned up code
2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be
Crime is now checked every frame call
2014-04-03 00:50:09 -04:00
cc9cii
f597d3e88b
Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors).
2014-04-03 07:46:26 +11:00
Jeffrey Haines
510f2d10ac
Replaces broken code with todo
2014-04-02 14:20:33 -04:00
Jeffrey Haines
6f1211dd8d
Moved mWitnesses into Player. resetCrime for paying fine.
2014-04-02 12:23:38 -04:00
Jeffrey Haines
7c0b51fb7e
Ai pursue now controls guards pursuit of crimes
...
Should extend AiActivate in the future
2014-04-02 00:18:22 -04:00
Jeffrey Haines
50dac98a2b
Feature 1154 & 73: Crime and NPC reactions
2014-04-01 20:24:25 -04:00
Jeffrey Haines
4037f3705e
Feature 1154 & 73: NPCs react to crime
2014-04-01 14:15:55 -04:00
Marc Zinnschlag
5b5069535e
keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly
2014-04-01 10:04:14 +02:00
Marc Zinnschlag
12e46c5dc7
Merge remote-tracking branch 'megaton/master'
2014-03-31 10:24:12 +02:00
Marc Zinnschlag
4ee1069baa
Merge remote-tracking branch 'scrawl/master'
2014-03-31 10:11:54 +02:00
scrawl
f5810b8e1c
Consider aspect ratio for loading screen background
...
More consistent with the main menu.
2014-03-30 23:07:49 +02:00
scrawl
1265131203
Set the selected index after all items are added (workaround for MyGUI bug)
2014-03-30 20:07:43 +02:00
megaton
50af9bc0d3
General perfomance optimizations.
2014-03-30 19:45:27 +04:00
cc9cii
d04bb3befb
MSVC uses C version of locale.
2014-03-30 17:23:22 +11:00
Jeffrey Haines
8ce938c6f1
Revert 6b28c06..98fd381
...
This rolls back to commit 6b28c06b2c
2014-03-29 22:26:53 -04:00
Jeffrey Haines
98fd381564
Feature #1154 Not all NPCs get aggressive when one is attacked
...
Compiling fix
2014-03-29 21:25:20 -04:00
Jeffrey Haines
6c866deb1b
Feature #1154 Not all NPCs get aggressive when one is attacked
...
Partially implemented
2014-03-29 21:23:34 -04:00
scrawl
5eeed03f5b
Only exchange bribe gold if the bribe was accepted
2014-03-30 00:12:31 +01:00
scrawl
72df9e77c6
Don't show version text in the pause menu
2014-03-30 00:07:32 +01:00
gus
d9ea7107b7
compile fix.
2014-03-29 18:36:32 +01:00
gus
bee057346b
Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-03-29 18:05:56 +01:00
Marc Zinnschlag
adab85eeb7
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-29 13:29:06 +01:00
Jeffrey Haines
6b28c06b2c
Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe
2014-03-29 07:47:41 -04:00
Jeffrey Haines
ad9286a30f
Revert "Revert "made mReceiver private""
...
This reverts commit 33aecc5218
2014-03-29 07:45:56 -04:00
Jeffrey Haines
33aecc5218
Revert "made mReceiver private"
...
This reverts commit 3e8f7b3bae
2014-03-29 07:45:36 -04:00
Marc Zinnschlag
c7b969821f
silenced a warning
2014-03-29 11:11:43 +01:00
Marc Zinnschlag
27095f3edb
Merge remote-tracking branch 'cc9cii/AiWander-improvements'
2014-03-29 11:08:51 +01:00
cc9cii
ebb1813b9b
Minor comment clarification.
2014-03-29 20:17:04 +11:00
cc9cii
07fd801d94
My previous analysis of the pathfinding issue was incorrect. It was in fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points.
...
There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily. The check mCell != cell in buildPath() is being triggered frequently. Not sure why.
2014-03-29 19:35:52 +11:00
cc9cii
267855c44e
Prevent NPC suicides off silt the strider platform in Seyda Neen. Added some comments as well. There may be opportunities for some optimization but left that out for now.
2014-03-29 19:35:52 +11:00
cc9cii
90a813ad2c
Allow interrupting a walking NPC to trigger a greeting.
2014-03-29 19:35:52 +11:00
Marc Zinnschlag
04baa4a573
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-29 08:14:04 +01:00
Jeffrey Haines
3e8f7b3bae
made mReceiver private
2014-03-29 02:59:47 -04:00
Jeffrey Haines
13d330e427
Feature #1233 Bribe gold not in inventory
...
Gold is now put into inventory receivers when bribing.
2014-03-28 21:16:42 -04:00
Marc Zinnschlag
86e5179fd8
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 22:40:12 +01:00
Jeffrey Haines
9efef31bb8
Feature #953 Trader Gold - Unused code/warning resolved
...
Removed unused code
getBaseGold throws proper error
2014-03-28 17:27:23 -04:00
Marc Zinnschlag
c38812d026
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 19:34:40 +01:00
Jeffrey Haines
401d21b4ee
getBaseGold implemented in MWWorld::Class for NPC and Creature
...
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
2014-03-28 14:21:38 -04:00
Jeffrey Haines
895748f18d
Gold Pool implemented for Vendors
...
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
2014-03-28 12:01:56 -04:00
Marc Zinnschlag
2c2106205d
Merge remote-tracking branch 'scrawl/master'
2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21
Bug #1224 : Changed fix to potentially allow for language independent saves
2014-03-27 22:32:42 +01:00
scrawl
4f852daf45
Don't play company logo when using --skip-menu
2014-03-27 19:59:33 +01:00
scrawl
f2cd37edd0
Play company logo movie
2014-03-27 19:51:48 +01:00
scrawl
5906d795c0
Refactored video player (now a MyGUI widget)
2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28
Add proper main menu (background image, logo animation, title music)
2014-03-27 15:25:01 +01:00
Marc Zinnschlag
5c81f20f46
Merge remote-tracking branch 'rohitnirmal/load-weap-icon'
2014-03-27 14:57:55 +01:00
Marc Zinnschlag
ce792cf182
Merge branch 'light'
2014-03-27 14:39:40 +01:00
Marc Zinnschlag
50f1679a4c
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-27 13:40:06 +01:00
Jeffrey Haines
6896142db1
Trader Gold Reset Delay
...
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
2014-03-27 07:30:24 -04:00
Marc Zinnschlag
53c4878d52
fix for inconsistent case in topic records
2014-03-27 10:01:42 +01:00
Jeffrey Haines
2a8bf46607
Trader Gold Reset Delay
...
Implemented traded gold reset delay.
Note:
Traders gold pool is still in inventory.
2014-03-27 01:23:56 -04:00
Rohit Nirmal
e695890e01
Only update the icon if player is NOT unarmed, to avoid bad dereference.
2014-03-26 21:53:35 -05:00
Rohit Nirmal
bcacdc49af
Update weapon icon in HUD when save is loaded.
2014-03-26 21:08:31 -05:00
scrawl
27956f3624
Savegame dialog: Hide main menu after successful load
2014-03-27 02:36:21 +01:00
scrawl
e5e1e84c52
Ask for confirmation to exit OpenMW
2014-03-26 22:05:21 +01:00
scrawl
a5598e9c2e
Add Credits button to main menu (plays mw_credits.bik)
2014-03-26 21:38:57 +01:00
scrawl
23f4bbc5b0
Videoplayer: only pause previous sounds if there is an audio stream
2014-03-26 21:36:57 +01:00
scrawl
5562c78ac4
Ask for confirmation when selecting 'New Game'
2014-03-26 21:11:39 +01:00
scrawl
ecfaa41e93
Savegame dialog: use locale-aware datetime format
2014-03-26 20:56:39 +01:00
scrawl
53ba23e303
Fixes #1224 : Store class name instead of id in savegame header
2014-03-26 19:56:12 +01:00
scrawl
793649c854
ToggleAI: Report current status on toggle
2014-03-26 19:55:52 +01:00
scrawl
688415ce54
Play deathknockout/deathknockdown animations when appropriate
2014-03-26 18:55:16 +01:00
Marc Zinnschlag
ed524b2fd4
added bright lighting mode
2014-03-26 18:29:15 +01:00
Marc Zinnschlag
9746f8bd32
added night lighting mode
2014-03-26 17:59:42 +01:00
Marc Zinnschlag
fa29942b27
added day lighting mode
2014-03-26 17:47:56 +01:00
Marc Zinnschlag
d5506172e8
added lighting switching
2014-03-23 15:14:26 +01:00
Marc Zinnschlag
205354ba30
some ambient light cleanup
2014-03-23 13:40:56 +01:00
Marc Zinnschlag
1b6b4e3442
Merge remote-tracking branch 'slothlife/weather_save'
2014-03-23 08:36:45 +01:00
cc9cii
772a49b2a6
Just some notes for future maintenance.
2014-03-23 13:38:11 +11:00
scrawl
0a17245633
Refactored settings window
2014-03-22 19:02:14 +01:00
Marc Zinnschlag
87ae03b5d4
fix for previous commit
2014-03-22 16:39:24 +01:00
Marc Zinnschlag
6bd3b3ee78
include local variable state in saved games
2014-03-22 15:00:49 +01:00
Marc Zinnschlag
4d80bc009a
Merge remote-tracking branch 'scrawl/master'
2014-03-22 09:54:42 +01:00
scrawl
0c207f7212
Fix build error
2014-03-22 02:08:09 +01:00
scrawl
394284d0f8
Fixes #1209 : Tarhiel never falls
...
There are a few pitfalls with this code:
- Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?)
- The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.
2014-03-22 02:08:04 +01:00
Alexander "Ace" Olofsson
317f1e0b63
Update dialoguesubview.cpp
...
That doesn't work on Windows. (Are and/or allowed in C++ in any other compiler?)
2014-03-21 13:44:01 +01:00
Marc Zinnschlag
41fd94b160
compensated for different coordinate systems
2014-03-21 13:39:22 +01:00
Marc Zinnschlag
1e57d55717
update/close on deletion of reference/referenceable
2014-03-21 13:27:46 +01:00
Marc Zinnschlag
698fe8cce3
update preview title on changed referenceableID (preview for references only)
2014-03-21 12:52:46 +01:00
Marc Zinnschlag
58daf52a67
deal with empty and invalid referenceable ID fields
2014-03-21 12:44:06 +01:00
Marc Zinnschlag
1a9df4bc56
Merge branch 'preview'
2014-03-21 12:35:40 +01:00
Marek Kochanowicz
2a26ff2299
better fix
2014-03-21 12:13:54 +01:00
Marc Zinnschlag
fc8ae2b9b5
fixed encoding problems
2014-03-21 11:56:48 +01:00
Marc Zinnschlag
10ce47938b
update preview on reference/referenceable changes
2014-03-21 11:22:43 +01:00
Marc Zinnschlag
2128d3008c
Merge branch 'master' into preview
2014-03-21 08:12:06 +01:00
slothlife
6dce3e5186
Fixed include to use C99 header, not C++11 header
2014-03-21 01:33:11 -05:00
slothlife
6eab9c5179
Move weather state save/load to a new class
2014-03-21 01:19:40 -05:00
Rohit Nirmal
e3a9daf921
Play item sound when trying to sell a bound item, too.
2014-03-20 22:22:31 -05:00
Marc Zinnschlag
688e03a9d2
Merge remote-tracking branch 'sirherrbatka/Editor-Dialog'
2014-03-20 22:27:28 +01:00
Marek Kochanowicz
fbb619db73
…
2014-03-20 21:41:11 +01:00
Marek Kochanowicz
a692ce99fa
where was my mind…
2014-03-20 20:26:53 +01:00
Marek Kochanowicz
ccd5e549cd
moved buttons down
2014-03-20 19:53:03 +01:00
Marek Kochanowicz
832a10b2ac
solving problems
2014-03-20 18:40:10 +01:00
Marc Zinnschlag
1a1d52c513
fixed a column ID problem
2014-03-20 14:19:50 +01:00
Marek Kochanowicz
5c34823bb0
added some placeholder icons
2014-03-20 13:59:00 +01:00
Marek Kochanowicz
ad2f9a69a1
prevent deleting already deleted record
2014-03-20 08:59:04 +01:00
slothlife
1acd1bd913
Feature #1173 : Saved Game: include weather state
...
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
2014-03-20 01:25:52 -05:00
Rohit Nirmal
e4c4747a27
Play item sound even if merchant doesn't purchase it.
2014-03-19 20:08:01 -05:00
Marek Kochanowicz
ea9b6fa37e
view button
2014-03-19 12:01:36 +01:00
Marek Kochanowicz
8f3103ce65
added preview button
2014-03-19 11:43:25 +01:00
Marek Kochanowicz
6416ae90d2
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
2014-03-19 10:23:15 +01:00
Marek Kochanowicz
010160d047
missed those :/
2014-03-18 20:56:55 +01:00
Marek Kochanowicz
c0b2b783cb
use more proper creators
2014-03-18 20:53:21 +01:00
Marek Kochanowicz
f3475f7ef5
Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog
2014-03-18 19:24:10 +01:00
Marek Kochanowicz
db774b02d7
clone and create buttons work
2014-03-18 09:36:22 +01:00
Marek Kochanowicz
95afca0558
delete record button
2014-03-17 19:28:41 +01:00
Marek Kochanowicz
7296b09357
revert button
2014-03-17 19:18:18 +01:00
Marek Kochanowicz
09ba547630
use tool buttons with icons
2014-03-17 15:35:36 +01:00
scrawl
128a47570e
One more fix
2014-03-17 14:15:52 +01:00
scrawl
4443e22387
Build fix
2014-03-17 13:32:13 +01:00
scrawl
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
2014-03-16 23:49:06 +01:00
scrawl
81dfc26d26
mwscript/locals was added twice
2014-03-16 21:39:46 +01:00
Marc Zinnschlag
20ea859aac
adjusted the far clip distance
2014-03-16 17:14:44 +01:00
sirherrbatka
3c8eeb8c48
added comment
2014-03-16 17:11:13 +01:00
Marc Zinnschlag
6b11265fbc
consider scale and orientation when previewing reference
2014-03-16 17:06:45 +01:00
Marc Zinnschlag
48ea93d890
less random camera start position
2014-03-16 17:06:30 +01:00
sirherrbatka
4a0d1ba272
do not cast and check multiple times
2014-03-16 17:06:11 +01:00
Marc Zinnschlag
fa042a8aca
use proper title for reference prewview subviews (avoid internal ID)
2014-03-16 13:22:32 +01:00
Marc Zinnschlag
8b36de6c67
Merge remote-tracking branch 'cc9cii/Slaughterfish-fix'
2014-03-16 12:57:38 +01:00
Marc Zinnschlag
afbdd84467
Merge remote-tracking branch 'cc9cii/AiWander-fix'
2014-03-16 12:47:30 +01:00
Marc Zinnschlag
c36dfef972
prewview subview
2014-03-16 12:44:01 +01:00
cc9cii
f71fb83bfc
Cleaned up more inaccurate comments.
2014-03-16 20:56:11 +11:00
cc9cii
f57c11254f
Revert to original variable names.
2014-03-16 20:09:18 +11:00
cc9cii
22c544d9d7
Remove unnecessary comment.
2014-03-16 12:51:12 +11:00
cc9cii
fdbd564700
Apparently fall trace needs to be done with the middle of the object.
2014-03-16 08:57:55 +11:00
cc9cii
43757efdc4
Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however.
2014-03-16 08:09:14 +11:00
scrawl
d08394bf78
Fixes #1205 : apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla)
2014-03-15 21:00:25 +01:00
scrawl
61955111f1
Fixes #1204 : Any health value < 1 should show as empty life bar.
2014-03-15 20:48:54 +01:00
scrawl
93c21b5ef2
Fixes #1197 : incorrect mouse wheel step
2014-03-15 20:34:12 +01:00
scrawl
3880247017
Fixes #1206 : effect texture override was not accounted for
2014-03-15 20:28:48 +01:00
Marc Zinnschlag
2fdf80bcbf
Merge remote-tracking branch 'gsedej/master'
2014-03-15 13:53:05 +01:00
cc9cii
e6977d00e8
Oops. Fix typo picked up by Zini.
2014-03-15 08:16:35 +11:00
cc9cii
b2e3fa70c2
Fix spelling errors in comments.
2014-03-14 07:04:39 +11:00
Marek Kochanowicz
4a623ace71
disabling works
2014-03-13 18:41:37 +01:00
Marek Kochanowicz
c97172d89c
fixed segfault and prevent drops from other documents
2014-03-13 17:00:14 +01:00
Marek Kochanowicz
e1a4b64efb
fixed segfault
2014-03-13 16:50:04 +01:00
cc9cii
d54ae58ec9
Bug #900 fix - minor update to comments
2014-03-14 00:09:03 +11:00
cc9cii
d92740efc9
Bug #900 fix - only fixed AiWonder, AiCombat, AiTravel and others may need a different strategy to this.
2014-03-13 23:44:52 +11:00
Marc Zinnschlag
7bc97fb8b8
reworked code for player positioning on startup and new game
2014-03-13 13:19:32 +01:00
Marek Kochanowicz
dd755a00e4
fix for the bug (?)
2014-03-13 08:52:37 +01:00
Marek Kochanowicz
cc1ceb35ce
drag and drop works
2014-03-12 20:34:55 +01:00
Marek Kochanowicz
fd4829141d
succesfully connected the signals
2014-03-12 19:55:51 +01:00
Marek Kochanowicz
1bf67e7390
added the new qlineedit subclass
2014-03-12 19:36:46 +01:00
Marek Kochanowicz
30a0c82e22
this code segfaults, but i don't know why
2014-03-12 16:28:10 +01:00
Marek Kochanowicz
919065db32
fixed segfault
2014-03-12 16:06:59 +01:00
Marek Kochanowicz
d1290ac556
skip deleled or erased records
2014-03-12 15:46:27 +01:00
Marek Kochanowicz
2278eb5e91
handle locking
2014-03-12 15:17:49 +01:00
Marek Kochanowicz
1a9d4204d2
correction
2014-03-12 15:07:17 +01:00
Gašper Sedej
43a12fffd5
indentation issue...
2014-03-12 14:37:44 +01:00
Marek Kochanowicz
2e226e63b6
change universalid of base subview after pressing next or prev
2014-03-12 13:04:40 +01:00
Gašper Sedej
d72a2f1ffb
Added code to test if git hash is availible
2014-03-12 12:33:42 +01:00
Marek Kochanowicz
cb9bcc3cc1
buttons are functional
2014-03-12 12:25:37 +01:00
scrawl
0cd40294a2
Fixed ranged combat for creatures
2014-03-12 11:30:44 +01:00
Marek Kochanowicz
299b7a6ce6
Added buttons, they don't do anything.
2014-03-12 11:08:04 +01:00
Gašper Sedej
06e02ed77f
Added version and revision number to mainmenu
2014-03-12 10:53:56 +01:00
Marek Kochanowicz
8d50af547a
created editwidget
2014-03-12 10:39:28 +01:00
Marek Kochanowicz
865e6b52ae
scroll area
2014-03-11 21:21:05 +01:00
Marek Kochanowicz
c422dc6eed
Refactorisation.
2014-03-11 20:40:31 +01:00
Marek Kochanowicz
5ad572346b
referencables also work now
2014-03-11 13:02:25 +01:00
Marek Kochanowicz
1edf5a4414
registered additional subviews.
2014-03-11 10:47:30 +01:00
Marek Kochanowicz
87286232d7
fixed bug, god bless overloading
2014-03-11 09:38:53 +01:00
Marek Kochanowicz
a25271f0b6
moving bloat away from the dispatcher
2014-03-11 09:14:13 +01:00
Marc Zinnschlag
ef1364878f
moved test cube from SceneWidget to WorldspaceWidget
2014-03-10 18:35:49 +01:00
Marek Kochanowicz
17b521cec8
additional check
2014-03-10 17:57:40 +01:00
Marek Kochanowicz
f4614c2c63
use qlabels for not editable fields
2014-03-10 17:52:45 +01:00
Marek Kochanowicz
089732419a
introduce longString
2014-03-10 17:18:29 +01:00
Marek Kochanowicz
cc96a38921
use qlinedit for the var
2014-03-10 13:27:52 +01:00
Marek Kochanowicz
874847c959
handle color
2014-03-10 13:25:01 +01:00
Marc Zinnschlag
7812427836
added Preview submenu item; fixed View issues regarding exterior cells
2014-03-10 12:44:34 +01:00
Marek Kochanowicz
73cb3ac0ed
embelishing
2014-03-10 12:04:03 +01:00
Marek Kochanowicz
361bc55973
dont force trying display
2014-03-10 09:47:41 +01:00
Marek Kochanowicz
9ab920bd80
display id and other not editable data
2014-03-10 09:37:53 +01:00
Marek Kochanowicz
b2fdaa74b0
trying to set the size policy
2014-03-09 18:44:04 +01:00
Marc Zinnschlag
2b17f5dde9
register resources locations on editor startup
2014-03-09 12:32:21 +01:00
Marc Zinnschlag
2de862126a
moved resources group creation from Engine to bsa component
2014-03-09 11:42:39 +01:00
Marek Kochanowicz
7eb10756d4
some extra views enabled
2014-03-09 08:58:24 +01:00
scrawl
6eaa7553f8
Fixes #1181 : Enable controls when loading a savegame
2014-03-09 03:34:49 +01:00
Sandy Carter
72a3c50eb8
( #1191 ) Disallow picking up if inventory disabled
...
Check if window manager has allowed the inventory window
if not, then items should not be possible to pick up
2014-03-08 13:45:54 -05:00
Marek Kochanowicz
0447be7e7a
register extra views. do not display id
2014-03-08 17:24:00 +01:00
Marek Kochanowicz
1f1774b5e1
changing the enumdelegate seteditordata
2014-03-08 16:54:05 +01:00
Marek Kochanowicz
9612c6a6fd
handle also bool boxes
2014-03-08 16:50:42 +01:00
Marek Kochanowicz
08ccae6b49
handle comboboxes
2014-03-08 16:21:49 +01:00
Marek Kochanowicz
a8b11829d4
disable not editable widgets
2014-03-08 15:18:40 +01:00
Marek Kochanowicz
3c60345d6b
nest wrapper into the proxy class
2014-03-08 15:15:00 +01:00
scrawl
072dc6d438
Feature #50 : Implement marksman mechanics.
2014-03-08 06:03:45 +01:00
scrawl
12de0afb03
Feature #50 : Spawn projectiles
...
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
2014-03-08 01:31:27 +01:00
Marek Kochanowicz
2e6b45dafb
edit view, savind works
2014-03-07 22:17:40 +01:00
Marek Kochanowicz
020e3f8fc5
Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3
2014-03-07 17:16:38 +01:00
Marek Kochanowicz
f0a45fa15f
just saved progress
2014-03-07 17:15:43 +01:00
cc9cii
f36bea03ab
Bug #1189 fix by scrawl
2014-03-07 19:36:44 +11:00
Marek Kochanowicz
b0ae78e889
basicly enabled code
2014-03-06 20:10:13 +01:00
Marc Zinnschlag
f1353dc84f
Merge branch 'scene'
2014-03-06 16:46:44 +01:00
Marc Zinnschlag
516a3b9abd
close interior cell view when cell is deleted
2014-03-06 16:40:08 +01:00
Marc Zinnschlag
0254a209f6
some general cleanup
2014-03-06 13:51:21 +01:00
Marc Zinnschlag
f04348fb8e
do not offer view action for cells flagged as deleted
2014-03-06 13:43:06 +01:00
Marc Zinnschlag
4a119c8f46
ambient lighting in interior cells
2014-03-06 13:02:21 +01:00
Marc Zinnschlag
7e0f0c8402
fixed SceneWidget destructor
2014-03-06 12:42:09 +01:00
Marc Zinnschlag
397921e457
specialising WorldspaceWdiget into paged and unpaged subclasses
2014-03-06 10:13:39 +01:00
Marc Zinnschlag
7386d3eb0b
moved navigation into the WorldspaceWidget
2014-03-06 10:01:23 +01:00
scrawl
e08f6c9ce3
Bug #416 : Copy framebuffer to a texture instead of not clearing
...
Potentially faster than the previous workaround, and should work for triple buffering too.
2014-03-06 04:01:25 +01:00
scrawl
83b6fcf22e
Bug #416 : Workaround for page flipping problem
2014-03-05 22:24:05 +01:00
scrawl
1d926816b5
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
2014-03-05 21:46:37 +01:00
scrawl
2a4e99c069
Set StaticGeometry origin
...
Fixes an exception for coordinates far away from (0,0,0).
2014-03-05 21:46:37 +01:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
scrawl
195071efc7
Terrain: geometry is now loaded in background threads.
...
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
2014-03-05 21:46:37 +01:00
scrawl
065b6d3331
Terrain: moved ESM::Land load to earlier in the startup procedure
...
Required for background loading as we cannot load ESM::Land data from background threads.
2014-03-05 21:46:36 +01:00
scrawl
8730b61362
Render maps after *all* cells have finished loading
...
Still not fixing Bug #772 , but at least this will allow for background loading of terrain.
2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f
Terrain: support alternate coordinate systems. Get rid of LoadingListener for now
2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
2014-03-05 17:08:58 +01:00
cc9cii
ce8d327e8e
Debug MSVC build of openmw needs number of sections beyond 2^16
2014-03-05 22:11:10 +11:00
gus
d84319300a
fix
2014-03-05 11:27:16 +01:00
gus
f4879dacd5
add AIfollow to summoned creatures
2014-03-05 11:24:39 +01:00
Marc Zinnschlag
a264e86e13
subclasses scene widget for worldspace scenes
2014-03-04 14:47:43 +01:00
Marc Zinnschlag
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-03-04 09:34:38 +01:00
Marc Zinnschlag
0ae9cc0106
removed unused function
2014-03-03 08:21:16 +01:00
Marc Zinnschlag
26c2f28879
replaced global world->scene menu item with individual view context menu items in cell and reference tables
2014-03-02 22:43:44 +01:00
Marc Zinnschlag
55195f819a
changed edit requests from row index format to UniversalId/hint format
2014-03-02 22:34:41 +01:00
Marc Zinnschlag
797f5527ee
added hint parameter for UniversalId viewing requests
2014-03-02 13:29:02 +01:00
Marc Zinnschlag
cb3994281c
changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace)
2014-03-02 13:11:15 +01:00
Marc Zinnschlag
ca30f2af3d
minor fix
2014-03-02 11:03:37 +01:00
Marc Zinnschlag
536a0e0ab0
added orbit navigation mode
2014-03-01 14:15:04 +01:00
scrawl
a99aa15d14
Fix a copy&paste mistake leaving start rotation uninitialized
2014-02-28 17:23:58 +01:00
Marc Zinnschlag
4d3abeedcb
keep camera upright in 1st person mode
2014-02-28 13:37:01 +01:00
Marc Zinnschlag
ae637d6abc
rolling
2014-02-28 11:58:03 +01:00
Marc Zinnschlag
0926501717
Merge remote-tracking branch 'cc9cii/branch_0_29_fixes' into openmw-29
2014-02-27 15:45:45 +01:00
Marc Zinnschlag
4eea2c7a86
added free navigation mode
2014-02-27 15:42:59 +01:00
Marc Zinnschlag
c977b2a756
moved implementation of the 1st person camera into a separate file
2014-02-27 15:23:14 +01:00
Marc Zinnschlag
14c3bfcf62
added navigation class
2014-02-27 14:46:06 +01:00
cc9cii
56ae85df0c
Fix 32bit Windows crash while taking the save screenshot.
2014-02-28 00:28:02 +11:00
cc9cii
8fa88f4480
sync with upstream
2014-02-28 00:13:57 +11:00
cc9cii
2421f23c2f
cleanup the mess...
2014-02-27 23:59:23 +11:00
Marc Zinnschlag
8f73cc9268
added navigation mode selection
2014-02-25 14:59:46 +01:00
Marc Zinnschlag
526d75df51
inverted ctrl key
2014-02-25 14:30:38 +01:00
Marc Zinnschlag
644f5cb8de
fixed mouse button release detection
2014-02-25 14:28:55 +01:00
Marc Zinnschlag
e33bd4d508
camera rotation via ctrl-left button drag
2014-02-25 14:24:35 +01:00
Marc Zinnschlag
e987199949
getting rid of some magic numbers
2014-02-25 14:14:53 +01:00
Marc Zinnschlag
07d20a2013
camera panning via left button drag
2014-02-25 14:09:07 +01:00
Marc Zinnschlag
b9107addc0
mouse wheel zooming
2014-02-25 13:39:49 +01:00
Marc Zinnschlag
b6ae521aa5
moving the camera with A and D keys
2014-02-25 13:31:15 +01:00
Marc Zinnschlag
af50575259
use shift key to speed up camera movement
2014-02-25 13:17:15 +01:00
Marc Zinnschlag
8081c067a6
moving the camera with W and S keys
2014-02-25 13:09:37 +01:00
Marc Zinnschlag
4ec4599be3
added navigation mode enum to SceneWidget
2014-02-25 12:30:45 +01:00
Marc Zinnschlag
6ec86564d1
re-enabled OGRE in OpenCS; cleaned up startup
2014-02-25 11:58:32 +01:00
cc9cii
5b48ca114f
aicombat pathfinding fix - check the correct list
2014-02-25 08:31:14 +01:00
cc9cii
85c467f00f
Minor cleanup for aicombat pathfinding workaround.
2014-02-25 08:30:52 +01:00
Nikolay Kasyanov
76c1d60d23
Fixed OpenCS build on OS X
2014-02-24 15:59:05 +01:00
Marc Zinnschlag
c62a352956
Merge branch 'cellstore'
2014-02-24 10:03:13 +01:00
Marc Zinnschlag
9b18e01507
keep track of which cells have state that needs to be saved
2014-02-24 10:03:04 +01:00
Marc Zinnschlag
bfcd768078
various bits of cleanup
2014-02-23 21:39:18 +01:00
Marc Zinnschlag
83ded18af0
encapsulated reference collections
2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f
moved CellRefList into a separate file
2014-02-23 20:11:05 +01:00
Marc Zinnschlag
f220867144
make Ptr a bit more pointer-like
2014-02-23 18:17:41 +01:00
Marc Zinnschlag
b72c1c2c58
encapsulated water level
2014-02-23 17:34:18 +01:00
gus
95ff869163
Merge branch 'openmw-29' of https://github.com/zinnschlag/openmw.git into AIFix2
2014-02-23 17:07:49 +01:00
Marc Zinnschlag
79e723ad06
encapsulated mIds
2014-02-23 16:46:07 +01:00
Marc Zinnschlag
8ea686c6c8
encapsulated mState
2014-02-23 14:26:36 +01:00
cc9cii
1bd2664cb0
aicombat pathfinding workaround
2014-02-23 11:47:25 +01:00
cc9cii
1ab5948f19
merge upstream changes
2014-02-23 19:11:37 +11:00
Marc Zinnschlag
b0ae5b8ab7
Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29
2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb
Revert "Allow MinGW64 compilation in Windows/msys"
...
This reverts commit c3f350e3fb
2014-02-22 23:45:13 +11:00
cc9cii
ac606a865c
Back out unnecessary change.
2014-02-22 23:22:23 +11:00
cc9cii
c241405d91
Fix Windows save & load.
2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb
Allow MinGW64 compilation in Windows/msys
2014-02-22 12:06:50 +11:00
Nikolay Kasyanov
59508e914f
Fixed OpenCS build on OS X
2014-02-22 01:17:58 +04:00
Marek Kochanowicz
e348c6baa9
accept drops from filters table. Cool. ☺
2014-02-21 13:50:59 +01:00
Marek Kochanowicz
e2dce53543
additional check on droping to prevent exception
2014-02-21 12:55:01 +01:00
Marek Kochanowicz
fcf17805a0
Installing basic event filter
2014-02-21 12:48:39 +01:00
Marc Zinnschlag
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
2014-02-21 11:35:46 +01:00
Marek Kochanowicz
55e9083570
refactorisation
2014-02-21 10:27:23 +01:00
Marek Kochanowicz
1c35a85adf
fixed bugs, added extra display_type
2014-02-20 19:27:51 +01:00
Marek Kochanowicz
7dff34ebf1
Features implemented. Time to debug.
2014-02-20 19:15:09 +01:00
Marek Kochanowicz
3ad6df1f92
try with the passing action
2014-02-20 17:54:18 +01:00
Marek Kochanowicz
38a86b5015
We can handle droping multiple records
2014-02-20 16:01:54 +01:00
Marek Kochanowicz
b788ab8b4c
correcting
2014-02-20 14:10:03 +01:00
Marek Kochanowicz
4fe21dc38f
Const correctness
2014-02-20 12:43:09 +01:00
Marc Zinnschlag
736644de05
Revert " #1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()"
...
This reverts commit 51fb9f65ea
2014-02-20 12:31:40 +01:00
Marek Kochanowicz
eb3cbaa4e1
Create filter on droping record.
2014-02-20 12:25:47 +01:00
Marek Kochanowicz
c7b3e139aa
Propagate signal to the edit widget
2014-02-20 11:07:04 +01:00
Marek Kochanowicz
fca7701359
Column titles retrived and passed to the filterbox.
2014-02-19 16:15:51 +01:00
pvdk
b43325119a
Some changes to the version retrieval: ignore shallow clones
2014-02-19 14:19:08 +01:00
Marek Kochanowicz
d7a1abb30b
emit signal with types (will be connected to the tablesubview)
2014-02-19 12:55:39 +01:00
Marek Kochanowicz
dd95ed8e4c
Accept drops on the filterbox
2014-02-19 12:32:48 +01:00
Marek Kochanowicz
569533eeae
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
2014-02-19 11:23:53 +01:00
scrawl
d25b3ad9cb
Fix AiCombat for creatures with weapons
2014-02-19 11:23:03 +01:00
scrawl
ebc67a82cf
Don't list unnamed quests in the quest book
2014-02-19 11:23:03 +01:00
scrawl
1fba5d1bb9
Terrain: change world bounds from AABB to 4 floats
2014-02-19 11:23:03 +01:00
scrawl
bc376e6649
Closes #888 : Treat "Bip 01" as animation root if existing
2014-02-19 11:23:03 +01:00
scrawl
439018e706
Get rid of useless return values
2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc
Moved includes to appropriate place
2014-02-19 11:23:03 +01:00
Marek Kochanowicz
e9664d80bd
make convert enumns public static
2014-02-19 11:22:47 +01:00
Marc Zinnschlag
550e5eb686
Merge remote-tracking branch 'corristo/osx-music-fix'
2014-02-18 09:12:02 +01:00
gus
d8f24ac499
bug fix
2014-02-17 15:49:49 +01:00
Marc Zinnschlag
ea16f79d77
Merge remote-tracking branch 'gus/AIFix2'
2014-02-17 10:54:07 +01:00
gus
84959eea28
woops, thanks scrawl
2014-02-17 10:50:10 +01:00
gus
6e1425321b
remove cout spam
2014-02-17 10:43:09 +01:00
gus
e5b19cf3c6
clean up
2014-02-17 10:37:11 +01:00
Marc Zinnschlag
02c6c65705
Merge remote-tracking branch 'sirherrbatka/DragDrop'
2014-02-17 09:55:50 +01:00
Marek Kochanowicz
2bb9e47507
Improvements.
2014-02-17 08:58:55 +01:00
Nikolay Kasyanov
51fb9f65ea
#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()
2014-02-17 02:59:23 +04:00
Nikolay Kasyanov
5e8cb2e466
Another attempt to fix #1041 . This time I'm sending real data from decoder
...
once after playback started.
2014-02-17 02:35:13 +04:00
Marek Kochanowicz
e1a0f60041
allow _foo ids without qoute
2014-02-16 20:26:22 +01:00
Marek Kochanowicz
b83817e05e
May only include alphanumeric characters and underscores and may not start with a number.
2014-02-16 20:18:28 +01:00
Marek Kochanowicz
3cc23a9cb3
very basic, but safe putting down " "
2014-02-16 18:41:42 +01:00
Nikolay Kasyanov
4e28fd85a3
Fixed build on OS X
2014-02-16 20:22:46 +04:00
Marc Zinnschlag
c18c3e51ee
handle IDs that don't exist anymore after loading
2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9
partially store creature state in saved game files (only attributes and dynamics for now)
2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85
store NPC state in saved game files
2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144
store list of known topics in saved game files
2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15
Merge branch 'script'
...
Conflicts:
readme.txt
2014-02-16 12:12:56 +01:00
Marek Kochanowicz
17af865a9f
checking for the source of the drop, reject those from other files for now
2014-02-16 09:51:33 +01:00
Marc Zinnschlag
9cdfca6c26
Merge remote-tracking branch 'potatoesmaster/disable-crash'
2014-02-15 22:55:00 +01:00
Marek Kochanowicz
cbe1fe2f95
removed misplaced bracket
2014-02-15 22:38:59 +01:00
Marek Kochanowicz
45d9364195
Put the id in the quote.
2014-02-15 22:14:27 +01:00
Marek Kochanowicz
ec8c8a9d88
-journalinfo +topic
2014-02-15 22:05:42 +01:00
Marek Kochanowicz
41606a67e4
implemented whitelist of allowed types in the scripts
2014-02-15 20:49:09 +01:00
Marek Kochanowicz
930b77e60a
allow drag and drop into the script edit window.
2014-02-15 19:52:40 +01:00
Marc Zinnschlag
01a7918124
Merge remote-tracking branch 'potatoesmaster/selected-spell'
2014-02-15 18:38:10 +01:00
Marek Kochanowicz
97fe5465bf
created new files
2014-02-15 17:55:18 +01:00
Emanuel Guevel
3d8ca02479
Fix breaking of enchanted items casting
2014-02-15 17:39:57 +01:00
Marc Zinnschlag
0afa61eed5
fixed referenceable-loading in case of more than one content file
2014-02-15 15:50:17 +01:00
Marc Zinnschlag
2007a3e902
improved script check error messages
2014-02-15 13:25:38 +01:00
Marek Kochanowicz
56be62b956
small reformatting
2014-02-15 13:23:51 +01:00
Marek Kochanowicz
4ee90c24e5
more readable code.
2014-02-15 13:22:14 +01:00
Marc Zinnschlag
4e04131957
fixing case broke sorting in script context
2014-02-15 13:09:43 +01:00
Marc Zinnschlag
2130ec39d6
disable warnings by default in script verifier
2014-02-15 12:58:34 +01:00
Marek Kochanowicz
b1f63947e8
Checking if the drop comes from same document.
2014-02-15 12:40:07 +01:00
Marek Kochanowicz
d6820b977e
store const ref to the document in the table.
2014-02-15 12:22:32 +01:00
Marek Kochanowicz
f3dc45f1ec
long line split.
2014-02-14 15:29:10 +01:00
Marek Kochanowicz
37d262b147
Splited very long line.
2014-02-14 15:12:34 +01:00
Marc Zinnschlag
7b8802588e
Merge remote-tracking branch 'sirherrbatka/DragDrop'
2014-02-14 14:28:30 +01:00
Marek Kochanowicz
aafde926d3
Documentation, corrections.
2014-02-14 14:04:36 +01:00
Marc Zinnschlag
e17af4231a
added script verifier
2014-02-14 13:38:30 +01:00
Marc Zinnschlag
0ff744c2ff
fixed CSMWorld::ScriptContext::isJournalId
2014-02-14 12:56:05 +01:00
gus
a315d5cc2b
aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp
2014-02-14 12:55:14 +01:00
Marek Kochanowicz
ae418f2538
nicer formatting
2014-02-14 12:51:50 +01:00
Marc Zinnschlag
0a8ffbfb1d
added missing implementation for CSMWorld::ScriptContext::getMemberType
2014-02-14 12:46:54 +01:00
Marc Zinnschlag
910d62e4b8
added missing implementation for CSMWorld::ScriptContext::getGlobalType
2014-02-14 11:59:33 +01:00
Marc Zinnschlag
451e1f413b
instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly
2014-02-14 11:15:16 +01:00
Emanuel Guevel
7c981587fc
When searching object by id, search in active cells before searching in the player's inventory
2014-02-13 22:58:12 +01:00
Marc Zinnschlag
053b3dc371
Merge branch 'openmw-28'
...
Conflicts:
CMakeLists.txt
2014-02-13 20:57:28 +01:00
Emanuel Guevel
e597328b6b
Make enable/disable a no-op for items in containers
2014-02-13 20:24:27 +01:00
Marek Kochanowicz
40cc108e54
drag and drop works.
2014-02-13 20:19:51 +01:00
Marek Kochanowicz
1bcc6d6918
using new icon.
2014-02-13 19:14:17 +01:00
Marek Kochanowicz
2afe3f3e57
Introduced multitype icon.
2014-02-13 19:00:35 +01:00
Marek Kochanowicz
6662560cbc
new displays for referencable table columns
2014-02-13 15:43:19 +01:00
Marc Zinnschlag
d6e212a02b
Merge branch 'master' into script
2014-02-13 15:02:02 +01:00
Marc Zinnschlag
e9238b456d
use case-insensitive sorting in columns
2014-02-13 15:01:10 +01:00
Marek Kochanowicz
09d3c7a446
Attempt to match types. Does not work at the moment.
2014-02-13 13:54:09 +01:00
gus
7c6e27e4f9
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aitravel.cpp
2014-02-13 12:59:04 +01:00
Marek Kochanowicz
71b2fc1c70
Introduced method to access display type.
2014-02-13 10:55:31 +01:00
Marc Zinnschlag
9c52820754
Merge remote-tracking branch 'scrawl/master'
2014-02-13 10:54:51 +01:00
Marek Kochanowicz
5f3f867a10
Implemented convertEnums function
2014-02-13 10:21:49 +01:00
scrawl
c6fb0f2d9b
Removed terrain component's dependency on ESM
2014-02-13 10:13:53 +01:00
Marc Zinnschlag
dde4fbd818
allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away
2014-02-13 09:52:44 +01:00
Marc Zinnschlag
b3412b7eec
another case fix (remote member access again)
2014-02-12 15:22:17 +01:00
Marc Zinnschlag
dc433a3c09
fixed case handling problem for local variable access
2014-02-12 13:38:16 +01:00
Marc Zinnschlag
388735046f
fixed broken remote member variable access
2014-02-12 13:35:24 +01:00
Marek Kochanowicz
c142089bfe
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
2014-02-12 13:13:32 +01:00
Marek Kochanowicz
c00834a8de
added some iostream garbage.
2014-02-12 13:12:58 +01:00
Marek Kochanowicz
8dfdd87a07
Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop
...
Conflicts:
apps/opencs/view/world/table.cpp
2014-02-12 12:12:53 +01:00
Marek Kochanowicz
62c9c77ddf
Compiles now.
2014-02-12 11:42:19 +01:00
gus
6cf561f713
get index to where we are dropping
2014-02-12 11:32:01 +01:00
gus
2e33ab3a13
droping somewhat works
2014-02-12 11:16:12 +01:00
Marek Kochanowicz
e1a39b8388
Replaced some display_string with specific type. Damn, i wish this is correct ;-)
2014-02-12 09:24:08 +01:00
Marek Kochanowicz
fc135fbfee
Added new Display types
2014-02-12 09:04:52 +01:00
Emanuel Guevel
8824af30b4
Allow to display message box outside of dialogue window
2014-02-11 18:26:57 +01:00
Marc Zinnschlag
ffd1783690
Merge remote-tracking branch 'mrcheko/master'
2014-02-11 17:03:50 +01:00
Marc Zinnschlag
e44a7268fc
Merge remote-tracking branch 'potatoesmaster/selected-spell'
2014-02-11 17:00:41 +01:00
Emanuel Guevel
a3eea4f6b6
Do not allow spellcasting stance without spell selected
2014-02-11 16:34:51 +01:00
Emanuel Guevel
70d35da116
Unset selected spell when removed
2014-02-11 16:34:23 +01:00
Emanuel Guevel
6a4820c0f7
Show a message when the player attempts to cast a disabled spell
2014-02-11 14:52:58 +01:00
Marc Zinnschlag
9de2922d22
fixed case problem in remote member variable access
2014-02-11 13:56:56 +01:00
Marek Kochanowicz
53e2e8415d
replaced start with exec
2014-02-11 12:25:21 +01:00
gus
df46218acc
try droping
2014-02-10 16:48:04 +01:00
Marc Zinnschlag
3b990795c4
added access to remote access of local variables of global scripts
2014-02-10 14:45:55 +01:00
gus
b5006c5dbd
compile fix
2014-02-09 15:33:00 +01:00
mrcheko
a6be72673c
improves animation-controlled velocity check
2014-02-08 16:59:15 +02:00
scrawl
8f949c6ae2
Fix lockpicks
2014-02-08 07:35:34 +01:00
scrawl
6ce499f0e6
Fixes #848 : Use hardcoded animation velocity for first person movement
2014-02-06 04:05:22 +01:00
scrawl
ff11d85a62
Fix wrong assertion
2014-02-06 03:15:01 +01:00
gus
632834ce10
WIP
2014-02-05 16:12:50 +01:00
scrawl
4a26909172
Fixes #1159 : Don't allow quick keys menu in chargen
2014-02-05 12:15:49 +01:00
Marek Kochanowicz
3b8f04c0f3
Allow multi-item drag.
2014-02-05 11:44:08 +01:00
Marek Kochanowicz
f01b02c42d
Changed format.
2014-02-05 11:24:33 +01:00
Marek Kochanowicz
76b729ac9b
Removed getUniversalid interface.
2014-02-05 11:19:55 +01:00
scrawl
677fc84223
Refactor actors update
2014-02-05 09:50:21 +01:00
scrawl
0cc1cd8f7e
Fix message box formatting bug
2014-02-05 05:18:11 +01:00
scrawl
7907181c0c
Fix uninitialized member
2014-02-05 05:18:11 +01:00
scrawl
ffe19e7a52
Feature #50 : Handle attach & release of projectiles
2014-02-05 05:18:11 +01:00
scrawl
8b8fb931a0
Feature #50 : Don't allow ranged weapon attack when ammunition is empty
2014-02-05 05:18:10 +01:00
scrawl
a07eaa0c0d
Feature #50 : Allow body pitch in third person for ranged weapon aiming
2014-02-05 05:18:10 +01:00
scrawl
5ee105c812
Fix typo
2014-02-05 05:18:10 +01:00
scrawl
7cf22391a5
Feature #50 : Handle weapon controllers (i.e. bowstring animations, etc)
2014-02-05 05:18:10 +01:00
scrawl
e1e7a492e2
Fix movement speed formula for flying creatures
2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc
Fixes #1158 (Armor rating label issues)
2014-02-05 05:18:10 +01:00
scrawl
8aed4fcfa4
Correction for marksman weapon inventory preview
2014-02-05 05:18:10 +01:00
scrawl
5b076aa570
Revert "Bug #1074 : Inventory paperdoll obscures armour rating"
...
This reverts commit b017a3be3e
2014-02-05 05:18:10 +01:00
scrawl
df78357e05
Handle knockout separately ( Closes #1151 )
2014-02-05 05:18:09 +01:00
Marek Kochanowicz
04287cb87a
Provide method to return whole data vector from tablemimedata.
2014-02-04 19:42:52 +01:00
Marek Kochanowicz
8b799683c1
Display QPixMap with dragged object.
2014-02-04 18:48:18 +01:00
Marek Kochanowicz
3439940a8e
Tablemimedata able to handle vector of objects and return icon.
2014-02-04 18:38:31 +01:00
Marek Kochanowicz
423b2906be
Yes, you can drag. But not drop.
2014-02-04 11:40:48 +01:00
Marek Kochanowicz
dc80bfff55
Attempt to get basic tablemimedata subclass.
2014-02-04 09:13:40 +01:00
mrcheko
688f359a33
discard creatures speed and negative fatique changes
2014-02-03 23:09:26 +02:00
Marc Zinnschlag
c5b92ed6c8
Merge remote-tracking branch 'pvdk/versioninfo'
2014-02-03 11:21:11 +01:00
Marc Zinnschlag
21f502df34
compatibility fix
2014-02-03 11:20:55 +01:00
pvdk
f263acdac6
Merge remote-tracking branch 'upstream/master' into versioninfo
2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson
e50a393de4
Fix linking issues on Windows using MSVC.
2014-02-02 23:59:57 +01:00
pvdk
4e03e9cf87
Changed development version info text and the tooltip now works on all platforms
2014-02-02 20:10:47 +01:00
Marc Zinnschlag
32860a05e3
added dummy implementations for getPcInJail and getPcTraveling
2014-02-02 15:35:18 +01:00
mrcheko
761f13d3ce
activate whole-body attack animations
2014-02-02 16:29:51 +02:00
Marc Zinnschlag
914ab1b8ab
allow 'x' instead of 'getjournalindex x'
2014-02-02 15:08:27 +01:00
Marc Zinnschlag
4ee43612f6
added new switch: --script-warn
2014-02-02 14:09:59 +01:00
mrcheko
b85a4dd35e
pos accum without conformity with animation bug/creature speed
2014-02-02 15:01:49 +02:00
Alexander "Ace" Olofsson
e3d85af70a
Fix an issue with int32_t being unknown on windows.
2014-02-02 13:57:19 +01:00
Marek Kochanowicz
a36cc26434
Created new files for TableMimeData class.
2014-02-01 19:06:41 +01:00
scrawl
1deb0a7cdf
Savegame dialog: Set key focus to editbox
2014-02-01 18:42:01 +01:00
scrawl
ec46575671
Overwriting saves fixes - copy description of overwritten slot, ask for confirmation
2014-02-01 18:42:01 +01:00
scrawl
6d37cd7e86
Savegame dialog: Don't allow empty save names
2014-02-01 18:42:01 +01:00
scrawl
63284d21a0
Savegame dialog: 'Enter' while editing a name is equivalent to pressing the ok button
2014-02-01 18:42:01 +01:00
scrawl
dea9d21db6
Some additional safety checks for global map loading
2014-02-01 18:42:01 +01:00
scrawl
f89b3cac02
Feature #764 : Store the actor that gave the dialog response
2014-02-01 18:42:01 +01:00
scrawl
a988a0d6dc
Don't add duplicate topic responses to the journal
2014-02-01 18:42:00 +01:00
scrawl
37ef8ec908
Savegame dialog: support loading saves using Enter key or double-click
2014-02-01 18:42:00 +01:00
scrawl
49e26415be
Don't call loadGame() from within the MWMechanics::Actors update sequence
2014-02-01 18:42:00 +01:00
Marc Zinnschlag
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d
added creature/NPC state to saved games (only container/inventory for now)
2014-02-01 17:36:23 +01:00
Marc Zinnschlag
d2ec3ffdc8
handle equipped items when serialising inventory state
2014-02-01 17:31:05 +01:00
Marc Zinnschlag
bcc5894e2d
changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later)
2014-02-01 15:24:01 +01:00
Marc Zinnschlag
dd674566a2
store content of containers in saved game files
2014-01-31 13:25:32 +01:00
scrawl
4ec86d1c68
Bug #1147 : Fix the inventory preview pose used for ranged weapons
2014-01-31 05:06:35 +01:00
scrawl
60bbab52fe
Support keyframe controllers for bones that aren't in the skeleton base
2014-01-31 05:06:34 +01:00
scrawl
da34f8bda1
Fix LastHitObject
2014-01-31 04:43:35 +01:00
scrawl
067c2bc2ec
Disable combat movements for creatures without weapons
2014-01-31 04:43:35 +01:00
scrawl
7820ea5806
"Always best attack" should only affect the player
2014-01-31 04:43:35 +01:00
scrawl
d0c6ecd03a
Bug #1148 : Workaround for broken images in some MW versions
2014-01-31 04:43:35 +01:00
scrawl
52f89e9a17
Don't play "idle" voice entries for NPCs with Hello 0
...
Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.
2014-01-31 04:43:35 +01:00
scrawl
39d86a9468
Improvements to smooth NPC steering
2014-01-31 04:43:29 +01:00
mrcheko
80d8aa4030
bug with sequence of knockouts; giving sense to some hit state code
2014-01-30 23:54:26 +02:00
Marc Zinnschlag
900532a6ca
store additional state of lights in saved game files
2014-01-30 12:37:33 +01:00
Marc Zinnschlag
ec7cb90ca4
added support for serialisation of CustomData state
2014-01-30 11:50:13 +01:00
scrawl
2b15b8b484
Fix gold bugs ( Fixes #1145 , Fixes #1146 )
2014-01-29 15:37:27 +01:00
scrawl
305e78c981
Fix creature attack bug
2014-01-29 15:37:27 +01:00
scrawl
e717694b36
Reset Run stance in AiWander
2014-01-29 15:37:27 +01:00
scrawl
23ffb8a4dc
Fixes #1143 : Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame.
...
This makes the Mehra Milo script work properly.
2014-01-29 15:37:27 +01:00
scrawl
434fd21584
Don't set journal index if a higher index is currently set
...
This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.
2014-01-29 15:37:27 +01:00
scrawl
edff88542b
Allow double click / Enter key for accepting race/class/birthsign
2014-01-29 15:37:27 +01:00
scrawl
a8a09762ce
Don't crash when deleting or disabling a moving door
2014-01-29 15:37:26 +01:00
scrawl
190512156d
Use some more GMSTs for enchanting
2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2
Move WhenStrikes skill success to a more appropriate place
2014-01-29 15:37:26 +01:00
scrawl
b8db151da7
Add missing skill increases for armor hits
2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d
Use GMSTs for levelup
2014-01-29 15:37:26 +01:00
scrawl
cc40cec395
Move levelup to NpcStats
...
The code came from back in the days where NpcStats did not derive from CreatureStats.
2014-01-29 15:37:26 +01:00
scrawl
ba67bf45f8
Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail.
...
This caused an exception when looting a creature that had moved cells.
2014-01-29 15:37:26 +01:00
scrawl
365ae15532
Drag&Drop: auto-hide windows that can't be drop targets on mouseover
2014-01-29 15:37:26 +01:00
mrcheko
3a5da7e6e8
merged with master
2014-01-29 00:03:00 +02:00
mrcheko
5ee1dc6be8
attacktypes error fix
2014-01-28 21:07:26 +02:00
Marc Zinnschlag
1d34f5e096
Merge remote-tracking branch 'sirherrbatka/cloning'
...
Conflicts:
apps/opencs/model/world/refiddata.cpp
2014-01-28 12:40:14 +01:00
Marc Zinnschlag
a473c3f619
some cleanup
2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a
Merge remote-tracking branch 'gus/AIFix2'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/actors.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2014-01-28 12:33:31 +01:00
Marek Kochanowicz
2bd98a69ab
Corrections, according to the comments. Thanks for the review. :-)
2014-01-28 11:16:48 +01:00
mrcheko
e50e94af0b
remove CreatureStats::mAttackType, set/getAttackType()
2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d
merge with master
2014-01-27 22:38:01 +02:00
Marek Kochanowicz
d3000ce099
whitespaces removed again.
2014-01-27 19:47:54 +01:00
Marek Kochanowicz
62ea0bb066
Cleared whitespaces.
2014-01-27 19:40:05 +01:00
Marek Kochanowicz
c82db915f1
Removed needless includes
2014-01-27 19:32:51 +01:00
Marek Kochanowicz
d0b07de7ef
Corrected bug mentioned by zini.
2014-01-27 16:59:18 +01:00
gus
846276f747
clean up
2014-01-27 15:14:24 +01:00
Marek Kochanowicz
ed0ba906cf
removed needless include
2014-01-27 15:05:29 +01:00
Marek Kochanowicz
9c579dbd6c
ok, that should be enough
2014-01-27 15:03:29 +01:00
Marek Kochanowicz
84e07c95b1
formatting
2014-01-27 15:02:29 +01:00
Marek Kochanowicz
51115fa5be
spaces around operators
2014-01-27 14:56:57 +01:00
Marek Kochanowicz
c91ae86084
is there something that can generate diff from two git branches? Using github for this is kinda annoying.
2014-01-27 14:53:39 +01:00
Marek Kochanowicz
52176d6435
reforfucking
2014-01-27 14:51:57 +01:00
Marek Kochanowicz
2b71568bb6
still reformating
2014-01-27 14:50:36 +01:00
Marek Kochanowicz
316debb827
reformating
2014-01-27 14:46:58 +01:00
Marek Kochanowicz
4d6fb31610
reformating
2014-01-27 14:45:07 +01:00
Marek Kochanowicz
2899f04a3f
reformatting
2014-01-27 14:43:12 +01:00
Marek Kochanowicz
6a0b5defd7
removed needless member value.
2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8
Removed pointless includes.
2014-01-27 13:36:01 +01:00
Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
2014-01-27 13:27:42 +01:00
Marek Kochanowicz
71d6364754
Chaninging variables name to follow our policy.
2014-01-27 13:13:39 +01:00
Marek Kochanowicz
aa6d1ff4c3
removed needless argument for cloning
2014-01-27 13:08:14 +01:00
Marek Kochanowicz
be8b978a89
corrected mistake in data
2014-01-27 12:23:03 +01:00
Marek Kochanowicz
62c2259c87
removing coordinates handling
2014-01-27 10:10:23 +01:00
mrcheko
45b3aa3d93
corrected things connected to determining attack type
2014-01-26 23:32:57 +02:00
gus
f5d589388c
bug fix
2014-01-26 22:06:54 +01:00
gus
764011dd1b
clean up
2014-01-26 21:53:55 +01:00
gus
7cb47aa635
new implementation of pathfinding. Works, but need clean up
2014-01-26 21:26:19 +01:00
scrawl
eba6c9a8fd
Fix massive console spam regarding the scrib's idle3 animation
2014-01-26 02:49:32 +01:00
scrawl
b1066de81d
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit 4e360136b1047bbe43b2
2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2ffec26342cd
2014-01-26 00:14:49 +01:00
scrawl
e0de76a6f7
Save/load global map
2014-01-25 19:06:14 +01:00
scrawl
e62bf8fca9
Remove some garbage
2014-01-25 16:41:26 +01:00
scrawl
79a9c4e048
Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame.
2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2
Fix crash when loading another game after dying
2014-01-25 16:13:45 +01:00
scrawl
28185e2017
Death/godmode fixes: Revive player *after* character update, since there might be fall damage.
2014-01-25 15:54:24 +01:00
scrawl
f09328ca84
Clear global map overlay when starting/loading a game
2014-01-25 13:34:56 +01:00
Marek Kochanowicz
032c542396
improving the cell cloning.
2014-01-24 20:34:33 +01:00
gus
707e579dfe
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-01-24 19:16:50 +01:00
gus
5ca5946760
WIP
2014-01-24 19:13:23 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
scrawl
295aed3533
Implement savegame screenshots
2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b
Include some required Ogre headers explicitely
2014-01-24 15:02:34 +01:00
scrawl
ac1859fb77
Merge branch 'savedgame' of https://github.com/zinnschlag/openmw into savedgame
2014-01-24 15:02:13 +01:00
scrawl
9b9c39af7a
Fix being able to activate magic bolts mid-flight
2014-01-24 13:22:39 +01:00
scrawl
ac4c904e62
Fix projectile bug
2014-01-24 13:22:30 +01:00
Marek Kochanowicz
01be9386d6
Id to the coordinates with the boost and explicit specialisations of template member functions.
2014-01-24 11:22:20 +01:00
mrcheko
87e83a92f8
refactoring of setting an attack type
2014-01-23 23:14:20 +02:00
Marek Kochanowicz
f390c7f4b0
Disable widgets in the cell creator.
2014-01-23 16:24:03 +01:00
Marek Kochanowicz
c87d9ff38d
Disable reference creator widget when in the clone mode.
2014-01-23 16:17:04 +01:00
Marek Kochanowicz
dda7ddb6f8
Disable not needed referencable creator widget when in cloning mode.
2014-01-23 16:00:44 +01:00
Marek Kochanowicz
1b1ecafdd8
introduced missing columns to data
2014-01-23 15:13:37 +01:00
pvdk
19bef4fce8
Distinguish between release and development builds
2014-01-23 13:18:05 +01:00
scrawl
70264eae3b
Feature #764 : Quest completetion status in quest book
2014-01-23 13:08:56 +01:00
scrawl
849ee54399
Feature #764 : Show quest names in quest book if present
2014-01-23 12:54:37 +01:00
Marc Zinnschlag
460089c0aa
ignore deleted references that did not came from a content file
2014-01-23 12:53:55 +01:00
Marc Zinnschlag
419e3a7d30
write references in cells to saved game file
2014-01-23 12:51:42 +01:00
scrawl
358cc3c62f
Closes #1060 : Fix incorrect message box size
2014-01-23 12:24:06 +01:00
Marc Zinnschlag
22cb4784b5
store cell state in saved game files (no references yet)
2014-01-23 11:29:40 +01:00
Marek Kochanowicz
4d9d31b25e
refrences cloning does not work
2014-01-23 09:41:09 +01:00
pvdk
c354cd52be
Added compile date and time to the version info in the launcher
2014-01-22 18:37:49 +01:00
pvdk
fa186f5ec1
Added version information to the launcher
2014-01-22 17:51:10 +01:00
pvdk
c95b8bcb39
Moved the generated version header stuff into components
2014-01-22 17:33:55 +01:00
scrawl
cf378ec31e
Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors
2014-01-22 15:25:03 +01:00
scrawl
2e6e0fd0a0
Fix GetPcCell bug
2014-01-22 14:45:36 +01:00
scrawl
ea21d8fec3
Fix CreatureTargetted function
2014-01-22 13:30:45 +01:00
scrawl
4c94289b1f
Fix PC Health Percent function
2014-01-22 13:30:07 +01:00
scrawl
f27701cbe8
Detect selling stolen items or enchanting with stolen items
2014-01-22 13:04:55 +01:00
scrawl
264226dfe3
Handle iWereWolfBounty
2014-01-22 12:33:47 +01:00
scrawl
194413c955
Feature #1119 : Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult.
2014-01-22 12:26:53 +01:00
scrawl
f89c400305
Don't complain about greetings with no sound
2014-01-22 00:02:43 +01:00
scrawl
16f5f5862d
Feature #956 : Implement blocking melee attacks
2014-01-21 23:25:24 +01:00
Marek Kochanowicz
b3b51992ef
copying references.
2014-01-21 21:37:21 +01:00
Marc Zinnschlag
9ebe66e693
improved cleanup; failed loads will now drop back into the main menu instead of crashing
2014-01-21 14:50:58 +01:00
Marc Zinnschlag
0f60898517
adding missing cleanup for SoundManager
2014-01-21 14:13:13 +01:00
scrawl
82a07af72c
Fix typo (should be Strength, not Luck). Use GMSTs for strength damage.
2014-01-21 12:30:23 +01:00
scrawl
1617a4f7d9
Use fCombatDistance
2014-01-21 12:30:23 +01:00
scrawl
a4404054bb
Feature #1130 : Add race power spells for NPCs as well, not just the player
2014-01-21 12:30:23 +01:00
scrawl
5de8c7fe29
Feature #1130 : Add auto-calculated NPC spells
2014-01-21 12:30:23 +01:00
scrawl
851a7d5014
Feature #957 : Handle area effects for "on touch" range
2014-01-21 12:30:15 +01:00
Marek Kochanowicz
bc0130f8d8
do not double check if record is deleted
2014-01-21 10:35:08 +01:00
Marek Kochanowicz
9b56b6585b
Cloning works for referencables as well.
2014-01-21 09:43:02 +01:00
Marek Kochanowicz
7594bcf97a
Small refactoring.
2014-01-21 08:27:29 +01:00
Marek Kochanowicz
d0a52b7b24
mostly refreshing view.
2014-01-20 18:28:06 +01:00
Marek Kochanowicz
92ee252eef
Small correction.
2014-01-20 16:39:42 +01:00
Marek Kochanowicz
d82f272e05
Properly check if clone is deleted.
2014-01-20 16:17:49 +01:00
Marek Kochanowicz
5a52715701
implemented check for deletion. But it seems flawed.
2014-01-20 15:58:19 +01:00
Marek Kochanowicz
38636fab9a
added setId to adapter
2014-01-20 14:38:20 +01:00
Marek Kochanowicz
a45339bbe6
lower case in command, not in the collection
2014-01-20 14:14:59 +01:00
Marek Kochanowicz
33620a001b
Cloning works for single record type tables. Well, kinda.
2014-01-20 13:59:00 +01:00
scrawl
c8a9e9f7fa
Stop AiCombat when the target is dead
2014-01-20 13:54:10 +01:00
scrawl
42284603f7
Properly handle on target effects with mArea=0
2014-01-20 13:44:38 +01:00
scrawl
9cedd3bb2e
Fix spell area not displaying in tooltip
2014-01-20 13:11:34 +01:00
scrawl
205e8aa4e9
Feature #957 : Implement area magic
2014-01-20 13:11:29 +01:00
scrawl
ba5300b071
Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.
2014-01-20 12:05:13 +01:00
scrawl
5dd3cfa09a
Loop projectile sounds
2014-01-20 11:50:52 +01:00
scrawl
df7c139e2f
Merge remote-tracking branch 'mrcheko/master'
2014-01-19 21:23:04 +01:00
scrawl
fec26342cd
Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..)
2014-01-19 21:11:48 +01:00
mrcheko
339399f8b1
bug fix/logic fix/future suggestion
2014-01-19 22:09:51 +02:00
scrawl
05e75e1214
Closes #1127 : Fix for subtitles for idle dialogue appearing outside of hearing range
2014-01-19 20:54:05 +01:00
scrawl
bea161331c
Play 'hello' voiced dialogue entries in AIWander
2014-01-19 20:53:58 +01:00
Marek Kochanowicz
0ea2bb7c4c
Working on commands
2014-01-19 16:49:39 +01:00
scrawl
0adc0f56ed
Issue #777 : Consider weapons in Creature::hit
2014-01-19 16:13:16 +01:00
scrawl
9723263730
Bug #1126 : Tweak creature attack distance a bit (still no idea where this should come from)
2014-01-19 14:47:58 +01:00
scrawl
1a00f26390
Bug #1126 : Golden saints and many other creatures only have "Bip01 Head"
2014-01-19 14:33:41 +01:00
scrawl
4e360136b1
Merge remote-tracking branch 'mrcheko/master'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
2014-01-19 14:01:39 +01:00
scrawl
047bbe43b2
Don't complain about missing jump animations
2014-01-19 13:46:40 +01:00
scrawl
13646a651b
Issue #777 : Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.
2014-01-19 13:32:58 +01:00
scrawl
198bb0de60
Issue #777 : Add CreatureAnimation variant for creatures with weapons/shields
2014-01-19 13:05:26 +01:00
Marek Kochanowicz
b3e45c55bc
progressing with the cloning
2014-01-19 11:44:47 +01:00
scrawl
589fbbd871
Issue #777 : Create InventoryStore for creatures with weapons/shields
2014-01-19 11:43:23 +01:00
scrawl
69ca03c308
Issue #777 : Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons.
2014-01-19 09:43:41 +01:00
scrawl
947b6c9645
kOgrePi unused
2014-01-18 22:16:31 +01:00
scrawl
4c0045b418
Bug #1109 : Do not reset water level when loading a plugin with no water level record (for real this time)
2014-01-18 21:11:12 +01:00
Marc Zinnschlag
14e64c180f
on load check player record for dangling ID references
2014-01-18 15:06:58 +01:00
Marc Zinnschlag
6584a01d01
reset reference to player NPC record during cleanup
2014-01-18 14:53:25 +01:00
mrcheko
969340d61b
fixed StartCombat script
2014-01-18 12:55:17 +02:00
scrawl
525ce2f042
Some cleanup - move definitions to implementation file
2014-01-18 10:52:16 +01:00
scrawl
c04a8afc8b
Make sure onPcEquip is also set for Equip script instruction
2014-01-18 10:51:52 +01:00
scrawl
9653355cf1
Feature #701 : Spawn levelled creatures in cells
2014-01-18 07:26:27 +01:00
mrcheko
df4df5b094
fixed weapRange for creatures/startcombat script(?)
2014-01-17 23:30:28 +02:00
scrawl
5049f3b134
Fix the group for creature attack animations
2014-01-17 20:18:35 +01:00
mrcheko
a11a6b616b
Merge remote-tracking branch 'upstream/master'
2014-01-17 21:00:55 +02:00
mrcheko
435bbdd530
one more mismatch fixed
2014-01-17 20:55:21 +02:00
mrcheko
46a4790cb1
final warnings removal
2014-01-17 20:33:49 +02:00
mrcheko
7df8273d71
fix for everybody
2014-01-17 20:01:15 +02:00
scrawl
3dcb292bc1
Do not soul trap creatures without a soul (which apparently exist)
2014-01-17 18:43:45 +01:00
mrcheko
5357f569e6
fix for scrawl
2014-01-17 19:36:22 +02:00
scrawl
149d77dedf
Feature #960 : Add knockdown and hit recovery for creatures
2014-01-17 17:41:16 +01:00
scrawl
9b32b1403b
Feature #960 : Implement Creature::hit
2014-01-17 17:19:08 +01:00
scrawl
228254c890
Handle creature attack animations in character controller
2014-01-17 16:31:27 +01:00
scrawl
c76a0448a3
Closes #1123 : Implement SlowFall magic effect
2014-01-17 15:47:34 +01:00
scrawl
27d0d9c592
Fix exception when clicking on statics when in the inventory window
2014-01-17 15:27:59 +01:00
scrawl
5fc38e7ac4
Don't use blood effects for fatigue damage
2014-01-17 15:20:28 +01:00
scrawl
c548dcee13
Quick keys menu: make sure selected spell still exists
2014-01-17 15:20:22 +01:00
Marc Zinnschlag
1b7697a4b2
handle missing player specific state during load/save
2014-01-17 13:07:57 +01:00
scrawl
805843d7ff
Closes #1086 : Implement blood effects
2014-01-17 11:27:13 +01:00
scrawl
240d96a0f1
Renamed AnimationValue to AnimationTime
2014-01-17 10:55:46 +01:00
scrawl
11394d83c5
Feature #1086 : Import blood models/textures in MWIniImporter
2014-01-17 10:55:46 +01:00
scrawl
ddc432c7ef
Fix stealing bug
2014-01-17 10:55:46 +01:00
scrawl
e410eb5273
Play 'Idle' voiced dialogue entries in AIWander. Tweak voice max distance.
2014-01-17 10:55:46 +01:00
scrawl
2836c7c927
Do not set owner when adding items to a container, as opposed to NPC/creatures
2014-01-17 10:55:46 +01:00
scrawl
fe66012bcd
Closes #1115 : Fix a bug causing number of AI packages to grow exponentially when adding an AI package. Not sure if adding the same package twice should even be allowed.
2014-01-17 10:55:46 +01:00
scrawl
f070d9966d
Implement movement speed formula for creatures. Still moving a bit too slow.
2014-01-17 10:55:46 +01:00
mrcheko
f2ad1c18f2
fix merging problem/some logic fixes
2014-01-16 22:24:05 +02:00
Alexander "Ace" Olofsson
ddf72c06de
Update statswindow.cpp
...
Fixes a build issue on MSVC ('floor' : ambiguous call to overloaded function)
2014-01-16 12:09:50 +01:00
Marc Zinnschlag
c300cd9375
loading/saving of some player state (cell/coordinates and some other bits)
2014-01-16 12:03:23 +01:00
mrcheko
d5f794d4fb
update to combat ai behaviour
2014-01-15 22:56:55 +02:00
scrawl
ea8f60eddf
Implement movement speed formula for creatures. Still moving a bit too slow.
2014-01-15 16:30:16 +01:00
scrawl
d544551f61
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
...
Information provided by Hrnchamd.
2014-01-15 15:50:45 +01:00
scrawl
7534fc968d
Minor acrobatics fixes
2014-01-15 14:53:30 +01:00
scrawl
28a2585106
Unsheath weapon in AiWander
2014-01-15 14:53:29 +01:00
scrawl
dff67bb0b6
StopCombat: mark as non-hostile
2014-01-15 14:53:29 +01:00
scrawl
da3295d69c
Closes #1106 : Move stance to CreatureStats, since creatures also have separate run/walk animations.
2014-01-15 14:53:29 +01:00
scrawl
03b2e99802
Remove unused Combat stance
2014-01-15 14:53:29 +01:00
scrawl
d0500e8124
Some unneeded includes cleanup
2014-01-15 14:53:28 +01:00
scrawl
0c4b6ea89f
Minor fix
2014-01-15 14:53:28 +01:00
scrawl
a432661b8a
Minor correction
2014-01-15 14:53:28 +01:00
scrawl
de64c57179
Fix some typos and accidental commit
2014-01-15 14:53:28 +01:00
Marc Zinnschlag
bf1a37dc38
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
2014-01-15 14:29:54 +01:00
Marek Kochanowicz
6224344957
Being any idiot is hard.
2014-01-15 12:52:38 +01:00
Marek Kochanowicz
3d722ba104
Corrected brackets.
2014-01-15 11:59:11 +01:00
Marek Kochanowicz
fbcb1a14fc
ooops, using search id
2014-01-15 11:12:56 +01:00
Marek Kochanowicz
89d4a90c06
Localised version of morrowind will no longer spam false positives. Don't check diff, please.
2014-01-15 10:30:43 +01:00
Marek Kochanowicz
344cae8f99
added new entry to the context menu
2014-01-14 15:44:04 +01:00
greye
61707694e8
fix memory leak in AISequence
2014-01-14 16:22:50 +04:00
Marek Kochanowicz
6397d9d40e
Added mCloneAction member
2014-01-14 13:12:15 +01:00
greye
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
2014-01-14 12:46:53 +04:00
Marek Kochanowicz
c981a2a6f8
Removed boost in favor of #include <components/misc/stringops.hpp>. Hopefully this will make scrawl happy. :P
2014-01-14 09:25:03 +01:00
Marek Kochanowicz
2c1ef610b9
Moving back to boost for case insensitive comparsion.
2014-01-14 09:16:59 +01:00
scrawl
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
2014-01-14 07:42:03 +01:00
scrawl
69381c49c7
Added a todo comment
2014-01-14 07:39:44 +01:00
scrawl
b8583124e0
Correction for RemoveSoulgem instruction
2014-01-14 06:13:30 +01:00
scrawl
90b92a8f41
Move levelled list code out of ContainerStore
2014-01-14 05:37:06 +01:00
scrawl
6aa56354c0
Revert "Bug #991 : Don't autoequip items with harmful permanent enchantments"
...
This is no longer needed, since merchants no longer equip items sold to them (2f35e5a04e71d9755ef1
2014-01-14 05:24:58 +01:00
scrawl
9de3abcb5f
Closes #1105 : Do not reduce magicka if unable to cast
2014-01-14 03:34:30 +01:00
scrawl
396efd580b
Fix a leftover of the old coordinate system
2014-01-14 03:26:56 +01:00
scrawl
2196ce427a
Closes #556 : Link movie volume to 'master' volume slider, instead of 'music'.
2014-01-14 03:08:37 +01:00
scrawl
95651857f3
Fix code duplication
2014-01-14 02:52:34 +01:00
scrawl
0d0005c433
Fix fatigue not restoring when waiting
2014-01-14 02:20:13 +01:00
Marek Kochanowicz
e34cb9e931
changed according to the scrawl sugestion
2014-01-13 19:17:03 +01:00
Marek Kochanowicz
59de794e58
Creature check was not invoked.
2014-01-13 19:02:23 +01:00
Marek Kochanowicz
17cc6a695c
fixed bug resposnsible for exception throwed.
2014-01-13 18:34:28 +01:00
scrawl
ba27b693f8
Increase sneak skill on successful pickpocket
2014-01-13 10:18:03 +01:00
scrawl
73268a8606
Fix skill progress not working
2014-01-13 10:18:03 +01:00
scrawl
cd06b2177d
Automatically knock down when fatigue goes below zero
2014-01-13 10:18:03 +01:00
scrawl
413bf127de
Allow drain fatigue effect to reduce below zero
2014-01-13 10:18:02 +01:00
scrawl
3a1b6dd354
Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected.
2014-01-13 10:18:02 +01:00
scrawl
83872f6bf5
Knockdown / hit recovery improvements. Use formula and GMSTs from research wiki for knockdown determination. Hand-to-hand automatically knocks out when fatigue empty.
2014-01-13 10:18:02 +01:00
Marc Zinnschlag
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2014-01-13 10:17:10 +01:00
Marc Zinnschlag
63cd70f810
some junk removal
2014-01-13 10:03:25 +01:00
scrawl
7983b07b10
Get bk_treasuryreport script to work properly:
...
- OnPcEquip needs to be set on *using* any item, not just equipping
- Handle PcSkipEquip
- Execute item's script once immediately after setting OnPcEquip
- Do not set OnPcEquip when an item that has skipped equipping sets pcskipequip back to 0 and gets equipped
2014-01-13 06:20:18 +01:00
gus
5d4e148063
some clean up
2014-01-12 22:47:22 +01:00
gus
5d038423ec
attempt to solve Bug #1009 by not building graph every frame
2014-01-12 18:42:31 +01:00
Marc Zinnschlag
9025210965
Merge branch 'refnum' into savedgame
...
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
2014-01-12 16:58:06 +01:00
gus
0e46c40cb5
Make ACtionTeleport non player specific and teleport actors following the teleporting actor
2014-01-12 14:03:11 +01:00
gus
1ae62665d6
get all actors following a given actor
2014-01-12 14:02:40 +01:00
gus
dd870e35db
get all actors following a given actor
2014-01-12 14:02:15 +01:00
gus
2446abe076
Allow getting current active package
2014-01-12 14:01:54 +01:00
gus
7e96a391da
FollowCell duration = 0 -> infinite time
2014-01-12 11:39:42 +01:00
gus
7066844e52
Follow you until a certain cell is reached
2014-01-12 11:38:58 +01:00
scrawl
f78b846f9e
Handle CasterLinked magic effect flag
2014-01-12 10:21:49 +01:00
scrawl
767c72e619
Fix diagonal movement being faster than forward movement
2014-01-12 10:04:06 +01:00
scrawl
fb778f8ecd
Use fEncumbranceStrMult
2014-01-12 04:09:51 +01:00
scrawl
1d19d36bd6
Remove unused magic effect flags and update esmtool output
2014-01-12 01:25:00 +01:00
scrawl
921ef6cd9c
Closes #1093 : Show weapon when initializing the character controller with a weapon equipped
2014-01-12 00:42:27 +01:00
scrawl
10ddea45e9
Move crime from onHit to hit, since failed hits are apparently also a crime
2014-01-11 23:12:21 +01:00
scrawl
44b2380874
Closes #947 : Decrease fatigue when running, swimming and attacking
2014-01-11 22:28:50 +01:00
scrawl
dddc0979a2
Fix another fatigue cap issue
2014-01-11 22:28:50 +01:00
scrawl
224f288359
Don't attempt to change disposition for creatures
2014-01-11 21:30:26 +01:00
scrawl
3db299f1b2
Fix fall damage crash
2014-01-11 21:30:26 +01:00
gus
051d7141be
check position to stop AIFollow
2014-01-11 20:32:38 +01:00
Marc Zinnschlag
5ea25dc269
player state cleanup
2014-01-11 15:34:32 +01:00
Marc Zinnschlag
b1ffb64a1f
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 14:33:27 +01:00
gus
ccf07f9406
Bugfix
2014-01-11 12:07:10 +01:00
gus
2d66b2c4fa
AiFollow. Npc get stuck often (no stuck dtection yet)
2014-01-11 12:06:36 +01:00
gus
f41f08c352
Wrong logic... should improve performances
2014-01-11 12:04:32 +01:00
gus
0609b71df9
fix pathfinding
2014-01-11 11:57:07 +01:00
Marc Zinnschlag
a0872b2646
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 11:51:53 +01:00
Marc Zinnschlag
1b03eec63e
Merge remote-tracking branch 'scrawl/master'
2014-01-11 11:43:12 +01:00
gus
828e5841d8
Windows SDL fix
2014-01-11 11:00:34 +01:00
scrawl
a2ba0dde31
Implemented GoToJail
2014-01-11 06:47:58 +01:00
scrawl
3896c88403
Use VFX_DefaultCast / VFX_DefaultHit if the magic effect does not specify any
2014-01-11 05:58:05 +01:00
scrawl
9ddee8fd8c
Autocalculate NPC reputation as according to research wiki
2014-01-11 04:03:13 +01:00
scrawl
9127839cc1
Add a searchPtr method as required for getting an owner, which may already be dead and disposed of.
2014-01-11 03:33:17 +01:00
scrawl
bf6d302fba
Confiscate stolen items when caught
2014-01-11 03:29:41 +01:00
scrawl
909494ff35
Implement Assault crimes. In other words, NPCs now fight back!
2014-01-11 03:08:16 +01:00
scrawl
12944f2459
Fix an auto equipping bug that allowed twohanded weapon and shield at the same time
2014-01-11 03:07:35 +01:00
scrawl
d4a98ffc27
Increase fight rating when being the victim of a crime
2014-01-11 02:27:44 +01:00
scrawl
aba72ffefe
Fix up the merge a bit
2014-01-11 02:12:41 +01:00
scrawl
727aa30347
Dead actors are unaware of everything
2014-01-11 02:06:54 +01:00
scrawl
d01f89b153
Rewrite some awful code
2014-01-11 00:24:21 +01:00
scrawl
e9f63270d9
Speed fix for "on target" spells
2014-01-10 22:51:42 +01:00
scrawl
621e52f09d
Play "attack" voiced dialogue entries randomly based on iVoiceAttackOdds.
2014-01-10 22:48:42 +01:00
scrawl
d9d6f37619
Use iVoiceHitOdds
2014-01-10 22:44:40 +01:00
scrawl
15e48107f7
Use i1stPersonSneakDelta + some cleanup
2014-01-10 22:39:01 +01:00
scrawl
2744cde40f
Use a few additional GMSTs
2014-01-10 22:27:31 +01:00
scrawl
3bf36515d5
Implement Trespassing crime
2014-01-10 21:26:24 +01:00
scrawl
f5a70dccf0
Fix title of buttons in generate class result dialog
2014-01-10 21:13:03 +01:00
scrawl
627dcddb33
Do not allow training skills above their governing attribute
2014-01-10 20:53:53 +01:00
Marc Zinnschlag
f62497dfdc
Merge remote-tracking branch 'mrcheko/master'
2014-01-10 19:08:35 +01:00
mrcheko
ffcb7fb280
fix for bug scrawl mentioned
2014-01-10 19:04:07 +02:00
Marek Kochanowicz
cb0d3794f7
Final check is not performed with just +1! Something is not right.
2014-01-10 11:01:29 +01:00
Marek Kochanowicz
688488de62
replaced == operator for string comparsion in npc check with boost algorithm to get case insensitive check.
2014-01-10 10:43:03 +01:00
Marek Kochanowicz
31c59db71c
Splited another long line in the header.
2014-01-10 10:22:18 +01:00
Marek Kochanowicz
468b9d7340
camel case in the header
2014-01-10 09:50:56 +01:00
Marek Kochanowicz
e4d637fd64
splited long lines in the header.
2014-01-10 09:49:05 +01:00
Marek Kochanowicz
b98cdabe89
Shameful bug fixed.
2014-01-10 09:42:36 +01:00
mrcheko
d41f27451b
appropriate camera vanity<>preview mode switch + hit recoils fix
2014-01-09 23:36:40 +02:00
scrawl
546b0cee76
Closes #1077 : Replace tags before trying to get the message length
2014-01-09 22:17:51 +01:00
scrawl
aa855e9524
Include some required Ogre headers explicitely
2014-01-09 20:56:24 +01:00
Marc Zinnschlag
5e2eb8caf8
Merge remote-tracking branch 'swick/master'
2014-01-09 09:47:42 +01:00
Marc Zinnschlag
85707b5e3e
Merge remote-tracking branch 'scrawl/master'
2014-01-09 09:35:54 +01:00
scrawl
768d9f7237
Scripting: Add an optional 'required' parameter to getReference (default: true). If required=false, it will not throw an exception if there's no reference. Fixes PcExpell not working without a reference like it's supposed to, and makes the code nicer for some others (use required=false instead of catching the exception)
2014-01-09 02:21:03 +01:00
scrawl
223c1d5a38
Use GMSTs for crime bounty
2014-01-09 02:20:52 +01:00
scrawl
6f9113fe88
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
2014-01-09 01:49:58 +01:00
scrawl
baf55df7a1
Gold fixes (when did this break?)
2014-01-09 01:34:10 +01:00
Sebastian Wick
925d28e4a7
crashcatcher uname error checking
2014-01-09 00:52:37 +01:00
scrawl
9bf7bf529c
Implement crime-related dialogue globals as they are described in MSFD
2014-01-09 00:40:25 +01:00
scrawl
d7f69205f6
Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes
2014-01-09 00:06:24 +01:00
scrawl
0f5dc59176
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
2014-01-08 23:37:46 +01:00
scrawl
372cd437d1
Add a utility function for counting items in a container
2014-01-08 23:00:29 +01:00
scrawl
c55f9bd0aa
GetWaterLevel fix (similar to MCP): if there is no water in the cell, return -FLT_MAX to prevent mods from incorrectly thinking the player is underwater.
2014-01-08 20:19:47 +01:00
Marc Zinnschlag
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
2014-01-08 20:16:39 +01:00
Marc Zinnschlag
a7be755db0
Merge remote-tracking branch 'mrcheko/master'
2014-01-08 20:13:31 +01:00
scrawl
bf02b77c1d
Closes #1090 : Don't throw an exception if a cell has no region in GetPCCell
2014-01-08 19:57:13 +01:00
scrawl
154fae9f25
Don't suppress exceptions thrown while running scripts
2014-01-08 19:52:57 +01:00
scrawl
9baa1bef78
Expell player from faction when committing a crime against a faction member
2014-01-08 19:26:03 +01:00
scrawl
19d63f392f
Clean up the NpcStats expelled interface. Show message box when expelled.
2014-01-08 18:59:00 +01:00
scrawl
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
2014-01-08 18:39:44 +01:00
scrawl
7b33f6f2ac
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
2014-01-08 17:19:43 +01:00
scrawl
b99ca92fee
Add missing line of sight check
2014-01-08 17:18:13 +01:00
Nikolay Kasyanov
bc90443aeb
Revert "Music playback on OS X >= 10.9 works again. Fixes bug #1041."
...
This reverts commit fc21dd1f3a
2014-01-08 18:07:58 +04:00
mrcheko
46519062d3
hit recoils/knockdowns feature
2014-01-08 16:05:14 +02:00
scrawl
2bb21f2f76
Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating.
2014-01-08 02:35:36 +01:00
scrawl
c85c2cff4e
Fix disposition changes from trades not applying properly
2014-01-08 01:46:42 +01:00
scrawl
728365b48d
Remove an unused hook
2014-01-07 21:07:02 +01:00
scrawl
03b6334ceb
Get rid of a hack
2014-01-07 20:43:08 +01:00
scrawl
0285d18fc2
Respect items belonging to a faction
2014-01-07 20:24:01 +01:00
scrawl
3c0080d2c1
Implement theft detection
2014-01-07 19:58:17 +01:00
scrawl
d2d76f4f47
Fix disintegration bug
2014-01-07 19:21:19 +01:00
scrawl
c4ab2f417a
Fix exception closing container window
2014-01-07 18:11:19 +01:00
scrawl
90b55c8d4b
Use Ogre's asin/acos functions which will protect against NaNs
2014-01-07 17:09:08 +01:00
Marc Zinnschlag
48a08c4c4d
Merge remote-tracking branch 'endorph/master'
2014-01-07 14:12:15 +01:00
Dmitriy 'Endorph' Shkurskiy
9afa8e952e
tabs -> spaces
2014-01-07 14:32:14 +02:00
Marc Zinnschlag
72a81a2381
Merge remote-tracking branch 'scrawl/master'
2014-01-07 10:17:33 +01:00
scrawl
780bf5a2cd
Implement pickpocket detection. Play a voiced dialogue entry when detected.
2014-01-07 03:01:33 +01:00
scrawl
ea3ee4407f
oops, didn't mean to commit this
2014-01-07 02:48:44 +01:00
Sergey Shambir
d5a0ff17fd
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
...
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
2014-01-07 05:06:20 +04:00
Sergey Shambir
d536ff3cdc
printAIPackage: changed field name from Unknown to ShouldRepeat too.
2014-01-07 04:58:59 +04:00
Sergey Shambir
5c7e39a92f
Implemented script commands StartCombat, StopCombat, GetTarget.
...
Also renamed one field of AIWander class because it's not longer
unknown.
2014-01-07 04:43:06 +04:00
scrawl
887db76ed2
Don't consider swimming or in-air characters as sneaking
2014-01-07 01:22:04 +01:00
scrawl
29c823b9d4
Implement awareness check function. Use this for combat AI and GetDetected instruction.
2014-01-07 00:51:09 +01:00
scrawl
4a3d148a48
Fixes #1089 (skill increases)
2014-01-07 00:37:52 +01:00
Marek Kochanowicz
b85fe2becf
Changes according to the comment.
2014-01-06 23:37:18 +01:00
Marc Zinnschlag
fefaec5804
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
2014-01-06 22:30:08 +01:00
scrawl
68b87714bb
Addition to 2f35e5a04e: companions should still auto equip
2014-01-06 22:14:11 +01:00
mrcheko
2591ff2d5a
bug repairing
2014-01-06 22:00:01 +02:00
Marek Kochanowicz
06f8537087
added final check for player npc. Removed useless includes. However, this code spams exceptions and I can't figure out why.
2014-01-06 18:43:44 +01:00
Marc Zinnschlag
43dd3b8ef2
removed redundant deletion flag from CellRef
2014-01-06 13:53:20 +01:00
Marc Zinnschlag
0ad7aa1f53
Merge remote-tracking branch 'scrawl/master'
2014-01-06 10:22:07 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
2f35e5a04e
Stop merchants from autoequipping items sold to them
2014-01-05 22:43:09 +01:00
Marc Zinnschlag
e63b4964b2
Merge remote-tracking branch 'scrawl/master'
2014-01-05 21:27:06 +01:00
scrawl
dde2cd5d5a
Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.
2014-01-05 20:53:45 +01:00
scrawl
73f8161d1e
Fix spell deletion not resetting the selected spell correctly
2014-01-05 19:40:05 +01:00
scrawl
b3764c504a
Implement GetPcJumping instruction
2014-01-05 19:08:12 +01:00
scrawl
45847c67ad
Lock NIF cache when loading an interior cell as well. Should improve load performance.
2014-01-05 18:38:21 +01:00
scrawl
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
2014-01-05 18:22:29 +01:00
scrawl
b8e9343764
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
2014-01-05 18:09:50 +01:00
Marek Kochanowicz
c69814ed14
corrected one, additional name to follow policy
2014-01-05 18:00:49 +01:00
Marek Kochanowicz
4338706307
static is a keyword. renamed static to staticElement
2014-01-05 17:31:54 +01:00
Marek Kochanowicz
80d424591f
npc instead of NPC.
2014-01-05 17:28:47 +01:00
Marek Kochanowicz
693c398204
forgot to save the file before comit -_-'
2014-01-05 17:05:57 +01:00
Marek Kochanowicz
873870c7ce
Chainging names to comply our policy.
2014-01-05 17:04:57 +01:00
scrawl
ce013315ba
Nothing to see here, move along.
...
Fine... it's flying cliff racers. But did you really want to know?
2014-01-05 16:09:06 +01:00
Marek Kochanowicz
c1f4a9cb0e
Added proper id check.
2014-01-05 12:18:26 +01:00
Marek Kochanowicz
89d8ee62fa
Removing name check from listCheck. Id can't be empty to be sure.
2014-01-05 12:12:36 +01:00
Marek Kochanowicz
220d92f865
changed ID check in leveled list to name.
2014-01-05 11:30:03 +01:00
scrawl
44e96fcaaa
Implement Charm magic effect
2014-01-05 01:56:36 +01:00
scrawl
14b70a3ce6
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
2014-01-05 01:34:35 +01:00
scrawl
634a53211c
Make sure materials are built before trying to determine their transparency
2014-01-04 22:56:06 +01:00
pvdk
92234cf783
Changed crashcatcher's uname system info retrieval and cleaned indentation
2014-01-04 21:46:38 +01:00
scrawl
c4e4a8fb57
Closes #1083 : Fix werewolf change handling
2014-01-04 20:50:18 +01:00
scrawl
f4517c8221
For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire
2014-01-04 20:50:18 +01:00
mrcheko
7002412760
resolve conflict in character.cpp
2014-01-04 17:55:09 +02:00
Marek Kochanowicz
e860717105
replaced raw values with enums.
2014-01-04 15:28:08 +01:00
Marek Kochanowicz
558690b571
implemented list of magical bolts for skipping.
2014-01-04 15:19:17 +01:00
Marek Kochanowicz
dfd1058551
Various style corrections.
2014-01-04 14:49:01 +01:00
Marek Kochanowicz
aa05ffcf60
Splited some long argument lists to the multiple lines.
2014-01-04 13:05:19 +01:00
Marc Zinnschlag
356b53bd22
Merge remote-tracking branch 'scrawl/master'
2014-01-04 11:38:31 +01:00
Dmitriy 'Endorph' Shkurskiy
7023395012
Windows-specific definition to omit inclusion of unused stuff from Windows.h
2014-01-04 07:46:29 +02:00
Dmitriy 'Endorph' Shkurskiy
18d4cdb2ac
Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator
2014-01-04 07:46:29 +02:00
scrawl
16838595a3
Another console fix: discard text markup when getting the command line's text
2014-01-04 05:24:32 +01:00
scrawl
1b96c5d266
Console improvements: Show scrollbar, allow copying text from the history
2014-01-04 05:13:53 +01:00
scrawl
710a1e2f37
Smash case for manual reference IDs as well, consistent with references in data files
2014-01-04 04:39:06 +01:00
scrawl
557652112f
Show the target HP bar also when casting a heal effect (same as MCP)
2014-01-04 04:21:44 +01:00
scrawl
12691040d1
Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.
2014-01-04 02:49:10 +01:00
scrawl
09d491d1ba
Move a piece of functionality to its appropriate place
2014-01-04 01:13:19 +01:00
scrawl
be2ebc5cac
Closes #1081 : Implement disease contraction
2014-01-03 23:33:14 +01:00
scrawl
2a7d610f87
Implement GetSpellReadied instruction
2014-01-03 22:55:17 +01:00
scrawl
c0fbcf413f
Use the playermagic and playerfighting control switches
2014-01-03 22:44:35 +01:00
scrawl
e9bd43e2da
Use GMSTs for bound items/creatures
2014-01-03 20:54:14 +01:00
Marek Kochanowicz
1c3296fb64
Some changes in weapons check.
2014-01-03 18:25:06 +01:00
scrawl
617a65cdd2
Print message to dialogue window after successful trade
2014-01-03 17:40:14 +01:00
scrawl
b22dd40b41
Implement Paralyze magic effect
2014-01-03 17:06:05 +01:00
Marc Zinnschlag
ee621245bb
Merge remote-tracking branch 'scrawl/master'
2014-01-03 15:59:06 +01:00
scrawl
55c5d7cee4
Implement Resurrect instruction
2014-01-03 15:54:23 +01:00
Marek Kochanowicz
7b63e1942c
style corrections
2014-01-03 11:42:49 +01:00
Marek Kochanowicz
24f090ca98
Finishing stuff.
2014-01-03 11:31:54 +01:00
Marek Kochanowicz
8201c97abf
Inventory item template.
2014-01-03 09:16:41 +01:00
scrawl
b4230f716e
Implement RemoveEffects instruction
2014-01-03 05:19:10 +01:00
scrawl
7d8ca91286
Implement RemoveSpellEffects instruction
2014-01-03 05:18:44 +01:00
scrawl
366801f3d5
Implement explodeSpell instruction (like Cast, with caster = target)
2014-01-03 04:44:50 +01:00
scrawl
93e1a2df73
Implement Cast script instruction (shrines work now)
2014-01-03 04:09:52 +01:00
scrawl
b42240be6d
Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.
2014-01-03 03:48:43 +01:00
scrawl
32ff3b530c
Change all instances of skill/attribute values to use an appropriate typedef.
2014-01-03 01:59:15 +01:00
scrawl
623cdef69f
Code cleanup
2014-01-02 21:49:12 +01:00
scrawl
eba60858dd
Closes #1078 : Show stat bar text even when 0
2014-01-02 21:48:33 +01:00
Marc Zinnschlag
3b75f6676c
Merge remote-tracking branch 'scrawl/openmw-0.28' into openmw-28
2014-01-02 21:27:08 +01:00
scrawl
299690631f
Implement SoulTrap magic effect
2014-01-02 21:21:28 +01:00
mrcheko
79e972bdb6
resolved accompanying minor problems
2014-01-02 21:54:41 +02:00
Lukasz Gromanowski
b017a3be3e
Bug #1074 : Inventory paperdoll obscures armour rating
...
Changed size of inventory paperdoll.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-02 20:20:57 +01:00
scrawl
596e0c8a49
Correct Dispel effect (use magnitude as chance)
2014-01-02 20:15:07 +01:00
scrawl
94d2ec8e4e
Add missing spells update
2014-01-02 20:02:28 +01:00
Marc Zinnschlag
5d3b696eb6
Merge remote-tracking branch 'scrawl/master' into openmw-28
2014-01-02 19:52:47 +01:00
scrawl
12de351feb
Check if levitation is enabled before levitating
2014-01-02 16:38:23 +01:00
scrawl
0990ca4b75
Closes #1072 : Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly
2014-01-02 15:58:00 +01:00
scrawl
e6c0e187bc
Closes #1073 : Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.
2014-01-02 15:44:58 +01:00
Marc Zinnschlag
0d3e67dafc
Merge branch 'master' into openmw-28
2014-01-02 13:39:36 +01:00
Marc Zinnschlag
a6e6411686
Merge remote-tracking branch 'scrawl/master'
2014-01-02 12:12:52 +01:00
scrawl
c558e12212
Don't try to move objects that are not in a cell
2014-01-02 03:06:48 +01:00
scrawl
993edf0384
Bug #1063 : Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc.
2014-01-02 02:27:48 +01:00
scrawl
0f2b2fabdb
Implement water walking
2014-01-02 02:03:44 +01:00
scrawl
783c501d70
Some checks to prevent bound item abuse
2014-01-02 01:36:08 +01:00
scrawl
590c8cb4a0
Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again.
2014-01-02 01:03:44 +01:00
scrawl
899214a906
Use fVanityDelay
2014-01-02 00:13:23 +01:00
scrawl
c6421276bd
Closes #841 : Correct activation distance in third person mode
2014-01-01 23:59:17 +01:00
scrawl
24aa743573
Add function for converting feet to game units
2014-01-01 23:34:18 +01:00
scrawl
f6387d5979
Implement Telekinesis magic effect. Remove some duplicate code.
2014-01-01 23:30:58 +01:00
scrawl
531bef6193
Shorter Vector3 initialisation
2014-01-01 22:46:10 +01:00
scrawl
5729672262
Show marked position on map. Implement Detect X magic effects.
2014-01-01 22:37:52 +01:00
mrcheko
16e10cc702
error fix
2014-01-01 22:46:29 +02:00
scrawl
bfc9fcf2cd
Add starting spells when building player (F_PCStart flag)
2014-01-01 21:34:00 +01:00
mrcheko
09a0a69b04
more improvements
2014-01-01 21:40:31 +02:00
Marc Zinnschlag
1f4c192bf6
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
2014-01-01 19:47:11 +01:00
Marc Zinnschlag
e1355be47c
Merge remote-tracking branch 'lgro/valgrind_warnings'
2014-01-01 19:41:52 +01:00
scrawl
eab7ffd6b4
Remove redundant finding of default exterior position height
2014-01-01 18:05:28 +01:00
scrawl
8e5cae1081
Implement mark/recall magic effects
2014-01-01 17:06:21 +01:00
Lukasz Gromanowski
2d4e06cd50
Updated comments about freeing format_ctx->pb->buffer.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 17:05:49 +01:00
Lukasz Gromanowski
722469d57b
Correction to the e9844e1 commit.
...
Restored interrior check in WeatherManager::update().
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 16:45:39 +01:00
scrawl
69ba8a40bf
Fix weird formatting added during the merge
2014-01-01 16:13:20 +01:00
scrawl
b3cd10dbea
Remove redundant setTeleported calls
2014-01-01 15:18:25 +01:00
Marc Zinnschlag
b19b277f18
temporarily disable OGRE-integration in OpenCS (need to sort out path problem first)
2014-01-01 15:16:51 +01:00
Marc Zinnschlag
c3482b6f24
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/mwmechanics/spellcasting.cpp
2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
...
Conflicts:
apps/openmw/mwworld/weather.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-01 14:57:14 +01:00
scrawl
ea3b88951a
Implement divine/almsivi intervention magic effects
2014-01-01 02:22:11 +01:00
scrawl
c86760e3cd
Remember the last known exterior position of the player in case we fail to map the interior to a world position.
2014-01-01 01:10:55 +01:00
Lukasz Gromanowski
101813fd0d
Fixes #417 : Apply weather instantly when teleporting
...
Correction to previous commit - WeatherManager->update()
will always be called.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 21:18:10 +01:00
Lukasz Gromanowski
e9844e1b37
Fixes #417 : Apply weather instantly when teleporting
...
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 20:40:23 +01:00
scrawl
b02b966c44
Closes #994 : Don't cap skills to 100 when set via console (except for modX variants)
2013-12-31 19:11:16 +01:00
Marc Zinnschlag
c34b586b65
Merge remote-tracking branch 'ace/fix'
2013-12-31 18:37:12 +01:00
scrawl
3604b9d171
Closes #566 : In interior cells, update global map position marker using the first exterior teleport door
2013-12-31 18:35:46 +01:00
scrawl
be1938ee90
Closes #805 : Don't add entities that are supposed to be invisible to static geometry
2013-12-31 18:32:46 +01:00
Lukasz Gromanowski
1ce4663065
Updated compiler opcodes for COE, and setHello.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 18:13:38 +01:00
mrcheko
a8fb1ae51c
improved, added knockdown after falling
2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson
8381cad5a4
Don't try to set a cursor before one exists
2013-12-31 14:13:42 +01:00
mrcheko
d6345bce91
added npc hit reactions
2013-12-31 13:24:20 +02:00
scrawl
94cdc1efd2
Enable mipmap generator for 1.9+
2013-12-31 00:54:40 +01:00
Lukasz Gromanowski
cb04f43384
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 23:08:53 +01:00
Lukasz Gromanowski
6107d5bad2
Updated ffmpeg decoder fix
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 22:16:06 +01:00
Lukasz Gromanowski
5c5f87445b
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 21:47:06 +01:00
Marek Kochanowicz
cb723710fe
Corrected stupid typo.
2013-12-30 19:24:53 +01:00
scrawl
b8ac37347c
Code cleanup for Class::canBeEquipped
2013-12-30 19:04:35 +01:00
Marek Kochanowicz
79bc149c73
reverting refidata.hpp
2013-12-30 18:47:19 +01:00
Marek Kochanowicz
a7de04d0a4
reverting refiddata.cpp
2013-12-30 18:46:18 +01:00
Marek Kochanowicz
4a1987ddec
correcting
2013-12-30 18:41:16 +01:00
scrawl
79a440e94a
Many additions to 900bc06d2c:
...
- Fix indentation
- Consider any kind of light, not just torch_infinite_time
- Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
- Remove redundant code and don't add additional lights to the inventory
- World::isDark returns false for interiors which are unaffected by weather
2013-12-30 17:57:41 +01:00
Marek Kochanowicz
3758fe3834
reformatted
2013-12-30 13:23:16 +01:00
Marek Kochanowicz
c89608f390
Check for head and hair. Correct faction check.
2013-12-30 11:39:03 +01:00
Scott Howard
2f082ef796
remove unneeded libraries
2013-12-29 16:25:49 -05:00
Marek Kochanowicz
842e26b8e5
added comment
2013-12-29 21:53:33 +01:00
Marek Kochanowicz
13637e7166
Dynamic_casting, checking rank. Commented out faction check, since it will not work.
2013-12-29 21:45:09 +01:00
Marek Kochanowicz
e321d571e1
Added faction check.
2013-12-29 21:06:08 +01:00
Marek Kochanowicz
9df6d23afc
removing member size values, since this does not work properly.
2013-12-29 20:15:00 +01:00
Lukasz Gromanowski
c65f018760
Fixes #417 : Apply weather instantly when teleporting
...
Corrected constant name.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 15:09:49 +01:00
Marc Zinnschlag
6de39a7329
Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day'
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-12-29 15:00:31 +01:00
Lukasz Gromanowski
faf8011c48
Fixes #417 : Apply weather instantly when teleporting
...
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 12:47:44 +01:00
scrawl
04f9f7af56
Closes #990 : Add option to unlock mouse cursor when in any menu
2013-12-29 00:58:48 +01:00
scrawl
17ff8165d2
Closes #1065 : Don't apply fall damage when landing in water
2013-12-29 00:36:36 +01:00
Marek Kochanowicz
bf0383fe05
Last fixes.
2013-12-28 18:07:01 +01:00
Marek Kochanowicz
147ee0ace3
small oops + added new variables to the constructor
2013-12-28 17:35:04 +01:00
scrawl
2a8ab932ef
Bug #951 : Only recalculate derived stats when attributes change
2013-12-28 17:19:35 +01:00
Marek Kochanowicz
b9d1047ad6
Small fix for lights.
2013-12-28 16:18:16 +01:00
Lukasz Gromanowski
100edda8c0
Fixes #417 : Apply weather instantly when teleporting
...
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 16:15:34 +01:00
Marek Kochanowicz
be6e47bcb6
Corrections
2013-12-28 15:51:38 +01:00
Marek Kochanowicz
5406a70fdd
still working on npc check
2013-12-28 11:34:51 +01:00
Marek Kochanowicz
da3dda896a
Code compiles now
2013-12-27 22:57:36 +01:00
scrawl
596c9b80a9
Check if threads are joinable before joining (issue with boost 1.52)
2013-12-27 22:38:30 +01:00
Marek Kochanowicz
03235bf0a2
NPC. Still WIP.
2013-12-27 22:13:55 +01:00
scrawl
85ec80100c
Bug #1005 : Hide torches/shields during spellcasting and hand-to-hand combat
2013-12-27 22:00:16 +01:00
scrawl
7265b427fe
Bug #1013 : Rewrote fall height detection
2013-12-27 21:21:18 +01:00
scrawl
02277db685
Bug #1052 : Don't use set/getOnlyText which discards escape characters
2013-12-27 19:52:10 +01:00
scrawl
686d9efac3
Bug #1060 : Fix incorrect spell type checks
2013-12-27 18:58:35 +01:00
scrawl
27092a4494
flagAsModified should be private
2013-12-27 18:58:35 +01:00
scrawl
6400f23ab0
Use the material controller manager for effects with overridden texture
2013-12-27 14:54:36 +01:00
scrawl
d262d9e6b0
Bug #1054 : Set render queue group for effects
2013-12-27 14:51:59 +01:00
scrawl
1c60a781a5
Add header to CMakeLists
2013-12-27 14:42:22 +01:00
scrawl
561c661156
Reset starting angle / position when adding world item to a container
2013-12-27 01:57:08 +01:00
scrawl
608bd0f525
Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028
2013-12-27 01:34:56 +01:00
scrawl
30b1da996b
Issue #1029 - Quick keys menu: Select compatible replacement when tool used up
2013-12-27 00:51:29 +01:00
scrawl
5a287a7e01
Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData.
2013-12-27 00:41:19 +01:00
scrawl
d09a86e208
Issue #1018 : Don't allow view mode switching while performing an action
2013-12-27 00:36:06 +01:00
scrawl
a3017e16d4
Don't allow changing the spell that is being cast mid-animation
2013-12-26 22:32:39 +01:00
scrawl
5054d8e6c1
Bug #1055 : Check power use and mana before starting cast animation
2013-12-26 22:06:13 +01:00
scrawl
71d9755ef1
Bug #991 : Don't autoequip items with harmful permanent enchantments
2013-12-26 21:26:59 +01:00
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
2013-12-26 20:53:52 +01:00
scrawl
a3ff9e5be8
Change destruction order - fixes a shutdown crash discovered with mesa
2013-12-26 20:53:52 +01:00
scrawl
fb845e81a4
Rename nosound to no-sound for consistency
2013-12-26 20:53:52 +01:00
scrawl
85ed21dbd2
Remove unused command line option
2013-12-26 20:53:51 +01:00
scrawl
33389b9b63
XDG compliant paths
2013-12-26 20:53:51 +01:00
scrawl
a9e1e89bbc
Bug #1007 : Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible
2013-12-26 20:53:51 +01:00
scrawl
31c1f484ed
Slight performance improvement for WindowManager::updateVisible
2013-12-26 20:53:51 +01:00
scrawl
b6bad969a0
Fix an issue with items that have no UI icon
2013-12-26 20:53:51 +01:00
scrawl
81ec8c2f55
Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense
2013-12-26 20:53:51 +01:00
