Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main repo’s master #2

Merged
merged 515 commits into from
Jun 18, 2019
Merged

Merge main repo’s master #2

merged 515 commits into from
Jun 18, 2019

Conversation

vibby
Copy link
Owner

@vibby vibby commented Jun 18, 2019

No description provided.

Toseben and others added 30 commits May 13, 2019 23:29
@Toseben
gui camera from controller position
0c32649
@Toseben
props gui panel styling
9d55b14
@Toseben
position gui correctly
bb3a01f
@Toseben
conditional rendering of virtual cams
1de2676
@Toseben
fix gui camera offset
38690f9
@audionerd
update shot-generator.storyboarder
5f69f6f
@audionerd
Merge pull request #1644 from wonderunit/shot-generator-layer
b8c3e0c 
shot-generator layer
@audionerd
show shot-generator layer in sidebar
d232a44 
- add ShotGeneratorPanel
- render ShotGeneratorPanel
@audionerd
css for ShotGeneratorPanel placeholder div
a79ba8b
@audionerd
set shot-generator.storyboarder aspect ratio to 2.39:1
8fb938d
@audionerd
FOV
ab62c25
@audionerd
render placeholder images for new shot-generator thumbnails
20477d4
@audionerd
add shot-generator placeholder thumbnail pngs
35fc999
@audionerd
update placeholder shot-generator thumbnail pngs
815eb6b
@audionerd
swap
7cadf89
@Toseben
slider that technically works
a164d77
@Toseben
update text centering
5343043
@Toseben
replace prop texts with sliders
9be13ad
@Toseben
prop value limits
9ab60c2
@Toseben
slider borders and styling
f2aabda
@Toseben
update redux state from slider
3283f4d
@audionerd
fix bug where shot generator panel didn't update on save
d6b17db 
- specifically re-render shot generator panel after image save
- use cache buster key for image url
@audionerd
add boardFilenameForLayerThumbnail
24475cf
@audionerd
refactor renderShotGeneratorPanel
d2f9404
@audionerd
save board-n-shot-generator-thumbnail.jpg
44fb699
@audionerd
add sg layer thumbnail to shot-generator.storyboarder fixture
10cbe1c
@audionerd
call renderShotGeneratorPanel from saveToBoardFromShotGenerator
a005b87
@audionerd
save layer thumbnail filename to .storyboarder
ef19c8d
@audionerd
note
16b4b4a
@audionerd
update shot-generator.storyboarder with layer thumbnail filename
8024cc5
setpixel and others added 29 commits June 14, 2019 12:16
@setpixel
removing old STS and related data files
3adeefc
@setpixel
deleting more old sts data files
defa227
@audionerd
exclude .cache from build
32a382e
@audionerd
exclude .github from build
930f563
@audionerd
exclude .vscode from build
2859080
@setpixel
removed old functions from model-loader
9e1ea9e
@setpixel
Merge branch 'master' of https://github.com/wonderunit/storyboarder
60665d7
@audionerd
always xr:build before dist
c3989ef
@audionerd
--no-source-maps for vr build
9de8ce3
@audionerd
update vendored WEBVR.js
7807e8a
@audionerd
"Enter Shot Generator VR"
f8d56b4
@audionerd
comment out RStats for now
3c3abf1
@audionerd
show a semi-transparent overlay on scene before VR is started
83459d4
@audionerd
className
2635ad8
@audionerd
center the "Enter Shot Generator VR" button
1e5f39b
@audionerd
button style tweaks
f4f4258
@audionerd
center all buttons
ead1694
@audionerd
fix print and import windows for electron v5
20371a4
@audionerd
Merge pull request #1674 from wonderunit/enter-vr-button-style
4f32980 
Improved styling for "Enter Shot Generator VR" button
@setpixel
bump v
09c208b
@Toseben
fix: can't select an object/character with the grip
00ce02c
@Toseben
remove wrist roll character rotation
82851d6
@Toseben
use second trigger to constraint objects
4a2ef7f
@Toseben
round constrained rotation to closest 22.5
d51b515
@Toseben
fix: snapping bug if above 180 degrees
5be5eb6
@Toseben
change from trigger to grip button for constraint
e45e037
@Toseben
snap z-axis to 180 on constraint, aka up or down
dec7f58
@setpixel
adding a camera will be closer to you
1cfb76b
@setpixel
Merge pull request #1678 from wonderunit/xr-controller-tweaks
e8a6a2e 
XR Controller Tweaks
@vibby vibby merged commit df4a3e2 into vibby:shot-generator Jun 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vibby @Toseben @audionerd @setpixel