Integration v2 (#1)

Integration v2 (#1)

Merged

Commits were merged into target branch

	Hongzheng Li opened 2 weeks ago merge application into main branch
	New commits added 2 weeks ago Add battery asset 9 months ago c0f509d9 Adding recharge station and corresponding factory 9 months ago df26c352 POI base code 9 months ago fb79dcc2 Merge pull request #1 from umn-csci-3081-s24/double-delivery-sam POI base code 9 months ago 553be209 Base drone decorator 9 months ago 21a2c59b Merge pull request #2 from umn-csci-3081-s24/double-delivery-dev Double delivery dev 9 months ago 64f0f95f Updated decorator attributes 9 months ago b177d32a Merge pull request #3 from umn-csci-3081-s24/double-delivery-daniel Double delivery daniel 9 months ago f8e40cd8 Messaging temp fix 9 months ago 8bc0a6c2 Add drone base decorator 9 months ago 46ded353 first iteration of battery decorator 9 months ago 9e68be41 intergrate battery decorator to the simulation 9 months ago a6d904e6 Drone.cc automatic multiple delivery 9 months ago 2dabeeff Front end base code 8 months ago 500565cb Merge pull request #4 from umn-csci-3081-s24/double-delivery-sam Front end base code - Still needs button prompting / functionality 8 months ago 49dd1913 Base button functionality 8 months ago a33a48ee Merge pull request #5 from umn-csci-3081-s24/double-delivery-sam Base button functionality 8 months ago 53ebc349 Prototype: No prompting 8 months ago e3ae71ec Functioning prototype 8 months ago 429f0330 Minor pop-up fix 8 months ago ae367300 Storing recharge stations 8 months ago 497becef Add getModel function for recharge station decorator 8 months ago 83a67bfc Add getModel to retrive position of recharge stations 8 months ago 1e6e594e Implement getModel() 8 months ago f04d9836 Implement findNearestRecharge station and refine logic of charging 8 months ago 42be4b42 Add movement to recharge stations 8 months ago eb5307ec fixed: not sending msg to front end 8 months ago 9c24154d Merge pull request #6 from umn-csci-3081-s24/double-delivery-sam Final Implementation (NOT CLEAN) 8 months ago 4dd2e29d fixed: not updating drones in the map 8 months ago 22d66a6b Documentation and clean-up 8 months ago eff2ee07 Merge pull request #7 from umn-csci-3081-s24/double-delivery-sam Documentation and clean-up 8 months ago 3f0edceb Change lookAhead() to checkIfNeedRecharge() 8 months ago 648467ee Change checkIfNeedRecharge function 8 months ago b2065428 Update lookAheadForRechargeStation() 8 months ago 1ab26c3f Created totalDistance function in PathStrategy 8 months ago af99d27d Finish lookAhead function 8 months ago 621f4a6f Adding functions to return total time for delivery, starting to refactor update in decorator 8 months ago 44c2f824 lookAhead mostly done 8 months ago 924d4b6b Fix totalPathDistance in PathStrategy 8 months ago 77586f92 Removed unneccessary functions 8 months ago b425af4b Working lookAhead function 8 months ago 0ea7e9ef Create message for when drone reaches recharge station 8 months ago 8fdb350f Merge branch 'battery-dev' into lookAhead 8 months ago c6aa511e Merge pull request #9 from umn-csci-3081-s24/lookAhead Complete lookAhead function 8 months ago 9de639c9 Fix issues after merging 8 months ago b1882145 Fix cppLint errors 8 months ago 582e1dd0 Make comments a bit more clear 8 months ago 9d3d81b1 Cleaned up getter functions in Drone 8 months ago a885f35a Make total path always include distance to final destination 8 months ago 6eecc2b2 Adding recharge drone methods 8 months ago a6f72bb8 Add recharge_drone asset 8 months ago 42fb79c7 Adding recharge drones to scene 8 months ago e8a31a2e Allow drone to go to recharge station after package if neccessary 8 months ago 010f5dff Rename totalPathDistance to currentPathDistance 8 months ago 8562beb1 Make drone only check lookAhead when changing paths 8 months ago b0165488 Adding recharge drone functionality 8 months ago 0da4f853 Make the drone not stop to recharge after picking up a package 8 months ago 7d90186b Fix: all recharge drones head to one dead drone 8 months ago 8acbef84 Merge branch 'recharge-drone-dev' of github.umn.edu:umn-csci-3081-s24/team-010-38-finalproject into recharge-drone-dev 8 months ago 5abe40f1 Fixed drone going to station after package 8 months ago cde96ecf Added documentation for new/existing classes, modified DroneDecorator functionality 8 months ago 86d36b68 Minor linting fixes and documentation additions 8 months ago 727d8e15 Add documentation 8 months ago 0df16beb Add README.md 8 months ago 5c04a810 Implement station malfunctioning 8 months ago 35cdfb21 Merge pull request #10 from umn-csci-3081-s24/Malfunctioning-Stations-Dev Implement station malfunctioning 8 months ago 90a5d6d1 Fix cppLint erros 8 months ago 4dcf1e26 Fixes to prevent segfaults, minor observer messaging update 8 months ago 17c1e0b7 Updated writeup 8 months ago b483a312 Add documentation 8 months ago 2d115514 Finish DroneBatteryDecorator.h documentation 8 months ago fab51f85 Merge branch 'extension-1-documentation' of github.umn.edu:umn-csci-3081-s24/team-010-38-finalproject into extension-1-documentation 8 months ago b1b8eea5 Added DoubleDelivery UML 8 months ago 636a60c2 Merge branch 'Integration-v2' into extension-1-documentation 8 months ago 06a37399 Merge pull request #12 from umn-csci-3081-s24/extension-1-documentation Integration of both features 8 months ago cd560dbd Fix error caused by integration 8 months ago 91689ffc add drone 8 months ago 2413c039 Fix integration 8 months ago 216f9835 Fix make lint errors 8 months ago 1f3d6840 Update README.md 8 months ago f6c0c7eb Update README.md 8 months ago eb72cfc9 Update README.md 8 months ago 90609b8a Update README.md 8 months ago 2d2fc2de Add documentation 8 months ago aeff1aa4 Updated writeup to be almost complete 8 months ago 4b8e0948 Update UML 8 months ago 2a43403b Minor linting and writeup formatting fixes 8 months ago 1fed34d7 Update README.md 8 months ago 06c97d11 Merge branch 'Integration-v2' of github.umn.edu:umn-csci-3081-s24/team-010-38-finalproject into Integration-v2 8 months ago 17f8ee72 Changed Double Delivery UML 8 months ago 0b64f4ca Merge branch 'Integration-v2' of https://github.umn.edu/umn-csci-3081-s24/team-010-38-finalproject into Integration-v2 8 months ago eaa046ed Updated writeup to include Docker Hub link 8 months ago 3cc7f7d1 Added instructions for Docker in writeup 8 months ago bc673f0f Update README.md 8 months ago 09a46e7e Update README.md 8 months ago d3dad881 ci: add .onedev-buildspec.yml 2 weeks ago 27110e51
	Hongzheng Li merged 2 weeks ago
	Referenced from commit 2 weeks ago Merges pull request #1 Integration v2 Hongzheng Li committed 2 weeks ago caebb76a

Submitter	Hongzheng Li
Target	main
Source	Integration-v2

Jobs

Merge Strategy

Create Merge Commit

Watchers (1)

Reference

pull request drone_simulation#1

Please wait...

Page is in error, reload to recover