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 |
|
samcake
|
1adf2cc8ba
|
Repesenting the collision meshes of a Model correctly
|
2015-12-08 16:45:12 -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 |
|
Bradley Austin Davis
|
011a43d5f2
|
Add sphere and cube triangle counts to displayed stats
|
2015-12-08 11:08:22 -08:00 |
|
Leonardo Murillo
|
eeebe06228
|
Using CPACK_PACKAGE_EXECUTABLES instead of CPACK_NSIS_CREATE_ICONS_EXTRE
|
2015-12-08 10:54:42 -08:00 |
|
James B. Pollack
|
22a1ee83e6
|
ignore parenting properties
|
2015-12-08 10:39:04 -08:00 |
|
Anthony Thibault
|
2c8cab9360
|
Merge pull request #6575 from sethalves/parents
Parents
|
2015-12-08 10:29:14 -08:00 |
|
Seth Alves
|
f94655bce2
|
Merge branch 'parents' of github.com:sethalves/hifi into parents
|
2015-12-08 10:01:24 -08:00 |
|
Seth Alves
|
3e3fd89402
|
Merge branch 'parents' of github.com:sethalves/hifi into parents
|
2015-12-08 09:45:07 -08:00 |
|
Seth Alves
|
dffa37c0e7
|
Merge branch 'master' of github.com:highfidelity/hifi into parents
|
2015-12-08 09:44:50 -08:00 |
|
Seth Alves
|
ec9f1e0754
|
possible fix for crash when grabbing bubblewand
|
2015-12-08 09:44:43 -08:00 |
|
Ryan Huffman
|
0759462df7
|
Remove unused variable in PacketReceiver
|
2015-12-08 09:38:23 -08:00 |
|
Ryan Huffman
|
71c266bc00
|
Fix order of initializion in ReceivedMessage
|
2015-12-08 09:22:17 -08:00 |
|
Ryan Huffman
|
44d740ef57
|
Remove unused variable 'addr'
|
2015-12-08 09:22:02 -08:00 |
|
samcake
|
4b03001c61
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-12-08 09:21:45 -08:00 |
|
Howard Stearns
|
faec4639b1
|
cap
|
2015-12-08 09:14:40 -08:00 |
|
Howard Stearns
|
481fe5a7d0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
|
2015-12-07 18:52:29 -08:00 |
|
samcake
|
b24af06589
|
Fixing the display of the collision hull mesh
|
2015-12-07 18:26:55 -08:00 |
|
samcake
|
d12fdb9726
|
Merge pull request #6584 from birarda/pref-no-auto
fix for avatar URL text editing, assert in Model.cpp
|
2015-12-07 18:11:49 -08:00 |
|
Seth Alves
|
5bf0ddfc2e
|
Merge branch 'master' of github.com:highfidelity/hifi into parents
|
2015-12-07 18:05:03 -08:00 |
|
Brad Hefta-Gaub
|
4cbbd252d5
|
Merge pull request #6587 from jherico/rigel
Fix crashes on exit due to poor cleanup
|
2015-12-07 18:04:52 -08:00 |
|
Bradley Austin Davis
|
b7aeb34a8c
|
Fix crashes on exit due to poor cleanup
|
2015-12-07 17:50:08 -08:00 |
|
Seth Alves
|
bee423718a
|
Merge branch 'master' of github.com:highfidelity/hifi into parents
|
2015-12-07 17:48:05 -08:00 |
|
Seth Alves
|
742288c583
|
Merge pull request #6586 from Atlante45/master
Fix grab behavior
|
2015-12-07 17:47:47 -08:00 |
|
James B. Pollack
|
6cf1ad464f
|
Merge pull request #6583 from birarda/extension-ci
use a case insensitive check for extensions in Application
|
2015-12-07 17:33:03 -08:00 |
|