Commits · 180ce26a4a15ee6178d80d1f64842e49f8f589a4 · tsoc / openmm

27 Jan, 2016 1 commit
- Add a test for combining FF XML files with close, but not exactly equal scaling · 180ce26a
  Jason Swails authored Jan 27, 2016
```
factors.
```
  180ce26a
26 Jan, 2016 6 commits
- Merge pull request #1365 from peastman/typemaps · c3847685
  peastman authored Jan 26, 2016
```
Install typemaps.i for use by plugins
```
  c3847685
- Merge pull request #1364 from swails/quikfix · e9974569
  peastman authored Jan 26, 2016
```
Fix calling createSystem with unitless hydrogenMass
```
  e9974569
- Fix calling createSystem with unitless hydrogenMass · e82796f6
  Jason Swails authored Jan 26, 2016
  
  e82796f6
- Install typemaps.i for use by plugins · 97fa20a0
  peastman authored Jan 26, 2016
  
  97fa20a0
- Merge pull request #1363 from peastman/improper · 544581cd
  peastman authored Jan 26, 2016
```
Improper torsions without wildcards override ones with
```
  544581cd
- Improper torsions without wildcards override ones with · abdc6296
  Peter Eastman authored Jan 25, 2016
  
  abdc6296
22 Jan, 2016 1 commit
- Merge pull request #1356 from peastman/condadocs · d2fd6cee
  peastman authored Jan 21, 2016
```
Updated documentation on installing to discuss conda
```
  d2fd6cee
21 Jan, 2016 18 commits
- Fixed supported OS X version number · aafe10bc
  peastman authored Jan 21, 2016
  
  aafe10bc
- Merge pull request #1359 from jchodera/master · 3a0e748c
  peastman authored Jan 21, 2016
```
Add a method for retrieving list of matching templates to ForceField
```
  3a0e748c
- Minor improvements to manual · 6a4213d8
  peastman authored Jan 21, 2016
  
  6a4213d8
- Fix more typos in test. · 1b28e6c5
  jchodera authored Jan 21, 2016
  
  1b28e6c5
- Fix typo in test. · ae0ad5c9
  jchodera authored Jan 21, 2016
  
  ae0ad5c9
- Add a method for retrieving list of matching templates to ForceField. · 15d1b5fc
  jchodera authored Jan 21, 2016
  
  15d1b5fc
- Merge pull request #1358 from jchodera/cuda75 · 79e66200
  peastman authored Jan 21, 2016
```
Update travis to use CUDA 7.5
```
  79e66200
- Remove debug .travis stuff · 52d29909
  jchodera authored Jan 21, 2016
  
  52d29909
- Fix typo · fca4ab1b
  jchodera authored Jan 21, 2016
  
  fca4ab1b
- More debugging. · 69065ab3
  jchodera authored Jan 21, 2016
  
  69065ab3
- Add more CUDA paths to CMake · de262aae
  jchodera authored Jan 21, 2016
  
  de262aae
- Update travis to use CUDA 7.5 (needs 'trusty' environment) · 42c4a7d4
  jchodera authored Jan 21, 2016
  
  42c4a7d4
- Merge pull request #1350 from jchodera/forcefield · 97136edd
  peastman authored Jan 21, 2016
```
Add methods to retrieve residues without matching forcefield residue templates
```
  97136edd
- Add warning about experimental API in ForceField · a2289e84
  John Chodera (MSKCC) authored Jan 20, 2016
  
  a2289e84
- Merge remote-tracking branch 'upstream/master' into forcefield · 454cd33c
  John Chodera (MSKCC) authored Jan 20, 2016
  
  454cd33c
- Merge pull request #1355 from peastman/streamprop · fbf0a0a2
  peastman authored Jan 20, 2016
```
Created property for disabling the PME stream
```
  fbf0a0a2
- Updated documentation on installing to discuss conda · 1561f089
  peastman authored Jan 20, 2016
  
  1561f089
- Created property for disabling the PME stream · 3a0fa3b2
  Peter Eastman authored Jan 20, 2016
  
  3a0fa3b2
20 Jan, 2016 14 commits
- Merge pull request #1354 from peastman/deviceindex · a07aace0
  peastman authored Jan 20, 2016
```
Fixed bug in selecting device index
```
  a07aace0
- Merge pull request #1348 from rafwiewiora/forcefield_type_wildcard · ab6cabb4
  peastman authored Jan 20, 2016
```
Enable wildcard use for Atom Types
```
  ab6cabb4
- Fixed bug in selecting device index · 35913c2a
  peastman authored Jan 20, 2016
  
  35913c2a
- fix indent · 4e742ade
  Rafal P. Wiewiora authored Jan 20, 2016
  
  4e742ade
- Fix docstrings, docs, and method names. · a4481f54
  John Chodera (MSKCC) authored Jan 20, 2016
  
  a4481f54
- Merge remote-tracking branch 'upstream/master' into forcefield · f7b56fdf
  John Chodera (MSKCC) authored Jan 20, 2016
  
  f7b56fdf
- tests · bd6c5aa9
  Rafal P. Wiewiora authored Jan 20, 2016
  
  bd6c5aa9
- Merge pull request #1353 from jchodera/update-readme · 95e05711
  peastman authored Jan 20, 2016
```
Update README.md badges and links
```
  95e05711
- Trivial change to re-trigger travis. · a04f3714
  John Chodera (MSKCC) authored Jan 20, 2016
  
  a04f3714
- Fix test · 7aacdeb1
  John Chodera (MSKCC) authored Jan 20, 2016
  
  7aacdeb1
- Add test for parameterizing system using templates built with the help of... · 06b61c6e
  John Chodera (MSKCC) authored Jan 20, 2016
```
Add test for parameterizing system using templates built with the help of getUniqueUnmatchedResidues()
```
  06b61c6e
- Fix import · 4f86aac9
  John Chodera (MSKCC) authored Jan 19, 2016
  
  4f86aac9
- Fix omitted template accumulation. · ce70fa17
  John Chodera (MSKCC) authored Jan 19, 2016
  
  ce70fa17
- Merge remote-tracking branch 'upstream/master' into forcefield · 86d8dbf9
  John Chodera (MSKCC) authored Jan 19, 2016
  
  86d8dbf9