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

Integration between Board Generation and Minigames #23

Open
wants to merge 95 commits into
base: tiles
Choose a base branch
from
Open

Integration between Board Generation and Minigames #23

wants to merge 95 commits into from

Commits on Feb 27, 2020

  1. Implemented basic board generation functionality

    @sanathsengupta
    sanathsengupta committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    b640bcf View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2020

  1. Fixed merge conflicts

    @sanathsengupta
    sanathsengupta committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    183dd9a View commit details
    Browse the repository at this point in the history

  2. Reversed merge

    @sanathsengupta
    sanathsengupta committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    c3e56a8 View commit details
    Browse the repository at this point in the history

  3. Reverted

    @sanathsengupta
    sanathsengupta committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    d797ce5 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

  1. Started work on Occlusion

    @sanathsengupta
    sanathsengupta committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    732636c View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Update README.md

    @erwang01
    erwang01 authored Mar 18, 2020
    Configuration menu
    Copy the full SHA
    3ebc79e View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Update CONTRIBUTING.md

    @erwang01
    erwang01 authored Mar 19, 2020
    Configuration menu
    Copy the full SHA
    7f0aec9 View commit details
    Browse the repository at this point in the history

  2. Plane visualization

    @sanathsengupta
    sanathsengupta committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    172cfc6 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @erwang01
    erwang01 authored Mar 19, 2020
    Configuration menu
    Copy the full SHA
    c73a63f View commit details
    Browse the repository at this point in the history

  4. Update CONTRIBUTING.md

    @erwang01
    erwang01 authored Mar 19, 2020
    Configuration menu
    Copy the full SHA
    d76ab49 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. Further developed plane visualization and began testing floor classif… 

    …ication
    @sanathsengupta
    sanathsengupta committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    c29cc08 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Implemented rudimentary classification system for floor planes

    @sanathsengupta
    sanathsengupta committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    6f7dcfb View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Implemented floor recognition and board generation -- TODO: Updating … 

    …board as anchor updates
    @sanathsengupta
    sanathsengupta committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    c5462dc View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. Completed static board generation

    @sanathsengupta
    sanathsengupta committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    f824d25 View commit details
    Browse the repository at this point in the history

  2. Began implementation of GameBoard class and object structure

    @sanathsengupta
    sanathsengupta committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    15d9986 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Cleaned up some code

    @sanathsengupta
    sanathsengupta committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    5f961cd View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. Clean up

    @sanathsengupta
    sanathsengupta committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    df1f201 View commit details
    Browse the repository at this point in the history

  2. Fixed merge conflicts and merged board_generation with classification

    @sanathsengupta
    sanathsengupta committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    d43fc36 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2020

  1. Revisions

    @sanathsengupta
    sanathsengupta committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    cc728de View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2020

  1. Began TileGrid implementation

    @sanathsengupta
    sanathsengupta committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    fd00562 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2020

  1. Significantly improved plane detection and tile grid generation

    @sanathsengupta
    sanathsengupta committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    823c501 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2020

  1. Began implementation of board placement

    @sanathsengupta
    sanathsengupta committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    34bb46b View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Greatly improved board generation time by storing static references t… 

    …o model and collision components
    @sanathsengupta
    sanathsengupta committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    423f28f View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Merge branch 'master' into tiles. Prep for pull request.

    @erwang01
    erwang01 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    de57b68 View commit details
    Browse the repository at this point in the history

  2. Finalized grid generation and implemented updating features, began wo… 

    …rk on displaying board outline based on camera orientation
    @sanathsengupta
    sanathsengupta committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    8bd89fe View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. Finished board placement implementation -- TODO: Implement directiona… 

    …l knowledge
    @sanathsengupta
    sanathsengupta committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    07bda67 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2020

  1. Merge branch 'tiles' into board_generation

    @erwang01
    erwang01 authored Apr 25, 2020
    Configuration menu
    Copy the full SHA
    ca16dba View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2020

  1. Fox Laser Asset. Improved target generation

    @erwang01
    erwang01 committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    385b316 View commit details
    Browse the repository at this point in the history

  2. Generated the rest of the USDZ laser target assets

    @erwang01
    erwang01 committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    dfa6f25 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2020

  1. add progress bar

    @erwang01
    erwang01 committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    01b7987 View commit details
    Browse the repository at this point in the history

  2. Spotlight confirm works but rendering is not great

    @erwang01
    erwang01 committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    492b5e1 View commit details
    Browse the repository at this point in the history

  3. Progress Bar and EC Squat level

    @erwang01
    erwang01 committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    381f878 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2020

  1. Add SwiftGif and MultiProgressView dependencies. Add custom color and… 

    … positions to TraceTarget
    @erwang01
    erwang01 committed May 2, 2020
    Configuration menu
    Copy the full SHA
    cbc0b94 View commit details
    Browse the repository at this point in the history

  2. Create Minigame ViewController. FIXME: Bug Minigame.swift:122 progres… 

    …sView is nil
    @erwang01
    erwang01 committed May 2, 2020
    Configuration menu
    Copy the full SHA
    c366da5 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2020

  1. Changed swift compiler settings from 'incremental' too 'whole module'… 

    … in order to fix build erroe'
    @sanathsengupta
    sanathsengupta committed May 3, 2020
    Configuration menu
    Copy the full SHA
    356f02b View commit details
    Browse the repository at this point in the history

  2. Completed MinigameView Controller

    @erwang01
    erwang01 committed May 3, 2020
    Configuration menu
    Copy the full SHA
    a31b583 View commit details
    Browse the repository at this point in the history

  3. Started implementing content team's tile models

    @sanathsengupta
    sanathsengupta committed May 3, 2020
    Configuration menu
    Copy the full SHA
    7626461 View commit details
    Browse the repository at this point in the history

  4. Update PassThroughView and add documentation

    @erwang01
    erwang01 committed May 3, 2020
    Configuration menu
    Copy the full SHA
    d3bcc47 View commit details
    Browse the repository at this point in the history

  5. Trial implementation of loading entire backround scene

    @sanathsengupta
    sanathsengupta committed May 3, 2020
    Configuration menu
    Copy the full SHA
    0e78885 View commit details
    Browse the repository at this point in the history

  6. Tile only implementation

    @sanathsengupta
    sanathsengupta committed May 3, 2020
    Configuration menu
    Copy the full SHA
    246a64d View commit details
    Browse the repository at this point in the history

  7. Added RC Files

    @sanathsengupta
    sanathsengupta committed May 3, 2020
    Configuration menu
    Copy the full SHA
    61f69eb View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. Finish TraceGame Progress Bar

    @erwang01
    erwang01 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    0a5a5fd View commit details
    Browse the repository at this point in the history

  2. Prep for MovementGame UI

    @erwang01
    erwang01 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    318e972 View commit details
    Browse the repository at this point in the history

  3. fix documentation and add TODOs

    @erwang01
    erwang01 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    b608a2a View commit details
    Browse the repository at this point in the history

  4. Started implementation of rotating board

    @sanathsengupta
    sanathsengupta committed May 4, 2020
    Configuration menu
    Copy the full SHA
    54ea2b6 View commit details
    Browse the repository at this point in the history

  5. Add Puffer Target. Placed TraceGame onto the ground instead of 1.5m i… 

    …n the air
    @erwang01
    erwang01 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    206e362 View commit details
    Browse the repository at this point in the history

  6. added scale

    @woojinko
    woojinko committed May 4, 2020
    Configuration menu
    Copy the full SHA
    a280cbb View commit details
    Browse the repository at this point in the history

  7. Squats coach added. TODO: Improve Movement Game state machine. Add ve… 

    …rtical progress bar.
    @erwang01
    erwang01 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    4ea5f81 View commit details
    Browse the repository at this point in the history

  8. Add vertical progress bar to squats

    @erwang01
    erwang01 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    d9a16fa View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. added scale factor for resizing board generation, worked on debugging… 

    … board generation
    @woojinko
    woojinko committed May 5, 2020
    Configuration menu
    Copy the full SHA
    d72f596 View commit details
    Browse the repository at this point in the history

  2. Review

    @sanathsengupta
    sanathsengupta committed May 5, 2020
    Configuration menu
    Copy the full SHA
    6b5aadc View commit details
    Browse the repository at this point in the history

  3. AHHH... Finally implemented board placement + rotation, FIXED faulty … 

    …grid generation logic from original implementation way back when...
    @sanathsengupta
    sanathsengupta committed May 5, 2020
    Configuration menu
    Copy the full SHA
    867e3d7 View commit details
    Browse the repository at this point in the history

  4. ready for testing

    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    72e5626 View commit details
    Browse the repository at this point in the history

  5. revert to TileScene

    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    4ec5f58 View commit details
    Browse the repository at this point in the history

  6. Offset Tile Collision Comp

    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    c9df176 View commit details
    Browse the repository at this point in the history

  7. Added USDZ block file. Checkpoint on scaling code.

    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    aa64e9a View commit details
    Browse the repository at this point in the history

  8. Fix Scaling. Removed anchor scaling and used TILE_SIZE instead.\n The… 

    …re is still the problem with the generated board having an outline over it.
    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    6ac250e View commit details
    Browse the repository at this point in the history

  9. Add documentation

    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    5294b81 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'board_scale' into laser 

    Minigame capabilities are currently disabled but everything builds.
    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    a411cc0 View commit details
    Browse the repository at this point in the history

  11. Standardize PlayerCollisionGroup

    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    1cf4dcc View commit details
    Browse the repository at this point in the history

  12. Organize Minigame code

    @erwang01
    erwang01 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    89bdae3 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. fixed the overlapped board problem. However we need to decide if Tile… 

    … is going to be a ModelEntity or not
    @erwang01
    erwang01 committed May 6, 2020
    Configuration menu
    Copy the full SHA
    6a241ef View commit details
    Browse the repository at this point in the history

  2. Minigame assignment logic

    @erwang01
    erwang01 committed May 6, 2020
    Configuration menu
    Copy the full SHA
    87a2a00 View commit details
    Browse the repository at this point in the history

  3. Added base code for switching into minigames. However, the collision … 

    …subscription does not seem to work
    @erwang01
    erwang01 committed May 6, 2020
    Configuration menu
    Copy the full SHA
    12e3d54 View commit details
    Browse the repository at this point in the history

  4. Minigame Transitions! Kinda... For some reason the children aren't be… 

    …ing attached.
    @erwang01
    erwang01 committed May 6, 2020
    Configuration menu
    Copy the full SHA
    b74b602 View commit details
    Browse the repository at this point in the history

  5. Successfully completed transitions

    @erwang01
    erwang01 committed May 6, 2020
    Configuration menu
    Copy the full SHA
    9028ab2 View commit details
    Browse the repository at this point in the history

  6. Lots of debug statements. MovementGame is proving difficult to load

    @erwang01
    erwang01 committed May 6, 2020
    Configuration menu
    Copy the full SHA
    b0d2cc1 View commit details
    Browse the repository at this point in the history

  7. Finished outline implementation (fully-functional now) and documented… 

    … TileGrid
    @sanathsengupta
    sanathsengupta committed May 6, 2020
    Configuration menu
    Copy the full SHA
    1dea7c1 View commit details
    Browse the repository at this point in the history

  8. Attempting pull

    @sanathsengupta
    sanathsengupta committed May 6, 2020
    Configuration menu
    Copy the full SHA
    abb2232 View commit details
    Browse the repository at this point in the history

  9. Only TraceGame has been enabled

    @erwang01
    erwang01 committed May 6, 2020
    Configuration menu
    Copy the full SHA
    eee1cc3 View commit details
    Browse the repository at this point in the history

  10. Successfully merged new outline code and documentation

    @sanathsengupta
    sanathsengupta committed May 6, 2020
    Configuration menu
    Copy the full SHA
    fe4a333 View commit details
    Browse the repository at this point in the history

  11. JK now merged

    @sanathsengupta
    sanathsengupta committed May 6, 2020
    Configuration menu
    Copy the full SHA
    bf9cb0f View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Identified MovementGame crash to be CollisionEvent.Updated

    @erwang01
    erwang01 committed May 20, 2020
    Configuration menu
    Copy the full SHA
    09ebec2 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2020

  1. Minigame documentation and organization

    @erwang01
    erwang01 committed May 23, 2020
    Configuration menu
    Copy the full SHA
    9597fc0 View commit details
    Browse the repository at this point in the history

  2. XCode sharedata

    @erwang01
    erwang01 committed May 23, 2020
    Configuration menu
    Copy the full SHA
    169fc3f View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. More MovementGame debugging

    @erwang01
    erwang01 committed May 27, 2020
    Configuration menu
    Copy the full SHA
    9de0bfe View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Added in ability to load background scene (not recommended at this st… 

    …age) and disabled ARTrackingConfig once board has been placed
    @sanathsengupta
    sanathsengupta committed May 28, 2020
    Configuration menu
    Copy the full SHA
    a6cf35d View commit details
    Browse the repository at this point in the history

