Fixed conflicts
This commit is contained in:
alkadienePhoton
132
commit-graph.html
Normal file
132
commit-graph.html
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
<!-- This file was created with the aha Ansi HTML Adapter. https://github.com/theZiz/aha -->
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="application/xml+xhtml; charset=UTF-8"/>
|
||||||
|
<title>stdin</title>
|
||||||
|
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
|
||||||
|
<style>
|
||||||
|
span {
|
||||||
|
font-family: 'Roboto', sans-serif;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<pre>
|
||||||
|
* <span style="color:olive;">d3294bc</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:teal;">HEAD</span><span style="color:olive;"> -> </span><span style="font-weight:bold;color:green;">main</span><span style="color:olive;">, </span><span style="font-weight:bold;color:olive;">tag: </span><span style="font-weight:bold;color:olive;">TwistScrimmageRelease</span><span style="color:olive;">, </span><span style="font-weight:bold;color:red;">origin/main</span><span style="color:olive;">)</span> SCRIMMAGE MERGE!!!
|
||||||
|
<span style="color:red;">|</span><span style="color:green;">\</span>
|
||||||
|
<span style="color:red;">|</span> * <span style="color:olive;">d66aecd</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/dev</span><span style="color:olive;">, </span><span style="font-weight:bold;color:red;">origin/HEAD</span><span style="color:olive;">, </span><span style="font-weight:bold;color:green;">dev</span><span style="color:olive;">)</span> Update README.md
|
||||||
|
<span style="color:red;">|</span> * <span style="color:olive;">bbdf0d0</span> Shortened fun sounds
|
||||||
|
<span style="color:red;">|</span> * <span style="color:olive;">a2ed2c4</span> Merge pull request 'arcmyx-dev' (#14) from arcmyx-dev into dev
|
||||||
|
<span style="color:red;">|</span> <span style="color:olive;">|</span><span style="color:blue;">\</span>
|
||||||
|
<span style="color:red;">|</span> <span style="color:olive;">|</span> * <span style="color:olive;">dd0070d</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/arcmyx-dev</span><span style="color:olive;">)</span> Update twist_scrimmage.py
|
||||||
|
<span style="color:red;">|</span> <span style="color:olive;">|</span> * <span style="color:olive;">9a06677</span> Added comments. Good luck for scrimmage y'all!!!
|
||||||
|
<span style="color:red;">|</span> <span style="color:olive;">|</span> * <span style="color:olive;">11e89c6</span> THE FINAL THINGY
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">52214be</span> Update final/4main.py
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">4540269</span> Update final/4main.py
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">785c955</span> Update final/4main.py
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">b6cffc6</span> Update final/4main
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">870dce3</span> Merge pull request 'arcmyx-dev' (#13) from arcmyx-dev into dev
|
||||||
|
<span style="color:red;">|</span> <span style="color:purple;">|</span><span style="color:blue;">\</span><span style="color:blue;">|</span>
|
||||||
|
<span style="color:red;">|</span> <span style="color:purple;">|</span> * <span style="color:olive;">bb76258</span> Update final/main4emaj.py
|
||||||
|
<span style="color:red;">|</span> <span style="color:purple;">|</span> * <span style="color:olive;">75e64da</span> Update final/main4emaj.py
|
||||||
|
<span style="color:red;">|</span> <span style="color:purple;">|</span> * <span style="color:olive;">8ea7cd5</span> Update final/main4emaj.py
|
||||||
|
* <span style="color:purple;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">5ba2811</span> Merge pull request 'Updated LICENSE and README' (#12) from dev into main
|
||||||
|
<span style="font-weight:bold;color:red;">|</span><span style="color:purple;">\</span><span style="color:purple;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">dd4fb8b</span> Switched to GPLv3
|
||||||
|
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">ee099d9</span> Switched to GPL v3
|
||||||
|
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">489add5</span> Removed emojis
|
||||||
|
* <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">387e00b</span> Merge branch 'dev'
|
||||||
|
<span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:green;">\</span><span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:olive;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">28e5bea</span> Updated README file with some formatting help from AI
|
||||||
|
* <span style="font-weight:bold;color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">3fdd6ae</span> Merge to main for Scrimmage
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span><span style="font-weight:bold;color:blue;">\</span><span style="font-weight:bold;color:blue;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">1e612e2</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:olive;">tag: </span><span style="font-weight:bold;color:olive;">Scrimmage-Twist</span><span style="color:olive;">)</span> Updated license information
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">4456a5a</span> Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span><span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">08e0b9a</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/Johannes_Dev</span><span style="color:olive;">)</span> Delete missions/Lift2.py
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">4533f95</span> Add stuff from Johannes accidental fork
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">ec74531</span> Merge pull request 'Vickram_dev_' (#8) from Vickram_dev_ into dev
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:olive;">|</span><span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> <span style="color:olive;">62b76d4</span> Merge pull request 'Add missions/tip the scale.py' (#4) from ayaan_dev into dev
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:purple;">|</span><span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:purple;">|</span> * <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">8008daf</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/ayaan_dev</span><span style="color:olive;">)</span> Add missions/tip the scale.py
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">cba5cfc</span> Merge pull request 'Update utils/combine_runs.py' (#5) from Vickram_dev_ into dev
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:red;">|</span><span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> <span style="color:olive;">3349e7f</span> Merge pull request 'Rishi_dev' (#7) from Rishi_dev into dev
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:blue;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">4b765b0</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/Rishi_dev</span><span style="color:olive;">)</span> Update missions/M8_5.py
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">2eca0d7</span> Initial commit
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:olive;">/</span> <span style="font-weight:bold;color:green;">/</span> <span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span> <span style="color:olive;">8949003</span> Mission 9 not in use
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span><span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:teal;">|</span><span style="color:teal;">/</span><span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">6931731</span> Update LINEUPS.md
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">d172c70</span> THIS CODE IS OUTDATED!!! DO NOT USE!!!
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">efcc011</span> Initial Commit
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">28bb3fa</span> Merge pull request 'Pull from Vickram to dev' (#2) from Vickram_dev_ into dev
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:purple;">|</span><span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> <span style="color:olive;">7ba2453</span> Merge pull request 'Pull from Johannes_Dev to dev' (#3) from Johannes_Dev into dev
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span><span style="color:green;">\</span> <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span><span style="color:green;">_</span><span style="font-weight:bold;color:green;">|</span><span style="color:green;">_</span><span style="color:blue;">|</span><span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span><span style="color:green;">/</span><span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">7eeead7</span> Sand Mission
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">e817650</span> Send Over
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">c4aa954</span> Boat mission
|
||||||
|
* <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">ee0b8eb</span> Update README.md
|
||||||
|
* <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">a745ed8</span> Merge pull request 'WIP - Test Merge ( dev to main )' (#1) from dev into main
|
||||||
|
<span style="color:olive;">|</span><span style="color:blue;">\</span> <span style="color:red;">\</span> <span style="color:green;">\</span> <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">7e2dc0b</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/Vickram_dev_</span><span style="color:olive;">)</span> Update final/main5.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">29bd9f0</span> Update final/main5.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">a3b04d3</span> Add final/main5.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">2d9eb49</span> Update final/main4.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">42090ea</span> Update final/main4.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">f7072a6</span> Update final/main4.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span><span style="color:teal;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">3f37e7e</span> Update final/main4.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">a3e7be2</span> Update final/main4.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">c2204e7</span> Update final/main4.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">0664a61</span> Add final/main4.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">227619d</span> Add final/3main.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">684447c</span> Add final/2main.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span><span style="color:blue;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">95d7c0c</span> Add final/1main.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">7e0c3d2</span> Delete Final Combined Codes
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">f190d38</span> Add Final Combined Codes
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">cd21a73</span> Delete missions/main.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">0fa1019</span> Upload files to "missions"
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span><span style="font-weight:bold;color:green;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> * <span style="color:olive;">bb89e01</span> Update utils/combine_runs.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span><span style="font-weight:bold;color:teal;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> * <span style="color:olive;">c690ae4</span> Update members/Vickram.txt
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span><span style="color:red;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span><span style="color:red;">/</span><span style="color:green;">|</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> <span style="color:olive;">d309b00</span> '{Johannes}'
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> <span style="color:olive;">37fb0a6</span> Add members/Ayaan.txt
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> <span style="color:olive;">e895fd1</span> Add members/Vickram.txt
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> <span style="color:olive;">70e09fb</span> Add members/Carlos.txt
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span><span style="color:green;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">d017d13</span> Update members/atharv.txt
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">6199a9c</span> Atharv - added my About Me
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">72547c5</span> Fixed grammar
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">5d57a3a</span> Initial commit
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">5c7e2e9</span> Uploaded files from Bitbucket
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">e36e3d0</span> Delete Send_Over.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">a35d599</span> Delete M8_5.py
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">6dedb0a</span> Uploaded files from Bitbucket
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">be5350d</span> Update README.md
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">2412f2c</span> Uploaded files from Bitbucket
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">125f1df</span> Uploaded files from Bitbucket
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">3ddaf7e</span> Uploaded files from Bitbucket
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">2629845</span> Test new
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">fdbc180</span> Test
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span><span style="color:blue;">/</span>
|
||||||
|
<span style="color:olive;">|</span> * <span style="color:olive;">ce4f984</span> Created new branch
|
||||||
|
<span style="color:olive;">|</span> * <span style="color:olive;">7a0d651</span> Test commit
|
||||||
|
<span style="color:olive;">|</span><span style="color:olive;">/</span>
|
||||||
|
* <span style="color:olive;">0d0e977</span> Initial commit
|
||||||
|
</pre>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
136
commit-graphnew.html
Normal file
136
commit-graphnew.html
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
<!-- This file was created with the aha Ansi HTML Adapter. https://github.com/theZiz/aha -->
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<head>
|
||||||
|
<meta
|
||||||
|
http-equiv="Content-Type"
|
||||||
|
content="application/xml+xhtml; charset=UTF-8"
|
||||||
|
/>
|
||||||
|
<title>COMMIT GRAPH</title>
|
||||||
|
<link
|
||||||
|
href="https://fonts.googleapis.com/css2?family=Roboto&display=swap"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<style>
|
||||||
|
span {
|
||||||
|
font-family: "Roboto", sans-serif;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<pre>
|
||||||
|
* d3294bc (HEAD -> main, tag: TwistScrimmageRelease, origin/main) SCRIMMAGE MERGE!!! [Atharv]
|
||||||
|
<span style="color:red;">|</span><span style="color:green;">\</span>
|
||||||
|
<span style="color:red;">|</span> * d66aecd (origin/dev, origin/HEAD, dev) Update README.md [Atharv]
|
||||||
|
<span style="color:red;">|</span> * bbdf0d0 Shortened fun sounds [Atharv]
|
||||||
|
<span style="color:red;">|</span> * a2ed2c4 Merge pull request 'atharv-dev' (#14) from atharv-dev into dev [Atharv]
|
||||||
|
<span style="color:red;">|</span> <span style="color:olive;">|</span><span style="color:blue;">\</span>
|
||||||
|
<span style="color:red;">|</span> <span style="color:olive;">|</span> * dd0070d (origin/atharv-dev) Update twist_scrimmage.py [Atharv]
|
||||||
|
<span style="color:red;">|</span> <span style="color:olive;">|</span> * 9a06677 Added comments. Good luck for scrimmage y'all!!! [Atharv]
|
||||||
|
<span style="color:red;">|</span> <span style="color:olive;">|</span> * 11e89c6 THE FINAL THINGY [Atharv]
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> 52214be Update final/4main.py [Ayaan]
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> 4540269 Update final/4main.py [Johannes]
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> 785c955 Update final/4main.py [Atharv]
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> b6cffc6 Update final/4main [Atharv]
|
||||||
|
<span style="color:red;">|</span> * <span style="color:blue;">|</span> 870dce3 Merge pull request 'atharv-dev' (#13) from atharv-dev into dev [Atharv]
|
||||||
|
<span style="color:red;">|</span> <span style="color:purple;">|</span><span style="color:blue;">\</span><span style="color:blue;">|</span>
|
||||||
|
<span style="color:red;">|</span> <span style="color:purple;">|</span> * bb76258 Update final/main4emaj.py [Atharv]
|
||||||
|
<span style="color:red;">|</span> <span style="color:purple;">|</span> * 75e64da Update final/main4emaj.py [Atharv]
|
||||||
|
<span style="color:red;">|</span> <span style="color:purple;">|</span> * 8ea7cd5 Update final/main4emaj.py [Atharv]
|
||||||
|
* <span style="color:purple;">|</span> <span style="color:teal;">|</span> 5ba2811 Merge pull request 'Updated LICENSE and README' (#12) from dev into main [Atharv]
|
||||||
|
<span style="font-weight:bold;color:red;">|</span><span style="color:purple;">\</span><span style="color:purple;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> dd4fb8b Switched to GPLv3 [Atharv]
|
||||||
|
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> ee099d9 Switched to GPL v3 [Atharv]
|
||||||
|
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> 489add5 Removed emojis [Atharv]
|
||||||
|
* <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> 387e00b Merge branch 'dev' [Coach]
|
||||||
|
<span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:green;">\</span><span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:olive;">|</span> * <span style="color:teal;">|</span> 28e5bea Updated README file with some formatting help from AI [Coach]
|
||||||
|
* <span style="font-weight:bold;color:blue;">|</span> <span style="color:teal;">|</span> 3fdd6ae Merge to main for Scrimmage [Coach]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span><span style="font-weight:bold;color:blue;">\</span><span style="font-weight:bold;color:blue;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> 1e612e2 (tag: Scrimmage-Twist) Updated license information [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> 4456a5a Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span><span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="color:teal;">|</span> 08e0b9a (origin/Johannes_Dev) Delete missions/Lift2.py [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="color:teal;">|</span> 4533f95 Add stuff from Johannes accidental fork [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:green;">|</span> <span style="color:teal;">|</span> ec74531 Merge pull request 'Vickram_dev_' (#8) from Vickram_dev_ into dev [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:olive;">|</span><span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> 62b76d4 Merge pull request 'Add missions/tip the scale.py' (#4) from ayaan_dev into dev [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:purple;">|</span><span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:purple;">|</span> * <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 8008daf (origin/ayaan_dev) Add missions/tip the scale.py [Ayaan]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> cba5cfc Merge pull request 'Update utils/combine_runs.py' (#5) from Vickram_dev_ into dev [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:red;">|</span><span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> 3349e7f Merge pull request 'Rishi_dev' (#7) from Rishi_dev into dev [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:blue;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 4b765b0 (origin/Rishi_dev) Update missions/M8_5.py [Rishikesh Lolapu]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 2eca0d7 Initial commit [Rishikesh Lolapu]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:olive;">/</span> <span style="font-weight:bold;color:green;">/</span> <span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span> 8949003 Mission 9 not in use [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span><span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:teal;">|</span><span style="color:teal;">/</span><span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 6931731 Update LINEUPS.md [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> d172c70 THIS CODE IS OUTDATED!!! DO NOT USE!!! [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> efcc011 Initial Commit [Vickram]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 28bb3fa Merge pull request 'Pull from Vickram to dev' (#2) from Vickram_dev_ into dev [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:purple;">|</span><span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> 7ba2453 Merge pull request 'Pull from Johannes_Dev to dev' (#3) from Johannes_Dev into dev [Atharv]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span><span style="color:green;">\</span> <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span><span style="color:green;">_</span><span style="font-weight:bold;color:green;">|</span><span style="color:green;">_</span><span style="color:blue;">|</span><span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span><span style="color:green;">/</span><span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span>
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> 7eeead7 Sand Mission [Johannes]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> e817650 Send Over [Johannes]
|
||||||
|
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> c4aa954 Boat mission [Johannes]
|
||||||
|
* <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> ee0b8eb Update README.md [Atharv]
|
||||||
|
* <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> a745ed8 Merge pull request 'WIP - Test Merge ( dev to main )' (#1) from dev into main [Coach]
|
||||||
|
<span style="color:olive;">|</span><span style="color:blue;">\</span> <span style="color:red;">\</span> <span style="color:green;">\</span> <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:teal;">\</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * 7e2dc0b (origin/Vickram_dev_) Update final/main5.py [Rishikesh Lolapu]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * 29bd9f0 Update final/main5.py [Rishikesh Lolapu]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * a3b04d3 Add final/main5.py [Rishikesh Lolapu]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * 2d9eb49 Update final/main4.py [Johannes]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * 42090ea Update final/main4.py [Johannes]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * f7072a6 Update final/main4.py [Johannes]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span><span style="color:teal;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * 3f37e7e Update final/main4.py [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * a3e7be2 Update final/main4.py [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * c2204e7 Update final/main4.py [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * 0664a61 Add final/main4.py [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * 227619d Add final/3main.py [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * 684447c Add final/2main.py [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span><span style="color:blue;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * 95d7c0c Add final/1main.py [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * 7e0c3d2 Delete Final Combined Codes [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * f190d38 Add Final Combined Codes [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * cd21a73 Delete missions/main.py [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * 0fa1019 Upload files to "missions" [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span><span style="font-weight:bold;color:green;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> * bb89e01 Update utils/combine_runs.py [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span><span style="font-weight:bold;color:teal;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> * c690ae4 Update members/Vickram.txt [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span><span style="color:red;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span><span style="color:red;">/</span><span style="color:green;">|</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> d309b00 '{Johannes}' [Johannes]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> 37fb0a6 Add members/Ayaan.txt [Ayaan]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> e895fd1 Add members/Vickram.txt [Vickram]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> 70e09fb Add members/Carlos.txt [Carlos]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span><span style="color:green;">/</span>
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * d017d13 Update members/atharv.txt [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 6199a9c Atharv - added my About Me [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 72547c5 Fixed grammar [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 5d57a3a Initial commit [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 5c7e2e9 Uploaded files from Bitbucket [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * e36e3d0 Delete Send_Over.py [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * a35d599 Delete M8_5.py [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 6dedb0a Uploaded files from Bitbucket [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * be5350d Update README.md [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 2412f2c Uploaded files from Bitbucket [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 125f1df Uploaded files from Bitbucket [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 3ddaf7e Uploaded files from Bitbucket [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 2629845 Test new [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * fdbc180 Test [Atharv]
|
||||||
|
<span style="color:olive;">|</span> <span style="color:blue;">|</span><span style="color:blue;">/</span>
|
||||||
|
<span style="color:olive;">|</span> * ce4f984 Created new branch [Coach]
|
||||||
|
<span style="color:olive;">|</span> * 7a0d651 Test commit [Coach]
|
||||||
|
<span style="color:olive;">|</span><span style="color:olive;">/</span>
|
||||||
|
* 0d0e977 Initial commit [Coach]</pre>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
112
graph.txt
Normal file
112
graph.txt
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
* d3294bc SCRIMMAGE MERGE!!!
|
||||||
|
|\
|
||||||
|
| * d66aecd Update README.md
|
||||||
|
| * bbdf0d0 Shortened fun sounds
|
||||||
|
| * a2ed2c4 Merge pull request 'arcmyx-dev' (#14) from arcmyx-dev into dev
|
||||||
|
| |\
|
||||||
|
| | * dd0070d Update twist_scrimmage.py
|
||||||
|
| | * 9a06677 Added comments. Good luck for scrimmage y'all!!!
|
||||||
|
| | * 11e89c6 THE FINAL THINGY
|
||||||
|
| * | 52214be Update final/4main.py
|
||||||
|
| * | 4540269 Update final/4main.py
|
||||||
|
| * | 785c955 Update final/4main.py
|
||||||
|
| * | b6cffc6 Update final/4main
|
||||||
|
| * | 870dce3 Merge pull request 'arcmyx-dev' (#13) from arcmyx-dev into dev
|
||||||
|
| |\|
|
||||||
|
| | * bb76258 Update final/main4emaj.py
|
||||||
|
| | * 75e64da Update final/main4emaj.py
|
||||||
|
| | * 8ea7cd5 Update final/main4emaj.py
|
||||||
|
* | | 5ba2811 Merge pull request 'Updated LICENSE and README' (#12) from dev into main
|
||||||
|
|\| |
|
||||||
|
| * | dd4fb8b Switched to GPLv3
|
||||||
|
| * | ee099d9 Switched to GPL v3
|
||||||
|
| * | 489add5 Removed emojis
|
||||||
|
* | | 387e00b Merge branch 'dev'
|
||||||
|
|\| |
|
||||||
|
| * | 28e5bea Updated README file with some formatting help from AI
|
||||||
|
* | | 3fdd6ae Merge to main for Scrimmage
|
||||||
|
|\| |
|
||||||
|
| * | 1e612e2 Updated license information
|
||||||
|
| * | 4456a5a Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev
|
||||||
|
| |\ \
|
||||||
|
| | * | 08e0b9a Delete missions/Lift2.py
|
||||||
|
| | * | 4533f95 Add stuff from Johannes accidental fork
|
||||||
|
| * | | ec74531 Merge pull request 'Vickram_dev_' (#8) from Vickram_dev_ into dev
|
||||||
|
| |\ \ \
|
||||||
|
| * \ \ \ 62b76d4 Merge pull request 'Add missions/tip the scale.py' (#4) from ayaan_dev into dev
|
||||||
|
| |\ \ \ \
|
||||||
|
| | * | | | 8008daf Add missions/tip the scale.py
|
||||||
|
| * | | | | cba5cfc Merge pull request 'Update utils/combine_runs.py' (#5) from Vickram_dev_ into dev
|
||||||
|
| |\ \ \ \ \
|
||||||
|
| * \ \ \ \ \ 3349e7f Merge pull request 'Rishi_dev' (#7) from Rishi_dev into dev
|
||||||
|
| |\ \ \ \ \ \
|
||||||
|
| | * | | | | | 4b765b0 Update missions/M8_5.py
|
||||||
|
| | * | | | | | 2eca0d7 Initial commit
|
||||||
|
| |/ / / / / /
|
||||||
|
| * | / / / / 8949003 Mission 9 not in use
|
||||||
|
| | |/ / / /
|
||||||
|
| |/| | | |
|
||||||
|
| * | | | | 6931731 Update LINEUPS.md
|
||||||
|
| * | | | | d172c70 THIS CODE IS OUTDATED!!! DO NOT USE!!!
|
||||||
|
| * | | | | efcc011 Initial Commit
|
||||||
|
| * | | | | 28bb3fa Merge pull request 'Pull from Vickram to dev' (#2) from Vickram_dev_ into dev
|
||||||
|
| |\ \ \ \ \
|
||||||
|
| * \ \ \ \ \ 7ba2453 Merge pull request 'Pull from Johannes_Dev to dev' (#3) from Johannes_Dev into dev
|
||||||
|
| |\ \ \ \ \ \
|
||||||
|
| | | |_|_|/ /
|
||||||
|
| | |/| | | |
|
||||||
|
| | * | | | | 7eeead7 Sand Mission
|
||||||
|
| | * | | | | e817650 Send Over
|
||||||
|
| | * | | | | c4aa954 Boat mission
|
||||||
|
* | | | | | | ee0b8eb Update README.md
|
||||||
|
* | | | | | | a745ed8 Merge pull request 'WIP - Test Merge ( dev to main )' (#1) from dev into main
|
||||||
|
|\ \ \ \ \ \ \
|
||||||
|
| | | | | | | | * 7e2dc0b Update final/main5.py
|
||||||
|
| | | | | | | | * 29bd9f0 Update final/main5.py
|
||||||
|
| | | | | | | | * a3b04d3 Add final/main5.py
|
||||||
|
| | | | | | | | * 2d9eb49 Update final/main4.py
|
||||||
|
| | | | | | | | * 42090ea Update final/main4.py
|
||||||
|
| | | | | | | | * f7072a6 Update final/main4.py
|
||||||
|
| | | | | | | |/
|
||||||
|
| | | | | | | * 3f37e7e Update final/main4.py
|
||||||
|
| | | | | | | * a3e7be2 Update final/main4.py
|
||||||
|
| | | | | | | * c2204e7 Update final/main4.py
|
||||||
|
| | | | | | | * 0664a61 Add final/main4.py
|
||||||
|
| | | | | | | * 227619d Add final/3main.py
|
||||||
|
| | | | | | | * 684447c Add final/2main.py
|
||||||
|
| | | | | | |/
|
||||||
|
| | | | | | * 95d7c0c Add final/1main.py
|
||||||
|
| | | | | | * 7e0c3d2 Delete Final Combined Codes
|
||||||
|
| | | | | | * f190d38 Add Final Combined Codes
|
||||||
|
| | | | | | * cd21a73 Delete missions/main.py
|
||||||
|
| | | | | | * 0fa1019 Upload files to "missions"
|
||||||
|
| | | | | |/
|
||||||
|
| | | | | * bb89e01 Update utils/combine_runs.py
|
||||||
|
| | | | |/
|
||||||
|
| | | | * c690ae4 Update members/Vickram.txt
|
||||||
|
| | | |/
|
||||||
|
| | |/|
|
||||||
|
| | * | d309b00 '{Johannes}'
|
||||||
|
| | * | 37fb0a6 Add members/Ayaan.txt
|
||||||
|
| | * | e895fd1 Add members/Vickram.txt
|
||||||
|
| | * | 70e09fb Add members/Carlos.txt
|
||||||
|
| | |/
|
||||||
|
| | * d017d13 Update members/atharv.txt
|
||||||
|
| | * 6199a9c Atharv - added my About Me
|
||||||
|
| | * 72547c5 Fixed grammar
|
||||||
|
| | * 5d57a3a Initial commit
|
||||||
|
| | * 5c7e2e9 Uploaded files from Bitbucket
|
||||||
|
| | * e36e3d0 Delete Send_Over.py
|
||||||
|
| | * a35d599 Delete M8_5.py
|
||||||
|
| | * 6dedb0a Uploaded files from Bitbucket
|
||||||
|
| | * be5350d Update README.md
|
||||||
|
| | * 2412f2c Uploaded files from Bitbucket
|
||||||
|
| | * 125f1df Uploaded files from Bitbucket
|
||||||
|
| | * 3ddaf7e Uploaded files from Bitbucket
|
||||||
|
| | * 2629845 Test new
|
||||||
|
| | * fdbc180 Test
|
||||||
|
| |/
|
||||||
|
| * ce4f984 Created new branch
|
||||||
|
| * 7a0d651 Test commit
|
||||||
|
|/
|
||||||
|
* 0d0e977 Initial commit
|
||||||
Reference in New Issue
Block a user