Skip to content

Sync#2

Merged
jherd23 merged 10 commits intojherd23:masterfrom
androidmage:master
Jan 6, 2016
Merged

Sync#2
jherd23 merged 10 commits intojherd23:masterfrom
androidmage:master

Conversation

@jherd23
Copy link
Copy Markdown
Owner

@jherd23 jherd23 commented Jan 6, 2016

No description provided.

androidmage and others added 10 commits January 5, 2016 23:14
Update to Scout initialization
scanArchonLocation returns a MapLocation of enemy archon and the new global variables are ourTeam and opponentTeam.
Added scanArchonLocation and new global vars
*Moved scanArchonLocation() to RESOURCE_FUNCTIONS for semantic reasons
*Made scanArchonLocation() static so it can be accessed by any inner class and any member of RESOURCE_FUNCTIONS
*Changed scanArchonLocation() to return null if no Archon is found
-Removed Scout.scanArchon() as its functionality is found in RESOURCE_FUNCTIONS.scanArchonLocation() [ie: if it returns null, same as returning false in the prior, if not null, same as true]
+Commented RESOURCE_FUNCTIONS.scanArchonLocation()
+New, encrypted RESOURCE_FUNCTIONS.trySendMessage function
jherd23 added a commit that referenced this pull request Jan 6, 2016
@jherd23 jherd23 merged commit 0d5d5b3 into jherd23:master Jan 6, 2016
jherd23 pushed a commit that referenced this pull request Jan 8, 2016
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.

2 participants