Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/b3-helm-sucht-kopf' into b3-helm…
Browse files Browse the repository at this point in the history
…-sucht-kopf
  • Loading branch information
namkhanh-nguyen committed Jan 24, 2025
2 parents 2eace53 + f9c04b0 commit 1f05706
Show file tree
Hide file tree
Showing 84 changed files with 766 additions and 142 deletions.
4 changes: 1 addition & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ I've started a documentation on how we should use the forking workflow here:

Please follow these Steps & Guidelines for your Pull Request:

#### Before you Request a Review Check and Tick these Boxes:
#### First, Check and Tick these Boxes:

[] make sure that the hugo site build works and check the result visually.
[] merge your local branch with upstream/main (see [update doc](https://github.com/htw-imi-showtime/showtime-website/blob/main/doc/update.md))
Expand All @@ -21,8 +21,6 @@ Please follow these Steps & Guidelines for your Pull Request:
**Note that if you fail to do so, I may simply reduce the file sizes brute force using
the script above - WITHOUT CHECKING THE QUALITY**

[] if everythings seems fine, request a review by bkleinen on github. (on the upper right)

#### Fill out this Information:

1. Change the PR Title to: <project-id> <describe your changes> (e.g. B0 - update techstack.md) and describe your changes:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-project-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
workflow_dispatch:

jobs:

check-pr-title:
if: ${{ ! startsWith(github.event.pull_request.title, 'STW') }}
runs-on: ubuntu-latest
env:
PR_TITLE: ${{ github.event.pull_request.title }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ concurrency:
jobs:
build:
name: Hugo Page Build
# if: ${{ github.repository_owner != 'htw-imi-showtime' }}
if: ${{ github.repository_owner != 'htw-imi-showtime' }}
permissions:
contents: write
runs-on: ubuntu-latest
Expand Down
26 changes: 17 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ cd showtime-website
git submodule update --init project-archive
```

2.b Complete with archive submodules:
2.b Complete with archive submodule:
(The former semester - you don't need it and its large.)

```
git clone --depth 1 --recurse-submodules git@github.com:<your-account>/showtime-website.git
Expand All @@ -69,15 +70,16 @@ cd showtime-website

3. [Install Hugo (extended)](https://gohugo.io/getting-started/installing)

4. Create a branch. Never change main directly, but keep it synced with the main repository and discard the branch.
4. Create a branch. Never change main directly, but keep main synced with the main repository and merge main into your branch regularly.

5. Create a new project directory for your project by duplicating either the bachelor's or the master's sample project directory:

```
cp -R archetypes/semester/bachelor/b0-template/ content/ws#_or_ss#/bachelor/b#-your-project/
```
5. Create your project directory like in the 2 examples below. Make sure
to replace the semester, the b/m and the project name appropriately.
All file names should only contain lowercase letters, numbers, `-` and one `.` to separate the extension.
```
cp -R archetypes/semester/master/m0-template/ content/ws#_or_ss#/master/m#-your-project/
# example for bachelor - the last parameter is the directory name that will be created:
hugo new --kind project ws24/bachelor/b3-myproject
# example for master:
hugo new --kind project ws24/master/m3-the-short-project-name
```

6. Fill out your project's homepage `content/ws24/<bachelor/master>/##-your-project/_index.md` and any subpages in your project's directory you'd like to keep. Delete the subpages you don't need.
Expand All @@ -86,7 +88,13 @@ cp -R archetypes/semester/master/m0-template/ content/ws#_or_ss#/master/m#-your-

8. Add your changes to the git index, commit them to the repository and push them to GitHub.

9. Create a new pull request on GitHub that merges your version of the repo's `master` branch onto the htw-imi-showtime `master` branch. For more info see [pull_request.md](doc/git/pull_request.md)
9. To publish your branch directly, Activate Github Actions, Switch on Github Pages for your repo (settings->Pages, choose GitHub Actions as source), and run the "Deploy Page using GH-Actions" workflow manually.

9. Create a new pull request on GitHub that merges your version of your branch onto the htw-imi-showtime `main` branch. For more info see [pull_request.md](doc/git/pull_request.md)

10. More information can be found in the [pull request template](.github/pull_request_template.md)

11. As you are not (or, unless you are) member of the organization/repo htw-imi-showtime/showtime-website, you cannot use the github feature to request a review. Feel free to use the comments for that, and open the pull request as early as possible. We need to enable the Workflow runs once manually, after that they will be re-run automatically on each push to your branch the PR is based upon.

</details>

Expand Down
64 changes: 64 additions & 0 deletions archetypes/project/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
+++
{{ $a := split .File.ContentBaseName "-" }}

project_id = "{{ index $a 0 | title }}"
title = "{{ delimit (after 1 $a) " " | title }}"

subtitle = "informativ, kurz - kurzer 2. titel, der klar über den Inhalt des Projektes informiert (subtitle)"

claim = "länger, fancy - ein Werbespruch, Mission Statement... soll neugierig machen (claim)"

abstract = "länger, informativ: Das Abstract ist eine eher trockene inhaltliche Zusammenfassung die klar über das Projekt informiert (abstract)"

# Properties for displaying the project in the project list
card_image = "kitty.jpg"

# Names are optional, team size is sufficient
team = ["Member 1", "Member 2"]
# this can be just one or a list as with team:
supervisor = "Supervisor"
draft = false

# website: if you have another project website
website_link = ""
# e.g. github
source_link = ""
# link to a demo site / where your project is available.
# it's ok if it's temporary / just for the showtime,
# just send a pr when you take the demo site down.
demo_link = ""
+++

{{<section title="Product">}}
(What we built) Your website should inform the reader about the Product you built and the Process that you used - how you built it. You can, however, change the section titles, e.g. with your project/product name.
{{</section>}}


{{<section title="Process">}}
(How we built it) Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla facilisis neque id vulputate malesuada. Quisque dignissim finibus urna sed sagittis.

If you feel that this page becomes too long, consider adding subpages!
{{</section>}}

{{<section title="???">}}
You can add any section with any title that you need, and you can add headers within your sections:

* **Subheader 1**

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla facilisis neque id vulputate malesuada. Quisque dignissim finibus urna sed sagittis.


* **Subheader 2**

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla facilisis neque id vulputate malesuada. Quisque dignissim finibus urna sed sagittis.

* **Subheader 3**

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla facilisis neque id vulputate malesuada. Quisque dignissim finibus urna sed sagittis.

{{</section>}}

{{<gallery>}}
{{<team-member image="cat.jpg" name="team member cat">}}
{{</gallery>}}

File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
+++
title = "Optional Subpage"
# if you have more than one subpage, the weight determines the order of the tabs
weight = 10
draft = false
# only draft = false will be visible on the page.
# use hugo --buildDrafts to see your drafts.
draft = true
+++

{{<section title="Optional Subpage">}}
Expand Down
35 changes: 0 additions & 35 deletions archetypes/semester/bachelor/b0-template/_index.md

This file was deleted.

33 changes: 0 additions & 33 deletions archetypes/semester/master/m0-template/_index.md

This file was deleted.

Binary file removed archetypes/semester/master/m0-template/cat.jpg
Binary file not shown.
Binary file removed archetypes/semester/master/m0-template/kitty.jpg
Binary file not shown.
22 changes: 0 additions & 22 deletions archetypes/semester/master/m0-template/optional_subpage.md

This file was deleted.

8 changes: 6 additions & 2 deletions content/_index.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
+++
showtime_date = "07/02/2025"
#showtime_date = "07/02/2025"
showtime_date = "10:00-15:00"
showtime_place = "WH H001"
showtime_save_the_date = "save the date!!"
showtime_save_the_date = "Fr 07/02/2025"
#showtime_save_the_date = "save the date!!"
# not in use anymore (for zoom showtime during the pandemic)
is_live = "false"
zoom_link = "TBD"
+++


{{<teaser category="about showtime" title="Project Fair & Presentations">}}

The Bachelor and Master students of the International Media and Computing Study Programs present their Practice Projects with presentations and a Project Fair.
Expand Down
2 changes: 1 addition & 1 deletion content/projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ layout = "projects_list"
+++


This term there are [5 bachelor's](#B1) and [2 master's](#M1) projects[:](../ws24/project_overview)
This term there are [5 bachelor's](#B1) and [2 master's](#M2) projects[:](../ws24/project_overview)
<!--
The Project Pitches and Group Selection will take place soon!
Expand Down
45 changes: 45 additions & 0 deletions content/ws24/bachelor/b1-chef/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
+++
project_id = "B1"
title = "CHEF"
subtitle = "Body-challenging VR experience"
claim = "Explore new ways of what VR entertainment can achieve"
abstract = "CHEF is a virtual reality game that blends physical engagement with cutting-edge VR technology to deliver an immersive experience. Designed for immediate playability, the game features captivating visuals and mechanics that hook players from the start without requiring extensive instructions."

# Properties for displaying the project in the project list
card_image = "chef_logo2.jpg"

# Names are optional, team size is sufficient
team = ["Maxim", "Leah", "Leonid", "Sascha", "Sergej", "Sodbilegt"]
supervisor = "Prof. Dr. Strippgen"
draft = false

website_link = ""
source_link = ""
+++


<img src="screenshot1_compressed.jpg" alt="Description of the picture" width="1000">


{{<section title="Goal">}}
Our goal was to create a VR experience that challenges the body while leveraging the latest VR technologies in unexpected and playful ways. We set out to design a game that is both instantly engaging and easy to pick up, requiring minimal explanation to players. To achieve this, we focused on using the Meta Quest 3 and Unity Engine as our primary development tools.
{{</section>}}

{{<section title="Team">}}
Our team consists of six IMI students who are passionate about the video games industry. To collaborate and exchange our ideas we used several tools like Discord, Github and Miro Board.
Early in the development process, we decided to divide our efforts into two dedicated teams: one focused on visuals and the other on programming. Each team member took on specific responsibilities, from crafting a captivating space environment to designing and fine-tuning the mechanics of the ingredient spawner. Collaboration was at the heart of our workflow, with continuous idea exchange fostering a highly creative and supportive workspace.

{{</section>}}



{{<gallery>}}
{{<team-member image="maxim.jpeg" name="Maxim">}}
{{<team-member image="leah.jpg" name="Leah">}}
{{<team-member image="leonid.jpg" name="Leonid">}}
{{<team-member image="sascha.jpeg" name="Sascha">}}
{{<team-member image="sodoo.jpg" name="Sodoo">}}
{{<team-member image="sergej.jpeg" name="Sergej">}}

{{</gallery>}}

Binary file added content/ws24/bachelor/b1-chef/chef_logo2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/ws24/bachelor/b1-chef/leah.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/ws24/bachelor/b1-chef/leonid.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/ws24/bachelor/b1-chef/maxim.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions content/ws24/bachelor/b1-chef/optional_subpage.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
+++
title = "Process"
weight = 10
draft = false
+++

{{<section title="Process">}}

The concept of the game was developed collaboratively during the early stages of the project. We had lengthy discussions about how to design a game that would be both highly engaging and fun. Our idea was to create the perfect mix of “Cooking Mama 2” and “Subway Surfers”, but set entirely in space. While the idea of combining cooking and space initially felt ambitious and even overwhelming at times, we remained committed to our vision.

By breaking the development process into two distinct stages — Endless Runner and Cooking — we were able to stay focused and organized while bringing this unique concept to life. We divided the work into two groups: the programming team focused on implementing the Endless Runner and Cooking mechanics, while the visuals team was tasked with designing cinematic scenes, including a space scene, a Mars scene, and a kitchen scene.

The Endless Runner phase introduced dynamic and engaging gameplay features. Players would need to catch ingredients floating through space while skillfully dodging obstacles like asteroids, which could damage the player’s progress. This element added a layer of excitement and challenge, creating fast-paced gameplay that kept players on their toes.
On the other hand, implementing the cooking process required creativity and experimentation as we worked to design an intuitive yet enjoyable system. We played with a variety of ingredients and recipes, ensuring that players would feel both accomplished and delighted when successfully crafting a dish in the cooking pot.

We constantly provided each other with feedback on the work, whether it was about an odd-looking space station, unappealing planet colors, or ingredients that floated too slowly. This collaborative effort ensured that our game was finely tuned for players to enjoy an immersive experience and engage with the world we created for them.


{{</section>}}
Binary file added content/ws24/bachelor/b1-chef/sascha.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/ws24/bachelor/b1-chef/sergej.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/ws24/bachelor/b1-chef/sodoo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1f05706

Please sign in to comment.