 jonasty
|
ff362a6bdc
|
Merge branch 'staging' into unified_scene
|
2022-04-07 11:37:37 +00:00 |
|
jonasty
|
0780b87291
|
Merge pull request 'Resource gathering - Tree cutting' (#25) from tree-cutting into staging
Reviewed-on: #25
|
2022-04-07 11:37:29 +00:00 |
|
jonasty
|
0719c15400
|
Merge branch 'staging' into tree-cutting
|
2022-04-07 11:36:56 +00:00 |
|
jonasty
|
e1a4dab3f7
|
resource scene added, small optimizations of environment
|
2022-04-06 14:36:14 +03:00 |
|
jonasty
|
0596e060db
|
homebase done portal room done
|
2022-04-05 20:53:02 +03:00 |
|
jonasty
|
ccafc9e970
|
unified scene working - small but with inventory and portals. has simple fix coming - overlaps in script use buttons still here, need flags to fix - simple torso for player character
|
2022-04-05 10:21:55 +03:00 |
 arlo
|
bf6bbc6723
|
log creation
|
2022-04-04 19:04:09 +03:00 |
|
arlo
|
51d75b196d
|
tree cut event
|
2022-04-04 16:09:59 +03:00 |
|
jonasty
|
53893b63a6
|
Merge pull request 'staging' (#23) from staging into master
Reviewed-on: #23
|
2022-03-29 09:50:37 +00:00 |
|
jonasty
|
aaf536d7ec
|
Merge branch 'master' into staging
|
2022-03-29 09:50:02 +00:00 |
|
jonasty
|
808cbfd033
|
Merge pull request 'portals-and-body' (#21) from portals-and-body into staging
Reviewed-on: #21
|
2022-03-29 09:49:11 +00:00 |
|
jonasty
|
c539311caf
|
Merge branch 'staging' into portals-and-body
|
2022-03-29 09:30:41 +00:00 |
|
jonasty
|
a71043121f
|
new character
|
2022-03-29 12:28:30 +03:00 |
|
arlo
|
8e50da0a93
|
added cuttable_tree and axe prefabs
|
2022-03-28 19:03:33 +03:00 |
 helar
|
5d197d0958
|
Merge pull request 'staging into master' (#20) from staging into master
Reviewed-on: #20
|
2022-03-28 14:43:38 +00:00 |
joonasp
|
0bd4fcc0a0
|
joonasP scene missing prefabs replaced
|
2022-03-28 17:36:04 +03:00 |
HelarJ
|
af07a29f40
|
final changes
|
2022-03-28 17:00:22 +03:00 |
|
HelarJ
|
53bd10a13c
|
merge door to staging
|
2022-03-28 16:54:50 +03:00 |
|
HelarJ
|
99d412b258
|
merge minigame to staging
|
2022-03-28 16:52:34 +03:00 |
 LAPTOP-NFGSIHNQ\shump
|
fb14e165d4
|
Door Interactions
|
2022-03-28 16:48:27 +03:00 |
|
HelarJ
|
72401758e2
|
merge highlight to staging
|
2022-03-28 16:46:33 +03:00 |
|
joonasp
|
06fde8ab2e
|
minigame node particles and despawn timer
|
2022-03-28 12:52:41 +03:00 |
|
HelarJ
|
8246a9ef8a
|
stackable inv objects, inv container
|
2022-03-28 10:08:54 +03:00 |
joonasp
|
851b7ae0da
|
essence minigame improvements
|
2022-03-25 18:03:38 +02:00 |
|
LAPTOP-NFGSIHNQ\shump
|
c10f3421f5
|
Merge branch 'Shumpei' into portals-and-body
# Conflicts:
# Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
# Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
# Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
# Assets/Project Files/Scripts/Shumpei.meta
# Assets/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4.unitypackage.meta
|
2022-03-25 10:46:05 +02:00 |
|
jonasty
|
e6cfaaf188
|
full body and animation, removed haptics that caused system crash
|
2022-03-24 22:50:55 +02:00 |
|
jonasty
|
0cb487d781
|
portal interaction and VR body
|
2022-03-24 18:02:34 +02:00 |
|
arlo
|
c23213ad50
|
outline on hover
|
2022-03-21 18:36:45 +02:00 |
|
joonasp
|
f0649da5d3
|
sounds for prefabs
|
2022-03-21 17:52:47 +02:00 |
|
LAPTOP-NFGSIHNQ\shump
|
e2e9f175bb
|
Arm-swing and joystick locomotion
|
2022-03-21 17:09:21 +02:00 |
|
arlo
|
f76431d855
|
panel to toggle nodding on/off
|
2022-03-19 22:29:19 +02:00 |
|
joonasp
|
22e4260521
|
lever improvements, ready to be used
|
2022-03-18 20:35:45 +02:00 |
|
joonasp
|
6f8245e798
|
Initial minigame testing in scene
|
2022-03-17 17:24:46 +02:00 |
|
joonasp
|
f2c0c3d9a1
|
lever prefab, haptic events and more comments in lever code
|
2022-03-16 22:16:55 +02:00 |
|
joonasp
|
ec8a34daf5
|
initial lever system
|
2022-03-15 20:07:59 +02:00 |
|
joonasp
|
c2767fe0d1
|
new branch joonasp
|
2022-03-15 10:20:33 +02:00 |
|
helar
|
84e21c94f3
|
Merge pull request 'staging' (#2) from staging into master
Reviewed-on: #2
|
2022-03-14 16:20:34 +00:00 |
|
HelarJ
|
670765ef3b
|
Update pack to URP
|
2022-03-14 18:14:44 +02:00 |
|
joonasp
|
6b9beee8f1
|
Merge and material conversion
|
2022-03-14 18:08:13 +02:00 |
|
HelarJ
|
1041b946b6
|
final v2
|
2022-03-14 16:52:00 +02:00 |
|
HelarJ
|
884d399679
|
final
|
2022-03-14 16:45:35 +02:00 |
|
HelarJ
|
f55009fc67
|
merge jonasty
|
2022-03-14 16:45:24 +02:00 |
|
HelarJ
|
54d7e65045
|
first
|
2022-03-14 16:33:09 +02:00 |
|
HelarJ
|
48ac923de2
|
Merge remote-tracking branch 'origin/nodding-arlo' into staging
|
2022-03-14 16:22:09 +02:00 |
|
jonasty
|
271d39c153
|
portals and dashing finalised
|
2022-03-14 16:20:51 +02:00 |
|
HelarJ
|
98dac07345
|
third person teleporting, grab interactables
|
2022-03-14 14:21:24 +02:00 |
|
arlo
|
643b4e38ab
|
nodding movement, platform
|
2022-03-13 01:50:13 +02:00 |
|
jonasty
|
e82799c36a
|
portals and dash. Also a bit of terrain building and level design
|
2022-03-13 00:26:35 +02:00 |
|
joonasp
|
b42bfd3c5e
|
Unity render pipeline upgrade, velocity based vignette system (may encounter problems on merge)
|
2022-03-12 21:38:42 +02:00 |
|
joonasp
|
f48d160bd3
|
XR interaction toolkit holsters, flying with physics
|
2022-03-10 17:25:29 +02:00 |