Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

Eye-Tracking Classroom / StarGazer

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !1 opened 5 years ago by Alexander Bazo@baa900037 
  • Report abuse
Report abuse

Add Features: Enemies

Add random creation of moving enemies and allow dwell time base targeting with gaze data.

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b dev origin/dev

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff dev

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge dev into master

Merged by

The changes were merged into master

  • Discussion 0
  • Commits 2
  • Changes 10
0/0 discussions resolved
  • Alexander Bazo @baa900037

    closed

    5 years ago

    closed

    closed
    Toggle commit list
  • Alexander Bazo @baa900037

    reopened

    5 years ago

    reopened

    reopened
    Toggle commit list
  • Alexander Bazo @baa900037 added 2 commits 5 years ago

    added 2 commits

    • dc172fd6 - Refactor renderer component
    • 81eef9d5 - Add enemies and allow player to focus and destroy them

    Compare with previous version

    added 2 commits * dc172fd6 - Refactor renderer component * 81eef9d5 - Add enemies and allow player to focus and destroy them [Compare with previous version](http://lab.las3.de/gitlab/eye-tracking-classroom/StarGazer/merge_requests/1/diffs?diff_id=91&start_sha=38964de7ce8dc77e4df7b26c304d7d7073d73ff0)
    Toggle commit list
  • Alexander Bazo @baa900037

    merged

    5 years ago

    merged

    merged
    Toggle commit list
  • Alexander Bazo @baa900037

    mentioned in commit 1889eba2

    5 years ago

    mentioned in commit 1889eba2

    mentioned in commit 1889eba28564034ac62b73969ade4b3f3c8bf9fd
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Alexander Bazo
Assignee
Alexander Bazo @baa900037
Assign to
None
Milestone
None
Assign milestone
None
Time tracking
No estimate or time spent
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: eye-tracking-classroom/StarGazer!1
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.