Merge Edge with sort and resize #2

Merged
alfred merged 64 commits from edge into master 2022-07-28 01:51:14 +01:00
3 changed files with 19 additions and 11 deletions
Showing only changes of commit 2bea4cb4b3 - Show all commits

View File

@ -94,8 +94,6 @@ main{
}
.main-table > div > div{
display: table-cell;
border-style: solid;
border-width: 1px;
vertical-align: middle;
box-sizing: inherit;
}

View File

@ -28,12 +28,8 @@ a{
background: #e0e0e0;
}
.main-table{
border-color: wheat;
background-color: #0f0f0f;
}
.main-table > div > div{
border-color: wheat;
}
.item-table > div > div{
border-color: whitesmoke;
border-color: wheat;
}

View File

@ -22,11 +22,18 @@ entries:
<p>
My first programming task at City, concluding the 2 week 2021 Programming Bootcamp,
although I have only spent 3 days programming this and was a tad bit too ambitious.
</p>
<p>
This Processing project show that I can use arrays, loops, mouse and keyboard interaction and geometric transforms.
The project contains a GUI library that I made to create the menu system for my ninjaformer game,
unfortunately, while the code for loading tile, sprite and level information exists (JSON, sprite sheet support),
The project contains a GUI library that I made to create the menu system for what could have been the Ninjaformer game.
</p>
<p>
Unfortunately, while the code for loading tile, sprite and level information exists (JSON, sprite sheet support);
I ran out of time before the submission to actually even start on the game. But you can play around with the main code and build your own GUIs too so...
</p>
<p>
<a href="https://github.com/Captain-ALM/Ninjaformer-Processing">https://github.com/Captain-ALM/Ninjaformer-Processing</a>
</p>
startDate: "01/10/2021"
endDate: "31/10/2021"
videoLocation: "https://cityuni.captainalm.com/resources/stream/vid1.mp4"
@ -35,14 +42,21 @@ entries:
content: >
<p>
My third programming task and first major project at City, concluding 2.2 Months of programming.
</p>
<p>
Looking back on this, I wish I started earlier (Like January) that way I could have implemented all the features I wanted.
This project allows for levels to be designed within the program and allows them to be edited as XML outside the program.
</p>
<p>
The code is extensible and it is relatively straight forward to impliment new features. There are a few bugs that can crop up
(Such as sticking to surfaces due to ground body updates) but I already know ways to fix them.
This project relies on part of a GUI library I built in it and I had to modify the CityGame library by extending it.
The audio and assets were also created by me.
The audio and assets were also created by me.
</p>
startDate: "25/02/2021"
<p>
<a href="https://github.com/cityteaching/citygame2122-Captain-ALM"><strike><del>Not public due to university anti-plagiarism policy.</del></strike></a>
</p>
startDate: "25/02/2022"
endDate: "08/05/2022"
videoLocation: "https://cityuni.captainalm.com/resources/stream/vid2.mp4"
videoContentType: "video/mp4"