Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:argonjs/argon into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
speigg committed Aug 30, 2016
2 parents 2f904fb + 994d697 commit c3e4f70
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ Augmented Environments Lab at Georgia Tech. To support our research,
we request that if you make use of this software, you let us know
how you used it by sending mail to Blair MacIntyre (blair@cc.gatech.edu).*

## Support

* [Documentation](http://docs.argonjs.io/)
* [API Reference](http://argonjs.io/argon/)

## Quick Start

To install this library manually, include this minified build in your project:
To install the argon.js library manually, include this minified build in your project:

* [argon.min.js](https://github.com/argonjs/argon/raw/master/argon.min.js)

Expand Down Expand Up @@ -39,15 +44,15 @@ If you aren't using es6 modules, `require` the package `"@argonjs/argon"`:
var Argon = require('@argonjs/argon');
```

If you arent using a module loader at all, no worries! The *argon.js* library
will create a global `Argon` variable that exposes the same API.
If you aren't using modules at all, no worries! The *argon.js* library will
create a global `Argon` variable that exposes the same API.

## Typescript

If you are using Typescript 2.0 and would like to leverage
*argon.js* typings, simply install *argon.js* using `npm`
*argon.js* typings (you should!), simply install *argon.js* using `npm`
as described above (even if you are not using modules in your
probject). However, if you aren't using modules, just be sure
project). However, if you aren't using modules, just be sure
to include a triple-slash reference so that the typescript
compiler knows you are using *argon.js* globally:

Expand All @@ -70,14 +75,9 @@ compiler options:
}
```

After that, you should have rich typings in any editor that
supports Typescript!
We recommend [Visual Studio Code](https://code.visualstudio.com).

## Support

* [Documentation](http://docs.argonjs.io/)
* [API Reference](http://argonjs.io/argon/)
After that, you can enjoy rich editing support for
*argon.js* in any editor that supports Typescript! We recommend
[Visual Studio Code](https://code.visualstudio.com).

## Build Guide

Expand Down Expand Up @@ -111,4 +111,4 @@ npm run build

```sh
npm run test
```
```
2 changes: 1 addition & 1 deletion types/cesium/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2159,7 +2159,7 @@ declare module 'cesium' {
rectangle: RectangleGraphics;
viewFrom: Property;
wall: WallGraphics;
constructor(options?: { id?: string; name?: string; show?: boolean; description?: Property; position?: PositionProperty; orientation?: Property; viewFrom?: Property; parent?: Entity; billboard?: BillboardGraphics; box?: BoxGraphics; corridor?: CorridorGraphics; cylinder?: CylinderGraphics; ellipse?: EllipseGraphics; ellipsoid?: EllipsoidGraphics; label?: LabelGraphics; model?: ModelGraphics; path?: PathGraphics; point?: PointGraphics; polygon?: PolygonGraphics; polyline?: PolylineGraphics; polylineVolume?: PolylineVolumeGraphics; rectangle?: RectangleGraphics; wall?: WallGraphics });
constructor(options?: { id?: string; name?: string; show?: boolean; description?: Property; position?: Cartesian3|PositionProperty; orientation?: Quaternion|Property; viewFrom?: Property; parent?: Entity; billboard?: BillboardGraphics; box?: BoxGraphics; corridor?: CorridorGraphics; cylinder?: CylinderGraphics; ellipse?: EllipseGraphics; ellipsoid?: EllipsoidGraphics; label?: LabelGraphics; model?: ModelGraphics; path?: PathGraphics; point?: PointGraphics; polygon?: PolygonGraphics; polyline?: PolylineGraphics; polylineVolume?: PolylineVolumeGraphics; rectangle?: RectangleGraphics; wall?: WallGraphics });
isAvailable(time: JulianDate);
addProperty(propertyName: string);
removeProperty(propertyName: string);
Expand Down

0 comments on commit c3e4f70

Please sign in to comment.