Master Final Project Pull #2
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Created placeholder scripts for Engine, BoardHex, BoardCorner, and BoardEdge and started framework for game saving
Created folders for my work as well as the scripts I'll need
Created a test scene and added different components playing with GUI Layout. Started formatting the editor window. Running into issues with the scroll view. Created the hex constructor.
Master update from nathan
Fixed error in hex class
I updated the GUI with multiple buttons including a trade button, something broke somewhere though and the buttons aren't being deactivated/reactivated. Sorry.
Redid save structure to match the engine, also created a game board with "Hex," "Road," and "Settlement," tags for raycasting for testing board interaction
Started building data structures for board.
Board and Project Cleaning
fixed window GUI formatting issue, forgot to endhorizontal
Conflicts: Settlers of Not Catan/Assets/Scene/SceneTest.unity Settlers of Not Catan/Assets/Scripts/Common/ScriptEngine.cs Settlers of Not Catan/Assets/Scripts/Common/ScriptHex.cs
Conflicts: Settlers of Not Catan/Assets/Scene/SceneTest.unity Settlers of Not Catan/Assets/Scripts/Common/ScriptEngine.cs Settlers of Not Catan/Assets/Scripts/Common/ScriptHex.cs
Updated hex class to include the number associated with the hex. Readded the vs 2015 package
Conflicts: Settlers of Not Catan/Assets/Scene/SceneTest.unity Settlers of Not Catan/Assets/Scripts/Common/ScriptHex.cs Settlers of Not Catan/Assets/UnityVS.meta
Also fixed the scripts on the test board prefab.
Added all of the necessary buttons for each phase. Started adding options for the different hexes.
Conflicts: Settlers of Not Catan/ProjectSettings/ProjectSettings.asset
Reformatted the editor window
File was moved, and got duplicated in merging
also finished data structures in the board and created a second board prefab with all the pieces interconnected
Conflicts: Settlers of Not Catan/Assets/Scripts/Common/ScriptBoardManager.cs.meta
Also checked everything after merge
Save Load Complete
Created a jagged array (non rectangular 2d array) to hold all of the hex data. Added code to draw the hex shapes on the window.
Implemented the adjacent only heuristic Created variables necessary to track how many of each type is placed Drew lines defining each hex Modified so lines change color based on what hex type it is Added an export map button with debug
Fixed some formatting, also added more variables for helpful heuristics.
Master w/ nathan's work
Roads now find adjacent settlement locations and give the settlements a reference to themselves
Edited the script engine
Added the final two map heuristics. Also added check to make sure the designer couldn't save an invalidmap.
Created a menu scene and finalized the game scene. All buttons work as best as I'm able to make them work.
Data connections finished
Ghostdreamer
pushed a commit
that referenced
this pull request
Oct 14, 2015
Update Craig's Fork - Friday evening
Ghostdreamer
pushed a commit
that referenced
this pull request
Oct 14, 2015
Friday night pull request
Ghostdreamer
pushed a commit
that referenced
this pull request
Oct 14, 2015
Added rule requiring road for settlement
Ghostdreamer
pushed a commit
that referenced
this pull request
Oct 14, 2015
Saturday afternoon commit #2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.