Commit graph

10741 commits

Author SHA1 Message Date
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
Marek Kochanowicz
b63f2f4cd5 Actually using new nestedmodel 2014-06-18 16:56:37 +02:00
scrawl
1dc9e151cb Count werewolf kills (Fixes #1525) 2014-06-18 16:56:36 +02:00
Marek Kochanowicz
1fb18873cb adding proxy model that is ment to be used by the dialoguesubview 2014-06-18 15:35:31 +02:00
Marek Kochanowicz
75b5513c6c Column is responsible for telling that it can nest columns now. 2014-06-18 11:58:18 +02:00
Marek Kochanowicz
ce5e889015 Nested table sits inside it's own layout now. 2014-06-17 20:12:14 +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
Marek Kochanowicz
5bee682bb3 modified: ../../view/world/dialoguesubview.cpp 2014-06-17 14:58:25 +02:00
scrawl
cb6f1d3a52 Fix wait dialog arrow button step (Fixes #1524) 2014-06-17 14:58:11 +02:00
Marek Kochanowicz
03980034a5 Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw
into NonTableFields

I have no idea what I'm doing

Conflicts:
	apps/opencs/model/world/idtable.cpp
	apps/opencs/model/world/refidadapter.hpp
	apps/opencs/model/world/refidadapterimp.hpp
2014-06-17 14:21:50 +02:00
Marek Kochanowicz
defd0b1754 Merge branch 'dialog-fix' into NonTableFields
TODO stop failing epicly with git
2014-06-17 14:08:59 +02:00
Marc Zinnschlag
2683aa9503 Merge remote-tracking branch 'filkry/bug640_luminescent_water' 2014-06-17 13:08:06 +02:00
Marek Kochanowicz
187fccc8cc Merge branch 'dialog-fix' into NonTableFields 2014-06-17 12:58:14 +02:00
Marek Kochanowicz
32fcc9ad61 Trying to merge. 2014-06-17 11:14:12 +02:00
Marc Zinnschlag
073cc3f02c fixed base flag in content file loader code 2014-06-17 11:01:17 +02:00
Marek Kochanowicz
bbe7854968 Corrected formatting to follow our standard better. 2014-06-17 10:46:54 +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
ec66484472 Fix forceGreeting with explicit references (Fixes #1518) 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
Marek Kochanowicz
d6288a8055 Remove unneded revert and delete slots 2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a refactoring dialogue subview 2014-06-16 11:31:57 +02:00
Marek Kochanowicz
7eb82f74ae Fixed complitaion. 2014-06-16 10:22:14 +02:00
Marek Kochanowicz
48691136fb Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix 2014-06-16 09:44:49 +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
5f5c0c5bff Remove an unused setting 2014-06-16 03:29:02 +02:00
scrawl
1b610cdbd0 Allow following NPCs to fast-travel (Fixes #1501) 2014-06-16 03:17:31 +02:00
scrawl
468db7a9c4 Remove terrain limit warning text that no longer applies 2014-06-16 03:16:50 +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