samcake
5805cc8f2b
Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry
2015-12-10 14:59:04 -08:00
samcake
81eedb8585
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-10 09:22:40 -08:00
Brad Hefta-Gaub
3499b452f8
add back SDL and Sixense
2015-12-10 09:02:13 -08:00
Brad Hefta-Gaub
0213426f0c
Merge pull request #6607 from imgntn/particle_system_visibility
...
Particle Systems Now Respect Visibility Setting
2015-12-10 07:49:54 -08:00
Brad Hefta-Gaub
1da8f6e618
Merge pull request #6605 from hyperlogic/tony/sixense-manager-debug-draw
...
SixenseManager: Added debug draw options
2015-12-10 07:48:35 -08:00
Brad Hefta-Gaub
bd1ab418a4
Merge pull request #6606 from hyperlogic/tony/remove-animation-start-automatically-property
...
[PROTOCOL CHANGE] Entities: Removed Start Automatically property from Animation Group
2015-12-10 07:35:55 -08:00
Brad Hefta-Gaub
3d325351fb
Merge pull request #6602 from AndrewMeadows/character-cleanup
...
move raw bullet code from interface to physics lib
2015-12-10 07:26:29 -08:00
James B. Pollack
9ecb2b2277
uncomment sams change to scriptengine
2015-12-09 18:27:45 -08:00
James B. Pollack
4e93f3ae81
respect visibility yay
2015-12-09 18:26:13 -08:00
Andrew Meadows
9e99bff250
fix avatar upward drift after shape change
2015-12-09 18:09:55 -08:00
Anthony J. Thibault
e9f529bf12
Entities: Removed Start Automatically property from Animation Group
...
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
2015-12-09 17:59:56 -08:00
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
samcake
f9269523a1
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-09 16:58:56 -08:00
samcake
9eb40bcd65
Trying to redner the collision geometry correctly but still an issue with the bounding box i get
2015-12-09 16:58:14 -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
d964032572
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-09 15:23:00 -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
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
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
Andrew Meadows
8c109fd623
move raw bullet code from interface to physics lib
2015-12-08 17:21:43 -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
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
Bradley Austin Davis
011a43d5f2
Add sphere and cube triangle counts to displayed stats
2015-12-08 11:08:22 -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
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
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
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
howard-stearns
9512c3f73d
Debugging.
...
Please enter the commit message for your changes. Lines starting
2015-12-07 16:58:59 -08:00
howard-stearns
b007617c85
Remove unneeded DisplayPlugin stuff.
2015-12-07 16:56:59 -08:00
Stephen Birarda
6dbff93bbd
fix assert on model URL change from _renderItemsSet
2015-12-07 16:24:26 -08:00
howard-stearns
55cfd1c8b4
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 15:49:47 -08:00
Stephen Birarda
7beaf5e235
force asset upload to use a lowercase extension
2015-12-07 15:18:32 -08:00
Seth Alves
0bf276efa5
adjust method names to fit convention
2015-12-07 14:37:35 -08:00
Seth Alves
982e986f1a
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 14:31:18 -08:00
