Commit graph

36075 commits

Author SHA1 Message Date
Bradley Austin Davis
fd5fb3096f Disabling OpenVR plugin 2015-12-09 17:31:53 -08:00
James B. Pollack
b4c272aaa1 sam just left 2015-12-09 17:28:45 -08:00
Brad Davis
978d39b7f4 Moving OpenVR to external plugin and updating to latest version 2015-12-09 16:20:24 -08:00
Howard Stearns
3b372fd897 coding standards 2015-12-09 16:12:34 -08:00
Andrew Meadows
a99542e298 Merge pull request #6601 from howard-stearns/fix-sync-period-calc
Fix sync period calc, restoring avatar render distance
2015-12-09 15:56:22 -08:00
Howard Stearns
acb43e18d0 coding standards 2015-12-09 15:54:49 -08:00
Ryan Huffman
ad0865171b Fix unused variable in scriptFinished 2015-12-09 15:52:30 -08:00
Howard Stearns
dd2d040253 Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-09 15:43:43 -08:00
Howard Stearns
5643a6a4c6 Merge branch 'correct-target-frame-rate' of https://github.com/howard-stearns/hifi into correct-target-frame-rate 2015-12-09 15:43:10 -08:00
Howard Stearns
d964032572 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-09 15:23:00 -08:00
Howard Stearns
270cfe8af7 coding standards 2015-12-09 15:22:44 -08:00
Anthony J. Thibault
a57a2792a4 SixenseManager: Added debug draw options
These debug draw options were added to help debug rare intermittent issues with
configuration the hydra and the Avatar arm IK.
2015-12-09 15:17:06 -08:00
Atlante45
1d513cfbba Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-09 15:09:19 -08:00
Ryan Huffman
5f60aeef22 Update ScriptEngine::_isUserLoaded to be atomic 2015-12-09 14:50:48 -08:00
Ryan Huffman
a21e07327d Update ScriptEngine::stop() to always run on its thread 2015-12-09 14:50:30 -08:00
Ryan Huffman
e7a1550b64 Update ScriptEngine::finished to include 2015-12-09 14:50:09 -08:00
Ryan Huffman
fc6a78d9ef Update scriptFinished signal to be a DirectConnection 2015-12-09 14:49:05 -08:00
Ryan Huffman
4bfce768ca Add locks around read/writes of _scriptEnginesHash 2015-12-09 14:48:33 -08:00
Atlante45
5574f4736b CR 2015-12-09 14:26:49 -08:00
Atlante45
17daff920c Fix all entities using relative grab pos/rot 2015-12-09 14:25:18 -08:00
Atlante45
4ee5bf316a Fix bow offsets 2015-12-09 14:25:18 -08:00
Atlante45
65bc6aa371 Fix left hand grab 2015-12-09 14:25:18 -08:00
Seth Alves
47df744552 Merge branch 'update-model-during-simulate' of github.com:sethalves/hifi into no-physics-until-ready 2015-12-09 12:40:18 -08:00
Seth Alves
7ae26ffa7d Merge branch 'near-grab-via-parenting' of github.com:sethalves/hifi into no-physics-until-ready 2015-12-09 12:39:20 -08:00
Seth Alves
78f7935d53 Merge pull request #6604 from sethalves/no-physics-until-ready
disable physics disabler
2015-12-09 11:31:12 -08:00
Seth Alves
446ca8236f disable physics disabler 2015-12-09 11:25:44 -08:00
Andrew Meadows
d59311f258 Merge pull request #6594 from sethalves/no-physics-until-ready
No physics until ready
2015-12-09 10:51:07 -08:00
Seth Alves
4d60c7bbc0 update model location with SpatiallyNestable's locationChanged call 2015-12-09 10:42:32 -08:00
Philip Rosedale
a580442b92 Merge pull request #6597 from jherico/scorpius
Fix occasional crashes switching from the Oculus plugin
2015-12-09 10:33:48 -08:00
howard-stearns
1d65cbce88 Remove unneeded getTargetFramePeriod and isVSynchronized. 2015-12-08 18:08:57 -08:00
Philip Rosedale
c93252b134 Merge pull request #6596 from AndrewMeadows/fix-bad-ownership
fix bad simulation ownership when using edit.js
2015-12-08 17:49:38 -08:00
howard-stearns
9ae22800fe Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-08 17:32:53 -08:00
Andrew Meadows
8c109fd623 move raw bullet code from interface to physics lib 2015-12-08 17:21:43 -08:00
Bradley Austin Davis
e77f2e8ac4 Pass correct frame index into Oculus SDK 2015-12-08 16:49:50 -08:00
howard-stearns
32e4967ee0 cleanup 2015-12-08 16:38:05 -08:00
Bradley Austin Davis
2604b49650 Fix occasional crashes switching from the Oculus plugin 2015-12-08 15:41:30 -08:00
howard-stearns
7afc803fb5 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-08 15:30:48 -08:00
howard-stearns
5b41d4da1c Snapshot of "working" version. 2015-12-08 15:30:23 -08:00
Philip Rosedale
bda4e41958 Merge pull request #6581 from kencooke/audio-reverb
New reverb parameters
2015-12-08 14:59:58 -08:00
Andrew Meadows
987b8d3334 fix bad simulation ownership when using edit.js 2015-12-08 14:34:25 -08:00
Stephen Birarda
e8141ed5e8 Merge pull request #6497 from murillodigital/master
Consolidated High Fidelity PR installer
2015-12-08 14:31:32 -08:00
Leonardo Murillo
9ba5670c76 Fix 2015-12-08 14:20:19 -08:00
Leonardo Murillo
dda99bfea6 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-08 14:07:50 -08:00
Seth Alves
c462bda86c disable physics when moving to a new domain 2015-12-08 14:01:18 -08:00
Seth Alves
164439b303 don't enable physics until an entire scene has been received from the entity server and until nearby (to MyAvatar) entities are ready 2015-12-08 13:53:39 -08:00
Leonardo Murillo
9062cca8c4 Restoring 2015-12-08 13:33:15 -08:00
Brad Hefta-Gaub
1356fb15aa Merge pull request #6591 from jherico/zaan
Add sphere and cube triangle counts to displayed stats
2015-12-08 13:27:37 -08:00
Brad Davis
43afa440a6 Merge pull request #6588 from huffman/fix-warnings
Fix warnings
2015-12-08 13:17:30 -08:00
Leonardo Murillo
cc6d30fe6f Fix to path setting in shortcuts 2015-12-08 13:06:10 -08:00
Ryan Huffman
4dbfd3bfd9 Fix concurrency issues for bools in ScriptEngine
Several member variables were unsafely being accessed from multiple threads. Making these variables std::atomic makes this safe.
2015-12-08 11:13:27 -08:00