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

End of semester merge #116

Merged
merged 1,007 commits into from
Dec 13, 2023
Merged

End of semester merge #116

merged 1,007 commits into from
Dec 13, 2023

Conversation

FergusonAJ
Copy link
Contributor

All code has been merged into development (with a few instructor tweaks / improvements).
Now it's time to move that code into main!

mdkdoc15 and others added 30 commits December 3, 2023 23:09
TrackingAgent with Alerter
Merge in Development branch from class
Deleted property for agents is now disabled
…ssed (non-zero return) or the time is up (returns zero). General cleanup and comments.
Timer added ,Draw functions optimized and It will only draw enlarge for  larger square size grids
Handles multiple clients quitting at once properly
…oup2

# Conflicts:
#	source/DataCollection/DataReceiver.hpp
# Conflicts:
#	source/Interfaces/MainInterface.cpp
#	source/Interfaces/NetWorth/client/ClientInterface.hpp
#	source/Interfaces/NetWorth/server/ServerInterface.hpp
#	source/core/AgentBase.hpp
#	source/core/Entity.hpp
…oup2

# Conflicts:
#	source/DataCollection/DataReceiver.hpp
Updated Formatting and Documentation
…for the classes MainInterface.cpp, MainInterface.cpp, MessageBoard.cpp, MessageBoard.hpp, TextBox.cpp, TextBox.cpp and also updates Group3_README.md for these classes.
mercere99 and others added 29 commits December 10, 2023 10:24
@FergusonAJ FergusonAJ merged commit c55a9e5 into main Dec 13, 2023
2 checks passed
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.