Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Probable waffle state management #154

Merged
merged 142 commits into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
b7a9874
Map rename
jHabjanMXP Dec 18, 2023
554393e
Map adjustment
jHabjanMXP Dec 18, 2023
4395284
Ember enclave
jHabjanMXP Dec 18, 2023
4e2a5e1
Handlers to separate classes
jHabjanMXP Dec 18, 2023
6accf97
Extend base scene
jHabjanMXP Dec 18, 2023
af0fca9
Passing info to scene
jHabjanMXP Dec 18, 2023
e928783
ActorContainer interface IComponent
jHabjanMXP Dec 18, 2023
998ced3
Connecting new maps to gui and click handler
jHabjanMXP Dec 18, 2023
1acdb23
Chat module restructure
jHabjanMXP Dec 19, 2023
caa2865
Game instance creation on server and passing to game
jHabjanMXP Dec 19, 2023
7742834
Fixed tests
jHabjanMXP Dec 19, 2023
f2fe6f4
Removing template assets
jHabjanMXP Dec 19, 2023
e3074b2
Probable waffle loader
jHabjanMXP Dec 19, 2023
fe2f6ef
Probable waffle loader
jHabjanMXP Dec 19, 2023
4daa064
Probable waffle loader
jHabjanMXP Dec 19, 2023
b8cdff6
Center preloader
jHabjanMXP Dec 19, 2023
ada3629
Animated tiles update fix
jHabjanMXP Dec 19, 2023
fa369bc
Room
jHabjanMXP Dec 20, 2023
7321b50
Merge remote-tracking branch 'origin/map2' into map2
jHabjanMXP Dec 20, 2023
74994e5
Split room dtos
jHabjanMXP Dec 20, 2023
8f43558
Pulling rooms
jHabjanMXP Dec 21, 2023
ff31221
Redefine factions
jHabjanMXP Dec 21, 2023
1c7e66b
Redefine game mode options
jHabjanMXP Dec 21, 2023
0741367
Lobby
jHabjanMXP Dec 21, 2023
d6a6b6a
Lobby
jHabjanMXP Dec 22, 2023
704abb9
Lava and obsidian tiles
jHabjanMXP Dec 23, 2023
f90226e
Merge remote-tracking branch 'origin/map2' into map2
jHabjanMXP Dec 23, 2023
b04b4f7
Folder move
jHabjanMXP Dec 23, 2023
9f9c28c
Tiles 2
jHabjanMXP Dec 23, 2023
5a4e200
Tiles 2
jHabjanMXP Dec 23, 2023
c08a8e0
Tiles 2
jHabjanMXP Dec 23, 2023
a89c4d3
Fence
jHabjanMXP Dec 24, 2023
64d2087
Sheep
jHabjanMXP Dec 24, 2023
ca1968c
Sheep
jHabjanMXP Dec 24, 2023
14322f1
Tree Christmas
jHabjanMXP Dec 24, 2023
883615a
Tile grass dark
jHabjanMXP Dec 24, 2023
5c1a810
Forest tiles
jHabjanMXP Dec 24, 2023
dc37a44
Frost forge wip
jHabjanMXP Dec 24, 2023
a292dc0
Frost forge wip
jHabjanMXP Dec 24, 2023
d1ad390
Frost forge wip
jHabjanMXP Dec 24, 2023
6dbfc51
Frost forge wip
jHabjanMXP Dec 24, 2023
47b589d
Frost forge wip
jHabjanMXP Dec 25, 2023
9d0c464
Frost forge
jHabjanMXP Dec 25, 2023
2c5eaa2
Hedgehog wip
jHabjanMXP Dec 25, 2023
3b01c3c
Hedgehog wip
jHabjanMXP Dec 25, 2023
ec0ef7a
Hedgehog
jHabjanMXP Dec 25, 2023
a4bb0f4
Hedgehog
jHabjanMXP Dec 25, 2023
3d2e125
Merge remote-tracking branch 'origin/map2' into map2
jHabjanMXP Dec 26, 2023
6200150
Fix add player
jHabjanMXP Dec 26, 2023
dea1828
Lobby
jHabjanMXP Dec 26, 2023
c9e694e
Lobby
jHabjanMXP Dec 26, 2023
7a6e109
Lobby
jHabjanMXP Dec 29, 2023
c914736
Lobby
jHabjanMXP Dec 29, 2023
eb09787
Lobby
jHabjanMXP Dec 29, 2023
80e05fd
Ranked
jHabjanMXP Dec 29, 2023
ec12085
Ranked
jHabjanMXP Dec 29, 2023
397dc97
Join
jHabjanMXP Dec 29, 2023
c39c68a
Applying code style
jHabjanMXP Dec 29, 2023
4fde8ec
Applying code style
jHabjanMXP Dec 29, 2023
4bf76d3
Restructure
jHabjanMXP Dec 29, 2023
db22ee5
Reformatting
jHabjanMXP Dec 29, 2023
b6e9f5d
Some mock components
jHabjanMXP Dec 29, 2023
4065a2b
Fix tests
jHabjanMXP Dec 29, 2023
98a84b2
Matchmaking
jHabjanMXP Dec 29, 2023
dbdf5e2
Join hosted game
jHabjanMXP Dec 29, 2023
4135ec3
Join hosted game
jHabjanMXP Dec 29, 2023
6be33a2
Map player definition rework part 1
jHabjanMXP Dec 29, 2023
8890ad9
Map player definition rework part 2
jHabjanMXP Dec 29, 2023
d6487df
Angular injects
jHabjanMXP Dec 30, 2023
29d7038
Angular injects
jHabjanMXP Dec 30, 2023
046b791
Fixed some tests
jHabjanMXP Dec 30, 2023
07cda03
Host options
jHabjanMXP Dec 30, 2023
4a96d13
Gateway with socket io types
jHabjanMXP Dec 30, 2023
96f0ea3
Lobby chat
jHabjanMXP Dec 30, 2023
bd170e8
Fixed tests
jHabjanMXP Dec 30, 2023
0cc9234
Matchmaking
jHabjanMXP Dec 31, 2023
c51507a
Gateways
jHabjanMXP Dec 31, 2023
f7eabad
No game mode on lobbies
jHabjanMXP Dec 31, 2023
8c9a65e
Gateways
jHabjanMXP Dec 31, 2023
1ab6f57
Gateways
jHabjanMXP Dec 31, 2023
f5ddf4c
Little muncher fixes
jHabjanMXP Dec 31, 2023
1de56c0
Owl wip
jHabjanMXP Dec 31, 2023
2b779af
Stone bridge
jHabjanMXP Dec 31, 2023
58da06c
Communicators
jHabjanMXP Jan 1, 2024
c4154d9
RecursiveKeyOf improvements for built-in property detection
jHabjanMXP Jan 1, 2024
3a45919
Lobby emitting and listening to events
jHabjanMXP Jan 2, 2024
15148cf
Lobby emitting player definitions
jHabjanMXP Jan 2, 2024
3ed8140
Lobby emitting player definitions
jHabjanMXP Jan 2, 2024
542f40b
Project icon
jHabjanMXP Jan 4, 2024
c918a9d
Merge remote-tracking branch 'origin/map2' into map2
jHabjanMXP Jan 4, 2024
afb590f
Manca new trees savanna
jHabjanMXP Jan 4, 2024
eb28be6
Animals
jHabjanMXP Jan 4, 2024
6ef7faa
Reparent
jHabjanMXP Jan 4, 2024
293d6ed
Reparent
jHabjanMXP Jan 4, 2024
f03cbef
Reparent
jHabjanMXP Jan 4, 2024
01f62a0
Z axis
jHabjanMXP Jan 4, 2024
ca92443
Lava block fix
jHabjanMXP Jan 6, 2024
dc00938
Lobby fixes
jHabjanMXP Jan 6, 2024
4da4869
Tab sizes
jHabjanMXP Jan 6, 2024
2cb3d66
GUI assets
jHabjanMXP Jan 6, 2024
4196920
UI scene
jHabjanMXP Jan 6, 2024
0591621
Remove old UI scene from Angular
jHabjanMXP Jan 6, 2024
c41d9ca
Angular standalone components
jHabjanMXP Jan 6, 2024
d4d6acf
Fixing some tests
jHabjanMXP Jan 6, 2024
f564564
Fixing some tests
jHabjanMXP Jan 6, 2024
38fc8e0
Fixing some tests
jHabjanMXP Jan 6, 2024
b6cdef9
Fixing final batch of tests
jHabjanMXP Jan 7, 2024
9a1c9b1
Score screen
jHabjanMXP Jan 7, 2024
b812677
Score screen
jHabjanMXP Jan 7, 2024
483ca3d
Score screen
jHabjanMXP Jan 7, 2024
de24f6a
Development instant game and ng zone fixes
jHabjanMXP Jan 7, 2024
85faa2f
Created load and replay pages
jHabjanMXP Jan 7, 2024
768a989
Button reposition
jHabjanMXP Jan 7, 2024
60f870d
Button slicing in texturePacker
jHabjanMXP Jan 7, 2024
6be0a37
Button slicing in Phaser editor
jHabjanMXP Jan 7, 2024
17edefe
Button nine slice
jHabjanMXP Jan 12, 2024
fb28fba
Sheep shearing
jHabjanMXP Jan 12, 2024
f755929
Sheep shearing
jHabjanMXP Jan 12, 2024
eb28448
Setting scene data to be passed to other prefabs
jHabjanMXP Jan 12, 2024
501cb49
Restoring actors from game wip part 1
jHabjanMXP Jan 12, 2024
09d47ef
Fix communicators when logged out
jHabjanMXP Jan 17, 2024
78428cc
Create actor from constructor name
jHabjanMXP Jan 17, 2024
c10f4eb
Save and load game state
jHabjanMXP Jan 17, 2024
389f88d
Initialization fixes
jHabjanMXP Jan 22, 2024
2cab3bb
Initialization fixes
jHabjanMXP Jan 22, 2024
f7ce262
Fix load and save
jHabjanMXP Jan 22, 2024
042ce06
Properly saving new scene data on save
jHabjanMXP Jan 22, 2024
1c4517d
Sheep anim up fix
jHabjanMXP Jan 22, 2024
d05b7f5
Game length pipe
jHabjanMXP Jan 22, 2024
f32d15b
Replay hud handling
jHabjanMXP Jan 22, 2024
7b2a83a
Depth sort on move
jHabjanMXP Jan 22, 2024
31fbe72
Throttle on tween update
jHabjanMXP Jan 22, 2024
083c524
Owner component
jHabjanMXP Jan 22, 2024
0884203
Owner component
jHabjanMXP Jan 23, 2024
3a8c853
Owner component
jHabjanMXP Jan 23, 2024
7f92e46
Multi selection
jHabjanMXP Jan 23, 2024
a5c659f
Separating fly squasher health component
jHabjanMXP Jan 23, 2024
7fe2903
Health component
jHabjanMXP Jan 23, 2024
9089a7c
58 - bleeding tiles fixes
jHabjanMXP Jan 28, 2024
ee1ec83
153 - Angular standalone migration
jHabjanMXP Jan 28, 2024
00f2279
Fixing some tests
jHabjanMXP Jan 28, 2024
af2763a
Fixing tests
jHabjanMXP Jan 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ node_modules
/.idea/*
!/.idea/dataSources.xml
!/.idea/sqldialects.xml
!/.idea/icon.svg
.project
.classpath
.c9/
Expand Down
21 changes: 21 additions & 0 deletions .idea/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion .skip
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ apps/client/src/manifest.webmanifest
apps/client/src/polyfills.ts
apps/client/src/test-setup.ts
apps/client/ngsw-config.json
apps/client/src/assets/icons
apps/client/src/assets/icons/pwa
apps/client/src/assets/icons/fuzzy-waddle.svg
apps/client/src/assets/icons/social-preview.png
apps/client/src/**/*.html
apps/client/src/**/*.scss
apps/client/src/**/*.spec.ts
Expand Down
7 changes: 3 additions & 4 deletions apps/api/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
"ignorePatterns": ["!**/*"],
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"rules": {
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-unused-vars": "warn"
"@typescript-eslint/no-unused-vars": "warn",
"no-case-declarations": "off"
}
}
]
Expand Down
12 changes: 6 additions & 6 deletions apps/api/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* eslint-disable */
export default {
displayName: 'api',
preset: '../../jest.preset.js',
testEnvironment: 'node',
displayName: "api",
preset: "../../jest.preset.js",
testEnvironment: "node",
transform: {
'^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }]
"^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }]
},
moduleFileExtensions: ['ts', 'js', 'html'],
coverageDirectory: '../../coverage/apps/api'
moduleFileExtensions: ["ts", "js", "html"],
coverageDirectory: "../../coverage/apps/api"
};
10 changes: 5 additions & 5 deletions apps/api/src/app/app.controller.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Test, TestingModule } from '@nestjs/testing';
import { Test, TestingModule } from "@nestjs/testing";

