Commit ffab290
committed
chore: fix merge conflicts from
* 'dev' of github.com:Autodesk/synthesis:
chore: fix ci
refactor: create useHoldPhysicsPause hook
fix: update stale comment
fix: restore previously removed cast
fix: mock real jolt vec object in unit test
fix: revert auto formatting change
fix: asan build jolt memory bug catchesdev
19 files changed
Lines changed: 249 additions & 141 deletions
File tree
- fission/src
- systems
- multiplayer
- physics
- scene
- simulation/synthesis_brain
- test/scene
- ui/panels/configuring
- assembly-config/interfaces
- cameras
- zones
- initial-config
- util
- threejs
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
136 | 140 | | |
137 | 141 | | |
138 | 142 | | |
139 | 143 | | |
140 | 144 | | |
| 145 | + | |
| 146 | + | |
141 | 147 | | |
142 | 148 | | |
143 | 149 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| |||
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
48 | 53 | | |
49 | 54 | | |
50 | 55 | | |
| |||
0 commit comments