Commit Graph

15503 Commits

Author SHA1 Message Date
Oliver Brakmann
d1f810731d Merge pull request #7437 from 42foobar42/nod2b
added nod mission 2b
2015-02-14 16:50:27 +01:00
Oliver Brakmann
de16d29aa6 Merge pull request #7445 from jwbuurlage/bleed
Fixes #7219. In addition, sets cursor corresponding to the order with hi...
2015-02-14 12:22:34 +01:00
Matthias Mailänder
76bf570426 Merge pull request #7436 from penev92/bleed_moveFiles2
Move the AI to Mods.Common
2015-02-14 09:42:18 +01:00
Matthias Mailänder
589e9fb5ee Merge pull request #7471 from x-a-n-a-x/D2KUI-tooltips
Closes #7470
2015-02-14 07:21:14 +01:00
Sebastien Kerguen
fa3c0e77d5 - fixes the missing tooltip glyphs #7470 2015-02-13 22:55:02 +01:00
Paul Chote
50860ab2b5 Merge pull request #7378 from obrakmann/fix_wiki_deployment
Switch wiki deployment to the orabot user with SSH auth
2015-02-12 14:43:19 +00:00
Taryn Hill
5349c69307 Merge pull request #7467 from ScottNZ/stylecop-fixes
Brace style fixes.
2015-02-12 07:54:10 -06:00
ScottNZ
582b6635ff Brace style fixes 2015-02-13 02:32:49 +13:00
Paul Chote
aa550790e5 Merge pull request #4528 from Mailaender/mime
Registered Linux MIME type to directly load replays
2015-02-12 11:21:37 +00:00
Paul Chote
6cacc70f6e Merge pull request #7456 from Mailaender/d2k-radar-fixup
Fixed the faction insignia being drawn over the radar minimap
2015-02-12 10:36:41 +00:00
Alexander Boll
52c67aef76 added hunt to every movement 2015-02-10 21:08:20 +01:00
Alexander Boll
e4647a8333 added nod mission 2b 2015-02-10 21:08:19 +01:00
Matthias Mailänder
ba66be18f7 remove empty Children: 2015-02-10 20:17:50 +01:00
Matthias Mailänder
b4ada2d61c change drawing order of faction logos over the minimap 2015-02-10 20:17:48 +01:00
Matthias Mailänder
1eb6c984f5 Merge pull request #7384 from Mailaender/new-d2k-build-palette
Added the new modular build palette to Dune 2000
2015-02-09 22:08:43 +01:00
penev92
6c6a4322ed Move the AI namespace to Mods.Common 2015-02-09 16:57:29 +02:00
Jan-Willem Buurlage
7eb2106375 Change cursor according to the command with highest priority. 2015-02-08 22:38:05 +01:00
Jan-Willem Buurlage
ce6c883fb1 Fixed #7219. Reduce boarding priority to resolve conflict with force-attacking own units. 2015-02-08 22:31:56 +01:00
Jan-Willem Buurlage
26562862f7 Add myself to authors 2015-02-08 22:30:55 +01:00
Matthias Mailänder
b0f986887c make maximum and minimum rows configurable 2015-02-08 20:43:35 +01:00
Matthias Mailänder
3be3700722 use the new modular UI 2015-02-08 20:43:32 +01:00
Matthias Mailänder
d921e0f838 Merge pull request #7418 from Mailaender/movie-list-removal
Removed the unused movie lists
2015-02-08 13:00:02 +01:00
Oliver Brakmann
32243122be Merge pull request #7435 from penev92/bleed_moveFiles
Moving more files to Mods.Common
2015-02-07 10:10:32 +01:00
Oliver Brakmann
0af8d6902b Merge pull request #7420 from abcdefg30/tsbounds
Fix some ts structure bounds
2015-02-06 22:03:54 +01:00
Oliver Brakmann
aafde15ddf Merge pull request #7393 from 42foobar42/bleed
Nod Mission 2a
2015-02-06 21:18:50 +01:00
Alexander Boll
9a09421800 fixed mission 2a and cleaned the code
changed according style code and added production trigger

corrected tech tree

removed comments and corrected same style issues

added gdi tech tree and changed produce to build

changed image format and replace spaces with tabs

deleted unnecessary tabs, added tooltips and corrected name

added lua file from nod 2a

changed according style code and added production trigger

deleted unnecessary tabs, added tooltips and corrected name

fixed image size

changed for loops to Utils.Do, removed facing and health from yaml,
changed movement function and corrected mission description

restored facing values unequal zero und fixed image position

Polish things a bit

Have player's units move into the map at the start

Polish some things
2015-02-06 21:11:18 +01:00
abcdefg30
3b84f42689 Fix some structure bounds 2015-02-06 20:48:21 +01:00
penev92
64887cb8c8 Move MainMenuLogic to Mods.Common 2015-02-06 13:37:43 +02:00
penev92
494b600ed8 Move refinery and harvester logic to Mods.Common;
Remove unused interface IAcceptOreDockAction
2015-02-06 13:23:07 +02:00
Matthias Mailänder
6714b498af Merge pull request #7428 from Phrohdoh/chmod
Unset executable bit from some thirdparty objects.
2015-02-05 19:22:22 +01:00
Oliver Brakmann
fc7e944727 Merge pull request #7398 from LipkeGu/ts_assets_part2
Adding the Rocks to Tiberian Sun
2015-02-05 18:22:57 +01:00
Oliver Brakmann
01ee8a3ca7 Merge pull request #7421 from huwpascoe/bugfix-carryall
BugFix: harvester-carryall remote death
2015-02-05 17:04:40 +01:00
Oliver Brakmann
1cb04d4500 Merge pull request #7408 from Mailaender/appveyor-nsis-deploy
Fixed NSIS being installed during every pull request build
2015-02-05 16:11:50 +01:00
Taryn Hill
a0130f105e Unset executable bit from some thirdparty objects. 2015-02-04 12:37:04 -06:00
huwpascoe
804cdee8f0 BugFix: harvester-carryall remote death
The d2k harvester would suddenly explode if the approaching carryall was
destroyed. This is because there was no distinction between the unit being
carried and the unit being reserved. To test you'll probably have to tweak
the turret missile in weapons.yaml so you can forcefire on the carryall.

* added a bool to check if carryall is actually holding it's target
* fixed harvester being stuck in reserved mode
2015-02-03 22:43:35 +00:00
Taryn Hill
e79239311a Merge pull request #7376 from abcdefg30/tsprereqs
Fix TS prerequisites.
2015-02-03 15:46:13 -06:00
Oliver Brakmann
86051ade43 Merge pull request #7423 from abcdefg30/demofix
Fix the demo truck explosion not killing the initiator
2015-02-03 22:20:18 +01:00
Guido L.
ce5e6e5a76 Add Rocks to Tiberian Sun 2015-02-03 19:26:47 +01:00
Oliver Brakmann
99c4e12650 Merge pull request #7425 from chrisforbes/issuestats
add issuestats badges to README
2015-02-03 17:21:54 +01:00
Chris Forbes
9f05d39352 add issuestats badges to README 2015-02-03 15:35:42 +13:00
Oliver Brakmann
0371cfef3b Merge pull request #7406 from abcdefg30/allies05a
Ported allies05a to lua
2015-02-02 17:06:53 +01:00
Oliver Brakmann
ccc34806de Some polish for allies05a
* Viewport follows the truck automatically
* Greece's reinforcements arrive only after the heli has left the scene
* Added "Reinforcements have arrived" notification
* Adds all the Lua files of the recent missions to the solution
2015-02-02 16:51:50 +01:00
abcdefg30
aab54218e5 Ported allies05a to lua 2015-02-02 16:51:50 +01:00
abcdefg30
3b5e95bdc5 Set "AffectsParent: true" for the "MiniNuke" weapon 2015-02-02 15:17:41 +01:00
Matthias Mailänder
595c792879 remove the unused movie lists 2015-02-01 18:53:50 +01:00
Matthias Mailänder
5040baac9b Merge pull request #7415 from obrakmann/gdi05a
Add mission gdi05a
2015-02-01 18:49:27 +01:00
Oliver Brakmann
1b4dc3d1fe Add mission gdi05a 2015-02-01 18:12:46 +01:00
Oliver Brakmann
479259b9d7 Update mission gdi03 2015-02-01 15:50:18 +01:00
Oliver Brakmann
4aa97ec776 Allow support powers to start with a full charge when created 2015-02-01 15:49:45 +01:00
Oliver Brakmann
de616c69a2 Merge pull request #7416 from atimoschenkow/adjust-nudge
Adjust nudging for cases where no enterable cell is found
2015-02-01 15:18:59 +01:00