Merge branch 'master' of https://bitbucket.org/fsfahrttoolteam/registration-system (9a7686a2) · Commits · fsini-informatik / fsfahrttool · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

fsfahrttool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

9a7686a2

Commit 9a7686a2 authored 9 years ago by Tim Repke

Downloads
- Plain Diff

Merge branch 'master' of https://bitbucket.org/fsfahrttoolteam/registration-system

parents e7d7e7bb 00c54ac3

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

registration-system/view/signups/game1/MAP_HOWTO.md 3 additions, 1 deletion

registration-system/view/signups/game1/MAP_HOWTO.md
registration-system/view/signups/game1/index.php 2 additions, 2 deletions

registration-system/view/signups/game1/index.php
registration-system/view/signups/game1/js/character.js 24 additions, 6 deletions

registration-system/view/signups/game1/js/character.js
registration-system/view/signups/game1/js/events.js 7 additions, 2 deletions

registration-system/view/signups/game1/js/events.js
registration-system/view/signups/game1/js/game.js 15 additions, 11 deletions

registration-system/view/signups/game1/js/game.js
registration-system/view/signups/game1/js/svgUtils.js 6 additions, 6 deletions

registration-system/view/signups/game1/js/svgUtils.js
registration-system/view/signups/game1/maps/castle_entrance.svg 0 additions, 0 deletions

...ration-system/view/signups/game1/maps/castle_entrance.svg
registration-system/view/signups/game1/maps/map_landing.svg 0 additions, 0 deletions

registration-system/view/signups/game1/maps/map_landing.svg
registration-system/view/signups/game1/test.html 1 addition, 0 deletions

registration-system/view/signups/game1/test.html

with 58 additions and 28 deletions

Loading

0% Loading 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

Impressum | Datenschutzerklärung