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

V0.97 s14 #676

Merged
merged 30 commits into from
Sep 30, 2019
Merged

V0.97 s14 #676

merged 30 commits into from
Sep 30, 2019

Conversation

Wyqer
Copy link
Member

@Wyqer Wyqer commented Sep 30, 2019

Sprint 14 update

Dubjunk and others added 30 commits September 10, 2019 10:42
@Dubjunk
Changed the sector capture condition
170b1f1
@Dubjunk
Basic captive module structure
7edbf6b
@Dubjunk
tanks block sector capture
8649a17
@Dubjunk
check sector on capture
5f960a9
@Dubjunk
added setCaptive function
2388bf9
@Dubjunk
ACE handcuff integration and more functions
27b2a33
@Dubjunk
typo
81ac03f
@Dubjunk
missing space
0f6887b
@Dubjunk
added interrogate action and blank settings finle
8130aa2
@Dubjunk
typos everywhere
c5ec660
@Dubjunk
clear garrison array on BLUFOR capture
ca3c5c6
@Dubjunk
added some more actions for a later stage
4884d42
@Dubjunk
tweaked the garrison to exclude captured units
e010fe9
@Dubjunk
fixed a lot of typos and the actions
5bcf909
@Dubjunk
added animations to the arrest function
876a541
@Dubjunk
ability to pass format text to common_addAction
d00689c
@Dubjunk
added the escort function to captives
8a8ec62
@Dubjunk
added global event to surrender and arrest
04596c4
@Dubjunk
added captive load/unload for vehicles
00bf3c9
@Dubjunk
add EH to the captive to remove all actions
47c4145
@Dubjunk
added interrogate functionality
3bc0c87
@Dubjunk
added interrogated event
beb7c47
@Dubjunk
removed unnecessary setVariable
057656d
@Dubjunk
missing function entry
5e128e1
@Dubjunk
fixed some locality problems
d9f5872
@Dubjunk
Suggestions by @Wyqer
46b247d
@Dubjunk
module ReadMe update
bdfc3b3
@Dubjunk
some documentation stuff
ed22bf3
@Dubjunk
suggestions by @veteran29
6cbaeea
@Dubjunk
Merge pull request #669 from KillahPotatoes/v0.97S14-531
2f537e9 
Prisoners of War
@Wyqer Wyqer added the done label Sep 30, 2019
@Wyqer Wyqer merged commit 26711e7 into v0.97 Sep 30, 2019
@Wyqer Wyqer deleted the v0.97S14 branch October 14, 2019 06:16
@Wyqer Wyqer added this to the Sprint 14 milestone Nov 20, 2019
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
Sprint 14
Development

Successfully merging this pull request may close these issues.
2 participants
@Wyqer @Dubjunk