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

UPDATE: Heart and Swim ! #95

Merged
merged 38 commits into from
Apr 26, 2016
Merged

UPDATE: Heart and Swim ! #95

merged 38 commits into from
Apr 26, 2016

Conversation

Vdauphin
Copy link
Owner

Update of Giallustio#67

@Vdauphin
Add : activate sea battelfiled
cd69a4d
@Vdauphin
Add : activate sea battelfiled in mission parameter
25801f6
@Vdauphin
FIX and change in traffic_create.sqf
64b6da3 
- FIX: coma in traffic_create.sqf
- change _iswater private by _pos_iswater
- FIX : BIS_fnc_findSafePos return an array of 2 elements
@Vdauphin
Change _iswater for _pos_iswater
c1e01dd
@Vdauphin
FIX BIS_fnc_findSafePos
f066f56
@Vdauphin
FIX: btc_fnc_randomize_pos search allow water surface if btc_p_sea is…
5de21ff 
… true
@Vdauphin
FIX: coma missing in patrol_create.sqf
abbe9b0
@Vdauphin
Change _pos_iswater for _isboat
1e40b54
@Vdauphin
Add : add_WP to beach city
3a27edc
@Vdauphin
Change + for pushBack
1d76d5a
@Vdauphin
Change code for optimize code
2a52224 
https://community.bistudio.com/wiki/Code_Optimisation
@Vdauphin
Add: check btc_p_sea before
0850467
@Vdauphin
FIXss
81bfd3c 
- missing coma
- tweak paramter name
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/Add-activate_NameMa…
19d7ab6 
…rine' into FIX-private_variable

# Conflicts:
#	=BTC=co@22_Hearts_and_Minds.Altis/core/fnc/civ/traffic_create.sqf
@Vdauphin
change + by pushback
0c34e7c
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/FIX-private_variabl…
884231d 
…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
@Vdauphin
Change codo for optimize code
410e761 
- change BIS_fnc_findSafePos for selectBestPlaces to detect beach
- change condition to find _cities
@Vdauphin
Change code for optimize code
33761f3
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/FIX-private_variabl…
c1ac3bf 
…e' into Add-activate_NameMarine
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/Add-beach_city' int…
6a71cc8 
…o Add-activate_NameMarine
@Vdauphin
Change for submarinex
e80c5bd 
Giallustio#70 (comment)
@Vdauphin
Add randomize spawn of enemy patrol
93f5d9b
@Vdauphin
Move btc_hq_red btc_hq_green btc_hq_blue
f4fb336
@Vdauphin
Tweak beach detection
46c9d8f
@Vdauphin
Add : Search for intel interaction on diver
3a8c7c3
@Vdauphin
Merge remote-tracking branch 'refs/remotes/Giallustio/master' into Ad…
308daec 
…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
@Vdauphin
Add: Eventhandler for patrol with empty fuel
f3083c9
@Vdauphin
Tweak distance nearRoads
8d53d85
@Vdauphin
FIX: choose no marine for vehicle assistance side
922f8eb
@Vdauphin
Merge remote-tracking branch 'refs/remotes/origin/FIX-btc_patrol_acti…
4683881 
…ve_negative' into Add-activate_NameMarine
@Vdauphin
FIX: diver spawn in sky
bb17cf1
@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
@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
FIX: btc_patrol_active is an array now
d80532d
@Vdauphin
Update mission.sqm from the last .sqm
538b510 
move btc_hq to not activate city/marina
@Vdauphin
FIX: array count
e59269d
@Vdauphin Vdauphin added this to the 1.13.1 milestone Apr 25, 2016
@Vdauphin Vdauphin merged commit be20497 into master_stable Apr 26, 2016
@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
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
1.13.1
Development

Successfully merging this pull request may close these issues.
1 participant
@Vdauphin