Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: bd13a29a14ed0237d0a31fbb3dc263c5a3ed329d
https://github.com/Warzone2100/warzone2100/commit/bd13a29a14ed0237d0a31fbb3dc263c5a3ed329d
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths:
A data/base/script/campaign/cam2-1s.js
Log Message:
-----------
Convert cam2-1s(slo/vlo) to JS
SUB_2_1S script conversion
Commit: 480b05388d4844f5eaf077588a74b7deece6baf5
https://github.com/Warzone2100/warzone2100/commit/480b05388d4844f5eaf077588a74b7deece6baf5
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
A data/base/script/cam2-1s.js
Log Message:
-----------
Sub_2_1s conversion to JS
Commit: 49fe8b231d81f9928f863ea509293f2d3fe0b79b
https://github.com/Warzone2100/warzone2100/commit/49fe8b231d81f9928f863ea509293f2d3fe0b79b
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1s.js
Log Message:
-----------
SUB_2_1S to JSCam
Commit: b6c9b1dd1ad14c8dfd4f2c029ebc50aba91807bf
https://github.com/Warzone2100/warzone2100/commit/b6c9b1dd1ad14c8dfd4f2c029ebc50aba91807bf
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
R data/base/script/cam2-1s.js
Log Message:
-----------
Delete cam2-1s.js
Commit: 9d9cca7136dbee3ac58f8e686ea50ee80bb1b9f3
https://github.com/Warzone2100/warzone2100/commit/9d9cca7136dbee3ac58f8e686ea50ee80bb1b9f3
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
A data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Work-In-Progress cam2-1x
Commit: 2a9c5016a7bd7930478ddfd76a0268ef91cfe585
https://github.com/Warzone2100/warzone2100/commit/2a9c5016a7bd7930478ddfd76a0268ef91cfe585
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Update cam2-1x.js
Commit: 1a8ebea2e2fe565df6b2affa6c4c74cfbc4939a9
https://github.com/Warzone2100/warzone2100/commit/1a8ebea2e2fe565df6b2affa6c4c74cfbc4939a9
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Update cam2-1x.js
Commit: 3c597da14f2b5c40c7fa7645d90133eae83cf66a
https://github.com/Warzone2100/warzone2100/commit/3c597da14f2b5c40c7fa7645d90133eae83cf66a
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Updated 2-1X winning conditions
Updated the winning condition function.
Commit: 53b177e1b8baf0d014533e270a0e6fffd24eeb6b
https://github.com/Warzone2100/warzone2100/commit/53b177e1b8baf0d014533e270a0e6fffd24eeb6b
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Updated 2-1X Victory Conditions
Fixed typos and stuff
Commit: 0c9a33c61c1c3a6be61159aa4282d5e13c402c0d
https://github.com/Warzone2100/warzone2100/commit/0c9a33c61c1c3a6be61159aa4282d5e13c402c0d
Author: CristianAlpha93 <cristian.odor...@gmail.com>
Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Fixed cam2-1x.js
Fixed typos, improved coding style.
Commit: f421c2b4bbce745316b436f66d2af7a32f2ebefc
https://github.com/Warzone2100/warzone2100/commit/f421c2b4bbce745316b436f66d2af7a32f2ebefc
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Updated cam2-1x
Changed victory conditions so that units are transfered only when the transport
is alive.
Commit: a19ee6ca75777eb24643edf06446e5e6eb00611e
https://github.com/Warzone2100/warzone2100/commit/a19ee6ca75777eb24643edf06446e5e6eb00611e
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
Changed paths:
M data/base/wrf/cam2/sub2-1.wrf
M data/base/wrf/cam2/sub2-1s.wrf
Log Message:
-----------
SUB_2_1 wrf update
Updated SUB_2_1 wrf files to run Javascript files
Commit: d3b96fc3424d31cea6e7598c105d2f61f5727bda
https://github.com/Warzone2100/warzone2100/commit/d3b96fc3424d31cea6e7598c105d2f61f5727bda
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Updated cam2-1x.js
Moved global variables to their functions, updated for loop to stop when it
finds the transport.
Commit: 21e24f8df1cf63e8d9796878697c9306542e5006
https://github.com/Warzone2100/warzone2100/commit/21e24f8df1cf63e8d9796878697c9306542e5006
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
Changed paths:
A data/base/wrf/cam2/sub2-1/labels.json
Log Message:
-----------
SUB_2_1 labels
Labels for cam2-1s/cam2-1x
Commit: 16a18d549d11d378c7ef2d0f2981ed6c8d7fa2e2
https://github.com/Warzone2100/warzone2100/commit/16a18d549d11d378c7ef2d0f2981ed6c8d7fa2e2
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-30 (Fri, 30 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Bugfix and update
Fixed an error in the RNG function (.ceil and .floor would round up/down to
integer, we do not want that).
Make use of the new changePlayerColour function developed by perim.
Commit: 286df7c1e3052b589e9c6d2445713deab61fa9cb
https://github.com/Warzone2100/warzone2100/commit/286df7c1e3052b589e9c6d2445713deab61fa9cb
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-30 (Fri, 30 Dec 2016)
Changed paths:
A data/base/script/campaign/cam2bx.js
Log Message:
-----------
cam2bx (.slo/.vlo) conversion
Converted cam2bx .slo and .vlo files from WZscript to JS
Commit: 9e60862f84bb656e0388a29ceb056a63fe9a5319
https://github.com/Warzone2100/warzone2100/commit/9e60862f84bb656e0388a29ceb056a63fe9a5319
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-30 (Fri, 30 Dec 2016)
Changed paths:
M data/base/wrf/cam2/cam2b.wrf
Log Message:
-----------
cam2b.wrf update
Update cam2b.wrf to read cam2bx.js from script/campaign
Commit: 39b6721db249803f7d3485b24b31c3399033bf7f
https://github.com/Warzone2100/warzone2100/commit/39b6721db249803f7d3485b24b31c3399033bf7f
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-30 (Fri, 30 Dec 2016)
Changed paths:
M data/base/wrf/cam2/sub2-1/labels.json
Log Message:
-----------
SUB_2_1 Labels
Fixed a minor formatting error for the sake of style consistency.
Commit: dd4cd89f71c02fc426f23b36e569b59eadd5e627
https://github.com/Warzone2100/warzone2100/commit/dd4cd89f71c02fc426f23b36e569b59eadd5e627
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-30 (Fri, 30 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1s.js
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
Updated SUB_2_1 scripts
Changed player to CAM_HUMAN_PLAYER to standardize variables across the scripts;
Added hackRemoveMessage to remove MSG2_1_MSG as per cam2-1s' script in WZscript;
Commit: 9e6276073c1a42e88341ba0af86389c8a002e9bc
https://github.com/Warzone2100/warzone2100/commit/9e6276073c1a42e88341ba0af86389c8a002e9bc
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-31 (Sat, 31 Dec 2016)
Changed paths:
M data/base/script/campaign/cam2-1s.js
M data/base/script/campaign/cam2-1x.js
Log Message:
-----------
SUB_2_1 Scripts update
Simplified scripts by KJeff01, added cyborg group management to send northern
cyborgs against the players.
Commit: 77c18e21e688b685d287def961bb48355c700029
https://github.com/Warzone2100/warzone2100/commit/77c18e21e688b685d287def961bb48355c700029
Author: Cristian Odorico <cristian.odor...@gmail.com>
Date: 2016-12-31 (Sat, 31 Dec 2016)
Changed paths:
M data/base/wrf/cam2/sub2-1/labels.json
Log Message:
-----------
Updated Labels for SUB_2_1
Fixes by KJeff01, cyborg management labels added
Commit: a924ecfa8d312e3c2d61e37cd089facf88b941bc
https://github.com/Warzone2100/warzone2100/commit/a924ecfa8d312e3c2d61e37cd089facf88b941bc
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
A data/base/script/campaign/cam1-5.js
A data/base/script/campaign/cam1-5s.js
M data/base/script/campaign/templates.js
R data/base/script/data/cam1-5.vlo
R data/base/script/data/cam1-5s.vlo
R data/base/script/text/cam1-5.slo
R data/base/script/text/cam1-5s.slo
M data/base/wrf/cam1/sub1-5.wrf
A data/base/wrf/cam1/sub1-5/labels.json
M data/base/wrf/cam1/sub1-5s.wrf
Log Message:
-----------
Convert cam1-5(s){.vlo,.slo} into cam1-5(s).js
Converts campaigns sub1-5 and sub1-5s into their js equivalents.
Remove cam1-5.vlo
Remove cam1-5s.vlo
Remove cam1-5.slo
Remove cam1-5s.slo
Commit: d5f40430b3683865aa96ec6a2250f13b0f263761
https://github.com/Warzone2100/warzone2100/commit/d5f40430b3683865aa96ec6a2250f13b0f263761
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
A data/base/script/campaign/cam1a-c.js
M data/base/script/campaign/libcampaign.js
M data/base/script/campaign/templates.js
R data/base/script/data/cam1a-c.vlo
R data/base/script/text/cam1a-c.slo
M data/base/wrf/cam1/cam1a-c.wrf
M data/base/wrf/cam1/cam1ca/labels.json
Log Message:
-----------
Convert cam1a-c{.vlo, .slo} into cam1a-c.js
Converts cam1a-c.
-Adds a default for interval for CAM_ORDER_PATROL and fixes a typo.
Delete cam1a-c.vlo
Delete cam1a-c.slo
Commit: 05648d9221d8df5611e0f9322b1a71656608e4c6
https://github.com/Warzone2100/warzone2100/commit/05648d9221d8df5611e0f9322b1a71656608e4c6
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
A data/base/script/campaign/cam1-7.js
A data/base/script/campaign/cam1-7s.js
M data/base/script/campaign/libcampaign.js
R data/base/script/data/cam1-7.vlo
R data/base/script/data/cam1-7s.vlo
R data/base/script/text/cam1-7.slo
R data/base/script/text/cam1-7s.slo
M data/base/wrf/cam1/sub1-7.wrf
A data/base/wrf/cam1/sub1-7/labels.json
M data/base/wrf/cam1/sub1-7s.wrf
Log Message:
-----------
Convert cam1-7(s){.vlo,.slo} to cam1-7(s).js
Converts cam1-7{.vlo,.slo} to cam1-7.js
Converts cam1-7s{.vlo,.slo} to cam1-7s.js
Delete cam1-7.vlo
Delete cam1-7s.vlo
Delete cam1-7.slo
Delete cam1-7s.slo
Add getArtifacts
Commit: 212780941a686d61af599c74b2ec82edf55a7537
https://github.com/Warzone2100/warzone2100/commit/212780941a686d61af599c74b2ec82edf55a7537
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
A data/base/script/campaign/cam1-1.js
A data/base/script/campaign/cam1-1s.js
R data/base/script/data/cam1-1-ai.vlo
R data/base/script/data/cam1-1.vlo
R data/base/script/data/cam1-1s.vlo
R data/base/script/text/cam1-1-ai.slo
R data/base/script/text/cam1-1.slo
R data/base/script/text/cam1-1s.slo
M data/base/wrf/cam1/sub1-1.wrf
A data/base/wrf/cam1/sub1-1/labels.json
M data/base/wrf/cam1/sub1-1s.wrf
Log Message:
-----------
Convert cam1-1(s){.vlo,.slo} to cam1-1(s).js
Convert cam1-1{.vlo,.slo} to cam1-1.js
Convert cam1-1s{.vlo,.slo} to cam1-1s.js
Delete cam1-1-ai.vlo
Delete cam1-1.vlo
Delete cam1-1s.vlo
Delete cam1-1-ai.slo
Delete cam1-1.slo
Delete cam1-1s.slo
Commit: 9e5ea36b5b5f84aa2328d98873e6a983231ea141
https://github.com/Warzone2100/warzone2100/commit/9e5ea36b5b5f84aa2328d98873e6a983231ea141
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/cam1ca.js
Log Message:
-----------
Fix extra win condition
In the event a player achieved the extra objective while the transporter is on
the map
the transporter would be placed into an attack group. This caused the famous
incident
where the transport would never leave (and thus a never ending level). This
change ensures
the extra objective is true only if no enemies are on the map and it landed at
least once.
Commit: 3961ee0b557feda2d1081aa0de2738c48a167d75
https://github.com/Warzone2100/warzone2100/commit/3961ee0b557feda2d1081aa0de2738c48a167d75
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
A data/base/script/campaign/cam1-d.js
A data/base/script/campaign/cam1-ds.js
M data/base/script/campaign/templates.js
R data/base/script/data/cam1-d.vlo
R data/base/script/data/cam1-ds.vlo
M data/base/wrf/cam1/sub1-d.wrf
M data/base/wrf/cam1/sub1-d/dinit.bjo
M data/base/wrf/cam1/sub1-d/feat.bjo
M data/base/wrf/cam1/sub1-d/game.map
A data/base/wrf/cam1/sub1-d/labels.json
M data/base/wrf/cam1/sub1-d/struct.bjo
M data/base/wrf/cam1/sub1-ds.wrf
Log Message:
-----------
Convert cam1-d(s){.vlo,.slo} to cam1-d(s).js
Convert cam1-d{.vlo,.slo} to cam1-d.js
Convert cam1-ds{.vlo,.slo} to cam1-ds.js
Delete cam1-d.vlo
Delete cam1-ds.vlo
Commit: b831d2515cef69a6094473eb1b43b91b43e9b628
https://github.com/Warzone2100/warzone2100/commit/b831d2515cef69a6094473eb1b43b91b43e9b628
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/messages/cam1-outro.txt
M data/base/script/campaign/cam1-7s.js
M data/base/script/campaign/cam1a-c.js
A data/base/script/campaign/cam1end.js
R data/base/script/data/cam1end.vlo
R data/base/script/text/cam1end.slo
M data/base/wrf/cam1/cam1end.wrf
Log Message:
-----------
Convert cam1end{.vlo,.slo} to cam1end.js
Converts cam1end{.vlo,.slo} to cam1end.js
Fix CAM2_BRIEF for cam1end.js
CAM2_BRIEF points to the wrong video sequence.
Use a better video playback for 1-7s and 1a-c
Use eventVideoDone instead of absurd queues for multiple video playback.
Delete cam1end.vlo
Delete cam1end.slo
Commit: f1dc0d5be4b23dc68b08e9ba46e083a58a3ae888
https://github.com/Warzone2100/warzone2100/commit/f1dc0d5be4b23dc68b08e9ba46e083a58a3ae888
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/cam1c.js
Log Message:
-----------
Bring back scavenger Kevlar
Scavengers should have Kevlar for 1-C and later for Alpha campaign.
Commit: 941c47287381dfaa13dd1fa511d00b712bfa3b0a
https://github.com/Warzone2100/warzone2100/commit/941c47287381dfaa13dd1fa511d00b712bfa3b0a
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/messages/brief2a.txt
A data/base/script/campaign/cam2-a.js
M data/base/script/campaign/libcampaign.js
M data/base/script/campaign/templates.js
R data/base/script/data/cam2a.vlo
R data/base/script/data/cam2arein.vlo
R data/base/script/data/cam2ax.vlo
R data/base/script/data/cam2tech.vlo
R data/base/script/data/vtols2a.vlo
R data/base/script/text/cam2ax.slo
M data/base/wrf/cam2/cam2a.wrf
A data/base/wrf/cam2/cam2start/labels.json
Log Message:
-----------
Convert cam2-a{.vlo, .slo} to cam2-a.js
and other files like cam2-a(s)(x)(arein) and the vtol file for 2a.
Improvements to libcampaign.
MB2A_MSG plays the wrong set of videos. This change disables the second video
and replace the first video with the correct one.
Commit: d46eea4088f7d62eafb995b2aaf20c8d781dc4d0
https://github.com/Warzone2100/warzone2100/commit/d46eea4088f7d62eafb995b2aaf20c8d781dc4d0
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/templates.js
Log Message:
-----------
Update campaign templates
Updates the campaign enemy templates file for every remaining level. At least
for the ones that
are actually used.
Commit: 60fdfa55ee2ee09df4fef632aafa6891153b7ab7
https://github.com/Warzone2100/warzone2100/commit/60fdfa55ee2ee09df4fef632aafa6891153b7ab7
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/templates.js
Log Message:
-----------
Add 2-B templates
Added the enemy templates for 2-B.
Commit: 2ed519436d05a24bfb4a32d00b343f4439d4caa3
https://github.com/Warzone2100/warzone2100/commit/2ed519436d05a24bfb4a32d00b343f4439d4caa3
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/templates.js
Log Message:
-----------
Move whirlwind AA turret and fix cyborg bodies
Whirlwind turret is now at 2-5 where it should be.
Cyborg bodies corrected.
Commit: 3e54f971eaa18c45a712d7dde9a7032e01594876
https://github.com/Warzone2100/warzone2100/commit/3e54f971eaa18c45a712d7dde9a7032e01594876
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/cam2-a.js
M data/base/script/campaign/libcampaign.js
M data/base/wrf/cam2/cam2start/labels.json
Log Message:
-----------
Campaign vtol support/update 2-a
Adds some basic enemy vtol attack and run away support to the campaign library.
Updates 2-A with these changes in mind.
Commit: 9eb737144cedb5d87883db6aa055c75b2cf22a33
https://github.com/Warzone2100/warzone2100/commit/9eb737144cedb5d87883db6aa055c75b2cf22a33
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
A data/base/script/campaign/cam2-2.js
A data/base/script/campaign/cam2-2s.js
R data/base/script/data/cam2-2.vlo
R data/base/script/data/cam2-2s.vlo
R data/base/script/data/vtols2-2.vlo
M data/base/wrf/cam2/sub2-2.wrf
A data/base/wrf/cam2/sub2-2/labels.json
M data/base/wrf/cam2/sub2-2s.wrf
Log Message:
-----------
Convert cam2-2(s){.vlo,.slo} to cam2-2(s).js
Converts cam2-2(s){.vlo,.slo} to cam2-2(s).js
Changes from original scripts:
-Enemy power was reduced so as not to make 50+ hover units should the player be
slow to complete the level.
-Enables Inferno hover units to be built along with lancer hover units (as the
original scripts intended).
-The bottom left most building will collapse to clear space for the commander
and defense units for the fail condition only if the commander reaches the
western base way-point.
Delete cam2-2.vlo
Delete cam2-2s.vlo
Delete vtols2-2.vlo
Commit: e89a0155b04a653d1fccbcd9aa7228b6fe0cad98
https://github.com/Warzone2100/warzone2100/commit/e89a0155b04a653d1fccbcd9aa7228b6fe0cad98
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/cam2-2.js
Log Message:
-----------
Undo 2-2 building change
No longer need to collapse the building since the commander defense group will
not take up as much space
and the level uses a slightly shifted fail zone area compared to the original
coordinates.
Commit: b9ef51636257a23bf94f1452c25c77b44d831aae
https://github.com/Warzone2100/warzone2100/commit/b9ef51636257a23bf94f1452c25c77b44d831aae
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/wrf/cam2/sub2-2/labels.json
Log Message:
-----------
Remove unused object label in campaign 2-2
Commit: 2d383028997b64b0169a62699ce1f5dad8b098e6
https://github.com/Warzone2100/warzone2100/commit/2d383028997b64b0169a62699ce1f5dad8b098e6
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/cam2-2.js
M data/base/wrf/cam2/sub2-2/labels.json
Log Message:
-----------
Finish 2-2
Commit: cae1a46827f7b140f6690effb9e66ce4d160ac5b
https://github.com/Warzone2100/warzone2100/commit/cae1a46827f7b140f6690effb9e66ce4d160ac5b
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/libcampaign.js
Log Message:
-----------
Improve campaign enemy vtol handling
Commit: 463aa7b948f06af3fc07d2f86eaccdde95b4527d
https://github.com/Warzone2100/warzone2100/commit/463aa7b948f06af3fc07d2f86eaccdde95b4527d
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/cam2-2.js
M data/base/script/campaign/cam2-a.js
M data/base/script/campaign/libcampaign.js
Log Message:
-----------
Improve campaign vtol management more
Makes creating those hit and run campaign vtols less dependent on levels
scripts.
Just call camSetVtolData(...) once and everything is handled for the user.
Also makes vtols use rearming pads if any.
Commit: f7c31e676c1216566e9ea628db2bdb77aee80d64
https://github.com/Warzone2100/warzone2100/commit/f7c31e676c1216566e9ea628db2bdb77aee80d64
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/cam1-1.js
M data/base/script/campaign/cam1-1s.js
M data/base/script/campaign/cam1-5.js
M data/base/script/campaign/libcampaign.js
Log Message:
-----------
cam1-1(s) updates
When on campaign 1-1s the power module should be built completely before
showing the video/setting up the transporter.
For campaign 1-1 remove a group order that should not happen.
And fix some comment typos in libcampaign.
Commit: 189fe0fb22ca012339be0dde081dc88d2d851571
https://github.com/Warzone2100/warzone2100/commit/189fe0fb22ca012339be0dde081dc88d2d851571
Author: KJeff01 <kjeff1...@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/script/campaign/libcampaign.js
Log Message:
-----------
Improve __camTriggerLastAttack
Extra precaution to make sure that campaign enemy transporter units are not
placed into attack groups along with
existing checks in the levels that use them.
Commit: 28187c24bd5ddc98b797c9f74b2f55629381ef97
https://github.com/Warzone2100/warzone2100/commit/28187c24bd5ddc98b797c9f74b2f55629381ef97
Author: Cyp <c...@wz2100.net>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M data/base/messages/brief2a.txt
M data/base/messages/cam1-outro.txt
A data/base/script/campaign/cam1-1.js
A data/base/script/campaign/cam1-1s.js
A data/base/script/campaign/cam1-5.js
A data/base/script/campaign/cam1-5s.js
A data/base/script/campaign/cam1-7.js
A data/base/script/campaign/cam1-7s.js
A data/base/script/campaign/cam1-d.js
A data/base/script/campaign/cam1-ds.js
A data/base/script/campaign/cam1a-c.js
M data/base/script/campaign/cam1c.js
M data/base/script/campaign/cam1ca.js
A data/base/script/campaign/cam1end.js
A data/base/script/campaign/cam2-1s.js
A data/base/script/campaign/cam2-1x.js
A data/base/script/campaign/cam2-2.js
A data/base/script/campaign/cam2-2s.js
A data/base/script/campaign/cam2-a.js
A data/base/script/campaign/cam2bx.js
M data/base/script/campaign/libcampaign.js
M data/base/script/campaign/templates.js
R data/base/script/data/cam1-1-ai.vlo
R data/base/script/data/cam1-1.vlo
R data/base/script/data/cam1-1s.vlo
R data/base/script/data/cam1-5.vlo
R data/base/script/data/cam1-5s.vlo
R data/base/script/data/cam1-7.vlo
R data/base/script/data/cam1-7s.vlo
R data/base/script/data/cam1-d.vlo
R data/base/script/data/cam1-ds.vlo
R data/base/script/data/cam1a-c.vlo
R data/base/script/data/cam1end.vlo
R data/base/script/data/cam2-2.vlo
R data/base/script/data/cam2-2s.vlo
R data/base/script/data/cam2a.vlo
R data/base/script/data/cam2arein.vlo
R data/base/script/data/cam2ax.vlo
R data/base/script/data/cam2tech.vlo
R data/base/script/data/vtols2-2.vlo
R data/base/script/data/vtols2a.vlo
R data/base/script/text/cam1-1-ai.slo
R data/base/script/text/cam1-1.slo
R data/base/script/text/cam1-1s.slo
R data/base/script/text/cam1-5.slo
R data/base/script/text/cam1-5s.slo
R data/base/script/text/cam1-7.slo
R data/base/script/text/cam1-7s.slo
R data/base/script/text/cam1a-c.slo
R data/base/script/text/cam1end.slo
R data/base/script/text/cam2ax.slo
M data/base/wrf/cam1/cam1a-c.wrf
M data/base/wrf/cam1/cam1ca/labels.json
M data/base/wrf/cam1/cam1end.wrf
M data/base/wrf/cam1/sub1-1.wrf
A data/base/wrf/cam1/sub1-1/labels.json
M data/base/wrf/cam1/sub1-1s.wrf
M data/base/wrf/cam1/sub1-5.wrf
A data/base/wrf/cam1/sub1-5/labels.json
M data/base/wrf/cam1/sub1-5s.wrf
M data/base/wrf/cam1/sub1-7.wrf
A data/base/wrf/cam1/sub1-7/labels.json
M data/base/wrf/cam1/sub1-7s.wrf
M data/base/wrf/cam1/sub1-d.wrf
M data/base/wrf/cam1/sub1-d/dinit.bjo
M data/base/wrf/cam1/sub1-d/feat.bjo
M data/base/wrf/cam1/sub1-d/game.map
A data/base/wrf/cam1/sub1-d/labels.json
M data/base/wrf/cam1/sub1-d/struct.bjo
M data/base/wrf/cam1/sub1-ds.wrf
M data/base/wrf/cam2/cam2a.wrf
M data/base/wrf/cam2/cam2b.wrf
A data/base/wrf/cam2/cam2start/labels.json
M data/base/wrf/cam2/sub2-1.wrf
A data/base/wrf/cam2/sub2-1/labels.json
M data/base/wrf/cam2/sub2-1s.wrf
M data/base/wrf/cam2/sub2-2.wrf
A data/base/wrf/cam2/sub2-2/labels.json
M data/base/wrf/cam2/sub2-2s.wrf
Log Message:
-----------
Merge remote-tracking branches 'kjeff01/campaignJS' and
'cristianalpha93/campaignJS'
Compare:
https://github.com/Warzone2100/warzone2100/compare/310933c76340...28187c24bd5d------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
