Skip to content

Commit

Permalink
Merge pull request #217 from n8rzz/feature/ATC-216
Browse files Browse the repository at this point in the history
feature/ATC-216
  • Loading branch information
n8rzz authored Dec 19, 2016
2 parents ec51eec + b3300ba commit 9756095
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 2,993 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Deprecates `sid` and `star` properties of the `AirportModel` in favor of `sidCollection` and `starCollection` [#54](https://github.com/n8rzz/atc/issues/54)
- Adds [Express](expressjs.com) server to serve static assets and add [travis](travis-ci.org) config file for travis continuous integration [#169](https://github.com/n8rzz/atc/issues/169)
- Rewrites the CommandParser from the ground up [#114](https://github.com/n8rzz/atc/issues/114)
- Removes `Pegjs` and references completing switch to new CommandParser [#216](https://github.com/n8rzz/atc/issues/216)



Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"express": "^4.14.0",
"jquery": "^3.1.0",
"lodash": "^4.15.0",
"pegjs": "^0.9.0",
"raf": "^3.3.0"
},
"devDependencies": {
Expand Down
5 changes: 0 additions & 5 deletions src/assets/scripts/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import $ from 'jquery';
import peg from 'pegjs';
import ContentQueue from './contentQueue/ContentQueue';
import LoadingView from './LoadingView';
import AirportController from './airport/AirportController';
Expand All @@ -13,7 +12,6 @@ import { speech_init } from './speech';
import { time, calculateDeltaTime } from './utilities/timeHelpers';
import { LOG } from './constants/logLevel';

window.peg = peg;
window.zlsa = {};
window.zlsa.atc = {};
const prop = {};
Expand All @@ -23,9 +21,6 @@ const prop = {};
// This will need to be re-worked, and current global functions should be exported and
// imported as needed in each file.
require('./util');
// this module doesnt appear to be in use anywhere
// require('./animation');
require('./parser');

// saved as this.prop.version and this.prop.version_string
const VERSION = [3, 2, 0];
Expand Down
Loading

0 comments on commit 9756095

Please sign in to comment.