Merge branch 'master' of https://bitbucket.org/fsfahrttoolteam/registration-system (a22c4b20) · 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

a22c4b20

Commit a22c4b20 authored 9 years ago by Tim Repke

Downloads
- Plain Diff

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

parents dab08ce8 7bad801f

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

registration-system/view/signups/game1/index.php 5 additions, 1 deletion

registration-system/view/signups/game1/index.php
registration-system/view/signups/game1/js/achievements.js 1 addition, 0 deletions

registration-system/view/signups/game1/js/achievements.js
registration-system/view/signups/game1/js/character.js 5 additions, 0 deletions

registration-system/view/signups/game1/js/character.js
registration-system/view/signups/game1/js/environment.js 14 additions, 5 deletions

registration-system/view/signups/game1/js/environment.js
registration-system/view/signups/game1/js/events.js 3 additions, 2 deletions

registration-system/view/signups/game1/js/events.js
registration-system/view/signups/game1/js/story.js 92 additions, 16 deletions

registration-system/view/signups/game1/js/story.js
registration-system/view/signups/game1/js/svgUtils.js 1 addition, 1 deletion

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/dorf.svg 0 additions, 0 deletions

registration-system/view/signups/game1/maps/dorf.svg
registration-system/view/signups/game1/maps/shop.svg 0 additions, 0 deletions

registration-system/view/signups/game1/maps/shop.svg
registration-system/view/signups/game1/test.html 3 additions, 0 deletions

registration-system/view/signups/game1/test.html
registration-system/view/signups/game1/ui.css 11 additions, 0 deletions

registration-system/view/signups/game1/ui.css

with 135 additions and 25 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