 Jonathan Hager
|
664a4baf71
|
Doors fixed + merge
|
5 years ago |
|
Jonathan Hager
|
6c9a3dd60e
|
Doors fixed
|
5 years ago |
 GammelJAN
|
9fee6a26e2
|
commit
|
5 years ago |
|
GammelJAN
|
8937f9c91c
|
Npcs and Player collide now
|
5 years ago |
|
GammelJAN
|
9fe2c07a3f
|
Quest has special dialogues now
|
5 years ago |
|
GammelJAN
|
4dbc1407c0
|
first quest added -> You have to get Information by talking to certain npcs - Interaction objects can go without extra Sprite now by naming the Texture of the InteractionObject '-' inside Tiled
|
5 years ago |
|
GammelJAN
|
a8f453a2f4
|
test commit
|
5 years ago |
|
GammelJAN
|
0cdbfa693a
|
tiledMap edited
|
5 years ago |
|
GammelJAN
|
335e74f825
|
assetsStructure - new tilesets - new Map started(Map1) - old files still in tiledMapDataOld
|
5 years ago |
|
GammelJAN
|
667028b41c
|
added structure to assets
|
5 years ago |
|
GammelJAN
|
2bdf196687
|
Merge branch 'master' of https://gitlab.com/JonathanHager/RPG
|
5 years ago |
|
GammelJAN
|
b55c75fb6a
|
merge
|
5 years ago |
|
Jonathan Hager
|
8ffad9c22c
|
Merge branch 'master' of https://gitlab.com/jonathanhager/rpg
merge
|
5 years ago |
|
Jonathan Hager
|
4c316fe234
|
Interactive objects with dialogues added
|
5 years ago |
|
GammelJAN
|
78a9a77d55
|
Merge branch 'master' of https://gitlab.com/JonathanHager/RPG
|
5 years ago |
|
GammelJAN
|
d5820252a5
|
screens added - merge
|
5 years ago |
|
Jonathan Hager
|
d2ff8dfe4b
|
Dialogue bug fixed
|
5 years ago |
|
GammelJAN
|
2f293db027
|
new maps added - npcs can be added via tiledmap - some tiles are now drawn above the player - for 3d-effect
|
5 years ago |
|
GammelJAN
|
758a4cf55c
|
Dialogues working
|
5 years ago |
|
Jonathan Hager
|
2071e3e69b
|
dialogues half working nice
|
5 years ago |
|
Jonathan Hager
|
9567de50f2
|
Merge branch 'master' of https://gitlab.com/jonathanhager/rpg
merge
|
5 years ago |
|
Jonathan Hager
|
5cae1b9bfa
|
Parser for dialogues
|
5 years ago |
|
GammelJAN
|
5526d5eb2e
|
textboxes automatically adjust height - bug with linebreaks - more testmaps added
|
5 years ago |
|
Jonathan Hager
|
ee41910b9a
|
Doors working
|
5 years ago |
|
Jonathan Hager
|
5e40b74855
|
merge
|
5 years ago |
|
Jonathan Hager
|
58aa3990d7
|
Map loading added
|
5 years ago |
|
GammelJAN
|
8a81aa9408
|
dialogue interaction between player and Npc possible (E)
|
5 years ago |
|
GammelJAN
|
a34723c5e9
|
Stage put into MapContainer - switchin between maps working
|
5 years ago |
|
Jonathan Hager
|
145b6eeddf
|
Jar generated
|
5 years ago |
|
Jonathan Hager
|
f0f3ec986f
|
NPC stops in certain radius
|
5 years ago |
|
Jonathan Hager
|
ee6c8738a2
|
NPC movement fixed
|
5 years ago |
|
Jonathan Hager
|
5ce7ed0208
|
Merge branch 'jonathan'
merge
|
5 years ago |
|
GammelJAN
|
62d7318cda
|
map has doorlayere with id - npc class added
|
5 years ago |
|
Jonathan Hager
|
c06aaa3a2e
|
Mapcontainer added
|
5 years ago |
|
GammelJAN
|
9deb603a79
|
commit
|
5 years ago |
|
GammelJAN
|
5b220f4bd4
|
Player Collision Rectangle added - Textbox positioning added
|
5 years ago |
|
Jonathan Hager
|
17e1ba53c5
|
Textboxes can draw n-answers
|
5 years ago |
|
Jonathan Hager
|
4c00ff580a
|
Movement fixed
|
5 years ago |
|
GammelJAN
|
fcfc344086
|
movement changes
|
5 years ago |
|
GammelJAN
|
5f2b06d6fb
|
merge conflicts solved
|
5 years ago |
|
GammelJAN
|
db694fa799
|
movement fixes - TODO: Refactor
|
5 years ago |
|
Jonathan Hager
|
f9a0040b11
|
Textboxes can be invoked by player
|
5 years ago |
|
Jonathan Hager
|
25453d2cf6
|
Collisions and animation updates working
|
5 years ago |
|
Jonathan Hager
|
26f658c44f
|
nothing
|
5 years ago |
|
GammelJAN
|
c0c4369c6e
|
movement and collissions added
|
5 years ago |
|
GammelJAN
|
bf5dbbb614
|
Merge branch 'master' of https://gitlab.com/JonathanHager/RPG
|
5 years ago |
|
Jonathan Hager
|
756f0fd3d3
|
Animation length is now used correctly
|
5 years ago |
|
GammelJAN
|
9c4e4cdd3c
|
movement and collisions started - MERGE
|
5 years ago |
|
GammelJAN
|
77103858cd
|
still wrong commit -.-
|
5 years ago |
|
GammelJAN
|
7fd5cd0c87
|
class not commited
|
5 years ago |
