Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
db30c97
Add files via upload
Feb 29, 2024
3d19b65
test
Feb 29, 2024
67f3bb0
Update workspace.xml
Feb 29, 2024
8ef9a30
tem[
Feb 29, 2024
c33b48d
temp
Feb 29, 2024
6090d9e
test
Feb 29, 2024
ecd422f
Merge branch 'codeTom' of https://github.com/th1583/ENG1 into codeTom
Feb 29, 2024
c73d44a
Create workspace.xml
ChrisO03 Feb 29, 2024
18814ec
Added main funcitonality
Atomix77 Mar 2, 2024
eb9576b
feat: transitions possiblity added
Atomix77 Mar 2, 2024
0aac7cb
added map 2 & 3
Mar 5, 2024
c3335a1
added transistions
Mar 6, 2024
fe63de7
fix
Atomix77 Mar 6, 2024
f5d5e51
fixes
Mar 6, 2024
ae53224
transitions completed
Atomix77 Mar 7, 2024
05a51c1
exterior maps all done
Atomix77 Mar 7, 2024
a125b37
Merge pull request #5 from th1583/codeTom
Mar 7, 2024
a1b2156
updated readme
Atomix77 Mar 7, 2024
ae8987b
Merge pull request #6 from th1583/codeTom
Mar 7, 2024
0ee8596
removed test
Mar 7, 2024
0616a2d
Merge pull request #7 from th1583/codeTom
Mar 7, 2024
c78bd13
added website readme
charliepiper Mar 8, 2024
a513076
Merge remote-tracking branch 'origin/codeChris' into codeChris
ChrisO03 Mar 9, 2024
eb844b4
charlie branch merge
charliepiper Mar 14, 2024
2019149
Merge branch 'master' of https://github.com/th1583/ENG1
charliepiper Mar 14, 2024
5a23218
fix merge
charliepiper Mar 14, 2024
ae4f744
fix merge
charliepiper Mar 14, 2024
677bfb1
revert to safe commit
charliepiper Mar 14, 2024
308e0b6
Merge branch 'dev_charliepiper'
charliepiper Mar 14, 2024
b329ab1
name chnage
Mar 14, 2024
66b675b
fix: home rendering
charliepiper Mar 14, 2024
34ebc63
Merge branch 'master' of https://github.com/th1583/ENG1
charliepiper Mar 14, 2024
162bbf0
added characters 2 and 3
Mar 14, 2024
1397eeb
Merge branch 'master' of https://github.com/th1583/ENG1
Mar 14, 2024
1d9a80b
Added character selection
charliepiper Mar 14, 2024
abd5df1
added activity fuinctions into maps and player class
Mar 15, 2024
a9f7d4c
Fixed corrupted tile in home.tmx
charliepiper Mar 15, 2024
17d8b0a
added activity marker
Mar 15, 2024
bed93ed
Added javadocs and comments to all used classes
charliepiper Mar 18, 2024
35867af
Added end screen
charliepiper Mar 18, 2024
b46bec6
added a ctivty funactionaility
Mar 19, 2024
fede4d2
Added activity class and GameStats class
ChrisO03 Mar 19, 2024
247cff7
Merge pull request #11 from th1583/codeChris
Mar 19, 2024
48396f8
added activty functionality
Mar 19, 2024
191649e
added java doc
Mar 19, 2024
20f3a1e
adding date and time display
Mar 19, 2024
1bd57be
GameStats day starts at 1
ChrisO03 Mar 19, 2024
8b0a0b6
Fixed collisions on interiors and scaling
charliepiper Mar 19, 2024
3722678
Added date time scaling
charliepiper Mar 19, 2024
09b30e0
Merge branch 'master' of https://github.com/th1583/ENG1
ChrisO03 Mar 20, 2024
e8c7cb8
Added final screen
charliepiper Mar 20, 2024
d1c7b13
Added activity count to end screen
charliepiper Mar 20, 2024
11ca9ea
Fixed layers in computer science building
charliepiper Mar 20, 2024
464c73c
Reverted speed to normal
charliepiper Mar 20, 2024
4b5d2f8
Fixed crash when trying to study
ChrisO03 Mar 20, 2024
12eecf5
Merge branch 'master' of https://github.com/th1583/ENG1
ChrisO03 Mar 20, 2024
f87e1d7
Fixed map3
charliepiper Mar 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
9 changes: 9 additions & 0 deletions .idea/ENG1.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Test Project/Test/.idea/vcs.xml → .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 21 additions & 36 deletions Test Project/Test/.idea/workspace.xml → .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

76 changes: 76 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
This is the read me containing the development guide for the project.

Map creation:
The map assets are within the assets folder. Download Tiled at https://www.mapeditor.org/ .

Create a new orthogonal map, csv format with a tile size of 16px by 16px and a map size of 120 tiles by 68 tiles resulting in 1920 x 1088 pixels.

To use the assets add a new tileset and make sure you embed them into the map. Once the map has been created, export the map as a png and add all tilesets used into the same folder within the game assets folder. Open the map folder within a text editor and change the image source of each tileset to location within the asset folder.

Collision Detection and Transitions:
Create a new layer where the collisions will occur. Edit a tileset and select a pixel that you do not use and add a property called blocked and place this pixel where you want collisions to occur and where the play can't go.
For transitions edit a tileset and select a different pixel that you don't use and add a property called transition and give it a value of the file path of where you want the transition to take you.



# Website

The **[website](https://charliepiper.github.io)** (for ENG1 cohort1/group1)


## Project Structure
The project structure is organised as follows:

```
ENG1/
├── src/app/ # Contains Next.js pages
│ ├── page.tsx # Home page
│ ├── layout.tsx # Home page layout
├── src/components/ # Reusable components
│ ├── ContentSection.tsx # Links to documents component
│ ├── DownloadSection.tsx # Game download component
│ ├── Footer.js # Footer component
│ ├── HeroSection.tsx # Hero component
│ ├── Navbar.tsx # Navbar component (both phone and desktop)
├── public/ # Static assets
│ └── ... # Other assets
├── styles/ # Global styles
│ └── globals.css # Global CSS file
├── README.md # Project documentation
├── package.json # Node.js dependencies and scripts
└── ...
```

## Technologies / Frameworks

-- **[Next.js](https://nextjs.org)**

-- **[TailwindCSS](https://tailwindcss.com)**


## Setup

To set up the project locally, follow these steps:

1. Clone the repository:
```bash
git clone <repository-url> (for now (will change) https://github.com/charliepiper/charliepiper.github.io.git)
```

2. Install dependencies:
```bash
npm install
```

3. Start the development server:
```bash
npm run dev
```

4. Open [http://localhost:3000](http://localhost:3000) in your browser to view the website.


Binary file removed game/assets/badlogic.jpg
Binary file not shown.
Loading