freezarite 136196f6a5 Merge remote-tracking branch 'origin/textureManagerChanges' into textureManagerChanges ...

# Conflicts:
#	.gitmodules
#	CMakeLists.txt
#	include/AssetManager.h
#	include/Map.h
#	include/TileComponent.h
#	src/AssetManager.cpp
#	src/Map.cpp
#	src/TileComponent.cpp

2024-11-19 19:14:20 +01:00

..

AssetManager.cpp

merged dev into textureManagerChanges

2024-11-17 16:26:05 +01:00

ColliderComponent.cpp

fix(PR) + cleaned up some dead code

2024-06-25 11:42:12 +02:00

CollisionHandler.cpp

Merge branch 'dev'

2024-11-13 13:12:09 +01:00

ECS.cpp

refactor (working version)

2024-01-23 18:50:21 +01:00

Entity.cpp

Added z-Index base render order

2024-10-15 23:42:32 +02:00

GameInternal.cpp

Merge remote-tracking branch 'origin/textureManagerChanges' into textureManagerChanges

2024-11-19 19:14:20 +01:00

HealthComponent.cpp

ref(teams): removed teams from engine

2024-06-24 23:03:18 +02:00

InputComponent.cpp

fix(PR) + cleaned up some dead code

2024-06-25 11:42:12 +02:00

main.cpp

Added z-Index base render order

2024-10-15 23:42:32 +02:00

Manager.cpp

Added z-Index base render order

2024-10-15 23:42:32 +02:00

Map.cpp

added new Map for tile-textures as they wont work with our current enum-class maps.

2024-11-17 16:59:46 +01:00

PlayerComponent.cpp

Rewrite player collisions

2024-01-28 14:59:41 +01:00

PowerupComponent.cpp

ref(teams): removed teams from engine

2024-06-24 23:03:18 +02:00

ProjectileComponent.cpp

Merge branch 'ref/remove-teams' into separation-refactor

2024-06-25 11:53:01 +02:00

RenderManager.cpp

Adjusted for loop

2024-10-16 13:57:23 +02:00

RenderObject.cpp

Added z-Index base render order

2024-10-15 23:42:32 +02:00

SoundManager.cpp

added some tweaks to playSound

2024-06-24 22:53:13 +02:00

SpriteComponent.cpp

added new Constructor for SpriteComponent as Tiles wont work with enums

2024-11-17 17:05:26 +01:00

StatEffectsComponent.cpp

Merge branch 'ref/nicole' into separation-refactor

2024-06-14 00:46:19 +02:00

TextureManager.cpp

added new Map for tile-textures as they wont work with our current enum-class maps.

2024-11-17 16:59:46 +01:00

TileComponent.cpp

merged dev into textureManagerChanges

2024-11-17 16:26:05 +01:00

TransformComponent.cpp

Merge branch 'dev'

2024-11-13 13:12:09 +01:00

Vector2D.cpp

Rewrote collision detection

2024-01-29 23:49:58 +01:00