Skip to content

Commit

Permalink
Merge branch 'mGL_sync' of https://github.com/Syntaf/ParticleSimulator
Browse files Browse the repository at this point in the history
…into mGL_sync
  • Loading branch information
Syntaf committed Sep 11, 2014
2 parents 3041609 + 510f3ec commit e192a10
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ OS X (Mac)
The console in this application supports a number of commands aimed at allowing a ton of user interaction and fun. The available commands are:
* `get <>`
* `set <> <>`
* `help`
* `help <>`
* `reset`
* `exit`

Expand All @@ -114,6 +114,7 @@ Get and set both require a name of a variable to either get/set, and set additio
* `mass`
* `mouseforce`
* `particlecount` (*get* **only** for now)
* `color_r/g/b/a`
An example run of the console might look like:
````
> get drag
Expand All @@ -126,7 +127,7 @@ An example run of the console might look like:
- [x] Begin GUI development
- [ ] Optimize particle container(chunking)
- [x] Provide a CMake build system
- [ ] Implement highly customizable enviroment
- [x] Implement highly customizable enviroment
- [ ] Move particle calculations to GPU

Additional Notes
Expand Down

0 comments on commit e192a10

Please sign in to comment.