scrawl
ae2036fa85
Merge pull request #1097 from Allofich/persuasion
...
Don't let intimidate bring disposition below 0 (Fixes #3584 )
2016-10-09 20:20:43 +02:00
Allofich
028db21c8a
Don't let disposition at end of dialogue be below 0 ( Fixes #3584 )
2016-10-10 02:20:24 +09: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
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
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
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
Allofich
53e94b7c3f
Fix shadowing warnings
2016-10-06 23:33:52 +09: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
MiroslavR
a05649e1d5
Use loop fallback for movement animations ( Fixes #3578 )
2016-10-03 22:36:56 +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
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
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
Martijn Bakker
45ffdbb284
fixed a segmentation fault when entering a cell which contains someone already attacking you
2016-09-30 00:40:13 +01:00
scrawl
85c7d014d3
Use a shader to render the simple water, ensuring that fog is applied per pixel ( Fixes #2716 )
2016-09-28 21:10:44 +02:00
scrawl
4791fadb9a
Merge pull request #1078 from MiroslavR/hidden-items
...
Do not show uncarriable lights in item views
2016-09-24 23:27:23 +02:00
scrawl
dc07885d25
Merge pull request #1069 from Allofich/combat
...
Add unarmed attack selection to chooseBestAttack()
2016-09-24 18:38:10 +02:00
MiroslavR
52e00f5fef
Do not show uncarriable lights in item views
2016-09-24 18:01:31 +02:00
Allofich
0582f2d918
Adjust touch spell/telekinesis interaction
2016-09-23 21:44:49 +09:00
Allofich
0c603e986d
Don't play touch spell explosions on non-activatable statics
2016-09-23 03:25:24 +09:00
Allofich
eecf412b85
Recreate vanilla-like behavior for telekinesis and touch spells
2016-09-23 01:16:03 +09:00
Allofich
04c13ffab3
Add unarmed attack selection to chooseBestAttack()
2016-09-22 00:45:54 +09:00
scrawl
8379291f70
Merge pull request #1072 from Allofich/range
...
Give "on touch" spells same range as vanilla MW
2016-09-21 17:39:44 +02:00
Allofich
37cc4e9efe
Don't play area vfx for 0-area touch spells that hit non-actors
2016-09-22 00:14:08 +09:00
Allofich
563ae479e8
Give "on touch" spells same range as vanilla MW
2016-09-21 23:34:32 +09:00
scrawl
c6ef26ba4b
Merge pull request #1070 from mrcheko/pathfinding
...
fix using potion as weapon
2016-09-20 22:58:54 +02:00
mrcheko
229cb4b386
remove dynamic_cast to ActionPotion
2016-09-20 23:00:00 +03:00
mrcheko
48765f2ff2
fix using potion as weapon
2016-09-19 23:43:26 +03:00
scrawl
718178bfe9
Merge pull request #1066 from MiroslavR/setinvisible
...
Don't use base invisibility magnitude for setting alpha
2016-09-19 15:35:12 +02:00
Allofich
7e3cca6d37
Vfx after Divine/Almsivi intervention should be attached to player
2016-09-19 22:20:16 +09:00
Allofich
d1157b3e10
Use correct vfx for teleport spells
2016-09-19 18:12:30 +09:00
MiroslavR
744667e163
Don't use base invisibility magnitude for setting alpha ( Fixes #3555 )
2016-09-19 00:05:50 +02:00
scrawl
cd4b182091
Merge pull request #1051 from Allofich/textures
...
Use spell effect particle textures
2016-09-18 22:37:14 +02:00
Allofich
a8e9f2df67
Cleanup
2016-09-19 05:20:04 +09:00
scrawl
30d5c7488d
savegamedialog: don't reset the character selection scrollbar when a character is deleted
2016-09-18 19:26:41 +02:00
scrawl
7bd445fb83
Don't crash if FontManager::getByName returns NULL ( Fixes #3552 )
2016-09-17 17:21:35 +02:00
