Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new side mission: Destroy underwater generator #87

Merged
merged 41 commits into from
Mar 12, 2016
Merged

Add new side mission: Destroy underwater generator #87

merged 41 commits into from
Mar 12, 2016

Conversation

Vdauphin
Copy link
Owner

Giallustio#65

  • spawn generator nicelly
  • create a composition when no nice place had been found
  • 30 slots migration

Final test :

  • local
  • server

Vdauphin and others added 14 commits December 13, 2015 23:52
@Vdauphin
Add side unit in a boat need assistance
e274d21
@Vdauphin
FIXsss
6866bb8 
- _unit not define
- btc_civ_type_boats
- createmaker not at _vehpos
- BIS_fnc_findSafePos instead of btc_fnc_randomize_pos
@Vdauphin
Clean code and FIX ace_medical_enableFor
416a0ed
@Vdauphin
FIX : injure civ do not spawn in cargo
82806a7
@Vdauphin
Random civ cargo position
f021e8c
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/Add-activate_NameMa…
d33e35e 
…rine' into Side-MedicalAssistanceBoat
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/Add-activate_NameMa…
4e0a812 
…rine' into Side-MedicalAssistanceBoat

# Conflicts:
#	=BTC=co@22_Hearts_and_Minds.Altis/core/def/mission.sqf
@Vdauphin
FIX: if no sea
1388c47
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/FIX-btc_patrol_acti…
4683881 
…ve_negative' into Add-activate_NameMarine
@Giallustio
Merge pull request #89 from Vdauphin/FIX-LoadDB_curator
ff465ed 
FIX: add addCuratorEditableObjects for objects loaded by DB
@Vdauphin
add: side mission destroy underwater generator
6daf239
@Vdauphin
FIX: diver spawn in sky
bb17cf1
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/Add-activate_NameMa…
b3f4409 
…rine' into Side-destroy_underwater_generator
@Vdauphin
Add: find interesting generator pos
3105b7d
@Vdauphin Vdauphin added this to the 1.14 milestone Feb 17, 2016
Giallustio and others added 14 commits February 19, 2016 16:56
@Giallustio
Merge pull request #88 from Vdauphin/FIX-ObjectLoad
f9fc535 
FIX: all objects are not loaded by DB
@Giallustio
fix ID of city created
0243444
@Giallustio
imported in EDEN
e69845c
@Giallustio
Added cargo container to DB
8efdc8d
@Giallustio
tweaked civilian and patrols number
aab0923
@Vdauphin
Merge remote-tracking branch 'refs/remotes/Giallustio/master' into Ad…
d3e665c 
…d-activate_NameMarine

# Conflicts:
#	=BTC=co@22_Hearts_and_Minds.Altis/mission.sqm
@Vdauphin
FIX: btc_hq are in triger
cee51fb
@Giallustio
Added acceleration time and reorganized parameters
5fee675
@Giallustio
30 slots
92bac00
@Giallustio
f
9f25e4a
@Vdauphin
Add: 30 slots
a86de57
@Vdauphin
Merge remote-tracking branch 'refs/remotes/Giallustio/master' into Ad…
909f86e 
…d-activate_NameMarine

# Conflicts:
#	=BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
#	=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm
@Vdauphin
Add: 30 slots migration
c992e4c
@Vdauphin
Add: 30 slots migration
46b73c6
@Vdauphin
Merge remote-tracking branch 'refs/remotes/Giallustio/master' into Si…
01248bc 
…de-MedicalAssistanceBoat

# Conflicts:
#	=BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_1.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_2.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_3.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_1.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_2.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_3.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_unc.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm
@Vdauphin
rm conflit
d732584
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/Side-MedicalAssista…
31d638d 
…nceBoat' into Side-destroy_underwater_generator

# Conflicts:
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_1.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_2.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_3.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_1.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_2.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_3.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_unc.paa
@Vdauphin
FIX: btc_patrol_active is an array now
d80532d
@Vdauphin
FIX: optimize
4161be5
@Vdauphin
FIX: sqm
0f7b181
@Vdauphin
Add: nice pos, fuel storage
b923057
@Vdauphin
Add : remove storagebladder and better place for storage
9952403
@Vdauphin
Add: random storage type
3bea180
@Vdauphin
Copy link
Owner Author

Vdauphin commented Mar 5, 2016

107410_2016-03-05_00002

107410_2016-03-05_00011

@Vdauphin Vdauphin merged commit 87b59ab into master8 Mar 12, 2016
@Vdauphin Vdauphin deleted the Side-destroy_underwater_generator branch July 22, 2016 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Vdauphin @Giallustio