Commits on May 30, 2020

  1. Add Background Model

    @erwang01
    erwang01 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    8c3d132 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @erwang01
    erwang01 authored May 30, 2020
    Configuration menu
    Copy the full SHA
    b15d276 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @erwang01
    erwang01 authored May 30, 2020
    Configuration menu
    Copy the full SHA
    43fcd61 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @erwang01
    erwang01 authored May 30, 2020
    Configuration menu
    Copy the full SHA
    0f1114f View commit details
    Browse the repository at this point in the history

  5. Minigames still don't work

    @erwang01
    erwang01 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    a83b965 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. Clean up

    @sanathsengupta
    sanathsengupta committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    e8d5065 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/integration' 

    Conflicts:
	ARrehab/ARrehab.xcodeproj/project.pbxproj
	ARrehab/ARrehab/ViewManipulation.swift
    @sanathsengupta
    sanathsengupta committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    3e057dd View commit details
    Browse the repository at this point in the history

  3. Documentation and rearragement

    @sanathsengupta
    sanathsengupta committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    359e883 View commit details
    Browse the repository at this point in the history

  4. Limit to Minigames in Corners. Add partial Minigame documentation

    @erwang01
    erwang01 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    78f5662 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Update Minigame README

    @erwang01
    erwang01 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    866338e View commit details
    Browse the repository at this point in the history

  2. Fixed MovementGame by working around CollisionUpdated. Added a bunch … 

    …of intermediary print statements
    @erwang01
    erwang01 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    20497e5 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2020

  1. Reorganize TraceGame, removed Experience.rcproject, added background

    @erwang01
    erwang01 committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    07c7403 View commit details
    Browse the repository at this point in the history

  2. Update README Background Tutorial 

    Reflects new ViewController organization.
    @erwang01
    erwang01 authored Jun 7, 2020
    Configuration menu
    Copy the full SHA
    b89ad7f View commit details
    Browse the repository at this point in the history

  3. Prep for PR. Code reorg and enabling background. 

    Reorganize TraceGame, removed Experience.rcproject, added background
    @erwang01
    erwang01 committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    b9e7997 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'integration' of https://github.com/augcog/ARrehab into … 

    …integration
    @erwang01
    erwang01 committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    7104015 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. Documentation and clean up

    @sanathsengupta
    sanathsengupta committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    c73e3cc View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Implemented floor entity to allow for physics collisions in minigames

    @sanathsengupta
    sanathsengupta committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    8107367 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. (re)Implemented floor entity for collision and physics detection

    @sanathsengupta
    sanathsengupta committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    7bfb063 View commit details
    Browse the repository at this point in the history