Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
erp5
erp5
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Labels
  • Merge Requests 138
    • Merge Requests 138
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Jobs
  • Commits
  • nexedi
  • erp5erp5
  • Merge Requests
  • !1775

Merged
Opened Apr 24, 2023 by Roque@rporchetto
  • Report abuse
Report abuse

Capture flag drone game

  • Overview 5
  • Commits 6
  • Changes 105

Summary

The goal is to create a new drone game with capture the flag rules.

Outcomes

The expected outcome is to publish a new officejs application which would allow players to

  • configure a swarm of drones logic with a javascript API
  • execute the swarm script on a configurable map, which contains fixed and moving obstacles, to reach multiple flags located on the map
  • get a score result, to allow comparing different script strategies

Demo

Latest: https://flock.app.officejs.com/f12560a278/

Old ones:

  • https://flock.app.officejs.com/2901d6b362/
  • https://flock.app.officejs.com/5449575def/
  • https://flock.app.officejs.com/3e05ec9dcb/
  • https://flock.app.officejs.com/0f31d5a51b/
  • https://flock.app.officejs.com/bbb0d365f8/
  • https://flock.app.officejs.com/107dd0a52b/ (uses azimutal, discarded)
  • https://flock.app.officejs.com/0f34dfb843/ (uses azimutal, discarded)
Edited Jul 28, 2023 by Roque

Check out, review, and merge locally

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

git fetch "https://lab.nexedi.com/rporchetto/erp5.git" "erp5_capture_flag"
git checkout -b "rporchetto/erp5-erp5_capture_flag" FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout "origin/master"
git merge --no-ff "rporchetto/erp5-erp5_capture_flag"

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.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!1775

Revert this merge request

This will create a new commit in order to revert the existing changes.

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.
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7