aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' into niels/gameheavydemon212025-01-08
|\
| * Merge pull request #112 from lonkaars/max/game2Jaro2025-01-08
| |\
| | * Background blackMax-0012025-01-08
| | * Added bubblesMax-0012025-01-08
| | * Added coin animationMax-0012025-01-08
| | * Merge remote-tracking branch 'origin/master' into max/game2Max-0012025-01-08
| | |\ | | |/ | |/|
| | * Added coin pickup soundMax-0012025-01-08
* | | working zapper, missilies with schedulerheavydemon212025-01-08
* | | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon212025-01-08
|\ \ \
| * | | WIPLoek Le Blansch2025-01-08
| * | | WIPLoek Le Blansch2025-01-08
| * | | pooling workingLoek Le Blansch2025-01-08
| * | | WIPLoek Le Blansch2025-01-08
| * | | another merge + WIPLoek Le Blansch2025-01-07
| |\ \ \
| * \ \ \ merge + more WIPLoek Le Blansch2025-01-07
| |\ \ \ \
| * | | | | more WIP zapperpoolLoek Le Blansch2025-01-07
| * | | | | revert signalcatchLoek Le Blansch2025-01-07
| * | | | | `make format`Loek Le Blansch2025-01-07
| * | | | | cleanupLoek Le Blansch2025-01-07
| * | | | | merge masterLoek Le Blansch2025-01-07
| |\ \ \ \ \
| * | | | | | more revertLoek Le Blansch2025-01-07
| * | | | | | partially revert engineLoek Le Blansch2025-01-07
| * | | | | | `make format`Loek Le Blansch2025-01-07
| * | | | | | add collider to zapperLoek Le Blansch2025-01-07
| * | | | | | roll back player controllerLoek Le Blansch2025-01-07
| * | | | | | place zapper methodLoek Le Blansch2025-01-06
| * | | | | | WIPLoek Le Blansch2025-01-06
| * | | | | | revert AnimatorLoek Le Blansch2025-01-06
| * | | | | | `make format`Loek Le Blansch2024-12-22
| * | | | | | more WIP zapperLoek Le Blansch2024-12-22
| * | | | | | reset BehaviorScript to masterLoek Le Blansch2024-12-22
| * | | | | | fix Player prefabLoek Le Blansch2024-12-22
| * | | | | | big WIPLoek Le Blansch2024-12-22
* | | | | | | made my code work by adding it to the gamescene,main and configheavydemon212025-01-08
* | | | | | | missile/preview/schedular/PreviewSceneheavydemon212025-01-08
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'max/game2' of github.com:lonkaars/crepeLoek Le Blansch2025-01-08
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | FixesMax-0012025-01-08
| * | | | | Made background forestMax-0012025-01-08
| * | | | | Made background aquarium moveMax-0012025-01-08
| * | | | | Made background move to next positionMax-0012025-01-08
| * | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0012025-01-08
| |\ \ \ \ \
| * | | | | | Commented out 3/4 of levelMax-0012025-01-08
| * | | | | | Merge remote-tracking branch 'origin/master' into max/game2Max-0012025-01-08
| |\ \ \ \ \ \
| * | | | | | | Finnished collisionMax-0012025-01-08
| * | | | | | | Adjusted scriptMax-0012025-01-08
| * | | | | | | InitMax-0012025-01-08
| * | | | | | | Added extra sorting layer for workersMax-0012025-01-07
| * | | | | | | Added the whole backgroundMax-0012025-01-07
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #108 from lonkaars/loek/randomWboerenkamps2025-01-08
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | add Random.hloek/randomLoek Le Blansch2025-01-08
|/ / / / / /