Skip to content

Huge refactor #1 (April-May 2017) #201

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.

Sign up for GitHub

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

Merged
HumbleDeer merged 35 commits into from
May 3, 2017
Merged

Huge refactor #1 (April-May 2017) #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cb8eedf
Basics for the ICS
kaizi99 Apr 13, 2017
21f136c
Changed item factory to work with JSON
Apr 13, 2017
9deb457
Merge branch 'master' of https://github.com/kaizi99/Community-Game
kaizi99 Apr 16, 2017
1478e95
Revert "Changed item factory to work with JSON"
kaizi99 Apr 16, 2017
cf3d43d
Revert "Basics for the ICS"
kaizi99 Apr 16, 2017
5f5f982
Changed Framework namespace to Entity
Apr 16, 2017
0832084
Refactored the ECS to make it less cluttered
kaizi99 Apr 16, 2017
2fe53db
Entities are now cloned instead of re-read from the json
kaizi99 Apr 17, 2017
8463f36
Forgot to initialize ID lol
kaizi99 Apr 17, 2017
d032eba
Linux fix
kaizi99 Apr 17, 2017
4f7d88d
Entites must now be registered in Entities.txt and ńew Hostile Component
kaizi99 Apr 17, 2017
baedf4a
Tile database ready, added a main menu, Giant refactor around the who…
Apr 18, 2017
124c96e
A* updated. No pointers!
Apr 21, 2017
15f258a
Rewrote Tile map and tile rendering
Apr 23, 2017
dd0cea8
AI Component can have different behaviour
Apr 23, 2017
0b12ece
Merge branch 'refactoring' of https://github.com/kaizi99/Community-Ga…
Apr 23, 2017
0716973
Logging system. And added StatePlaying
Apr 27, 2017
48cdacc
Deprecated Exceptions.h/.cpp
Apr 27, 2017
4d6c810
Fixed logging and sfml keys.
Apr 27, 2017
c8372e3
Merge pull request #2 from HopsonCommunity/master
Apr 28, 2017
de71a45
Merge
Apr 28, 2017
91be182
Merge branch 'HopsonCommunity-master' into refactoring
Apr 28, 2017
9d23ab9
Tile render and level generation. Menu singleplayer button now works
Apr 28, 2017
6ba67ed
Entities in level. Tile textures not rendering resolved*
Apr 30, 2017
31cd07f
Player now spawns in the room, collision added (still needs rework), …
Apr 30, 2017
08dae42
Started work on physics stuff testing WIP WIP
May 2, 2017
58be22c
Travis pls?
May 2, 2017
5fcd928
Fixed issue with inconsistent folder naming
Bravo555 May 3, 2017
7653fec
Casing in includes for tiles
May 3, 2017
bfaf7b6
Merge branch 'master' of https://github.com/kaizi99/Community-Game in…
May 3, 2017
c2b4c75
Merge branch 'refactoring' of https://github.com/kaizi99/Community-Ga…
May 3, 2017
0e55163
Build errors for gcc
May 3, 2017
fb49577
Function must return a value
May 3, 2017
b1bcccb
Platform specific..
May 3, 2017
ef74426
Casing in includes for tile
May 3, 2017
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
3 changes: 3 additions & 0 deletions res/entities/Entities.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Player.json
Projectile.json
enemy/Zombie.json
142 changes: 74 additions & 68 deletions res/entities/Player.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,80 @@
{
{
"name": "Player",
"components": [
{
"componentType": "Player"
},
{
"componentType": "Sprite",
"src": "entity/player_modelDefault",
"origin": {
"x": 15,
"y": 48
{
"componentType": "Player"
},
{
"componentType": "Sprite",
"src": "entity/player_modelDefault",
"flipOnVelocity": true,
"origin": {
"x": 15,
"y": 48
},
"rect": {
"left": 0,
"top": 0,
"width": 32,
"height": 64
}
},
"rect": {
"left": 0,
"top": 0,
"width": 32,
"height": 64
}
},
{
"componentType": "Position",
"position": {
"x": 0,
"y": 0
}
},
{
"componentType": "Collision",
"aabb": {
"xMin": 13,
"yMin": 16,
"xMax": 26,
"yMax": 32
}
},
{
"componentType": "Stats",
"base": {
"max_health": 150,
"health_regen": 5,
"armor": 0,
"magic_resist": 0
}
},
{
"componentType": "Velocity",
"speed": 188,
"velocity": {
"x": 0,
"y": 0
}
},
{
"componentType": "Animator",
"animations": [
{
"name": "idle",
"positionX": 0,
"positionY": 0,
"stride": 32,
"length": 8,
"fps": 7
"componentType": "Position",
"position": {
"x": 0,
"y": 0
}
},
{
"name": "run",
"positionX": 0,
"positionY": 64,
"stride": 32,
"length": 8,
"fps": 14
}]
}]
}
"componentType": "Physics",
"aabb": {
"xMin": 0,
"yMin": 0,
"xMax": 32,
"yMax": 32
},
"mass": 10,
"density": 0.4,
"restitution": 0.1
},
{
"componentType": "Stats",
"base": {
"max_health": 150,
"health_regen": 5,
"armor": 0,
"magic_resist": 0
}
},
{
"componentType": "Velocity",
"speed": 188,
"velocity": {
"x": 0,
"y": 0
}
},
{
"componentType": "Animator",
"animations": [
{
"name": "idle",
"positionX": 0,
"positionY": 0,
"stride": 32,
"length": 8,
"fps": 7
},
{
"name": "run",
"positionX": 0,
"positionY": 64,
"stride": 32,
"length": 8,
"fps": 14
}
]
}
]
}
4 changes: 2 additions & 2 deletions res/entities/Projectile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"name": "Projectile",
"components": [
{
Expand Down Expand Up @@ -34,4 +34,4 @@
"y": 0
}
}]
}
}
138 changes: 69 additions & 69 deletions res/entities/enemy/Zombie.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
{
{
"name": "Zombie",
"components": [
{
"componentType": "AI",
"trackingDistance": 7
},
{
"componentType": "Sprite",
"src": "entity/enemy/zombie",
"origin": {
"x": 32,
"y": 48
{
"componentType": "AI",
"behaviour": {
"type": "FollowPlayer",
"trackingDistance": 7
}
},
{
"componentType": "Hostile"
},
"rect": {
"left": 0,
"top": 0,
"width": 64,
"height": 64
}
},
{
"componentType": "Position",
"position": {
"x": 0,
"y": 0
}
},
{
"componentType": "Collision",
"aabb": {
"xMin": 16,
"yMin": 28,
"xMax": 47,
"yMax": 64
}
},
{
"componentType": "Stats",
"base": {
"max_health": 50,
"health_regen": 0,
"armor": 10,
"magic_resist": 0
}
},
{
"componentType": "Velocity",
"speed": 100,
"velocity": {
"x": 0,
"y": 0
}
},
{
"componentType": "Animator",
"animations": [
{
"name": "idle",
"positionX": 16,
"positionY": 0,
"stride": 64,
"length": 4,
"fps": 7
"componentType": "Sprite",
"src": "entity/enemy/zombie",
"flipOnVelocity": true,
"origin": {
"x": 32,
"y": 48
},
"rect": {
"left": 0,
"top": 0,
"width": 64,
"height": 64
}
},
{
"name": "run",
"positionX": 16,
"positionY": 64,
"stride": 64,
"length": 4,
"fps": 14
}]
}]
}
"componentType": "Position",
"position": {
"x": 0,
"y": 0
}
},
{
"componentType": "Stats",
"base": {
"max_health": 50,
"health_regen": 0,
"armor": 10,
"magic_resist": 0
}
},
{
"componentType": "Velocity",
"speed": 100,
"velocity": {
"x": 0,
"y": 0
}
},
{
"componentType": "Animator",
"animations": [
{
"name": "idle",
"positionX": 16,
"positionY": 0,
"stride": 64,
"length": 4,
"fps": 7
},
{
"name": "run",
"positionX": 16,
"positionY": 64,
"stride": 64,
"length": 4,
"fps": 14
}
]
}
]
}
Binary file added res/textures/gui/menu/dev/background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/textures/tiles/atlas.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions res/tiles/Blank.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions res/tiles/Dark_Stone.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions res/tiles/Light_Stone.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions res/tiles/Med_Stone.json
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions res/tiles/Void.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Passable": true,
"Breakable": false,
"Texture": [ 0, 0 ]
}
5 changes: 5 additions & 0 deletions res/tiles/dungeon/BrickFloor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Passable": true,
"Breakable": false,
"Texture": [ 0, 5 ]
}
5 changes: 5 additions & 0 deletions res/tiles/dungeon/BrickWall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Passable": false,
"Breakable": false,
"Texture": [ 0, 4 ]
}
Loading