Commit Graph

22875 Commits

Author SHA1 Message Date
reaperrr
f95ec2b11f Merge pull request #12684 from abcdefg30/proneOffset
Fix the ProneOffsets of TakeCover
2017-02-12 20:31:08 +01:00
Paul Chote
d6a793fa7d Merge pull request #12758 from reaperrr/fix-d2k-weapons
Fix D2k weapons
2017-02-12 19:02:27 +00:00
Paul Chote
4a1bf43a74 Merge pull request #12763 from reaperrr/cncdll-to-common
Change target location for Mods.Cnc to mods/common
2017-02-12 18:25:59 +00:00
reaperrr
686b21c044 Change target location for Mods.Cnc to mods/common 2017-02-12 18:02:15 +01:00
abcdefg30
a3aab6f051 Merge pull request #12757 from reaperrr/merge-ra-into-cnc
Merge Mods.RA into Mods.Cnc
2017-02-12 17:47:41 +01:00
abcdefg30
c09fa25257 Merge pull request #12762 from reaperrr/common-ui
Move RA chrome yamls to common
2017-02-12 17:37:47 +01:00
reaperrr
996f7ba5cf Merge pull request #12730 from abcdefg30/aircraftCrate
Fix GiveUnitCrateAction and SpawnMPUnits being limited to MobileInfo
2017-02-12 17:27:24 +01:00
Paul Chote
b2ed96f887 Merge pull request #12748 from reaperrr/fix-ra-sounds
Fix RA 25mm and DepthCharge playing sounds
2017-02-12 15:47:35 +00:00
reaperrr
66f1cc69d8 Move D2k/TS ingame-observer.yaml to common 2017-02-12 16:45:19 +01:00
reaperrr
5e465ff965 Remove RA reference from d2k 2017-02-12 16:45:17 +01:00
reaperrr
6f9f630fdc Move RA chrome yamls to common 2017-02-12 16:45:15 +01:00
reaperrr
b7125852b5 Remove d2k dependency from TS UI 2017-02-12 15:17:36 +01:00
reaperrr
0c44a49722 Merge pull request #12600 from pchote/externalmods
Add support for switching to mods from other engine installations.
2017-02-12 13:18:53 +01:00
reaperrr
cdf2a1e87d Merge pull request #12649 from obrakmann/more-sysinfo-stuff
More sysinfo stuff
2017-02-12 12:48:37 +01:00
reaperrr
a5f4d6031c Merge pull request #12749 from MustaphaTR/d2k-add-new-tiles
Add new tiles that will be in Harkonnen Missions 1 and 2
2017-02-12 12:35:12 +01:00
reaperrr
0f7c53dac0 Fix DepthCharge hit explosion
The splash anim + h2obomb2.aud should always play, regardless of whether a submarine was hit.
2017-02-12 01:59:45 +01:00
reaperrr
3ff045f711 Merge pull request #12731 from abcdefg30/oldBase
Minor removal of rules duplication in ts yaml
2017-02-12 01:49:47 +01:00
reaperrr
0c3a786d10 Merge Mods.RA into Mods.Cnc 2017-02-12 01:33:22 +01:00
reaperrr
194a386a66 Remove unused Heal weapon from D2k 2017-02-12 01:25:47 +01:00
reaperrr
be6aaa0da5 Use InstantHit projectile for d2k BloomExplosion 2017-02-12 01:24:16 +01:00
reaperrr
0176fa5ff3 Remove redundant Blockable from DevBullet 2017-02-12 01:23:42 +01:00
reaperrr
69eaa16726 Make D2k machine guns unblockable and instant hits
To match original.
2017-02-12 01:20:03 +01:00
Paul Chote
51973cd798 Tweak 64 bit wording to match the two entries above it. 2017-02-11 19:36:14 +00:00
Paul Chote
3f9062692b Add window scale to sysinfo. 2017-02-11 19:36:14 +00:00
Oliver Brakmann
a0b911d498 Add sysinfo version to sysinfo query 2017-02-11 19:36:14 +00:00
Oliver Brakmann
54278ae8f3 Add window size to sysinfo query 2017-02-11 19:36:14 +00:00
reaperrr
cdfa3fddf8 Move ParatroopersPower and para scripting to Mods.Common 2017-02-11 19:02:06 +01:00
abcdefg30
6df7038454 Merge pull request #12746 from ltem/d2k-trike-offset
Quickfix for Trike armament offset
2017-02-11 18:29:16 +01:00
ltem
677df8d4da Quickfix for Trike offset + Adding Height parameter to wall's
BlockProjectiles
2017-02-11 18:17:33 +01:00
abcdefg30
5fee23019f Merge pull request #12732 from MustaphaTR/d2k-ordos-1b
D2K - Add Ordos Mission 1b
2017-02-11 18:06:20 +01:00
abcdefg30
6e419d8ee0 Merge pull request #12737 from SoScared/le_shadows
[RA] Add shadow to projectiles, alter armament offsets of Chrono Tank, Phase Transport
2017-02-11 18:03:05 +01:00
abcdefg30
b26b7b9f46 Merge pull request #12702 from Mailaender/maxmind.db-2.1.2
Drop dependency on Maxmind.GeoIP and Newtonsoft.Json
2017-02-11 17:50:35 +01:00
Paul Chote
f2e6601e07 Remove legacy MP lobby mod and replay switching logic. 2017-02-11 16:45:18 +00:00
Paul Chote
69a869fe43 Pass Engine.LaunchPath from OSX launcher. 2017-02-11 16:45:18 +00:00
abcdefg30
584d76c771 Merge pull request #12675 from FrameLimiter/bleed
Restores tank traps to the map editor.
2017-02-11 17:39:22 +01:00
abcdefg30
c93585e3f2 Merge pull request #12697 from pchote/attack-charge
Implement new charge attack logic for TD/TS obelisks.
2017-02-11 17:35:08 +01:00
FrameLimiter
615c76402f Restores tank traps to the map editor.
Tank Traps are missing from the editor because they inherit "^Rock:" from the default.yaml which requires the tileset DESERT.
Tank Traps are a TEMPERAT tileset item.
2017-02-11 17:30:52 +01:00
Paul Chote
8385207fba Pass Engine.LaunchPath from linux launchers. 2017-02-11 16:21:35 +00:00
Paul Chote
2f7446e9fc Pass Engine.LaunchPath from windows launcher. 2017-02-11 16:21:35 +00:00
Paul Chote
2da4e87b94 Implement new server-connection mod switching logic. 2017-02-11 16:21:34 +00:00
Paul Chote
4d982f00e4 Add 32px icons for default mods. 2017-02-11 16:21:34 +00:00
Paul Chote
25a0d5be5b Load icons for installed mods. 2017-02-11 16:21:34 +00:00
Paul Chote
328bae550c Implement external mod registration and launching. 2017-02-11 16:21:34 +00:00
Paul Chote
a52ea71c62 Add AttackCharges trait for TD and TS obelisks. 2017-02-11 16:19:58 +00:00
Paul Chote
f219d40aa1 Improve support for overlapping sounds. 2017-02-11 16:19:58 +00:00
Paul Chote
53d7988ad1 Fix WithColoredOverlay upgrade rule. 2017-02-11 16:19:58 +00:00
Paul Chote
a8d46adb2d Rename tesla attack logic and move to Mods.Cnc. 2017-02-11 16:19:58 +00:00
abcdefg30
8ad37e6e0d Remove Buildable from unbuildable civilian structures 2017-02-11 15:28:52 +01:00
abcdefg30
7247350780 Remove cloak from ^OldBase 2017-02-11 15:21:01 +01:00
abcdefg30
1b4b146308 Reduce duplication by introducing ^OldBase 2017-02-11 15:21:00 +01:00