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: Classe name civ mod @Ericj_Taliban #75

Merged
merged 42 commits into from
Feb 21, 2016
Merged

Add: Classe name civ mod @Ericj_Taliban #75

merged 42 commits into from
Feb 21, 2016

Conversation

Vdauphin
Copy link
Owner

@Vdauphin Vdauphin commented Jan 3, 2016

Giallustio#91

Add :

  • Afghan civil
  • more skin for vanillia skin
  • option in mission parameter to choose between vanillia and Taliban
  • check if mod are present
  • 30 slots migration

Final test :

  • local
  • server

@Vdauphin Vdauphin added this to the 1.14 milestone Jan 3, 2016
Vdauphin and others added 22 commits January 7, 2016 23:17
@Vdauphin
Add: arma 3 CIV
7b3d597
@Vdauphin
Remove ace_medical_enableAdvancedWounds
df297c8
@Vdauphin
FIX: ace_medical_enableAdvancedWounds need a bollean
2b6d736
@Vdauphin
Don't add EH killed if unit is in vehicule
800dbcd
@Vdauphin
FIX: EH getout too much added
d8dcfaa
@Vdauphin
Add: check if is negative
3e426bb
@Vdauphin
Reset to Giallustio@b34fbb4
9097ee6
@Vdauphin
FIX: btc_patrol_active is an array of group patrol
85385bd
@Vdauphin
FIX: btc_civ_veh_active is an array of traffic veh
1321efe
@Vdauphin
Remove ace_medical_pain
f204309
@Vdauphin
FIX: not stable condition
0000b29
@Vdauphin
FIX: mission don't detect database
788d17a
@Giallustio
Merge pull request #80 from Vdauphin/FIX-bandage_error
06a0fb7 
FIX : bandage not working normally
@Giallustio
Merge pull request #85 from Vdauphin/Side-MedicalAssistance
e964b3a 
UPDATE : Side medical assistance
@Giallustio
Merge pull request #86 from Vdauphin/FIX-not_detect_database
77f1ac0 
FIX: mission don't detect database
@Giallustio
del
5988a30
@Giallustio
ace_medical_enableRevive & ace_medical_preventInstaDeath
6410b3b
@Giallustio
delay spawn patrols
5e98e17
@Giallustio
moved traffic & patrol
1211335
@Giallustio
Merge pull request #83 from Vdauphin/FIX-btc_patrol_active_negative
ac2ae75 
FIX: btc_patrol_active and btc_civ_veh_active negative
@Giallustio
Merge branch 'master' of https://github.com/Giallustio/HeartsAndMinds
df97860
@Giallustio
Merge pull request #84 from Vdauphin/Add-captive-enemies
622b0c0 
UPDATE: Interrogate Prisoner
Vdauphin and others added 14 commits January 31, 2016 12:32
@Vdauphin
Tweak: mission description prarameter
a9eb81f
@Vdauphin
FIX: all objects are not loaded by DB if an object is loaded or not a…
0603652 
…live or isNull
@Vdauphin
FIX: load object by DB are not curator enable
4b90d4c
@Giallustio
Merge pull request #89 from Vdauphin/FIX-LoadDB_curator
ff465ed 
FIX: add addCuratorEditableObjects for objects loaded by DB
@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
@Giallustio
Added acceleration time and reorganized parameters
5fee675
@Giallustio
30 slots
92bac00
@Giallustio
f
9f25e4a
@Vdauphin
Add: 30 slots migration
3e3af3e
@Vdauphin
Merge remote-tracking branch 'refs/remotes/Giallustio/master' into Ad…
1a06b25 
…d-Taliban_civil

# Conflicts:
#	=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf
#	=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 Vdauphin merged commit 1a06b25 into master8 Feb 21, 2016
@Vdauphin Vdauphin deleted the Add-Taliban_civil branch September 4, 2016 20:51
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