Skip to content

test pull request of main into android #9

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

Open
wants to merge 75 commits into
base: android-testing
Choose a base branch
from
Open

test pull request of main into android #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
0d6182e
Fixing some stuff in EffectsMenu, added events for changing editing o…
Sep 21, 2022
a285493
Made a simpler Arduino scene 2
Sep 23, 2022
1c4bc6b
Finished Arduino ex
Sep 23, 2022
a5395aa
Changed Colliders on PLAYER prefab. Added main Example scene objects.…
Sep 26, 2022
b3af7fb
Finished Example scenes and tweaks. Still got issue with right hand.
Sep 26, 2022
c694a41
Mini updates to UI and examples
Sep 27, 2022
4139c79
Added DataToMeshMorph and DataToSound
Sep 29, 2022
6c4ae5e
Merged documentation but needs edits
Oct 3, 2022
4cd1368
made toc readme
Oct 3, 2022
72742db
Updated docs
Oct 3, 2022
d10b81b
updated docs images
Oct 3, 2022
0641e9c
updated docs
Oct 3, 2022
17947ea
docs
Oct 3, 2022
e9bdc64
UI Addition for editing manager
shankar-r19 Oct 5, 2022
642627a
Revert "UI Addition for editing manager"
shankar-r19 Oct 5, 2022
599b6cf
Merge branch 'main' of https://github.com/julesra/AR-CYB-UnityArduino…
Oct 5, 2022
895416b
minor changes
Oct 7, 2022
5002c31
Moved some things and updated Licenses
Oct 7, 2022
c56046d
Cleaned up licenses, put pointer to latest branch.
Oct 7, 2022
c064ec4
update text
Oct 7, 2022
d44338d
1
Oct 7, 2022
a68283b
1
Oct 7, 2022
eea9a5c
same
Oct 7, 2022
8cdd371
docs updates
Oct 8, 2022
a3b8213
Merge pull request #1 from iuli4n/dev-iulian-main
Oct 8, 2022
a9ac537
same
Oct 8, 2022
955798e
Merge pull request #2 from iuli4n/dev-iulian-main
Oct 8, 2022
0e5efe4
renamed doc files
Oct 11, 2022
18ed8c1
test
Oct 11, 2022
85f6534
'
Oct 11, 2022
f27fcfa
'
Oct 11, 2022
af21c34
Removed links to shankar's repo
Oct 11, 2022
a9dff10
'
Oct 11, 2022
45e64d6
'
Oct 11, 2022
df37202
'
Oct 11, 2022
3ef0e1b
'
Oct 11, 2022
0b23122
'
Oct 11, 2022
e6a97aa
quick edits
Oct 11, 2022
a24765e
quick edits
Oct 11, 2022
12e4ce9
quick edits
Oct 11, 2022
7781486
quick edits
Oct 11, 2022
ea60fb2
quick edits
Oct 11, 2022
0a1106c
quick edits
Oct 11, 2022
4d0086b
quick edits
Oct 11, 2022
0304ef4
quick edits
Oct 11, 2022
8dea143
quick edits
Oct 11, 2022
d2bebef
Added Arduino main example project and moved around the other examples
Oct 11, 2022
c5a992c
quick edits
Oct 12, 2022
624c2b1
quick edits
Oct 12, 2022
604a6ea
quick edits
Oct 12, 2022
c0cd3dd
quick docs
Oct 12, 2022
c745891
Squashed commit of the following:
Oct 12, 2022
08a1644
Merge pull request #3 from iuli4n/dev-iulian-main
Oct 12, 2022
9c93cc8
quick edits
Oct 12, 2022
8ffec87
quick edits
Oct 12, 2022
18d5338
Merge pull request #4 from iuli4n/dev-iulian-main
Oct 12, 2022
3cb0320
Removed photon ID so people can use their own
Oct 14, 2022
eea9a59
removed photon ID
Oct 14, 2022
88a33dd
Merge pull request #5 from iuli4n/dev-iulian-main
Oct 14, 2022
2a67542
GITIGNORE - disabled updating of PhotonServerSettings.asset
Oct 14, 2022
1c9fde1
Merge pull request #6 from iuli4n/dev-iulian-main
Oct 14, 2022
c1234d3
Added info about gitignore for Photon ID
Oct 14, 2022
42211c8
same update
Oct 14, 2022
60900f9
Merge pull request #7 from iuli4n/dev-iulian-main
Oct 14, 2022
5446452
added bugs list
Oct 17, 2022
e870ad5
Update 2.1_Sample_Scenes.md
Oct 17, 2022
6b57f0f
Update README.md
Oct 17, 2022
6b37eaf
Merge pull request #8 from iuli4n/dev-iulian-main
Oct 17, 2022
21e7a65
Update 1.1_AR_CYB_Software_Information_and_Installation.md
Jan 12, 2023
c2896b1
Update README.md
Jan 12, 2023
bbc187d
Update README.md
Jan 12, 2023
5c92f9f
Update 1.1_AR_CYB_Software_Information_and_Installation.md
Jan 12, 2023
a4ff3c2
cleaned up
Jan 31, 2023
7edd2c1
Update 2.1_Sample_Scenes.md
Jan 31, 2023
5d99267
Update 2.1_Sample_Scenes.md
Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ crashlytics-build.properties
# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# PHOTON SETTINGS FILE
PhotonServerSettings.asset
294 changes: 0 additions & 294 deletions Assets/Export/3DObjectMenu Variant.prefab
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/Export/3DObjectMenu Variant.prefab.meta
View file
Open in desktop

This file was deleted.

Loading