Marc Zinnschlag
4791098e11
Merge remote-tracking branch 'miroslavr/master'
2014-07-28 10:06:22 +02:00
Marc Zinnschlag
7991dfb907
Merge remote-tracking branch 'scrawl/master'
2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7
Merge branch 'scripts'
2014-07-28 09:02:24 +02:00
scrawl
c6d3b0b70b
Moved merchant restock from trade start to dialogue start, since other services also interact with it.
2014-07-28 02:27:48 +02:00
scrawl
315b022d2d
Add transfer gold from all services to NPC trade gold pool
2014-07-28 00:55:57 +02:00
scrawl
45206bc3f6
Savegame: write and read dynamic Store before Cells
2014-07-28 00:32:59 +02:00
MiroslavR
b4ba18afe7
Include revision number in the "version" command line option ( Closes #1711 )
2014-07-27 23:36:40 +02:00
scrawl
6262d6c964
Don't leave stale player CharacterController in Actors when loading game ( Fixes #1713 )
2014-07-27 23:10:58 +02:00
scrawl
d81e9cfefd
Implement actors fighting for the actor they are following ( Fixes #1141 )
2014-07-27 20:33:45 +02:00
scrawl
47e42d4fda
Destroy Engine after exception is logged
...
In cases where OpenMW throws an exception, then crashes in the Engine destructor (ideally should not happen, but keeps happening), we will at least see what the exception was about.
2014-07-27 20:33:45 +02:00
scrawl
8c81e22f3e
Determine target for On Touch effects for non-player actors
2014-07-27 20:33:44 +02:00
scrawl
31d058b98c
Add workaround for ScrollView messing up canvas size ( Fixes #1700 )
...
TODO: Create fixed ScrollView widget?
2014-07-27 20:33:44 +02:00
scrawl
16b089cdc8
Fix invisible enchanting price when self-enchanting was previously used.
2014-07-27 20:33:44 +02:00
scrawl
9c60e4d826
Change button caption from "Buy" to "Create" when self-enchanting
2014-07-27 20:33:44 +02:00
scrawl
09607f992e
Enchanting: fix inverted self-enchant success chance ( Fixes #1701 )
2014-07-27 20:33:44 +02:00
scrawl
b370c0f7b5
Enchanting: Don't check price on self-enchanting (Bug #1701 )
2014-07-27 20:33:43 +02:00
scrawl
4a1e561015
Properly assign effect attribute/skill in potion creation ( Fixes #1704 )
2014-07-27 20:33:02 +02:00
scrawl
90b2709d6c
Allow absorption of non-harmful spells ( Fixes #1693 )
...
Also fix absorption being calculated for each effect rather than the whole spell.
2014-07-25 19:56:06 +02:00
scrawl
60499eff83
Hotfix for message boxes locking up the game
2014-07-25 19:48:37 +02:00
Marc Zinnschlag
af54bb9623
removed some redundancies; some more general cleanup
2014-07-25 12:23:18 +02:00
Marc Zinnschlag
d0654f3ade
move starting of startup scripts from engine startup to new game start; also restart all startup scripts on saved game load
2014-07-25 12:17:15 +02:00
Marc Zinnschlag
1ca0cc4988
rewrote MWScript::Locals::configure to be independent of precompiled script data
2014-07-25 09:37:21 +02:00
Marc Zinnschlag
a3c4000198
moved call to Globalscripts::addStartup out of the constructor because at the time of construction the environment may not be set up yet to perform this operation
2014-07-25 09:36:02 +02:00
Marc Zinnschlag
87c54adb24
some cleanup
2014-07-25 09:26:30 +02:00
Marc Zinnschlag
f6b502b195
rewrote dialgoue filter access to local variables
2014-07-25 09:08:59 +02:00
Marc Zinnschlag
9f69db0d69
added missing const to ScriptManager::getLocals
2014-07-25 08:12:53 +02:00
Marc Zinnschlag
2e355df8b3
removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts)
2014-07-25 07:59:50 +02:00
scrawl
4ec51b386a
Add ManualResourceLoader for fog of war textures ( Fixes #1675 )
2014-07-24 19:00:57 +02:00
scrawl
4b3e12bfb4
Fix pinned widgets receiving mouse clicks in gamemode ( Fixes #1686 )
2014-07-24 18:04:44 +02:00
scrawl
469d2afffa
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwgui/levelupdialog.cpp
2014-07-24 02:33:46 +02:00
scrawl
d4ff17f1c5
Remove unused FLTV and NAM0 from CellRef
2014-07-24 02:20:16 +02:00
scrawl
7ae9bbb1a5
Implement iCrimeThresholdMultiplier
2014-07-24 02:17:44 +02:00
scrawl
fc618cb3ea
Use separate function for fatigue restoration during resting/waiting
2014-07-24 02:17:44 +02:00
scrawl
103325bfb8
Change HUD enemy health bar to use actorId
2014-07-24 02:17:44 +02:00
scrawl
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
2014-07-24 02:17:38 +02:00
scrawl
ca45a63cf7
Close doors instantly when using Lock instruction
2014-07-22 17:55:54 +02:00
scrawl
2b57c7fa67
Use CellRef's global variable to disable owner ( Fixes #1677 )
2014-07-22 17:06:40 +02:00
Marc Zinnschlag
91afc2ebe7
Merge remote-tracking branch 'mikesc/bug1482'
2014-07-22 08:13:35 +02:00
Marc Zinnschlag
6b5f79a9ca
Merge remote-tracking branch 'miroslavr/master'
2014-07-22 08:11:11 +02:00
Marc Zinnschlag
ccf672630f
Merge remote-tracking branch 'lgro/aicombat'
2014-07-22 08:06:24 +02:00
Michał Ściubidło
e24173f94a
Fix bug 1482:
...
- put powers on cooldown only when they are used succedsfully
2014-07-21 23:56:38 +01:00
Lukasz Gromanowski
171c61022d
Added initialization of weapRange in AiCombat::execute().
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-07-21 21:17:12 +02:00
MiroslavR
3b67e9b329
Rework level up dialog to behave more like vanilla
2014-07-21 20:56:02 +02:00
scrawl
c0645d4978
Increase death count immediately on death (Bug #1588 )
...
This is required for scripts using getDeadCount as reaction to onDeath that rely on the increased value.
2014-07-21 20:37:14 +02:00
scrawl
d43c21a9fc
Make NPCs react to being attacked by other actors ( Fixes #1588 )
2014-07-21 20:36:26 +02:00
scrawl
127add7623
Don't allow dialogue with werewolf NPCs
2014-07-21 18:19:45 +02:00
Marc Zinnschlag
d87630b41a
blacklisting for scripts in OpenMW
2014-07-21 09:34:10 +02:00
scrawl
10d4da7994
Fix date time in journal entries being off by one day ( Fixes #1668 )
2014-07-21 01:17:01 +02:00
scrawl
5629803a08
Implement correct armor mitigation mechanics
2014-07-20 23:45:31 +02:00
scrawl
804f1a5e59
Adjust combat mechanics
...
- Projectiles can not trigger critical hits
- Critical hits are only possible if the target is not in combat (Fixes #1669 )
- Hand-to-hand deals damage to health during entire duration of knockdown animation (including standing up)
2014-07-20 23:17:55 +02:00
