Sem van der Hoeven
645c4df494
[FIX] in game scene
2021-06-11 10:42:52 +02:00
SemvdH
8835646e32
Merge pull request #5 from SemvdH/mergebranch-Jasper
...
Mergebranch jasper into develop
2021-06-11 10:27:46 +02:00
SemvdH
ab7123b89a
Merge branch 'develop' into mergebranch-Jasper
2021-06-11 10:27:30 +02:00
SemvdH
dbecbb594e
Merge pull request #4 from SemvdH/feature/point-count
...
point count into develop
2021-06-11 10:18:31 +02:00
SemvdH
38d3c6e5cb
Merge branch 'develop' into feature/point-count
2021-06-11 10:18:11 +02:00
SemvdH
71761dd322
Merge pull request #3 from SemvdH/feature/MovementCharacter
...
Feature/movement character into develop
2021-06-11 10:16:39 +02:00
SemvdH
eaab85ac33
Merge branch 'develop' into feature/MovementCharacter
2021-06-11 10:14:12 +02:00
SemvdH
cca8680a98
Merge pull request #2 from SemvdH/feature/house-generation
...
Feature/house generation into develop
2021-06-11 10:05:23 +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
Menno
dd6ee77316
[ADD] added all the models to the project
2021-06-08 15:53:51 +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
Sem van der Hoeven
1e55736615
[ADD] multiple hand detection squares
2021-06-08 13:17:07 +02:00
Menno
625965ed1b
[ADDED] rotating bounding boxes
2021-06-08 12:22:54 +02:00
Jasper
509f64f04d
Merge branch 'feature/pause-menu' into feature/menu
2021-06-08 12:15:27 +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
Sem van der Hoeven
ef470bd4f1
[ADD] start of multiple squares
2021-06-08 11:54:48 +02:00
Jasper
1558ee298b
[ADD] added comments to startup_scene.h
2021-06-08 11:49:57 +02:00
Nathalie Seen
69d88ab1c1
[ADD] comments to camera and toolbox
2021-06-08 11:39:47 +02:00
Kim
a4d5658a06
[ADD] Commented main_character h and cpp files
2021-06-08 11:37:56 +02:00
Jasper
e7a9cda9dd
[ADD] added a on/off for hand detection in menu
...
you can switch between mouse and hand detection now
2021-06-08 11:14:07 +02:00
Sem van der Hoeven
afd3e00ddb
[ADD] contour of hand in calibration screen
2021-06-08 11:03:22 +02:00
Nathalie Seen
edbbfb136a
[ADD] made camera follow the character with lerp
2021-06-08 10:55:48 +02:00
Sem van der Hoeven
bb68d98bfe
[ADD] comments
2021-06-08 10:43:59 +02:00
Jasper
c94f798a9d
[ADD] added comments and deleted cout's
2021-06-04 16:45:11 +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
Jasper
aa4860eb48
[FIX] only clicks ones when you close hand now
2021-06-04 16:41:16 +02:00
Sem van der Hoeven
e70d2ef19d
[EDIT] removed unused hand stuff
2021-06-04 16:32:30 +02:00
Jasper
b3412e414e
[ADD] menu now works
...
menu switches to next item when hand is closed and calls OnClick() when hand is closed
2021-06-04 16:32:26 +02:00
Sem van der Hoeven
1ab5ae798e
[ADD] hand calibration screen
2021-06-04 16:27:30 +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
Sem van der Hoeven
e4b5dc39c0
[EDIT] change variable names in compliance with code style guide
2021-06-04 15:10:19 +02:00
Sem van der Hoeven
b80653b668
[EDIT] change method names in compliance with code style guide
2021-06-04 15:07:36 +02:00
Sem van der Hoeven
ca2959bf2d
[FIX] detecting hand when its just a finger or hair
2021-06-04 14:48:19 +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
81dec3b9f4
[ADD] detecting if hand is in square
2021-06-04 13:10:11 +02:00
Sem van der Hoeven
f5926fffcb
[ADD] detecting if hand is in square
2021-06-04 13:09:51 +02:00
Nathalie Seen
2523e1abfa
Merge branch 'feature/automatic-rendering' into feature/MovementCharacter
...
* feature/automatic-rendering:
[ADD] deque method
[EDIT] caffemodel in gitignore
[EDIT] small fix
[ADD] (test) trees at every chunk
[ADD] comments
[ADD] added deque support for light loading
[ADD] automatic loading of models
[ADDED] timer class
# Conflicts:
# src/scenes/in_Game_Scene.cpp
# wk2_fps.vcxproj.filters
2021-06-04 12:57:51 +02:00
Nathalie Seen
bc5703eb65
[FIX] made bee move
2021-06-04 12:52:24 +02:00
Sem van der Hoeven
4c49895f6d
[MERGE] async compvision
2021-06-04 12:29:36 +02:00
Sem van der Hoeven
921609de5d
[EDIT] stuff
2021-06-04 11:39:23 +02:00
