David Cernat
07acd7a721
Make player markers work in interiors and make them easier to test
2016-10-09 10:29:30 +03:00
scrawl
1893617ec9
Improvements to ignored light list setting
...
The pointer to the LightListCallback is now stored in the Animation, which eliminates the need for dynamic_cast. Also, when the object root is recreated, the previously used LightListCallback will be reused, so we no longer need the objectRootReset() notifier.
Finally, there was a bug when saving and reloading the game, the getIgnoredLightSources() were not being set, as the ActorAnimation constructor completes before the NpcAnimation sets the ObjectRoot. This was solved by creating the LightListCallback in advance in the Animation constructor.
2016-10-08 23:59:28 +02:00
MiroslavR
11565b5966
Make actors with non-portable lights in inventory glow ( Closes #2042 , #3338 )
2016-10-08 23:17:12 +02:00
scrawl
5c94e2324f
Add missing use plugin macro for static build
2016-10-08 19:20:44 +02:00
scrawl
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
2016-10-08 19:20:24 +02:00
scrawl
b0d4c8740c
Merge pull request #1098 from nikolaykasyanov/osx-missing-plugins
...
[OS X] Add missing plugins to packaging script
2016-10-08 19:11:03 +02:00
Nikolay Kasyanov
4815938de2
[OS X] Add missing plugins to packaging script
...
Source: https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OSG_plugins
Issue: https://bugs.openmw.org/issues/3585
2016-10-08 17:07:06 +02:00
scrawl
6615330430
Fix use of UnrefQueue in removeObject
2016-10-08 16:41:17 +02:00
scrawl
3019d70986
Use 'default icon' for items with no icon specified
2016-10-08 16:05:20 +02:00
scrawl
48f299532c
Merge pull request #1096 from Allofich/magic
...
Don't let Weakness to Magicka affect paralysis
2016-10-08 14:50:07 +02:00
Allofich
f6f16b68de
Don't let Weakness to Magicka affect paralysis
2016-10-08 17:56:12 +09:00
Koncord
bd1b1fca64
Woops
2016-10-08 15:36:25 +08:00
Koncord
50d989d767
Fix server crash if player is not fully connected
2016-10-08 15:30:52 +08:00
Koncord
79532cf797
Detecting reason of death
2016-10-08 15:15:43 +08:00
Koncord
2e81034e53
Started work on the map markers
2016-10-07 13:17:44 +08:00
scrawl
37bfa88b2d
Merge pull request #1094 from Allofich/alchemy
...
Fix reversed use of alembics and retorts
2016-10-06 19:02:24 +02:00
Allofich
498976775a
Fix reversed use of alembics and retorts
2016-10-07 01:38:50 +09:00
scrawl
73b6c34a23
Merge pull request #1092 from Allofich/warnings
...
Fix shadowing warnings
2016-10-06 17:50:26 +02:00
scrawl
0c981b6fe5
Fix typo in script opcode ( Fixes #3583 )
2016-10-06 17:36:50 +02:00
Allofich
53e94b7c3f
Fix shadowing warnings
2016-10-06 23:33:52 +09:00
David Cernat
6eae017561
Merge pull request #74 from OpenMW/master
...
Add OpenMW commits up to 5 Oct
2016-10-06 06:16:09 +03:00
scrawl
97cd8c21e4
Merge pull request #1091 from Allofich/coverity
...
Coverity fixes
2016-10-05 18:00:18 +02:00
Allofich
df03b32205
Coverity fixes
2016-10-05 23:32:26 +09:00
scrawl
721062a4bd
Merge pull request #1089 from Allofich/bound
...
Corrections for bound equipment
2016-10-04 18:34:27 +02:00
Allofich
506d0e8e54
Correction to display of 0-weight tooltips
2016-10-04 23:02:45 +09:00
Allofich
160da0b149
Treat 0-weight armor as light armor in some respects
2016-10-04 23:02:25 +09:00
scrawl
17455821f6
Merge pull request #1088 from MiroslavR/movement-loopfallback
...
Use loop fallback for movement animations
2016-10-03 23:17:12 +02:00
MiroslavR
a05649e1d5
Use loop fallback for movement animations ( Fixes #3578 )
2016-10-03 22:36:56 +02:00
scrawl
e883528a60
Merge pull request #1087 from sandstranger/gles1_crash_fix
...
disable using shaders for gles1 and Android
2016-10-03 21:18:19 +02:00
sandstranger
5230bf6528
disable using shaders for gles1 and Android
2016-10-03 20:31:08 +04:00
scrawl
44dffe55ab
Merge pull request #1083 from Allofich/onhit
...
Make AI response to spell hits more like original MW
2016-10-02 14:06:51 +02:00
scrawl
3d76ba5a7c
Merge pull request #1086 from Allofich/warnings
...
Fix shadowing warnings
2016-10-02 14:03:02 +02:00
Allofich
6ec37b5cfb
Fix shadowing warnings
2016-10-02 17:48:54 +09:00
Allofich
e78f02aaf2
Consider reflected/absorbed hostile spells as assaults
2016-10-02 16:08:24 +09:00
scrawl
933a601e00
Merge pull request #1085 from MiroslavR/interactive-id
...
Fix interactive ID validity checks
2016-10-01 21:25:04 +02:00
MiroslavR
210c02d98e
Fix interactive ID validity checks in TypesetBookImpl
2016-10-01 21:07:17 +02:00
Allofich
a81a04e6d0
Remove unused line
2016-10-02 01:11:01 +09:00
Allofich
fa17784722
Change breaks to continues
2016-10-02 00:54:01 +09:00
scrawl
140be70a90
Merge pull request #1082 from Gladdy/master
...
Fix for segmentation fault on entering a cell
2016-10-01 16:42:47 +02:00
scrawl
b170efb9fa
Merge pull request #1084 from Allofich/water
...
Don't let water-only creatures prevent resting
2016-10-01 16:14:19 +02:00
Allofich
a2e174a40f
Don't let water-only creatures prevent resting
2016-10-01 22:15:31 +09:00
Allofich
266ec1aadc
Make AI response to spell hits more like original MW
2016-10-01 21:38:17 +09:00
Koncord
fa0a55c2a9
Fix use of freed memory
2016-10-01 10:54:42 +08:00
David Cernat
f276edddcc
Set version to 0.2.0
2016-09-30 15:26:55 +03:00
Koncord
94d5efdfd3
Call LOG_QUIT after Networking's dtor call
2016-09-30 18:16:09 +08:00
David Cernat
add1a5e5b2
Merge pull request #72 from OpenMW/master
...
Add OpenMW commits up to 30 Sep
2016-09-30 12:37:29 +03:00
David Cernat
e0361835b0
Allow script-induced setting of equipment
2016-09-30 12:36:20 +03:00
David Cernat
4b96080521
Make GetItemSlot work and add SendEquipment in server item functions
2016-09-30 12:30:05 +03:00
Marc Zinnschlag
e918474a94
Merge remote-tracking branch 'rcutmore/bug-3277'
2016-09-30 09:37:45 +02:00
David Cernat
728a09e423
Reorder functions in LocalPlayer and make their names more consistent
2016-09-30 08:59:58 +03:00