summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-17Merge branch 'timing'Aaron Perley2-9/+6
2016-10-17Sunrise and twinkle timingAaron Perley2-9/+6
2016-10-17Change omg url & add different depthliwencTaiwan2-9/+49
2016-10-17Merge branch 'master' of https://github.com/rayhogenson/bridgegroup12-99/+144
Conflicts: ShowRunner.py
2016-10-17Sunrise changesgroup13-10/+10
2016-10-17Finish twinkleAaron Perley1-31/+46
2016-10-16Merge branch 'master' into twinkleAaron Perley4-38/+66
Conflicts: ShowRunner.py
2016-10-16Basic twinkleAaron Perley2-101/+131
2016-10-16Dolphin attempt 2, it almost looks goodgroup11-3/+3
2016-10-16Sharkgroup11-1/+1
2016-10-16Stingraygroup11-1/+1
2016-10-16Whalegroup11-9/+9
2016-10-16Jellyfishgroup11-6/+9
2016-10-16Eelgroup11-7/+12
2016-10-16Don't crash when it's not a fishgroup11-1/+2
2016-10-16Go fastergroup11-13/+30
2016-10-16Merge branch 'master' of https://github.com/rayhogenson/bridgegroup16-87/+312
Conflicts: fish_show.py
2016-10-16Use staticmethod instead of classmethod in by_typeRaymond Hogenson1-2/+2
2016-10-16Add __unicode__ to VectorRaymond Hogenson1-0/+6
2016-10-16Improve eel movementRaymond Hogenson2-7/+42
2016-10-16Create new sorts of fish to be displayedRaymond Hogenson2-84/+234
2016-10-15Merge branch 'master' of github.com:rayhogenson/bridgeRaymond Hogenson10-130/+536
2016-10-14Add img-disable css and usageliwencTaiwan2-2/+32
The “socket.on(enable/disable image)” haven’t been tested.
2016-10-13Package include path fix and add optimization for computing coveragegroup13-4/+6
2016-10-13Modify sunrise showAaron Perley2-39/+92
2016-10-13Update fish show with increasing depth and fish type handlingAaron Perley3-24/+62
2016-10-11Add pretty webpageAaron Perley3-47/+279
2016-10-11Add back show testing main function in bridge.pyAaron Perley1-0/+9
2016-10-11Add event passing between webapp and showAaron Perley8-21/+70
2016-10-11Add support for multiple fishAaron Perley1-11/+10
2016-10-10Improve sun colorsgroup11-35/+29
2016-10-09Choose a random hue when a fish is spawnedgroup12-1/+4
2016-10-09Merge branch 'master' of github.com:rayhogenson/bridgeRaymond Hogenson5-13/+73
2016-10-09MergeRaymond Hogenson2-0/+207
2016-10-09Realistic small fish movementgroup13-24/+41
2016-10-09Add new fish movement schemeRaymond Hogenson4-11/+256
2016-10-09Refactor bridge, fish show, and sunrise show codeAaron Perley6-211/+121
2016-10-09Update simulator to use pygame instead of tkinterAaron Perley2-34/+23
2016-10-09Merge branch 'master' of https://github.com/rayhogenson/bridgegroup10-0/+0
2016-10-09Add twinklegroup111-21/+526
2016-09-30Meeting 2Raymond Hogenson3-21/+63
2016-09-27Scale the amount to change by the distanceRaymond Hogenson1-1/+2
This way it doesn't take too long to get to where we're trying to go, but this might actually make it look worse. The best thing to do here is to experiment with the bridge directly.
2016-09-27Fix many syntax errors and typosRaymond Hogenson3-10/+27
2016-09-27Merge branch 'master' of github.com:rayhogenson/bridgeRaymond Hogenson4-14/+95
2016-09-27Create .gitignore fileRaymond Hogenson1-0/+2
We ignore __pycache__ and *.pyc.
2016-09-27Split files and finish render codeRaymond Hogenson4-74/+107
Although it is unlikely that this code will actually run, it is split up rather nicely such that it should be maintainable into the future. Right now only one fish is supported, and it moves at some fixed rate across the bridge. This is fine for a demo, but the rendering process will need to be changed significantly before the end.
2016-09-27Add bridge simulator and cleanup codeAaron Perley4-42/+121
2016-09-27Fish rendergroup11-0/+29
2016-09-27Fix to_RGB and to_HSV functions to actually workRaymond Hogenson1-2/+2
2016-09-27Use python 2 superRaymond Hogenson1-2/+2