SemvdH
|
3a42966e92
|
Merge branch 'develop' into feature/loading_all_models
|
2021-06-18 15:33:06 +02:00 |
|
SemvdH
|
17d2bd7382
|
Merge branch 'develop' into feature/handControl
|
2021-06-18 15:28:30 +02:00 |
|
Sem van der Hoeven
|
1d940fe1db
|
[MERGE] develop into this
|
2021-06-18 15:25:15 +02:00 |
|
SemvdH
|
ec14dd1093
|
Merge branch 'develop' into feature/game_logic/game_over
|
2021-06-18 15:17:43 +02:00 |
|
Jasper
|
17b585190a
|
[EDIT] loadingscreen now has a background, and got rid of some memory leaks
|
2021-06-18 15:09:30 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
b92c0c74eb
|
no message
|
2021-06-18 15:08:08 +02:00 |
|
Jasper
|
ad2d651d41
|
[FIX] fixed the loading scene, everything runs correctly now
|
2021-06-18 14:53:16 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
5419801113
|
Merge branch 'feature/game_logic/collisionFix' into feature/game_logic/game_over
* feature/game_logic/collisionFix:
[FIXED] collisions
[WIP] collision fixing
# Conflicts:
# src/scenes/game_Over_Scene.cpp
# src/scenes/in_Game_Scene.cpp
|
2021-06-18 13:57:34 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
824f9a2433
|
[ADD] gameover scene shows the points
|
2021-06-18 13:35:19 +02:00 |
|
Menno
|
c0a099a05e
|
[FIXED] collisions
|
2021-06-18 12:32:45 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
022c7eb1f0
|
[WIP] collision fixing
|
2021-06-18 11:20:24 +02:00 |
|
Sem van der Hoeven
|
982f787d44
|
[ADD] comments
|
2021-06-18 11:11:56 +02:00 |
|
Sem van der Hoeven
|
b446a366fb
|
[ADD] comments and cleanup includes
|
2021-06-18 11:06:59 +02:00 |
|
Sem van der Hoeven
|
0d6f10dff5
|
[ADD] comments and cleanup includes
|
2021-06-18 11:06:25 +02:00 |
|
Sem van der Hoeven
|
01570d8045
|
[FIX] auto skin calibration in game scene
|
2021-06-18 10:49:59 +02:00 |
|
Sem van der Hoeven
|
ce0a1f3da7
|
[EDIT] files accordingly to style guide
|
2021-06-18 10:31:00 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
e51b56b156
|
[WIP] Collision detectie moet nog worden egimplementeerd om naar game over screen te gaan
|
2021-06-11 16:49:09 +02:00 |
|
Sem van der Hoeven
|
344745d9cf
|
[ADD] auto calibration in game scene
|
2021-06-11 16:46:00 +02:00 |
|
Nathalie Seen
|
a6fa9514df
|
[ADD] maincharacter uses deltatime for movement
|
2021-06-11 16:19:21 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
a65f3391f7
|
[Add] Pointsystem works
|
2021-06-11 15:32:06 +02:00 |
|
Nathalie Seen
|
3517d2b36a
|
[ADD] made movement based on hand position
|
2021-06-11 14:46:24 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
9b1bea3eec
|
Merge branch 'feature/number-from-images' into feature/game_logic/point_system
* feature/number-from-images:
[ADD] convert number to digits
|
2021-06-11 12:32:03 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
8c1191c131
|
[ADD] start of number display
|
2021-06-11 12:31:33 +02:00 |
|
Sem van der Hoeven
|
692bb76164
|
[ADD] convert number to digits
|
2021-06-11 12:30:47 +02:00 |
|
Sem van der Hoeven
|
ae9386a811
|
[FIX] in game scene
|
2021-06-11 10:58:21 +02:00 |
|
Sem van der Hoeven
|
645c4df494
|
[FIX] in game scene
|
2021-06-11 10:42:52 +02:00 |
|
SemvdH
|
ab7123b89a
|
Merge branch 'develop' into mergebranch-Jasper
|
2021-06-11 10:27:30 +02:00 |
|
SemvdH
|
38d3c6e5cb
|
Merge branch 'develop' into feature/point-count
|
2021-06-11 10:18:11 +02:00 |
|
SemvdH
|
eaab85ac33
|
Merge branch 'develop' into feature/MovementCharacter
|
2021-06-11 10:14:12 +02:00 |
|
SemvdH
|
4e9e534c02
|
Merge branch 'develop' into feature/house-generation
|
2021-06-11 10:05:11 +02:00 |
|
Nathalie Seen
|
770b54bdd5
|
[ADD] character falls when it hits a tree
|
2021-06-11 09:59:35 +02:00 |
|
Sem van der Hoeven
|
a8996f63ef
|
[ADD] start game scene fingers
|
2021-06-08 16:06:46 +02:00 |
|
Sem van der Hoeven
|
88252f4dc8
|
[ADD] static skin treshold
|
2021-06-08 15:35:03 +02:00 |
|
Nathalie Seen
|
551d53a3dc
|
[ADD] made collision work
|
2021-06-08 15:25:24 +02:00 |
|
Sem van der Hoeven
|
27594d466b
|
[ADD] better info on camera
|
2021-06-08 15:11:54 +02:00 |
|
Sem van der Hoeven
|
5e137faef5
|
[ADD] up left and right detection regions
|
2021-06-08 14:48:46 +02:00 |
|
Kim
|
15f71680a9
|
[ADD] basic point system based on amount of entities in chunk (house entitie excluded)
|
2021-06-08 14:42:58 +02:00 |
|
Menno
|
b092bd5f0a
|
[ADD] furniture
|
2021-06-08 14:24:12 +02:00 |
|
Sem van der Hoeven
|
cadee7d8e9
|
[ADD] hand detection type enum
|
2021-06-08 13:38:47 +02:00 |
|
Menno
|
625965ed1b
|
[ADDED] rotating bounding boxes
|
2021-06-08 12:22:54 +02:00 |
|
Nathalie Seen
|
ae93ed6b34
|
[FIX] renamed uses of main_character to MainCharacter in in_Game_secene
|
2021-06-08 11:59:58 +02:00 |
|
Nathalie Seen
|
edbbfb136a
|
[ADD] made camera follow the character with lerp
|
2021-06-08 10:55:48 +02:00 |
|
Lars
|
4587559030
|
[COMMENTS] added some comments for all the scene files
the only thing i could not find was the on key method, the other params are empty(thus no comments)
|
2021-06-04 16:44:10 +02:00 |
|
Menno
|
aa9c6a0fbb
|
[ADDED] comments
|
2021-06-04 15:54:23 +02:00 |
|
Menno
|
8c50792657
|
[FEATURE] simple house generator
|
2021-06-04 15:49:56 +02:00 |
|
Nathalie Seen
|
86383aace5
|
[ADD] camera follows the only at the z position
|
2021-06-04 14:44:41 +02:00 |
|
Menno
|
cfd2d00d08
|
[ADDED] simple house generation
|
2021-06-04 14:32:16 +02:00 |
|
Sem van der Hoeven
|
e166c1f988
|
[EDIT] small fix
|
2021-06-02 10:51:59 +02:00 |
|
Sem van der Hoeven
|
ad35e14bfc
|
[ADD] (test) trees at every chunk
|
2021-06-02 09:37:13 +02:00 |
|
lars
|
2468d7fa7f
|
[ADD] the pause menu can be accessed with the 'P' key. the real button are not implemented yet.
|
2021-06-01 15:18:07 +02:00 |
|