Commit graph

17145 commits

Author SHA1 Message Date
Marc Zinnschlag
48c257b939 Merge remote-tracking branch 'aesylwinn/ContentNumberFix' 2016-09-06 15:48:05 +02:00
scrawl
05e4542d33 Merge pull request #1048 from mrcheko/pathfinding
Pathfinding unification v2
2016-09-06 13:19:18 +02:00
mrcheko
aa441f2648 AiPackage: fix path recalc on cell change
AiTravel: remove unneeded code
2016-09-06 01:11:10 +03:00
mrcheko
a22fc43947 aiwander: reset path on cell change
remove redundant mIsWanderDestReady var
2016-09-05 15:18:34 +03:00
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
Koncord
e5e9c90441 Travis: disable build server for clang 2016-09-04 19:10:39 +08:00
Koncord
5eaad1b92e again fix headerSize 2016-09-04 18:38:49 +08:00
Stanislav Zhukov
d9452f3798 Add travis badge 2016-09-04 17:59:14 +08:00
Koncord
485a1b1e3b Disable OS X in Travis CI 2016-09-04 17:58:28 +08:00
Koncord
64b5638d40 DIE TABS, DIE!!!!!!!1 2016-09-04 17:39:08 +08:00
Koncord
9abd4e5a16 Fail :D 2016-09-04 17:03:07 +08:00
Koncord
b2f1bb06f2 fix travis 2 2016-09-04 16:51:16 +08: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
Koncord
2567c35434 shut up variadic macros warning in GCC 2016-09-04 16:41:16 +08:00
Koncord
ab6d6d1cc8 Fix log message in Networking::Connect() 2016-09-04 16:18:53 +08:00
Koncord
9a4edff122 Disable unnecessary builds 2016-09-04 16:06:49 +08:00
Koncord
d110834ee7 Fix log message in Networking::Update() 2016-09-04 16:03:07 +08:00
Koncord
31c372a0e7 resolve depends for travis 2016-09-04 15:44:37 +08: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
David Cernat
81999a8179 Remove outdated ID_GAME_UPDATE_SKILLS packet, part 2 2016-09-02 07:58:20 +03:00
Alexander "Ace" Olofsson
123e57a65c Include the OpenAL32.dll file into builds 2016-09-02 06:57:36 +02:00