Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 03:13:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31938 commits 25 branches 0 tags 1.1 GiB
Commit graph

31938 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
dc8756e465 Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation 2015-09-15 14:40:23 -07:00
Philip Rosedale
e04f89280d Merge pull request #5812 from sethalves/grab-controller-adjustment 
Grab controller adjustment
 2015-09-15 13:29:07 -07:00
Brad Davis
4c0a21f3d2 Merge pull request #5811 from ZappoMan/scriptEngineCleanup 
Rework the ScriptEngine shutdown process, Fix crash in AC Scripts
 2015-09-15 13:23:40 -07:00
Brad Hefta-Gaub
016a5e5f0a cleanup comments 2015-09-15 11:52:07 -07:00
Brad Hefta-Gaub
41caa36038 removed some debug code 2015-09-15 11:50:10 -07:00
Seth Alves
e650e40388 try harder to have line rezzed when it's needed. don't ignore entities that are too close when doing line intersection 2015-09-15 11:32:56 -07:00
Brad Hefta-Gaub
bdae3e420b fix crash in AC 2015-09-15 11:24:04 -07:00
Seth Alves
7b5d6c20e9 double change in hand rotation before applying it to the object 2015-09-15 11:21:13 -07:00
Brad Davis
41383c49cf Merge pull request #5808 from kencooke/audio-fix 
Audio fixes
 2015-09-15 11:04:31 -07:00
Brad Hefta-Gaub
6521de8163 rework ScriptEngine and worker thread shutdown 2015-09-15 11:00:05 -07:00
Seth Alves
99b0046fc7 various adjustments 2015-09-15 10:43:17 -07:00
Ken Cooke
ffe3fcf4ce Replace repeated division with multiply by inverse 2015-09-15 10:18:53 -07:00
Stephen Birarda
6756d5364b sensible defaults for other time_point uses 2015-09-15 10:11:05 -07:00
Ken Cooke
5045f8558e Fix incorrect scale factor for converting int16_t to/from float 2015-09-15 10:08:24 -07:00
Stephen Birarda
6a186ad1fe ensure a handshake goes out the first time 2015-09-15 09:48:17 -07:00
Brad Hefta-Gaub
0efc8d6628 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 2015-09-15 09:21:02 -07:00
Clément Brisset
cb1b70820a Merge pull request #5801 from AndrewMeadows/fix-animation-tests 
fix animation unit tests
 2015-09-15 17:53:06 +02:00
Brad Hefta-Gaub
bd8d2dab9c Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 2015-09-15 08:50:55 -07:00
Brad Davis
4ce1db16f4 Merge pull request #5804 from ZappoMan/scriptEngineCleanup 
ScriptEngine Threading Repairs
 2015-09-15 08:47:11 -07:00
Brad Hefta-Gaub
38e4726fa7 Merge pull request #5807 from jherico/marge 
Fix avatar and other model animations
 2015-09-15 08:38:26 -07:00
Sam Gateau
9f8d6a78cc Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug 2015-09-15 08:35:42 -07:00
Sam Gateau
400f90aea4 Introducing a stereo loop that should do the right thing but doesn't yet 2015-09-15 08:34:46 -07:00
Brad Hefta-Gaub
bd1d3cb468 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 2015-09-15 08:11:11 -07:00
Brad Hefta-Gaub
70d2288407 CR feedback 2015-09-15 08:04:26 -07:00
Brad Davis
f4818c17cf Fix avatar and other model animations 2015-09-15 08:04:17 -07:00
Brad Davis
3f688f92d3 Don't do an O(N^2) operation on cluster matrices 2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub
2fb2307bf8 Merge pull request #5805 from highfidelity/revert-5800-marge 
Revert "Fix over-calculation of cluster matrices"
 2015-09-14 21:46:01 -07:00
Brad Hefta-Gaub
70fcdbf2fd Revert "Fix over-calculation of cluster matrices" 2015-09-14 21:20:11 -07:00
Brad Hefta-Gaub
e92d195030 tweak 2015-09-14 21:18:36 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029 more work on script engine 2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae more work on proper threading of ScriptEngine 2015-09-14 20:26:04 -07:00
Brad Hefta-Gaub
096a6cb4b9 Merge pull request #5800 from jherico/marge 
Fix over-calculation of cluster matrices
 2015-09-14 19:38:01 -07:00
Brad Davis
7a843b3610 Merge pull request #5798 from AndrewMeadows/minor-ik-tuning 
minor tuning of IK behavior
 2015-09-14 18:55:31 -07:00
Anthony J. Thibault
90f46ba2c8 Added hand state machines to AnimGraph. 
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
  the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
 2015-09-14 18:54:12 -07:00
Brad Davis
d7a850d7be Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix 
Hifi 3 d connexion cmake fix
 2015-09-14 18:53:39 -07:00
MarcelEdward
c1ddf5fc32 Update Find3DConnexionClient.cmake 2015-09-15 03:22:44 +02:00
MarcelEdward
8a71b31af0 Update Find3DConnexionClient.cmake 2015-09-15 03:06:07 +02:00
Sam Gateau
45dc5be53d DeferredTransform buffer working for the deferred rendering in mono 2015-09-14 17:48:15 -07:00
Stephen Birarda
a27e0e7cc7 remove an unused alias 2015-09-14 17:18:22 -07:00
Stephen Birarda
84ab4fd585 force minimum for p_hrc time_point values 2015-09-14 17:16:42 -07:00
Andrew Meadows
d74628720f fix bug using unitialized std::vector elements 2015-09-14 17:14:04 -07:00
Andrew Meadows
75ec142827 fix animation-tests 2015-09-14 16:42:57 -07:00
Brad Davis
35e4440c4f Don't do an O(N^2) operation on cluster matrices 2015-09-14 16:09:13 -07:00
Stephen Birarda
2385331075 Merge pull request #5799 from huffman/move-assert 
Move assert in asset request
 2015-09-14 16:07:47 -07:00
Sam Gateau
00688172dd work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes 2015-09-14 15:49:05 -07:00
Ryan Huffman
b0ffb50fdf Move assertion in AssetRequest below error checking 
If the request had an error then there is no reason the assertion should
be true.
 2015-09-14 15:48:11 -07:00
Philip Rosedale
15e3678eab Merge pull request #5793 from kencooke/master 
bugfix for audio pops at startup
 2015-09-14 15:31:23 -07:00
MarcelEdward
c3ecbd15f8 Update Find3DConnexionClient.cmake 2015-09-15 00:30:49 +02:00
MarcelEdward
64a8f7ebb4 Update 3DConnexionClient.h 2015-09-15 00:30:11 +02:00