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.

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

UPDATE: Heart and Swim ! #78

Closed
wants to merge 38 commits into from

Conversation

Vdauphin
Copy link
Contributor

@Vdauphin Vdauphin commented Jan 4, 2016

Update of #67

- FIX: coma in traffic_create.sqf
- change _iswater private by _pos_iswater
- FIX : BIS_fnc_findSafePos return an array of 2 elements
- missing coma
- tweak paramter name
…rine' into FIX-private_variable

# Conflicts:
#	=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/traffic_create.sqf
…e' into Add-beach_city

# Conflicts:
#	=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/traffic_add_WP.sqf
#	=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/mil/patrol_addWP.sqf
- change BIS_fnc_findSafePos for selectBestPlaces to detect beach
- change condition to find _cities
…d-activate_NameMarine

# Conflicts:
#	=BTC=co@22_Hearts_and_Minds.Altis/core/def/mission.sqf
#	=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/int/add_actions.sqf
…d-activate_NameMarine

# Conflicts:
#	=BTC=co@22_Hearts_and_Minds.Altis/mission.sqm
…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
Copy link
Contributor Author

I did some commits to resolve conflicts.
Thanks for the 1.13 update !

@Vdauphin
Copy link
Contributor Author

Vdauphin commented Mar 7, 2016

Enemy boat patrol after a hard day ...
107410_2016-03-07_00005
A civilian coming back to home :)
107410_2016-03-07_00007

@Vdauphin
Copy link
Contributor Author

Summer clean up :)

@Vdauphin Vdauphin closed this May 23, 2017
@Vdauphin Vdauphin deleted the Add-activate_NameMarine branch May 23, 2017 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant