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.

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

VR and other fixes #104

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b81e30e
Add ReadyGrab ( Phone Edit ) animation.
gonnavis Jan 24, 2023
9b4fa9a
Rebuild wasm. && doing: Set phone position. && Dev.
gonnavis Jan 24, 2023
49d65ea
update object preview
ronmetavese Jan 25, 2023
ca0d9a3
ok: phone position/rotation fit with hand.
gonnavis Jan 26, 2023
69ffb98
Restore beam.
gonnavis Jan 26, 2023
b17c363
ok: show/hide phone.
gonnavis Jan 27, 2023
5a40c19
Fix error due to no app.
gonnavis Jan 27, 2023
10ed5a8
Clean
gonnavis Jan 27, 2023
f4ad683
fix movement issue
ronmetavese Feb 1, 2023
2f1f85b
add `networkreconfigure`
ronmetavese Feb 1, 2023
2096ee7
Merge branch 'main' into rondoor-fix-drag-drop-issue
ronmetavese Feb 1, 2023
c936572
Fix preview and drop issue
ronmetavese Feb 1, 2023
077f2db
Merge branch 'main' into rondoor-fix-drag-drop-issue
ronmetavese Feb 1, 2023
5afd07a
Switch client port from 443 to 8080
soulofmischief Feb 1, 2023
a1fd201
Merge branch 'rondoor-fix-drag-drop-issue' of https://github.com/weba…
lalalune Feb 4, 2023
a4a55bb
Merge branch 'rondoor-multiplayer' of https://github.com/webaverse-st…
lalalune Feb 4, 2023
f366975
Merge branch 'vis/PhoneAnimPr' of https://github.com/webaverse-studio…
lalalune Feb 4, 2023
4ac0869
fix build stuff
lalalune Feb 4, 2023
9d80c2c
fix the bs
lalalune Feb 4, 2023
b3f97e8
Update README.md
lalalune Feb 4, 2023
87afd6b
env overrides
lalalune Feb 4, 2023
6bd9a13
Merge branch 'main' of https://github.com/webaverse-mmo/webaverse int…
lalalune Feb 4, 2023
bee374f
add env for local.webaverse.com
lalalune Feb 4, 2023
ee243f9
remove garbage
lalalune Feb 4, 2023
54b5d0e
update attempts to reach with env
lalalune Feb 4, 2023
aad9ae3
Remove stret and VRM deps
lalalune Feb 5, 2023
24830a4
remove three-vrm dep?
lalalune Feb 5, 2023
914945a
Merge branch 'main' of https://github.com/webaverse-mmo/webaverse int…
lalalune Feb 5, 2023
c5182f6
Fix core modules
lalalune Feb 5, 2023
d9f8b79
Remove avatars from public, move animations
lalalune Feb 5, 2023
4a4c835
Move skeleton back
lalalune Feb 5, 2023
001f9eb
Push some working defaults for env
lalalune Feb 5, 2023
d57110b
comment out button
lalalune Feb 5, 2023
4f6b4c5
Support webxr on vrm object
jakezira Feb 13, 2023
149bfbb
Enabled webxr support by using `u` key
jakezira Feb 14, 2023
6c0f7f5
Removed xr mode debugging code
jakezira Feb 14, 2023
c850c56
update node version in Dockerfile
listofbanned Feb 16, 2023
03d9a84
beautify dockerfile
listofbanned Feb 16, 2023
4f6d56f
fix cluster name
listofbanned Feb 16, 2023
abd34da
Enabled lower body IK
jakezira Feb 16, 2023
d37d296
Fix name 'container' to 'cluster'
listofbanned Feb 16, 2023
3df00c1
Update Dockerfile
listofbanned Feb 17, 2023
6bca341
Merge pull request #2 from webaverse-mmo/jakezira/webxr-vrm
lalalune Feb 17, 2023
9e41980
Merge pull request #3 from webaverse-studios/main
lalalune Feb 17, 2023
f0e049a
Merge pull request #4 from webaverse-studios/stable
lalalune Feb 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VITE_CORE_MODULES_URL=https://local.webaverse.com:8080/core-modules/
VITE_COMPILER_URL=https://webaverse-compiler.vercel.app/
15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node
FROM node:19.0.0
ARG pm2_secret_key
ENV LAST_UPDATED 20160605T165400
ENV PM2_PUBLIC_KEY wicmdcymxzyukdq
Expand All @@ -7,14 +7,15 @@ ENV HOSTNAME=0
ENV URL=https://local.webaverse.com
ENV PORT=443
LABEL description="webaverse-app"



# Copy source code
COPY . /app


# Change working directory
WORKDIR /app


# Install dependencies
RUN apt update -y
Expand All @@ -31,12 +32,12 @@ RUN apt-get install -y apt-transport-https \
libnspr4 \
libnss3 \
libx11-xcb1


# Expose API port to the outside
EXPOSE 443
EXPOSE 444


# Launch application

# Launch application
CMD npm run start-pm2 && npm run setup:test && npm test
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ You can host the source files on either your Windows file system or on the Ubunt

Start the application by running the NPM command at a WSL command prompt.

### Deployment

To deploy the compiler app to vercel, use the following build settings:
build command: `npm run build`
output directory: `dist/packages/compiler/.next`
root directory: `./` or leave blank

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
Expand Down
2 changes: 1 addition & 1 deletion buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ phases:
- docker push $REPOSITORY_URI:latest
- docker push $REPOSITORY_URI:$IMAGE_TAG
- echo Writing image definitions file...
- printf '[{"name":"ECSContainer-'$SERVICE_NAME'-'$AWS_DEFAULT_REGION'","imageUri":"%s"}]' $REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json
- printf '[{"name":"ECSCluster-'$AWS_DEFAULT_REGION'","imageUri":"%s"}]' $REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json
artifacts:
files: imagedefinitions.json
Loading