Commit Graph

15894 Commits

Author SHA1 Message Date
Oliver Brakmann
863db5a42c Merge pull request #7640 from Phrohdoh/rand-dmg-sounds
SoundOnDamageTransition to use string[].
2015-03-14 12:39:20 +01:00
Oliver Brakmann
0062391665 Merge pull request #7652 from fluxer/bleed
add /lib and /lib64 to the locations lookup for Lua
2015-03-14 10:52:32 +01:00
Matthias Mailänder
33e49c371a try to fix the AppVeyor build 2015-03-14 09:57:22 +01:00
Pavel Penev
03bab4a72a Merge pull request #7631 from pchote/sequence-rework
Rework sequence parsing.
2015-03-14 00:13:03 +02:00
Taryn Hill
76457c5fc1 Merge pull request #7542 from Mailaender/appveyor-deployment-fix
Fixed AppVeyor deployment.
2015-03-13 16:22:40 -05:00
Pavel Penev
04e0275d33 Merge pull request #7650 from Phrohdoh/fix-ramp-nre
Fix NRE caused by checking the RampType of a tile in #7645.
2015-03-13 20:30:02 +02:00
Pavel Penev
dd424f0b14 Merge pull request #7657 from MustaphaTR/copyright-date-readme
Update year of Copyrights on Readme
2015-03-13 16:34:54 +02:00
Mustafa Alperen Seki
aaf0f8d906 Update year of Copyrights on Readme 2015-03-13 12:36:09 +02:00
Pavel Penev
dc6040217b Merge pull request #7618 from Rydra/upstream/hv-heuristic
Changed the harvester heuristic, solved several regressions in Pathfinder and harvesters
2015-03-13 01:55:50 +02:00
Taryn Hill
7bf058896d Apply SoundOnDamageTransition upgrade rule. 2015-03-12 16:09:15 -05:00
Taryn Hill
1e0612ddf0 Change SoundOnDamageTransition to randomly select
from a string[] instead of a single string.
2015-03-12 16:09:11 -05:00
Taryn Hill
32edeccb56 Merge pull request #7476 from abcdefg30/any-subfaction
Allow picking of a random subfaction.
2015-03-12 15:52:39 -05:00
abcdefg30
63fe578ba8 Allow picking of a random subfaction 2015-03-12 21:34:23 +01:00
Saulius Menkevičius
e1fa6af954 HackyAI can now build buildings with new MCV
There was an issue where HackyAI would try to build buildings
at old base location and would fail, unless it was placed at the
same place where the old MCV was.
2015-03-12 20:10:08 +02:00
Ivailo Monev
6f070994b5 add /lib and /lib64 to the locations lookup for Lua (issue #7637) 2015-03-12 15:20:46 +00:00
Taryn Hill
602de0ea13 Fix NRE caused by checking the RampType of a tile in #7645. 2015-03-12 09:11:51 -05:00
David Jiménez
ea32c20450 Changed the harvester heuristic so that now takes into account the distance from the initial search location. This makes harvesters somewhat more "intelligent" and gather nearer resources. Also solved several regressions introduced in the recent changes in the Pathfinder 2015-03-12 12:28:34 +01:00
Matthias Mailänder
fa4f43b750 account for initial health 2015-03-11 23:18:03 +01:00
Pavel Penev
687403ab89 Merge pull request #7645 from Phrohdoh/fix-slope-buildings
Mark ramp/slope tiles as unbuildable.
2015-03-11 23:50:17 +02:00
Taryn Hill
a744900e74 Mark ramp/slope tiles as unbuildable. 2015-03-11 16:30:55 -05:00
Matthias Mailänder
4f775a8dc7 Merge pull request #7641 from Generalcamo/patch-2
Add a Cloaking sound to the Phase Transport
2015-03-11 20:24:42 +01:00
Cody Brittain
a2de502619 Add a Cloaking sound to the Phase Transport
Adds a cloaking sound to the phase transport
2015-03-10 20:30:45 -04:00
Oliver Brakmann
f5535c00a2 Merge pull request #7593 from Phrohdoh/wiki-trait-links
Wiki trait links.
2015-03-10 18:40:53 +01:00
Oliver Brakmann
60bf903e7c Merge pull request #7634 from Phrohdoh/sw-docs
Add some documentation to support powers.
2015-03-10 18:35:41 +01:00
Matthias Mailänder
cb29c29efc deploy on any branch with tags 2015-03-10 07:31:26 +01:00
Matthias Mailänder
32328835ff try to fix artifact deployment 2015-03-10 07:31:26 +01:00
Matthias Mailänder
7bf3ef0e90 stop 7-Zip from displaying prompts that halt the build 2015-03-10 07:31:24 +01:00
Matthias Mailänder
7123f93e86 Merge pull request #7617 from Mailaender/fuzzy-nuget
Removed FuzzyLogicLibrary.dll binary from source code management
2015-03-10 06:50:56 +01:00
Taryn Hill
a5bbb60db9 Remove unnecessary newline from output.
Make required trait strings a hyperlink.
2015-03-10 00:20:40 -05:00
Taryn Hill
51e470e64c Add some documentation to support powers. 2015-03-10 00:13:24 -05:00
Paul Chote
f91ee3fb45 Fix sequence terminology. 2015-03-09 20:45:49 +00:00
Paul Chote
7292bd20b3 Move Sequence parsing into mod code. 2015-03-09 20:45:22 +00:00
Paul Chote
d3783f0244 Introduce ISpriteSequence interface. 2015-03-09 19:19:00 +00:00
Paul Chote
2cc714be4e Allow IGlobalModData to opt-in to custom parsing. 2015-03-09 19:19:00 +00:00
Paul Chote
60937b096b Give a sensible error if LoadScreen/LobbyDefaults is missing. 2015-03-09 19:18:59 +00:00
Matthias Mailänder
429111a282 fix the destroyed radar dishes 2015-03-08 21:51:36 +01:00
Matthias Mailänder
762c0e12a2 Merge pull request #7522 from delftswa2014/bugfix/sellicon
Closes #7508
2015-03-08 19:13:34 +01:00
Oliver Brakmann
78e74eb685 Merge pull request #7601 from Phrohdoh/ab-hotkeys
Add hotkeys to playback controls.
2015-03-08 17:19:24 +01:00
Taryn Hill
a05b015581 Add hotkeys to playback controls. 2015-03-08 10:30:26 -05:00
Oliver Brakmann
190d197613 Merge pull request #7544 from delftswa2014/bugfix/sam_site_friendlyfire
Friendly fire fixes and sam sites
2015-03-08 16:16:14 +01:00
Oliver Brakmann
a39352aee3 Merge pull request #7524 from penev92/bleed_enemySightedNotification1
Fix the EnemyWatcher trait (hotfix)
2015-03-08 15:44:31 +01:00
Paul Chote
4110064c44 Fix TS civilian actor/sequence definitions. 2015-03-08 13:01:47 +00:00
penev92
4a5b3b59ed Properly remove worms from the world 2015-03-08 15:01:40 +02:00
penev92
58ab28206f Fix multiple notifications in multiplayer bug 2015-03-08 15:01:38 +02:00
penev92
1261fd1b07 Increase NotificationInterval to 30 seconds 2015-03-08 15:01:36 +02:00
Pavel Penev
a3065ad90c Merge pull request #7616 from obrakmann/fix-win-map-hashes
Ensure LF line ending for .yaml files for hash consistency across platforms
2015-03-08 14:55:32 +02:00
Matthias Mailänder
ac5a1b2569 fetch FuzzyLogicLibrary from NuGet 2015-03-08 10:22:37 +01:00
Pavel Penev
5ad1424c87 Merge pull request #7579 from Mailaender/lua51-msvc110
Avoid MSVC120 runtime dependency for Lua Windows DLLs
2015-03-08 02:29:55 +02:00
Pavel Penev
4c394d61e4 Merge pull request #7611 from Mailaender/freetype2-msvc-downgrade
Fixed FreeType2 depending on too new VS C++ runtime DLLs
2015-03-08 02:27:14 +02:00
Oliver Brakmann
419e63a33c Ensure LF line ending for .yaml files for hash consistency across platforms
Without this change, the git client will auto-convert the line endings to CRLF, which leads to hash mismatches for unpacked maps, which would be especially bad if we were going to build the Windows package on a Windows system.

Adds the same rule for .lua files as well, in preparation for a change that will make those contribute to the map hash.
2015-03-07 23:34:01 +01:00