Marc Zinnschlag
|
b8fa555260
|
Merge remote-tracking branch 'aesylwinn/RandomFixes'
|
2016-09-05 11:10:34 +02:00 |
|
scrawl
|
fbc9b90ebe
|
Cleanup
|
2016-09-05 00:04:11 +02:00 |
|
scrawl
|
8677a6f803
|
Merge pull request #1044 from Allofich/magic
Changes to multi-effect spells
|
2016-09-05 00:03:10 +02:00 |
|
Allofich
|
c617e90755
|
Fix for loading projectile speed
|
2016-09-05 05:41:24 +09:00 |
|
Allofich
|
f8270f6bd5
|
Consolidations and cleanup for multi-effect spells
|
2016-09-05 05:30:51 +09:00 |
|
Allofich
|
dbd7c038b2
|
Add loading code for multi-effect projectiles
|
2016-09-05 03:45:13 +09:00 |
|
Allofich
|
c6cd1f813b
|
Attach projectiles to nodes of multi-effect bolts
|
2016-09-05 02:59:33 +09:00 |
|
Allofich
|
5a0d3feb98
|
Use C++ int-to-string conversion
|
2016-09-05 02:52:44 +09:00 |
|
scrawl
|
346c6528e0
|
Merge pull request #1047 from Allofich/explosion
Double scaling of spell explosions
|
2016-09-04 19:31:05 +02:00 |
|
Allofich
|
a36f7babc1
|
Double scaling of spell explosions
|
2016-09-05 02:18:57 +09:00 |
|
Allofich
|
60384399ee
|
Fix errors and warnings
|
2016-09-05 01:39:18 +09:00 |
|
Allofich
|
f49ebee56a
|
Play sounds for multi-effect projectile
|
2016-09-04 23:57:06 +09:00 |
|
Allofich
|
37f07f7435
|
Combine into one multi-effect magic projectile
|
2016-09-04 22:35:29 +09:00 |
|
Allofich
|
10842462c7
|
Send lists of models and sounds to launchMagicBolt
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
96e1726e4d
|
Fix warnings
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
ecec7d8215
|
Fix spells having explosions for wrong range type
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
c4d77b6a8b
|
Casting animation comes from the first effect
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
3300ef5db7
|
Don't apply projectile effects multiple times
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
f36e5ef403
|
Use last effect of spell for hand effect color
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
f6c3a62b3e
|
Use average speed for multiple spell projectiles
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
f1a18027f2
|
Shoot projectiles of spells with multiple effects
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
446c0a4fa8
|
Play all of a spell's casting effects
|
2016-09-04 17:42:27 +09:00 |
|
Allofich
|
b4577fe751
|
Allow multiple spell hit sounds on single target
|
2016-09-04 17:42:27 +09:00 |
|
scrawl
|
7859e378df
|
Merge pull request #1045 from Allofich/attack
Fix AI melee attack
|
2016-09-04 00:22:59 +02:00 |
|
Aesylwinn
|
fab7549b42
|
Fix windows path issue in editor debug run.
- The problem was caused by spaces in the data directory
|
2016-09-03 17:49:49 -04:00 |
|
Aesylwinn
|
ee432690e6
|
Make it easier to place objects in the scene editor.
This fix allows objects to be dropped onto the ground, and prevents
objects from being selected through the ground.
|
2016-09-03 17:37:13 -04:00 |
|
Allofich
|
5c2bc515fe
|
Remove overridden code in aicombat
|
2016-09-04 02:13:09 +09:00 |
|
scrawl
|
8c0dc5e1cf
|
Merge pull request #1040 from jorgesumle/master
Added link to GPLv3 in README.md
|
2016-09-03 18:44:12 +02:00 |
|
mrcheko
|
0775ed75ea
|
fix zero div in getXAngleToDir
|
2016-09-03 17:50:06 +03:00 |
|
Allofich
|
0d63d75bb0
|
Remove no longer used parameter
|
2016-09-03 22:40:24 +09:00 |
|
Allofich
|
286e4bb98f
|
Remove attacktype movement
|
2016-09-03 21:16:59 +09:00 |
|
scrawl
|
bde25c8299
|
Merge pull request #1043 from ace13/win-ci
Include the OpenAL32.dll file into Windows builds
|
2016-09-02 11:20:12 +02:00 |
|
Alexander "Ace" Olofsson
|
123e57a65c
|
Include the OpenAL32.dll file into builds
|
2016-09-02 06:57:36 +02:00 |
|
scrawl
|
bdf55927e1
|
Merge pull request #1041 from Allofich/waterwalking
Don't allow casting Water Walking in deep water
|
2016-09-02 02:57:22 +02:00 |
|
Allofich
|
154dcc942c
|
Let NPCs use attack type regardless of movement
|
2016-09-01 22:43:33 +09:00 |
|
Marc Zinnschlag
|
316cf40f12
|
Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation'
|
2016-09-01 11:51:34 +02:00 |
|
Allofich
|
b99c2c54d8
|
Allow Water Walking on non-submerged creatures
|
2016-09-01 03:53:53 +09:00 |
|
Aesylwinn
|
c0d53a2557
|
Fix CellRefs being teleported from interior to exterior cells.
|
2016-08-31 11:02:04 -04:00 |
|
Allofich
|
22b11c5947
|
Move Water Walking check into checkEffectTarget()
|
2016-08-31 23:56:31 +09:00 |
|
Allofich
|
f25c65260c
|
Limit sMagicinvalidEffect to self-cast spells
|
2016-08-31 17:22:45 +09:00 |
|
Allofich
|
6c3cad238b
|
Use castByPlayer bool
|
2016-08-31 17:18:23 +09:00 |
|
Aesylwinn
|
b2ddd3c259
|
Initialize with correct content file number instead of correcting at save stage.
|
2016-08-30 16:42:38 -04:00 |
|
Allofich
|
a6216d883f
|
Don't allow casting Water Walking in deep water
|
2016-08-31 04:37:50 +09:00 |
|
Bret Curtis
|
b39516466f
|
lib was unnecessary, deps for travis included openthreads20 which is now built on ppa with osg-3.4 package. translation: fixed on ppa side
|
2016-08-30 20:09:28 +02:00 |
|
Bret Curtis
|
b67d7ec1e0
|
apparently the lib needs to go in as well
|
2016-08-30 19:12:18 +02:00 |
|
Bret Curtis
|
b944c8716e
|
bump OSG to 3.4
|
2016-08-30 19:00:27 +02:00 |
|
Jorge
|
139cd190d4
|
Added link to GPLv3 in README.md
|
2016-08-30 16:52:40 +02:00 |
|
Aesylwinn
|
3ae2fc17c6
|
Fix some issues with content file numbers in the editor.
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
|
2016-08-29 18:06:56 -04:00 |
|
scrawl
|
b92a4f1a32
|
Merge pull request #1038 from ace13/win-package-fix
Install Qt5 platform DLLs on Windows
|
2016-08-29 19:21:15 +02:00 |
|
Alexander "Ace" Olofsson
|
c9d4ff35c4
|
Install Qt5 platform DLLs on Windows
|
2016-08-29 18:40:40 +02:00 |
|