import { AppController } from './app.controller';
import { AppController } from "./app.controller";

describe('AppController', () => {
describe("AppController", () => {
let app: TestingModule;

beforeAll(async () => {
Expand All @@ -11,10 +11,10 @@ describe('AppController', () => {
}).compile();
});

describe('getHealth', () => {
describe("getHealth", () => {
it('should return "OK"', () => {
const appController = app.get<AppController>(AppController);
expect(appController.getHealth()).toBe('OK');
expect(appController.getHealth()).toBe("OK");
});
});
});
6 changes: 3 additions & 3 deletions apps/api/src/app/app.controller.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Controller, Get } from '@nestjs/common';
import { Controller, Get } from "@nestjs/common";

@Controller()
export class AppController {
// health endpoint always returns OK used for monitoring for zero downtime deploys
@Get('health')
@Get("health")
getHealth(): string {
return 'OK';
return "OK";
}
}
6 changes: 3 additions & 3 deletions apps/api/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { Module } from "@nestjs/common";
import { AppController } from "./app.controller";
import { AuthModule } from "../auth/auth.module";
import { ConfigModule } from "@nestjs/config";
import { EventsModule } from "./events/events.module";
import { ChatModule } from "./chat/chat.module";
import { GameSessionModule } from "./game-session/game-session.module";
import { LittleMuncherModule } from "./little-muncher/little-muncher.module";
import { APP_GUARD } from "@nestjs/core";
import { ThrottlerGuard, ThrottlerModule } from "@nestjs/throttler";
import { FlySquasherModule } from "./fly-squasher/fly-squasher.module";
import { ProbableWaffleModule } from "./probable-waffle/probable-waffle.module";

@Module({
imports: [
Expand All @@ -23,11 +23,11 @@ import { FlySquasherModule } from "./fly-squasher/fly-squasher.module";
}
]),
AuthModule,
EventsModule,
ChatModule,
GameSessionModule,
LittleMuncherModule,
FlySquasherModule
FlySquasherModule,
ProbableWaffleModule
],
controllers: [AppController],
providers: [
Expand Down
20 changes: 10 additions & 10 deletions apps/api/src/app/chat/chat.controller.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Test, TestingModule } from '@nestjs/testing';
import { ChatService } from './chat.service';
import { chatServiceStub } from './chat.service.spec';
import { ChatController } from './chat.controller';
import { MessageDto } from './message.dto';
import { authUserStub } from '../../auth/auth.service.spec';
import { Test, TestingModule } from "@nestjs/testing";
import { ChatService } from "./chat.service";
import { chatServiceStub } from "./chat.service.spec";
import { ChatController } from "./chat.controller";
import { MessageDto } from "./message.dto";
import { authUserStub } from "../../auth/auth.service.spec";

describe('ChatController', () => {
describe("ChatController", () => {
let app: TestingModule;

beforeAll(async () => {
Expand All @@ -15,11 +15,11 @@ describe('ChatController', () => {
}).compile();
});

describe('postMessage', () => {
it('should return void', async () => {
describe("postMessage", () => {
it("should return void", async () => {
const chatController = app.get<ChatController>(ChatController);
const user = authUserStub;
const messageDto: MessageDto = { message: 'test' };
const messageDto: MessageDto = { message: "test" };
const result = await chatController.postMessage(user, messageDto);
expect(result).toBeUndefined();
});
Expand Down
15 changes: 7 additions & 8 deletions apps/api/src/app/chat/chat.controller.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { Body, Controller, Post, UseGuards } from '@nestjs/common';
import { ChatService } from './chat.service';
import { SupabaseAuthGuard } from '../../auth/guards/supabase-auth.guard';
import { CurrentUser } from '../../auth/current-user';
import { AuthUser } from '@supabase/supabase-js';
import { MessageDto } from './message.dto';
import { Body, Controller, Post, UseGuards } from "@nestjs/common";
import { ChatService } from "./chat.service";
import { SupabaseAuthGuard } from "../../auth/guards/supabase-auth.guard";
import { CurrentUser } from "../../auth/current-user";
import { AuthUser } from "@supabase/supabase-js";
import { MessageDto } from "./message.dto";

@Controller()
export class ChatController {
constructor(private readonly chatService: ChatService) {}

@Post('message')
@Post("message")
@UseGuards(SupabaseAuthGuard)
async postMessage(@CurrentUser() user: AuthUser, @Body() body: MessageDto): Promise<void> {
await this.chatService.postMessage(body.message, user);
Expand Down
Loading
Loading