Skip to content

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

Merged
HumbleDeer merged 35 commits intoHopsonCommunity:masterfrom
kaizi99:refactoring
May 3, 2017
Merged

Huge refactor #1 (April-May 2017)#201
HumbleDeer merged 35 commits intoHopsonCommunity:masterfrom
kaizi99:refactoring

Conversation

@Repertoi-e
Copy link
Copy Markdown

@Repertoi-e Repertoi-e commented May 2, 2017

No description provided.

kaizi99 and others added 27 commits April 13, 2017 13:50
@kaizi99
Basics for the ICS
cb8eedf
Changed item factory to work with JSON
21f136c
@kaizi99
Merge branch 'master' of https://github.com/kaizi99/Community-Game
9deb457
@kaizi99
Revert "Changed item factory to work with JSON"
1478e95 
This reverts commit 21f136c.
@kaizi99
Revert "Basics for the ICS"
cf3d43d 
This reverts commit cb8eedf.
Changed Framework namespace to Entity
5f5f982
@kaizi99
Refactored the ECS to make it less cluttered
0832084
@kaizi99
Entities are now cloned instead of re-read from the json
2fe53db
@kaizi99
Forgot to initialize ID lol
8463f36
@kaizi99
Linux fix
d032eba
@kaizi99
Entites must now be registered in Entities.txt and ńew Hostile Component
4f7d88d
Tile database ready, added a main menu, Giant refactor around the who…
baedf4a 
…le project, moved files around
A* updated. No pointers!
124c96e
Rewrote Tile map and tile rendering
15f258a
AI Component can have different behaviour
dd0cea8
Merge branch 'refactoring' of https://github.com/kaizi99/Community-Game…
0b12ece 
… into refactoring
Logging system. And added StatePlaying
0716973
Deprecated Exceptions.h/.cpp
48cdacc
Fixed logging and sfml keys.
4d6c810
Merge pull request #2 from HopsonCommunity/master
c8372e3 
Merge from master
Merge
de71a45
Merge branch 'HopsonCommunity-master' into refactoring
91be182
Tile render and level generation. Menu singleplayer button now works
9d23ab9
Entities in level. Tile textures not rendering resolved*
6ba67ed
Player now spawns in the room, collision added (still needs rework), …
31cd07f 
…Zombie added but bugged
Started work on physics stuff testing WIP WIP
08dae42
Travis pls?
58be22c
@HumbleDeer
Copy link
Copy Markdown
Collaborator

HumbleDeer commented May 3, 2017

It means you code doesn't comply or is faulty

@Bravo555
Copy link
Copy Markdown
Contributor

Bravo555 commented May 3, 2017 •
edited
Loading

Error occurs because Tile.h is not in the same directory as TilesMap.h. If you want to go directory above, use .. in the path.
Also, is that intentional?
obraz

EDIT: It happened because file and folder names on NTFS are case insensitive.
difference
Arch Linux VM (left) and Git Bash for Windows (right)

@Bravo555
Copy link
Copy Markdown
Contributor

Bravo555 commented May 3, 2017

FTFY

@Repertoi-e
Copy link
Copy Markdown
Author

Repertoi-e commented May 3, 2017

Wow ty

@Bravo555
Copy link
Copy Markdown
Contributor

Bravo555 commented May 3, 2017

The last thing is just correct the paths in files manually. There is now only one folder, tile.

@Bravo555 Bravo555 self-requested a review May 3, 2017 05:29
@Repertoi-e
Copy link
Copy Markdown
Author

Repertoi-e commented May 3, 2017

Ok ready for merge :X

HumbleDeer
HumbleDeer approved these changes May 3, 2017
View reviewed changes
Copy link
Copy Markdown
Collaborator

@HumbleDeer HumbleDeer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay.

@HumbleDeer HumbleDeer merged commit f9fcfb3 into HopsonCommunity:master May 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@HumbleDeer HumbleDeer HumbleDeer approved these changes

@Bravo555 Bravo555 Awaiting requested review from Bravo555

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Repertoi-e @HumbleDeer @Bravo555 @kaizi99