mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 14:53:52 +00:00
Code Issues Releases Wiki Activity
11210 commits 108 branches 66 tags 133 MiB
Commit graph

8439 commits

Author SHA1 Message Date
scrawl
2d17d8f61a Savegame: start in (0,0) cell if player's cell no longer exists 
This happens frequently when saves are loaded that were created in a different MW language.
 2014-06-26 01:19:03 +02:00
scrawl
5bd2f30a99 CellRef uninitialized fixes 2014-06-25 19:52:14 +02:00
scrawl
f6a568c995 Implement rain (Feature #41) 2014-06-25 18:20:21 +02:00
scrawl
09926a86cb Fix comparing outdated listener position with up-to-date cell (Fixes #1499) 2014-06-25 18:10:26 +02:00
scrawl
2bcbc6ab7d Potential crash fix, either way should have a better error message now 2014-06-25 14:52:12 +02:00
Marc Zinnschlag
85965bfd47 Merge remote-tracking branch 'scrawl/master' 2014-06-25 09:58:00 +02:00
scrawl
ec64f1a53a Reset accumulation root when its animation finishes 
Fixes a position flicker after standing up from knockdown.
 2014-06-25 02:46:39 +02:00
scrawl
ee098de0a6 Don't ignore lighting values of particles not attached to a character 2014-06-25 01:14:21 +02:00
scrawl
b259c5def2 Make GetFactionReaction garbage argument optional 2014-06-25 01:12:57 +02:00
scrawl
3d9bdad8ba Correct run speed for creatures (by Hrnchamd - Fixes #1136) 2014-06-25 00:51:02 +02:00
scrawl
7f1d0fc2a2 Fix disposition for npcs in same faction, by Hrnchamd 2014-06-25 00:12:51 +02:00
scrawl
8a8ecce1e5 Fix some uninitialized data written to savegames 2014-06-25 00:11:25 +02:00
scrawl
693a097b21 Implement idlestorm animation (Feature #41) 2014-06-24 18:37:38 +02:00
scrawl
36135293e8 Fix moving object from an inactive to another inactive cell 2014-06-24 15:29:36 +02:00
scrawl
b52977e44c Add dummy Face implementation for now (Bug #1541) 2014-06-24 15:09:13 +02:00
scrawl
36132e054a Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41) 2014-06-24 15:00:15 +02:00
scrawl
1d46ac19ff Fix being able to activate through terrain 2014-06-24 02:24:32 +02:00
scrawl
320ab1b2c1 Don't say voice when using startcombat for a dead actor (Fixes #1542) 2014-06-23 22:00:17 +02:00
scrawl
0b34d8d2fd Add support for animated collision shapes (Fixes #1549) 2014-06-23 20:43:24 +02:00
slothlife
9ea22324f7 Fix some MSVC warnings. 
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
 2014-06-23 01:13:30 -05:00
scrawl
64a4c2785e Fix water walking 2014-06-22 22:30:30 +02:00
scrawl
d296c6e9b7 Handle fog density values of 0 (Bug #1549) 2014-06-22 22:30:29 +02:00
scrawl
cbec0ffaee Exception fix 2014-06-22 22:30:29 +02:00
slothlife
ead801f2d0 Fix for compiling Win32 debug. 2014-06-21 21:15:41 -05:00
scrawl
e23a7694f3 Don't throw exception when using ModDisposition on creatures (Fixes #1548) 2014-06-22 00:34:32 +02:00
scrawl
e002acdeae Physics: Create actor shapes outside of BulletNifLoader 
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
 2014-06-21 23:37:16 +02:00
scrawl
98329a94b4 Add case sensitivity workaround for spine bones (Fixes #1547) 2014-06-21 19:54:12 +02:00
scrawl
a4ce9d6a7f Always show the script name when a script fails to compile 2014-06-20 23:56:21 +02:00
scrawl
9a26cf22e6 Implement toggleMenus 2014-06-20 18:51:00 +02:00
scrawl
ad0a182b7e Improve error message for unknown cells 2014-06-19 20:08:53 +02:00
scrawl
091f9a8fdc Optimize global map render slightly 2014-06-19 19:14:59 +02:00
scrawl
8eab3abb15 Fix initial view offset for large world maps (Fixes #1523) 2014-06-19 19:03:12 +02:00
scrawl
11b05c352f Fix exception when casting Bound Gloves spell 2014-06-19 16:00:27 +02:00
Marc Zinnschlag
30f8e279ed Merge remote-tracking branch 'scrawl/master' 2014-06-19 10:35:28 +02:00
scrawl
4648524df4 Improve getLOS (use eye level). Also, don't crash when used with non-actors. 2014-06-19 04:53:25 +02:00
scrawl
185ff279a3 Add missing sound effect for mages guild transport 2014-06-19 03:29:36 +02:00
scrawl
cc3c6ae7b8 Fix very slow movement on some creatures, e.g. rats (Bug #1136) 
Neither fAthleticsRunBonus, fBaseRunMultiplier or the creature's athletics skill (i.e. Combat stat) have any effect on the run speed (tested by setting those to absurd values). The new formula is just a guess and doesn't seem to be completely accurate.
 2014-06-19 02:36:10 +02:00
scrawl
6760f4c897 Make cached GMSTs in MWClass::Npc/Creature safer 2014-06-19 02:09:46 +02:00
scrawl
4234c70232 Savegame: Disable CustomData load optimization for npcs and creatures for now to preserve compatibility (still enabled for containers) 2014-06-19 02:00:40 +02:00
scrawl
d878456d0f Don't add an extra path separator 2014-06-19 01:10:33 +02:00
scrawl
c3e4160a0a Don't crash in StatsWindow for invalid faction rank values 
PcRaiseRank: don't allow to raise rank beyond max rank
 2014-06-18 23:50:55 +02:00
scrawl
2193977eec Savegame: Don't fill CustomData from ESM records if the savegame overwrites it anyway 
This gets rid of some junk in ContainerStores (since clear() only sets count to 0 and doesn't really delete references), and significantly speeds up loading savegames (by about 80% in my test)
 2014-06-18 22:59:18 +02:00
scrawl
4e71db7081 Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs. 2014-06-18 21:39:17 +02:00
scrawl
8a4227ec38 Heal player while in jail 2014-06-18 16:57:54 +02:00
scrawl
9a6737073f Fix broken swimdeath in first person 2014-06-18 16:57:54 +02:00
scrawl
e95483c40f Fix crash for on target spells cast by non-actors (Fixes #1529) 2014-06-18 16:57:53 +02:00
scrawl
fe1e6a2719 Make Weakness effects apply to all subsequent effects within the same spell (Fixes #1150) 2014-06-18 16:57:53 +02:00
scrawl
56bc5a9d39 Fix being able to steal undetected just after invisibility breaks 2014-06-18 16:57:53 +02:00
scrawl
80f66e2157 Fix crash when avformat_open_input fails (Fixes #1522) 2014-06-18 16:57:53 +02:00
scrawl
d4678a8d55 Fix level up dialogue layout (Fixes #1393) 2014-06-18 16:57:53 +02:00
scrawl
666dbc6ddc Disable QuickKeysMenu in werewolf form 2014-06-18 16:57:53 +02:00
scrawl
a3ea7cb956 Ignore distance when considering aggression due to crime (seems to work better, all balmora mages guild members now come to help when one is attacked) 2014-06-18 16:57:53 +02:00
scrawl
1dc9e151cb Count werewolf kills (Fixes #1525) 2014-06-18 16:56:36 +02:00
scrawl
1244da85df Make Detect Life spell detect NPCs when in werewolf form (Fixes #1527) 2014-06-17 16:27:33 +02:00
scrawl
4f9ebd148c Fix broken AI movement on Z axis 2014-06-17 15:25:54 +02:00
Marc Zinnschlag
2683aa9503 Merge remote-tracking branch 'filkry/bug640_luminescent_water' 2014-06-17 13:08:06 +02:00
Marc Zinnschlag
073cc3f02c fixed base flag in content file loader code 2014-06-17 11:01:17 +02:00
scrawl
2477456f99 Implement Murder crimes and OnMurder instruction (Fixes #1315) 2014-06-17 04:05:27 +02:00
scrawl
3801dfb4ba Add delay to sneak icon update and skill progress (Fixes #1321) 2014-06-17 04:05:27 +02:00
scrawl
ffb6f5d555 Use fFight<Crime> GMSTs to control attacks in response to crimes 2014-06-17 04:05:27 +02:00
scrawl
8ac019611d Fix Potion use action removing the potion even when the action is not executed (Fixes #1521) 2014-06-17 04:05:20 +02:00
Fil Krynicki
c36fc48c47 Fixed underwater issue 
I had accidentally deleted some interpolation parameters.
 2014-06-16 17:15:49 -04:00
Fil Krynicki
cfea7736d9 WIP fix 
Bug is fixed, but appears to have broken vision underwater. Notes:

+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
 2014-06-16 17:08:02 -04:00
scrawl
28feb260eb Implement disposition/distance based aggression (Fixes #1520) 2014-06-16 20:05:53 +02:00
scrawl
d11a5e19f7 Fix positionCell not properly teleporting actors from inactive to active cells (Fixes #1516) 2014-06-16 20:05:53 +02:00
scrawl
2ce8323a42 Fix getDistance not detecting references in inactive cells properly 2014-06-16 20:05:47 +02:00
scrawl
47bd170d7e Crashcatcher: create temp file in /tmp, not working directory (which may not have write access) 2014-06-16 04:13:36 +02:00
scrawl
f935cfc6c9 Fix crash when stealing items with the owner not around (Fixes #1512) 2014-06-16 04:03:53 +02:00
scrawl
1b610cdbd0 Allow following NPCs to fast-travel (Fixes #1501) 2014-06-16 03:17:31 +02:00
scrawl
78f30e2970 Fix a journal layout bug 2014-06-16 02:52:25 +02:00
scrawl
345ba99c17 Fix WeaponAnimationTime not working after restoring draw state (when loading save or re-entering a cell - Fixes #1497) 2014-06-16 02:52:25 +02:00
scrawl
9ea071c1e8 Fix weapon incorrectly showing when saving and loading with spell equipped 2014-06-16 02:52:25 +02:00
scrawl
edccb62c1f Clear MyGUI's clipboard, since we don't want to use it (Fixes #1277) 
This would cause pasted text to appear twice, but only when using an SVN version of MyGUI, since 3.2 had a bug where it wouldn't recognize the Ctrl C/V/X keys when using separated key/textinput events.
 2014-06-16 02:52:25 +02:00
scrawl
4f73e8bb71 Add items to player inventory upon drag start (Fixes #1507) 2014-06-16 02:52:25 +02:00
scrawl
0aba1088a1 Attempt to open companion window if no greetings are found (Bug #1507) 2014-06-16 02:52:25 +02:00
scrawl
3b7119ba0d Make Bipedal creatures always able to walk and swim (Fixes #1509) 
This is necessary since the vanilla CS greys out the walk/swim checkboxes when Bipedal is checked.
 2014-06-16 02:52:24 +02:00
scrawl
d5b97005ab Make ESM::Faction skills optional (Fixes #1508) 
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
 2014-06-16 02:52:16 +02:00
scrawl
ee2b81763e Savegame: Store AiSettings and summoned creatures 
CreatureStats state is now completely stored (Closes #1174)

Also play VFX_Summon_Start and VFX_Summon_End visual effects.
 2014-06-15 21:19:37 +02:00
scrawl
a0f9a6718f Disable fProjectileThrownStoreChance when shooting at player (Fixes #1490) 2014-06-15 16:11:22 +02:00
scrawl
fd59a4a79e Fix some doxygen typos 2014-06-15 16:11:22 +02:00
scrawl
77388fe2ce Implement BetaComment instruction (dumps reference info) 2014-06-15 16:11:16 +02:00
scrawl
326c747508 Don't run scripts when in pause menu (Fixes #1495) 2014-06-15 14:18:16 +02:00
scrawl
9e6d21d95b Clear message boxes in windowmanager cleanup (Fixes #1496) 2014-06-15 14:18:16 +02:00
scrawl
e288437885 Disable all other animations on death (Fixes #1483) 2014-06-15 14:18:16 +02:00
scrawl
1adb81abd0 Sort using ciLess, not ciEqual 2014-06-15 14:18:16 +02:00
scrawl
88f8f25ffa Don't allow scripted dialogue with dead actors (Fixes #1493) 2014-06-15 14:18:16 +02:00
scrawl
8d8015ce18 Remove a squareroot in pathfinding 2014-06-15 14:18:16 +02:00
scrawl
afbd5162ee Move AiWander arrival check to time-critical section 2014-06-15 14:18:16 +02:00
scrawl
7afd2ca614 Consider moved references in CellStore::listRefs 2014-06-15 14:18:16 +02:00
scrawl
31a4e10c6f Fix incorrect trigger of change flag for static doors 2014-06-15 14:18:16 +02:00
scrawl
395f98e476 Fix triggering changed flag for all references when cell is visited 
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.

Also clean up RefData interface slightly.
 2014-06-15 14:18:16 +02:00
scrawl
b20f8cc04f Don't clear AiSequence if there are no saved packages (eg for old savegames) 2014-06-15 14:18:16 +02:00
Marc Zinnschlag
01c90a3434 Merge remote-tracking branch 'mrcheko/master' 2014-06-15 14:12:38 +02:00
mrcheko
a6ee4272aa fix bug when you were able to kill somebody from large distance without 
being spotted
 2014-06-15 00:14:18 +04:00
mrcheko
6da061fd96 fix http://bugs.openmw.org/issues/1340 
Did I understand right that guards trigger combat after refusing pay
gold/go to jail via script?
 2014-06-14 23:36:57 +04:00
Alexander "Ace" Olofsson
c24e08dff6 Use Ogre::Math::PI 2014-06-14 14:43:24 +02:00
Alexander "Ace" Olofsson
6ea29812ac Another way of getting M_PI 2014-06-14 13:54:01 +02:00
Alexander "Ace" Olofsson
dc2fefffc7 Fix missing M_PI define on Windows 2014-06-14 13:29:55 +02:00
scrawl
832f1a4857 Fix merge mistake 2014-06-14 02:31:01 +02:00
scrawl
0637cde267 Bug #1417: Make sure to reset all position/rotation fields when placing items 2014-06-13 23:40:49 +02:00
scrawl
ad3a78706e Bug #1417: Use fmod to wrap local rotations (more efficient and robust) 2014-06-13 23:40:35 +02:00
scrawl
54d8606b78 Fix logging fatal exceptions to cerr, and log them to openmw.log 2014-06-13 22:04:20 +02:00
mrcheko
9d40f2e196 Merge remote-tracking branch 'origin/master' 2014-06-13 23:23:25 +04:00
mrcheko
c4e5872620 fix bug http://bugs.openmw.org/issues/1470 2014-06-13 23:22:00 +04:00
scrawl
3334078d4d Add first person meshes to refraction render (Fixes #1481) 2014-06-13 21:14:17 +02:00
scrawl
fe5bbfce3c Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
 2014-06-13 19:31:33 +02:00
scrawl
8114f48469 Workaround per-frame resources leak in MyGUI. New vertex buffers were being created every frame. 2014-06-13 19:06:09 +02:00
mrcheko
fc6366fb27 Merge remote-tracking branch 'upstream/master' 
Equipping_Weapon check isn't needed cause there won't be WeapType_None in
that case

Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2014-06-13 14:12:41 +04:00
scrawl
e458cf1df2 Savegame: Store death counter (Fixes #1477) 2014-06-13 02:26:53 +02:00
scrawl
797134aa51 Handle activation scripts in AiActivate (Fixes #1478) 2014-06-13 02:26:52 +02:00
scrawl
a54ac579a5 Savegame: Store AiSequence 2014-06-13 02:26:52 +02:00
scrawl
be6f1fe4fe Fix a sign error 2014-06-13 02:26:52 +02:00
scrawl
91ed5183c8 Show base item value in tooltip, not real value (Fixes #1469) 2014-06-13 02:26:52 +02:00
scrawl
604d5ac000 Fix console reference label not resetting when loading save 2014-06-13 02:26:52 +02:00
mrcheko
df7213185f warning fixes 2014-06-12 23:42:33 +04:00
Marc Zinnschlag
2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 2014-06-12 12:54:39 +02:00
Marc Zinnschlag
82eb13c070 Merge remote-tracking branch 'cc9cii/master' 2014-06-12 12:46:04 +02:00
cc9cii
37f0c253f6 For compiling with MSVC 2012 2014-06-12 07:04:57 +10:00
scrawl
68d6b6b2f3 Cell merge fix (reference context position was not saved correctly) 2014-06-11 21:56:10 +02:00
scrawl
41ab7329a8 Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202 
Note: breaks compatibility with input.xml, so the filename was changed.
 2014-06-11 19:47:42 +02:00
scrawl
013916fca3 Fix for broken physics in exteriors (Fixes #1446) 
The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.
 2014-06-11 19:01:23 +02:00
scrawl
d970cc06d7 Don't play the same music track twice in a row (Fixes #746) 2014-06-11 18:11:16 +02:00
scrawl
d60df66811 Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108) 2014-06-11 16:56:41 +02:00
scrawl
73be457805 Merge ESM::Cell fields by subrecord 
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.

Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
 2014-06-11 16:13:33 +02:00
Marc Zinnschlag
c23e9e03fd Merge branch 'refs' 2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c added extended versions of revert and delete 2014-06-11 11:43:38 +02:00
Marc Zinnschlag
2faeceacfa Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/openmw/main.cpp
 2014-06-11 08:51:18 +02:00
scrawl
0f31e31088 Allow opening journal during dialogue (Fixes #1460) 2014-06-11 03:08:22 +02:00
scrawl
14a9f0ebf8 Handle Quadratic and Linear attenuation independently (Fixes #1456) 2014-06-11 02:24:17 +02:00
Emanuel Guevel
a41339da1e Write logs in log directory 
The crash.log file was created in the working directory, requiring users
that had installed the game to run it with augmented privileges to be
able to create the file.
 2014-06-10 23:46:49 +02:00
mrcheko
d6d9df6cec split getStartTime 2014-06-11 00:20:46 +04:00
scrawl
07d20c212b Fix crash activating quick key 1 2014-06-10 21:34:47 +02:00
scrawl
10758d6297 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-06-10 19:32:49 +02:00
scrawl
7b5482f25b Fix character selection caption when there is no character in settings.cfg 2014-06-10 19:01:18 +02:00
scrawl
5a955279bb Fix main menu background showing when resizing window during load 2014-06-10 18:49:42 +02:00
scrawl
3788fb042e Implement MenuTest script instruction (Fixes #1454) 2014-06-10 18:49:42 +02:00
scrawl
6ba112619a Fix dropped items ending up inaccessible when standing in objects with no collision (Fixes #1441) 2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc Implement ClearInfoActor script instruction (Fixes #1422) 2014-06-10 18:49:41 +02:00
scrawl
a90245147b Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor (Fixes #1423) 2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1 Implement text replacement for journal topic responses (Fixes #1429) 2014-06-10 15:42:50 +02:00
scrawl
3bf599248e CMake cleanup: Remove distribution-specific install stuff (unused) 2014-06-10 15:03:27 +02:00
scrawl
4119038f1d Remove an old workaround (Fixes #1458) 2014-06-10 14:46:44 +02:00
mrcheko
979128b2c5 Combat music; some minor combat fixes 2014-06-10 14:20:29 +04:00
scrawl
65d5311037 Revert "Don't try to show exceptions in a message box if SDL was not initialized" 
According to SDL docs, "This function may be called at any time, even before SDL_Init()".

Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine.

This reverts commit 39eea24dc3.

Conflicts:
	apps/openmw/main.cpp
 2014-06-10 04:10:34 +02:00
scrawl
c0c1db4490 Don't list non-usable items in QuickKeysMenu selection (Fixes #1427) 2014-06-10 03:28:21 +02:00
scrawl
271aac3fcc Savegame dialog: Grey out buttons if no save is selected 2014-06-10 02:47:02 +02:00
scrawl
311acfa8ff Add delete button to save load menu (Fixes #1453) 2014-06-10 02:27:38 +02:00
scrawl
881ae33b74 Don't allow Creatures with no movement abilities to move (Fixes #1457) 2014-06-10 02:15:09 +02:00
scrawl
e0d6670ac4 Move video skip detection to WindowManager 
Fixes a bug where skipping using Esc would not work if a mouse button had been pressed previously
 2014-06-10 01:57:54 +02:00
scrawl
7721e54191 Use descriptive names for save files and character folders (Fixes #1449) 2014-06-10 00:22:00 +02:00
scrawl
e796fa2313 Add another french morrowind font workaround (Fixes #1447) 2014-06-09 22:18:53 +02:00
mrcheko
698cbba6ef old bug + comment fix 2014-06-09 23:02:06 +04:00
mrcheko
08e8dab067 merge openmw master 2014-06-09 22:37:49 +04:00
scrawl
1bab74a98d Fix punishment for stealing 0 value items (Fixes #1435) 2014-06-09 03:42:29 +02:00
scrawl
5488fe1ab3 Change npc training skills to prefer skills with lowest ID if skill values are the same (Fixes #1445) 2014-06-09 03:40:14 +02:00
scrawl
a3752da79f Store Always Run control state in settings 2014-06-08 19:50:39 +02:00
mrcheko
67abc60264 aiming to moving target in ranged combat ai 
1) Taking into account target move vector and speed. However aiming is not
ideal, since attack strength can't be controlled directly. I did achieve
almost 100% accuracy updating it everyframe but then thought it would be
unfair, cause AI should mimic human targetting.
2) Also added in this commit func to measure real attack durations for
weapon.
 2014-06-08 20:59:26 +04:00
Marc Zinnschlag
48468b7d0c some dialogue subview cleanup and start of command dispatching refactoring 2014-06-08 14:10:08 +02:00
Marc Zinnschlag
b717e3fcb8 Merge remote-tracking branch 'filkry/bug1196jumpdialog' 2014-06-08 11:25:34 +02:00
scrawl
d2dca27067 Correct wrong assertions (Fixes #1425) 2014-06-08 11:25:10 +02:00
scrawl
b9dadff5a3 Recognize DELE subrecords at the end of the record (Fixes #1414) 2014-06-08 11:22:37 +02:00
scrawl
823ccb1b3d Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386) 2014-06-08 11:22:37 +02:00
scrawl
69855097ca Fix an always true condition (Bug #1355) 2014-06-08 11:22:37 +02:00
scrawl
b470596206 Handle failed savegame file operations (Fixes #1413) 2014-06-08 11:22:37 +02:00
scrawl
2ec324c80b Consider all splash screens in the Splash folder (Fixes #1416) 2014-06-08 11:22:37 +02:00
scrawl
927ae00454 Fix code that stopped animation immediately after starting it, due to thinking it has completed (Fixes #1370) 2014-06-08 11:22:37 +02:00
slothlife
51c45796b1 Fix physics to not trigger Bullet assert in Debug 
When physics attempts to move by a very small amount, precision losses
caused Bullet to trigger an assert in debug from normalizing a zero
length vector.
 2014-06-07 19:26:12 -05:00
Fil Krynicki
cd693b6d37 Fixed mouse closing containers, and injection/gui test order 
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.

Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.

And fixed a comment.
 2014-06-07 20:08:29 -04:00
Marc Zinnschlag
7ede6573eb removed more hardcoded column numbers 2014-06-07 14:39:34 +02:00
Marc Zinnschlag
302e2f8e9a fixed some proxy model problems related to column numbers 2014-06-07 14:32:12 +02:00
Marc Zinnschlag
e4a37ef709 removed some hardcoded column numbers 2014-06-07 13:06:19 +02:00
Marc Zinnschlag
85fca19fd9 replaced selection model in CommandDispatcher with a slightly slower but more robust implementation 2014-06-07 13:02:45 +02:00
Fil Krynicki
1d3a220d94 Added A_Use command to player controls. 2014-06-06 22:35:16 -04:00
Fil Krynicki
97caa1f8a4 Alternative fix strategy by checking for binding state 2014-06-06 22:25:23 -04:00
Marc Zinnschlag
f6ae967ba0 simplified Data constructor 2014-06-06 20:47:31 +02:00
Marc Zinnschlag
0668019c86 Merge remote-tracking branch 'scrawl/master' 2014-06-06 19:09:24 +02:00
scrawl
58d963d6e6 Fix warning 2014-06-06 18:43:30 +02:00
scrawl
b68a8e38cd Remove unused map 2014-06-06 15:24:06 +02:00
scrawl
54a5dba3f5 Don't reserve Pauldron parts for robes (Fixes #1396) 2014-06-06 15:20:56 +02:00
Hallfaer Tuilinn
01283f531e Fix for Bug #1409 2014-06-06 15:13:25 +02:00
scrawl
9627146bf4 Another fix for trade exploit (hopefully the last: Fixes #1408) 2014-06-06 15:08:44 +02:00
Marc Zinnschlag
c6557e1ade some UniversalId cleanup and enhancements 2014-06-06 14:25:06 +02:00
scrawl
f3cece8dec Fix alchemy allowing same item ID in different slots (Fixes #1407) 2014-06-06 14:12:50 +02:00
Marc Zinnschlag
3e0c6ec732 some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have 2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb factored out command creation from table view into a separate class 2014-06-06 12:43:21 +02:00
scrawl
40d6c8abf7 Remove horizontal messagebox layout, not used in vanilla (Fixes #1402) 2014-06-06 02:24:51 +02:00
scrawl
d442853b3e Allow opposite gender's parts as fallback (Fixes #1404) 2014-06-06 01:30:23 +02:00
scrawl
c36decb855 Fix being able to place items on top of actors (Fixes #1403) 2014-06-06 00:43:24 +02:00
scrawl
3d103f3785 Don't block hits when in hand-to-hand combat (shield not visible) 2014-06-05 22:27:46 +02:00
scrawl
0063b63ae4 Don't use armor mitigation for fall damage 2014-06-05 22:23:57 +02:00
scrawl
6db936bb3a Refactor item icon code into ItemWidget (Fixes #1391) 
- Removed duplicate code
 - Fixed missing magic backgrounds during item drag&drop
 - Change background texture used for HUD icons
 2014-06-05 22:13:18 +02:00
scrawl
f53e86cad9 Fix AiCombat being incorrectly added to player (Fixes #1356) 2014-06-05 21:51:57 +02:00
scrawl
1173957e56 Fix item weight displaying as 1e+3 for Stendarr's Hammer 2014-06-05 18:15:48 +02:00
scrawl
17f8b49db6 Add missing padding for item tooltip magic effects 2014-06-05 17:51:15 +02:00
scrawl
d2e98c4de1 Fix forced switch to third person on death not always working 
For instance, when dying from fall damage
 2014-06-05 17:21:02 +02:00
scrawl
b6e52ae8ab Fix crash when loading a savegame after dying (Fixes #1389) 2014-06-05 17:01:22 +02:00
scrawl
4e235516c3 Work around missing character in french morrowind font (Bug #1390) 2014-06-05 16:16:16 +02:00
scrawl
85c9871178 Use question mark for not found glyphs in the font 2014-06-05 16:15:47 +02:00
scrawl
cefa20bfb9 Fix not reacting to quit request while video is playing 2014-06-05 15:52:02 +02:00
scrawl
c0f1449004 Cycle with equipped items if all slots are occupied (Fixes #1395) 2014-06-05 14:54:07 +02:00
Marc Zinnschlag
1b9b275f30 fix for bug #1369 2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe simplified feature management for record tables 2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770 Revert "added changed reference tracking for cells" 
This reverts commit f4334da42e.
 2014-06-04 21:12:23 +02:00
Marc Zinnschlag
5313862a46 Merge remote-tracking branch 'scrawl/master' 2014-06-04 15:14:29 +02:00
scrawl
00775035af Add missing hasItemHealth for lockpicks/probes (Fixes #1385) 2014-06-04 01:03:12 +02:00
scrawl
d7f3cd75ac Rewrite journal GUI topic list to use MWList 2014-06-03 16:04:18 +02:00
scrawl
17b15a6f4f Fix overlapping text in SpellWindow when the window is too small 2014-06-03 01:12:31 +02:00
scrawl
d777739425 Fix a crash on exit when projectiles were active 2014-06-03 00:44:32 +02:00
scrawl
bbc5b125ab Rewrite journal GUI quest index 
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
 - Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
 - Fixes a bug where the quest index would not be updated when opened.
 2014-06-03 00:28:33 +02:00
slothlife
281d3b4c95 Fix for dereferencing past end of mGuiModes. 2014-06-02 17:21:13 -05:00
scrawl
577ed3943b Show wallpaper when loading a savegame 2014-06-02 23:26:43 +02:00
scrawl
d2ad2e0f31 Re-enable collision when an actor is resurrected 2014-06-02 20:45:25 +02:00
scrawl
996e49c534 Change CharacterManager to use list instead of vector 
Solves a crash when deleting all savegames of a character due to mCurrent being invalidated
 2014-06-02 20:24:35 +02:00
scrawl
68afac6a19 Fix large size_t being truncated to int 2014-06-02 19:47:39 +02:00
Marc Zinnschlag
f130f8535c Merge remote-tracking branch 'slothlife/cmake-fixes' 2014-06-02 19:08:15 +02:00
scrawl
8b33c087e0 Properly handle exceptions when saving the game 
Add message boxes when an exception occurs while loading or saving the game
 2014-06-02 14:46:41 +02:00
Emanuel Guevel
929aae6869 Silence a clang warning 
warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]
 2014-06-02 10:30:44 +02:00
slothlife
20dabaead9 Fix CMake scripts to link static dependencies 
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.

Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
  libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.

Modified launcher, openmw, and opencs to link the static Ogre plugins.

Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.

Fixed FindMyGUI.cmake to correctly look for static variants.

Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
 2014-06-02 02:51:04 -05:00
scrawl
f6f6b5604a Fix loading a savegame when some of its content files were disabled 
Fixes #1380
 2014-06-01 23:11:38 +02:00
Marc Zinnschlag
538aa6607e Merge remote-tracking branch 'scrawl/master' 2014-06-01 10:25:53 +02:00
Fil Krynicki
bbb7ceab43 Merge branch 'master' into bug1196jumpdialog 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-05-31 19:58:21 -04:00
Fil Krynicki
cd131e7f86 1196/1217 fix 
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
 2014-05-31 19:51:21 -04:00
scrawl
dcc0e2d105 When dialogue goodbye is forced, allow using either the red link or the goodbye button 
Fixes #1373
 2014-06-01 00:21:55 +02:00
scrawl
0f1b39bca4 Fix trade exploit 
Using the Max Sale button it was possible to "invert" the buying/selling state.
 2014-05-31 18:28:00 +02:00
scrawl
865486604f Make trade disposition changes temporary again, as in vanilla 2014-05-31 13:57:07 +02:00
scrawl
a1bdf20958 Make trade balance label editable 2014-05-31 13:53:36 +02:00
scrawl
de7fcf0beb Fix unhandled edge case in TradeItemModel with items that are able to stack, but are not currently stacked (e.g. after repairing a damaged item) 
Fixes #1368
 2014-05-31 13:45:47 +02:00
scrawl
16ac6e7aac Merge DialInfo objects by subrecord instead of overwriting the object 
Fixes #1360
 2014-05-31 13:01:11 +02:00
Rohit Nirmal
4f4a37896e Check if player's CellStore is non-NULL before configuring fog. 
This prevents an assertion fail in getCell() when changing the
view distance while in the main menu.
 2014-05-30 22:37:13 -05:00
Fil Krynicki
6cc6172779 Update in response to comments. 
It turns out I was erroneous about problem (1) in my original commit
message. I thought that in an edge case the OpenMWGUI could both handle
the same event on the frame the GUI was closed. My test for
this was broken. So after brainstorming many possible unsatisfactory
solutions to this event handling, it's luckily not necessary!
 2014-05-30 15:12:57 -04:00
scrawl
8761aa5795 Loop main menu video when it's finished playing 2014-05-30 14:28:04 +02:00
scrawl
ac77b07e29 Small fix for menu background 2014-05-30 14:28:04 +02:00
Marc Zinnschlag
f5e587f566 Merge remote-tracking branch 'puppykevin/master' 2014-05-30 11:42:19 +02:00
Marc Zinnschlag
be7f344eca Merge branch 'refs' 
Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp
 2014-05-30 10:38:38 +02:00
Marc Zinnschlag
4778c27548 silenced two warnings 2014-05-30 10:18:05 +02:00
Marc Zinnschlag
be88168e91 Merge remote-tracking branch 'scrawl/master' 2014-05-30 10:07:18 +02:00
scrawl
b81c7d05c6 Remove CG shaders from settings window (not fully supported on non-nvidia cards, amd profiles have an instruction limit making them useless) 
Can still be used by editing the config file, however.
 2014-05-29 23:16:36 +02:00
Marc Zinnschlag
2f56b11530 Merge remote-tracking branch 'digmaster/master' 2014-05-29 18:57:16 +02:00
scrawl
6a882e1e8d Don't show hidden factions in StatsWindow (e.g. Nerevarine) 2014-05-29 18:09:04 +02:00
Marc Zinnschlag
ae50632774 implemented cell and reference saving int OpenCS 2014-05-29 18:08:40 +02:00
scrawl
3b3b53d665 Support animated main menus (menu_background.bik) 
Closes #1362
 2014-05-29 17:24:25 +02:00
scrawl
a6788cfb0e Support lights that do not have a model (Fixes #1361) 2014-05-29 16:44:50 +02:00
scrawl
95b3026c7e Fix cells being listed twice in console autocompletion when using --skip-menu=0 and loading a game 2014-05-29 16:34:05 +02:00
Digmaster
03d7137655 Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button 2014-05-29 06:19:25 -04:00
Digmaster
a5cfa8a049 Removes add behavior when pressing escape while waiting. 2014-05-29 01:52:41 -04:00
scrawl
c6a4506ac2 Make console error prefix slightly less technical (see https://bugs.openmw.org/issues/1194#note-2) 2014-05-28 22:35:36 +02:00
Kevin Poitra
8516b837ff Revert "Started implementing sound time tracking so we can have NPCs' mouths move as they talk." 
This reverts commit b897080156.
 2014-05-28 15:04:35 -05:00
scrawl
41a04b9c65 Slightly adjust menu button position 2014-05-28 21:50:08 +02:00
scrawl
e9ab7c85c6 Fix exception when there are spaces in INI-imported color settings 2014-05-28 21:29:09 +02:00
Kevin Poitra
3f00f00426 Remove some debug code. 2014-05-28 14:20:04 -05:00
scrawl
18e24a2007 Fix old savegames causing the save list to not fill properly (Error in framelistener: Object '$dynamic0' not found) 
Fixes #1357
 2014-05-28 21:08:20 +02:00
Kevin Poitra
16a6edbd0e Fix a possible crash due to a null pointer. 2014-05-28 12:58:45 -05:00
Marc Zinnschlag
f112c78858 Merge remote-tracking branch 'scrawl/master' 2014-05-28 19:47:36 +02:00
Kevin Poitra
251df73407 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-05-28 12:29:40 -05:00
Kevin Poitra
b897080156 Started implementing sound time tracking so we can have NPCs' mouths move as they talk. 2014-05-28 12:26:35 -05:00
scrawl
e68600eda2 Make Activate instruction work properly even when onActivate was not called in the same frame. 
There are two major differences to the old implementation:
 - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
 - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.

Fixes #1166 and #1346.
 2014-05-28 19:23:50 +02:00
scrawl
42ea43c3d1 Fix container scripts not getting removed properly on cell change 
Broken by f99eda1a54
 2014-05-28 18:45:07 +02:00
Marc Zinnschlag
bb011f278e Merge remote-tracking branch 'cc9cii/master' 2014-05-28 14:45:57 +02:00
scrawl
56ff399f30 Say attack voiced dialogue *after* the target is set up 
Required for the CreatureTargetted filter to function properly
 2014-05-28 13:59:31 +02:00
cc9cii
bbe77d656a Minor fixes from static analysis. 2014-05-28 21:15:50 +10:00
Arthur Moore
9be219beba Fixes Bug #1348 "Evidence Chest unlocking when arrested." 2014-05-27 22:09:37 -04:00
Marc Zinnschlag
be39395ce7 Merge remote-tracking branch 'scrawl/master' 2014-05-27 21:09:24 +02:00
Digmaster
033f1850f9 Fixed crass on character creation, allowed some character creation windows to be Esc-able 2014-05-27 14:30:26 -04:00
Digmaster
060a50f94a Fixed issue with QuickKeyMenu and ItemSelectionDialog 2014-05-27 13:50:24 -04:00
Fil Krynicki
91f4967614 Fix for bug 1196. 
This bug would cause the player to jump when jump was assigned to
Space and they closed a dialog with Space. I tested vanilla
MW for behaviour and found that Jump was the only basic input which
MW does not allow when closing dialogs (i.e. if Space is assigned to
move forward, MW will move you forward after closing the dialog).

There were two reasons for the bug:
1) OpenMW GUI does not consume UI events
2) Jump occurs so long as key is down (not only on first key down)

To minimally fix the bug, I made it so that keypress events can be
consumed by the GUI and not passed along to the player control
input manager (1). However, if the player holds space, they will still
jump (as the subsequent key held events will be captured and cause
a jump).

Unfortunately, there is no idiomatic way that I could find in the
OpenMW input manager to perform events only on key down. Instead,
I introduced a variable which tracks whether the jump key has been
pressed for the first time within the current frame (2).

Note: I was initially concerned that limiting the jump event to
KeyDown and not Key Hold would cause issues with swimming,
levitating, or variable height jumping. However, after a bunch
of testing in vanilla MW and exploration of the OpenMW codebase
I could find nothing suggesting the need to capture the jump
key being held.
 2014-05-27 13:12:27 -04:00
scrawl
0b45a9e6b2 Fix case folding for faction reaction from ESX records 2014-05-27 19:02:48 +02:00
scrawl
2b15b85af1 Fix position adjustment not working properly for rotated objects 2014-05-27 17:58:18 +02:00
scrawl
2fe86f2b85 Consider hit normal for item drop test (Fixes #995) 2014-05-27 17:39:04 +02:00
scrawl
f476aa4ade Remove MyGUI color codes when copying to system clipboard 2014-05-27 17:07:14 +02:00
scrawl
49a6579d3a Fixed esmtool 2014-05-27 15:37:04 +02:00
scrawl
3e2eed9269 Implement getFactionReaction function 
Strange bug when using value != 0 for the garbage argument?
 2014-05-27 15:23:22 +02:00
scrawl
e266c39c5d Implement modFactionReaction instruction (Closes #1347) 2014-05-27 14:54:29 +02:00
Marc Zinnschlag
27c795483b Merge remote-tracking branch 'ace/win-build-fix' 2014-05-27 14:32:20 +02:00
scrawl
578adb4ef6 PcJoinFaction and friends: make sure the given faction exists 2014-05-27 13:54:25 +02:00
Alexander "Ace" Olofsson
d3357cc279 The MSVC linker is really pedantic with this. 
Functions compiled as taking a class can't be linked with functions giving a struct, because of the name mangling I'm guessing...

unresolved external symbol "protected: void __thiscall MWWorld::LiveCellRefBase::loadImp(class ESM::ObjectState const &)" (?loadImp@LiveCellRefBase@MWWorld@@IAEXABVObjectState@ESM@@@Z)
 2014-05-27 13:27:18 +02:00
Marc Zinnschlag
1665822224 Merge remote-tracking branch 'puppykevin/master' 2014-05-27 12:42:48 +02:00
Marc Zinnschlag
e0ba9a4bf2 added reference collection stage to saving operation (preparation for cell saving) 2014-05-27 12:39:26 +02:00
Digmaster
2b3b11d848 Give access to the main menu when at a choice in dialogue 2014-05-27 05:33:25 -04:00
Digmaster
ee7b5fa5c2 Fixed crash when Esc-ing out of Save "are you sure" dialog. 2014-05-27 04:38:13 -04:00
Digmaster
e0356cf89d Added support to close modal windows with Esc 2014-05-27 03:00:31 -04:00
Kevin Poitra
beba58268c Fix a typo within the launcher. Fixes bug #1058. 2014-05-27 01:47:57 -05:00
Marc Zinnschlag
9e21da9636 Merge remote-tracking branch 'scrawl/master' 2014-05-27 08:34:54 +02:00
Digmaster
e0d55116a4 Dims and disabled Goodbye button in dialogs when unavailable. 2014-05-27 00:30:37 -04:00
Digmaster
79d0ed64d9 Undo some changes I made in the past that shouldn't exist 2014-05-26 23:31:40 -04:00
Digmaster
1ca921d6e2 Merge remote-tracking branch 'upstream/master' 2014-05-26 23:26:23 -04:00
Digmaster
e3e51324a4 Esc button exits all non-modal GUI windows 2014-05-26 23:13:37 -04:00
scrawl
cf68f6da96 Fix ESX dependencies not being checked except for the first one 2014-05-27 00:06:34 +02:00
scrawl
4caa8c5cca Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations) 2014-05-26 20:52:38 +02:00
scrawl
5660f283dd Fix actor models incorrectly being rotated on X/Y axes 2014-05-26 20:52:38 +02:00
scrawl
0966755a0c Store death animation index in CreatureStats 2014-05-26 20:52:32 +02:00
Marc Zinnschlag
3937cfcd8b Merge remote-tracking branch 'scrawl/master' 2014-05-26 19:02:13 +02:00
scrawl
3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 2014-05-26 17:34:36 +02:00
scrawl
f629307f60 Fix frame delay for sound listener position (Fixes #1180) 2014-05-26 16:43:19 +02:00
scrawl
bfd91c0681 Fix potential NpcStats overwriting issue 2014-05-26 12:31:08 +02:00
Marc Zinnschlag
4aab4bae65 minor cleanup and silenced a warning 2014-05-26 10:14:24 +02:00
Marc Zinnschlag
f0d0a31a19 Merge remote-tracking branch 'mrcheko/master' 2014-05-26 10:08:40 +02:00
Thomas
7697b9e868 Ensures nothing bad will happen if we try to lock a door that never had a lock level 2014-05-26 01:48:24 -04:00
Thomas
b3ffd5b868 Fix for bug Bug #1098 2014-05-26 01:42:11 -04:00
mrcheko
8fa7fcdbee fix bug http://bugs.openmw.org/issues/1335 (1304 as well) 
though fish detects if actor is swimming, but in MW it attacks even if
the player is knee-deep in water
 2014-05-25 21:03:37 +04:00
scrawl
10d835a55c Some more missing isInCell checks 2014-05-25 15:07:35 +02:00
scrawl
f3ba31de2d Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwscript/cellextensions.cpp
 2014-05-25 14:58:47 +02:00
scrawl
039398c8ae Basic RefData and CellRef change tracking 
Wrapped item charge handling in getItemHealth function
 2014-05-25 14:30:07 +02:00
Marc Zinnschlag
130af28fa5 Merge remote-tracking branch 'cc9cii/master' 
Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2014-05-25 12:07:09 +02:00
Marc Zinnschlag
ff15601a4c Merge branch 'openmw-30' 2014-05-25 11:55:25 +02:00
mrcheko
c62187bd55 fix bug at http://bugs.openmw.org/issues/1155 
Though it still can happen sometimes but not in such stupid manner.
 2014-05-25 13:31:46 +04:00
cc9cii
d2794165ba Disable binkaudio sound for FFmpeg libavocdec versions below 54.55.xxx (Windows x64) and 54.10.xxx (Windows 32bit). Later versions are all allowed, but due to sample formats there will be no sound and this message will be shown on the console "Sound Error: Unsupported sample format: fltp" 2014-05-25 18:56:50 +10:00
mrcheko
559c772906 Merge remote-tracking branch 'upstream/master' 2014-05-25 10:21:54 +04:00
cc9cii
4f94a31b54 Fix crash starting a new game. 2014-05-25 07:50:19 +10:00
mrcheko
56881cb7c9 fix bugs in aisequence::execute 2014-05-24 23:05:30 +04:00
scrawl
a05c8fd3ce Make applyEnchantment return the record ID instead of modifying Ptr 2014-05-24 14:58:48 +02:00
scrawl
1d8da95756 Warning fix 2014-05-24 14:47:51 +02:00
scrawl
08cf58204f Merge branch 'master' of github.com:scrawl/openmw 2014-05-23 16:45:28 +02:00
scrawl
f09c8ddc9e Remove a pointless assert 2014-05-23 16:44:51 +02:00
scrawl
a7d525245c Fix missing include 2014-05-23 16:07:02 +02:00
Scott Howard
c9011f707f missing #include <iostream> in mwiniimporter 
missing #include <iostream> in mwiniimporter/main.cpp
 2014-05-23 08:41:49 -04:00
cc9cii
367acd9676 Enable video but without sound. 2014-05-23 21:55:47 +10:00
cc9cii
3718847ffc Disable video for Windows until the crash issues are fixed. 2014-05-23 21:07:01 +10:00
Marc Zinnschlag
f4334da42e added changed reference tracking for cells 2014-05-23 09:32:34 +02:00
scrawl
b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
 2014-05-23 08:39:48 +02:00
Marc Zinnschlag
6ac700a501 Merge remote-tracking branch 'potatoesmaster/getClass' 2014-05-23 08:00:52 +02:00
Marc Zinnschlag
244eb11651 Merge remote-tracking branch 'greye/widechar' 2014-05-23 07:48:26 +02:00
scrawl
a2f156be8e Prevent magic bolts from colliding with their caster 2014-05-22 23:34:32 +02:00
scrawl
df8e095c83 Small cleanup 2014-05-22 23:27:54 +02:00
Emanuel Guevel
1e4a854433 Remove static method MWWorld::Class::get(&Ptr) 
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
 2014-05-22 20:50:00 +02:00
Emanuel Guevel
20cfdd4b43 Move LiveCellRefBase ctor where it belongs to 2014-05-22 20:50:00 +02:00
scrawl
cba50c7338 Optimize ManualRef: look up correct Store instead of searching 2014-05-22 15:46:35 +02:00
scrawl
4b5f02f644 Remove useless throwing of exception 2014-05-22 15:29:36 +02:00
greye
663d5c314e be more verbose on change reasons 2014-05-22 16:35:57 +04:00
greye
8f9091550e require boost::locale only on Windows 2014-05-22 15:42:47 +04:00
scrawl
3380e1e1c5 Fix ShouldAttack filter 
This makes NPCs exit dialogue properly when they should attack as a result of taunting actions.
 2014-05-22 12:20:25 +02:00
scrawl
c6c254d279 Do not trigger levelup if rest was interrupted 2014-05-22 11:08:36 +02:00
scrawl
18bba6bcec Fix layout glitch when autosaving 2014-05-22 11:03:45 +02:00
greye
cb598f0455 the same for data-local entry 2014-05-22 01:13:27 +04:00
greye
28b59f4008 process paths as UTF-8 in launcher 2014-05-22 01:08:03 +04:00
scrawl
cf07d2ab93 Fix swapped position of Save and Load menu buttons 2014-05-21 16:38:50 +02:00
scrawl
f812746010 Auto-select first save in load dialog 2014-05-21 16:36:55 +02:00
scrawl
3a7e2f8bb5 Allow invoking Journal instruction with non-existing index 
This is used by the MG_EscortScholar1 quest.
 2014-05-21 14:18:14 +02:00
greye
8b94e31062 try to set relative path to resources 2014-05-21 15:39:58 +04:00
scrawl
2f6d400c62 Merge branch 'master' of https://github.com/OpenMW/openmw into newgame 2014-05-21 10:41:03 +02:00
scrawl
b39b572c5a Moved mStartupScript to World, so that it is executed for a New game 2014-05-21 09:25:45 +02:00
scrawl
9fe505c8fa Only run --script-run commands when bypassing the menu 
Running them while no game is started yet is dangerous, and also leaves bits and pieces of state (e.g. in LocalScripts for scripted items added to inventory) that will not get cleaned up properly when a game is loaded (since when no game was previously running, no cleanup is performed). As a result, dangling MWWorld::Ptrs were left in LocalScripts.
 2014-05-20 18:35:17 +02:00
scrawl
abd6b6ab33 Fix not returning to main menu on failed loads when using quickload 2014-05-20 17:11:26 +02:00
scrawl
7ab98f0c6f Clear choices when dialogue starts 
This is usually not needed, because it is not possible to exit dialogue while in a choice. However you can still exit dialogue by loading a different savegame.
 2014-05-20 16:57:38 +02:00
greye
b728a919a2 write dependency on boost::locale to CMake files 2014-05-20 12:59:58 +04:00
scrawl
220ab86eca Simplify new game movie player 2014-05-20 10:07:08 +02:00
Marc Zinnschlag
e0b6bf6aeb implemented reference record deleting 2014-05-20 09:28:18 +02:00
Marc Zinnschlag
d8440e1fdc implemented reference record merging 2014-05-20 09:02:22 +02:00
greye
9dbe3f21d9 keep non-const signature for argv after conversion 2014-05-20 10:42:21 +04:00
greye
130349e0cd open files in binary mode when necessary 2014-05-20 08:14:29 +04:00
Marc Zinnschlag
58afa58549 Merge remote-tracking branch 'mrcheko/master' 2014-05-19 22:07:32 +02:00
mrcheko
638df221a6 memory leak fix 2014-05-19 23:29:35 +04:00
greye
20527e0bd4 use boost::filesystem instead of boost::iostreams 2014-05-19 16:56:41 +04:00
scrawl
6bd0bbb8df Do not load (0,0) on new game 2014-05-19 14:09:16 +02:00
greye
db16bb8983 fix OpenCS saving to Unicode path destination 2014-05-19 15:52:19 +04:00
greye
9c6224c74d fix saving to Unicode path destination 2014-05-19 15:43:25 +04:00
scrawl
6f03694d50 Fixes #1334: Only unequip item if the sell/drag action is actually successful 2014-05-19 08:03:55 +02:00
Marc Zinnschlag
7c149e98e0 Merge branch 'openmw-30' 2014-05-18 22:38:52 +02:00
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 when using --skip-menu=0.
 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