Jasper
|
f1f8ac2d08
|
Merge branch 'feature/random_levels' into feature/loading_all_models
|
2021-06-18 10:54:17 +02:00 |
|
Lars
|
773e8e9a96
|
[FIX + check] cleaned up the singleton and loading scene, only loading the models should be the only thing to do. besides checking it in another scene!
|
2021-06-18 10:43:26 +02:00 |
|
Lars
|
8dbe088a91
|
[add] add some code + singleton, not working properly yet
|
2021-06-18 10:08:16 +02:00 |
|
Jasper
|
26d438e4d1
|
[EDIT] models now generate in a 3x3 grid with always 9 models
|
2021-06-18 09:58:08 +02:00 |
|
Jasper
|
24285b9714
|
[ADD] added an extra layer to the grid for the lamps and fans. Grid now generates correctly.
Good enough
|
2021-06-11 16:34:25 +02:00 |
|
Lars
|
001f28d198
|
[forget]
|
2021-06-11 16:01:17 +02:00 |
|
Jasper
|
fb70d10c47
|
[EDIT] made a grid for the models to load in
Some items still clip through the wall
|
2021-06-11 15:58:28 +02:00 |
|
Lars
|
f6fad79c2e
|
[TRY] trying to manage some data storage
|
2021-06-11 15:56:34 +02:00 |
|
Jasper
|
bce2ccf889
|
[ADD] added base for loading scene
|
2021-06-11 11:43:46 +02:00 |
|
Sem van der Hoeven
|
504b97b320
|
[FIX] pointer
|
2021-06-11 11:13:49 +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
|
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 |
|