Commit Graph

22850 Commits

Author SHA1 Message Date
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
3ff045f711 Merge pull request #12731 from abcdefg30/oldBase
Minor removal of rules duplication in ts yaml
2017-02-12 01:49:47 +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
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
abcdefg30
6376e1fd22 Remove unnecessary Tooltip and Buildable definitions from ^CivBuilding 2017-02-11 15:21:00 +01:00
Mustafa Alperen Seki
db08535231 Add new tiles that will be in Harkonnen Missions 2017-02-11 16:11:47 +02:00
SoScared
99603eb607 ballistic shadows attempt 1 2017-02-11 12:09:48 +01:00
abcdefg30
ba69bfe494 Merge pull request #12705 from pchote/tweak-killself
Fix KillsSelf trait.
2017-02-10 19:06:20 +01:00
abcdefg30
307f722ef0 Merge pull request #12696 from pchote/fix-preview-rendering
Fix BGRA channel count.
2017-02-10 12:13:15 +01:00
abcdefg30
ac9c8b93a2 Merge pull request #12633 from reaperrr/slim-ra-weapons
Slim down RA weapon yamls via inheritance
2017-02-09 21:57:39 +01:00
Mustafa Alperen Seki
66ddae1818 Add Ordos 1b 2017-02-09 18:03:49 +02:00
Matthias Mailänder
01357c4f59 Merge pull request #12664 from MustaphaTR/d2k-ordos-1a
D2K - Add Ordos Mission 1a
2017-02-09 09:42:48 +01:00
reaperrr
c1e4a162fe Merge pull request #12710 from pchote/spectator-sort
Sort servers with spectators above empty servers.
2017-02-08 23:16:39 +01:00
reaperrr
fce404f6d9 Rename RA largecaliber.yaml to ballistics.yaml 2017-02-08 23:06:01 +01:00
reaperrr
36d725130a Streamlined RA missiles.yaml 2017-02-08 23:05:59 +01:00
reaperrr
7251572eb6 Streamlined RA explosions.yaml 2017-02-08 23:05:55 +01:00
reaperrr
b645780ba3 Streamlined RA other.yaml 2017-02-08 23:05:52 +01:00
reaperrr
d8a26838c2 Streamlined RA largecaliber.yaml 2017-02-08 23:05:48 +01:00
reaperrr
4c5be8d1d6 Streamlined RA smallcaliber.yaml 2017-02-08 23:05:44 +01:00
reaperrr
c61a7b4131 Merge pull request #12709 from pchote/spicebloom-spurt
Play spicebloom spurt animation on each growth step.
2017-02-08 15:37:16 +01:00
Matthias Mailänder
5372d87521 Merge pull request #12677 from pchote/fix-player-drop
Fix player drop handling.
2017-02-08 09:01:58 +01:00
Matthias Mailänder
bad3a645a3 Merge pull request #12713 from pchote/fix-paused-weather-scroll
Fix weather particle positions when scrolling while paused.
2017-02-08 08:39:36 +01:00
Paul Chote
f6b65c98e4 Fix PBOG voxel rendering. 2017-02-07 10:05:06 +00:00