Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 18:18:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

12944 commits

Author SHA1 Message Date
Bradley Austin Davis
e12e4ece34 Fixing lighting and atmosphere 2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
Brad Hefta-Gaub
b88c8e507b fix a couple of properties 2015-09-21 11:35:26 -07:00
samcake
2875cb99bb Fixing the compilation issue 2015-09-21 09:47:00 -07:00
samcake
6a714f405c Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map 2015-09-21 00:53:48 -07:00
samcake
3614812681 MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce 2015-09-20 23:31:59 -07:00
samcake
6914caac9d Renaming TextureStorage.x to TextureMap.x 2015-09-20 18:14:03 -07:00
samcake
d6d95ff86b Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-20 14:33:23 -07:00
samcake
a41c20a1b7 Fixing buggy hash map look up and cleaning of name 2015-09-20 14:17:55 -07:00
Brad Hefta-Gaub
ba5109c458 Merge pull request #5858 from howard-stearns/see-other-default-avatars 
Let other users see your default avatar.
 2015-09-20 13:57:29 -07:00
Howard Stearns
4fadf986e4 Merge pull request #5857 from hyperlogic/tony/look-whos-talking 
Talking idle animation support
 2015-09-20 13:46:40 -07:00
Howard Stearns
4d2048c6f6 Let other users see your default avatar. 
Fixes https://app.asana.com/0/26225263936266/51001490412567
 2015-09-20 13:12:13 -07:00
samcake
c9cb768945 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-19 09:00:19 -07:00
samcake
9a8dc6ca5d Fix compilation issues on mac 2015-09-19 08:59:47 -07:00
samcake
8941741508 Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap 2015-09-18 18:47:18 -07:00
Anthony J. Thibault
eadf212418 Updated avatar.json with talking idle animation. 2015-09-18 18:31:53 -07:00
Brad Hefta-Gaub
ec87502f49 Merge pull request #5840 from jherico/bart 
Instanced rendering for Box entities
 2015-09-18 18:06:25 -07:00
Anthony J. Thibault
44eb448cbe Hooked up isTalking flag to Rig and AnimGraph. 2015-09-18 18:05:51 -07:00
David Rowe
812ab9b7c6 Merge branch 'master' into 20681 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2015-09-18 16:44:04 -07:00
Philip Rosedale
5e64420ea1 Merge pull request #5850 from jherico/dargo 
Remove overcalling of glVertexAttrib4f
 2015-09-18 16:38:22 -07:00
Brad Davis
8a703d0363 Instanced rendering, first pass 2015-09-18 16:29:29 -07:00
Andrew Meadows
269e3d7f23 Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance 
Entities.getEntityProperty() performance improvements
 2015-09-18 15:19:06 -07:00
Bradley Austin Davis
f851c6204f Remove overcalling of glVertexAttrib4f 2015-09-18 15:14:04 -07:00
Brad Davis
2f0ba40347 Merge pull request #5844 from ZappoMan/cruftRemovalMachine 
Cruft removal machine
 2015-09-18 14:59:16 -07:00
Brad Hefta-Gaub
d2a468b31d Merge pull request #5845 from hyperlogic/tony/vive-controller-offset-fix 
Adjust controller offset from 6 inches to 3 inches
 2015-09-18 14:26:27 -07:00
Brad Hefta-Gaub
020fb25ace CR feedback 2015-09-18 14:24:01 -07:00
Seth Alves
26c14ab730 Merge pull request #5847 from ZappoMan/callEntityMethods 
fix grab behavior with toys, add better mechanism for toys to detect grab
 2015-09-18 14:21:59 -07:00
Brad Hefta-Gaub
0d37511071 add support for scripts to call methods on entity scripts 2015-09-18 14:06:38 -07:00
David Rowe
ec146069b1 Reuse old property enum slots 2015-09-18 13:06:18 -07:00
David Rowe
03194437f5 Merge branch 'master' into 20681 
Conflicts:
	examples/entityScripts/sprayPaintCan.js
 2015-09-18 12:04:02 -07:00
Brad Hefta-Gaub
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Shared Vive Room
3c64db5c86 Adjust controller offset from 6 inches to 3 inches 
When using the vive controller the position of your wrist should
match your actual wrist a bit better, unless your name is Shaquille O'Neal.
 2015-09-18 12:02:05 -07:00
Andrew Meadows
07f3abfc91 fix bugs 2015-09-18 12:01:23 -07:00
samcake
64cf8590eb fix typos 2015-09-18 11:51:58 -07:00
samcake
5f5cc3dbaf fix typos 2015-09-18 11:51:28 -07:00
samcake
767407af9c Merging and cleaning shaders 2015-09-18 11:46:44 -07:00
Brad Hefta-Gaub
6edc817bf2 move the best zone logic out of EntityTreeRenderer::render() 2015-09-18 11:35:50 -07:00
samcake
d4fd2ea4c6 merging 2015-09-18 11:31:53 -07:00
Andrew Meadows
4cb2249cda premature optimization: remove another branch 2015-09-18 10:16:19 -07:00
Andrew Meadows
a85afb5280 simplify logic of RotationAccumulator::add() 2015-09-18 10:13:21 -07:00
Andrew Meadows
6ed0a57d9f avoid unecessary computation of last absolutePose 2015-09-18 10:09:23 -07:00
Andrew Meadows
9e94e7f1d0 less complicated RotationAccumulator 2015-09-18 07:11:36 -07:00
Sam Gateau
d0f7ddd3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-18 00:03:19 -07:00
David Rowe
8634b59914 Make able to emit from within portion of ellipsoid volume 2015-09-17 23:49:57 -07:00
David Rowe
9e2b5b75b6 Make able to emit in specified range of directions 
Controlled by polar and azimuth start and finish angles, around point or
from specified part of spheroid surface.
 2015-09-17 22:40:49 -07:00
Andrew Meadows
b6a153d926 split RotationAccumulator into its own files 2015-09-17 22:30:44 -07:00
Andrew Meadows
420acde720 blend IK effects between distinct end effectors 2015-09-17 22:11:59 -07:00
Brad Hefta-Gaub
4a34b142d1 remove render element proxies 2015-09-17 22:05:14 -07:00
David Rowe
f647dcf147 Change emitter radiuses to dimensions to match sphere properties 2015-09-17 21:06:40 -07:00
Brad Hefta-Gaub
d0a4622427 removed some debug code 2015-09-17 21:01:56 -07:00
Brad Hefta-Gaub
45c34e1617 only copy properties to the script values for properties that our type actually has 2015-09-17 20:55:19 -07:00
Brad Hefta-Gaub
7f9a6d7b8e whitespace fixes 2015-09-17 20:26:50 -07:00
Brad Hefta-Gaub
6de424237f add support for property groups in the desired properties logic 2015-09-17 20:24:15 -07:00
Brad Hefta-Gaub
ec86394556 Merge pull request #5835 from hyperlogic/tony/vive-eye-offset-fix 
Fix for getEyePose in OpenVRDisplayPlugin
 2015-09-17 20:22:10 -07:00
Brad Hefta-Gaub
08babecb75 add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps 2015-09-17 19:51:21 -07:00
Anthony Thibault
493819c013 Merge pull request #5834 from AndrewMeadows/ik-repairs-001 
route hand data directly to new anim system
 2015-09-17 17:49:05 -07:00
Brad Hefta-Gaub
b16dfb8a9e whitespace repair 2015-09-17 17:41:54 -07:00
Brad Hefta-Gaub
81255c8379 whitespace repair 2015-09-17 17:40:41 -07:00
Brad Hefta-Gaub
4e2cb00ec3 first cut at only returning type specific properties in getEntityProperties 2015-09-17 17:33:53 -07:00
Shared Vive Room
4459708b0e Fix for getEyePose in OpenVRDisplayPlugin 2015-09-17 17:16:12 -07:00
David Rowe
12e2cf3ce9 Emit in all directions from a point or the surface of a spheroid 2015-09-17 17:14:35 -07:00
Brad Hefta-Gaub
3deaa68b7b Merge pull request #5832 from samcake/HMDLightingBug 
Fix the lighting issue when the Rear View mirror is enabled
 2015-09-17 16:46:56 -07:00
Andrew Meadows
4505d5999c route hand data differently for new Anim system 2015-09-17 16:04:00 -07:00
Andrew Meadows
9746d31f5e notes for moving hand updates 2015-09-17 16:04:00 -07:00
Ryan Huffman
d0acd74861 Merge pull request #5833 from birarda/master 
fix for some locking races in SendQueue/Connection cleanup
 2015-09-17 15:04:52 -07:00
Stephen Birarda
285a6cc738 use erase directly for cleanupConnection 2015-09-17 14:51:48 -07:00
Howard Stearns
fb71a85bb8 Merge pull request #5831 from hyperlogic/tony/anim-qstring 
AnimGraph: prefer QString over std::string
 2015-09-17 14:36:39 -07:00
Stephen Birarda
a914ec82c3 more comment correctness for Socket 2015-09-17 14:17:43 -07:00
Stephen Birarda
1f9bb22b9e fix some wording in Socket comment 2015-09-17 14:17:03 -07:00
Stephen Birarda
36e2d4fc76 add check for NotStarted state in PL queue 2015-09-17 14:16:03 -07:00
Stephen Birarda
320429fd1e Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-17 14:15:05 -07:00
Stephen Birarda
4758dd2a53 correct locking races in SendQueue/Connection cleanup 2015-09-17 14:13:24 -07:00
Sam Gateau
b207d97f72 Fix the lighting when the rear view mirror is showing up 2015-09-17 12:28:17 -07:00
Brad Hefta-Gaub
58e0625192 Merge pull request #5824 from jherico/marge 
Debug Oculus plugin for performance testing
 2015-09-17 11:46:26 -07:00
Anthony J. Thibault
bef136d811 AnimGraph: prefer QString over std::string 2015-09-17 11:21:14 -07:00
Ryan Huffman
f099e17f43 Merge pull request #5823 from birarda/master 
guard a perpetual AC domain connection if the NL thread is locked
 2015-09-17 09:40:52 -07:00
Stephen Birarda
fb38fd05ed Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-17 09:37:29 -07:00
Brad Davis
5ba6242bda Support a debug oculus plugin for performance testing 2015-09-16 19:55:57 -07:00
Howard Stearns
5eef0e21ad Merge pull request #5826 from AndrewMeadows/ik-repairs-000 
prevent initial bad IK targets for hands
 2015-09-16 18:49:46 -07:00
David Rowe
c992107363 Add particle properties ready to use for emitting from a spheroid 2015-09-16 18:07:18 -07:00
Brad Hefta-Gaub
6fac447b97 Merge branch 'master' of https://github.com/highfidelity/hifi into getEntityPropertiesPerformance 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
	libraries/script-engine/src/ScriptCache.cpp
	libraries/script-engine/src/ScriptCache.h
 2015-09-16 17:16:57 -07:00
Seth Alves
da74d4b1e1 Merge pull request #5830 from ZappoMan/entityScriptsReload 
add reload all support for entity scripts
 2015-09-16 17:09:07 -07:00
Brad Hefta-Gaub
b645d99412 CR feedback 2015-09-16 17:07:12 -07:00
Andrew Meadows
e1fc1900ab remove IK 'flutter' bug 2015-09-16 17:02:12 -07:00
Andrew Meadows
d4ea661aca cleanup whitespace 2015-09-16 17:02:12 -07:00
Andrew Meadows
9a86fc2e62 build local list of IK targets every frame 2015-09-16 17:02:12 -07:00
Andrew Meadows
089c719612 minor cleanup 2015-09-16 17:02:12 -07:00
Howard Stearns
e9265ebec2 Merge pull request #5828 from hyperlogic/tony/anim-bug-fixes 
AnimController bug fixes and rename to AnimManipulator
 2015-09-16 16:59:41 -07:00
Brad Hefta-Gaub
2021a15527 fix white space 2015-09-16 16:54:21 -07:00
Brad Hefta-Gaub
fa6396bbfa fix white space 2015-09-16 16:53:20 -07:00
Brad Hefta-Gaub
7840f122dc add reload all support for entity scripts 2015-09-16 16:46:46 -07:00
Brad Hefta-Gaub
248107c468 add reload all support for entity scripts 2015-09-16 16:45:26 -07:00
Brad Hefta-Gaub
009633f281 Merge pull request #5829 from samcake/HMDLightingBug 
Fixing the disappearing local lights
 2015-09-16 16:19:21 -07:00
Sam Gateau
882ca5d6c0 Fix the lights not rendering roperly 2015-09-16 15:57:35 -07:00
Anthony J. Thibault
5aeebba90e Renamed AnimController to AnimManipulator, Removed offsets on IK targets 2015-09-16 15:49:47 -07:00
Brad Hefta-Gaub
0a41ab2f41 Merge pull request #5827 from jherico/homer 
fix ScriptEngine location property
 2015-09-16 15:19:54 -07:00
Anthony J. Thibault
fae4b08eb0 AnimController Node Bug fixes 
AnimController: proper support for alpha
AnimController: bug fix for translation.
AnimOverlay: renamed local var when building hand boneSets from head to hand.
 2015-09-16 15:11:53 -07:00
Brad Hefta-Gaub
e1cb041576 first cut at adding desiredProperties to getProperties 2015-09-16 15:00:42 -07:00
Brad Davis
cbb8bee962 Trying to fix ScriptEngine location property 2015-09-16 15:00:24 -07:00
David Rowe
d51cab3e3d Replace particle velocity with speed and orientation 2015-09-16 14:51:08 -07:00
Sam Gateau
d45547aa1a Merge and update 2015-09-16 13:46:07 -07:00
Stephen Birarda
cc8ad868b8 don't parent DS timer to object in another thread 2015-09-16 12:27:57 -07:00
Stephen Birarda
500a96ee7c guard perpetual AC domain connection if NL thread locked 2015-09-16 12:25:03 -07:00
Stephen Birarda
5df7ce7424 fix for missing jurisdiction listener in Agent 2015-09-16 11:43:54 -07:00
Philip Rosedale
b968911fcc Merge pull request #5820 from kencooke/audio-fix 
fix audio int16_t to float scaling
 2015-09-16 10:26:36 -07:00
Stephen Birarda
13728a7a96 Merge pull request #5806 from Atlante45/as_caching 
Asset Server caching
 2015-09-16 10:06:40 -07:00
Anthony Thibault
2141eadfa8 Merge pull request #5816 from howard-stearns/stability 
Get rid of avatar tilt
 2015-09-16 10:05:15 -07:00
Ken Cooke
def24a15ad fix audio int16_t to float scaling 2015-09-16 09:00:41 -07:00
Atlante45
88d073b4ac More disk cache debug info 2015-09-16 15:20:48 +02:00
Atlante45
dd0244b15d Added a couple comments 2015-09-16 15:17:15 +02:00
Atlante45
9678e70444 Asset caching 2015-09-16 15:17:15 +02:00
Atlante45
eabee9857a Enum coding standard 2015-09-16 15:17:14 +02:00
BOB LONG
efc321bc10 Display face blend coefficients 
Display the face blend coefficients and update the value in real time.
 2015-09-16 00:40:26 -07:00
Brad Davis
f35ffd2ab7 Merge pull request #5814 from samcake/HMDLightingBug 
Fixing HMD and stereo lighting bug
 2015-09-15 18:10:26 -07:00
Sam Gateau
80d25a68b6 Bringing back the eyeView per side to the deferred transform stack 2015-09-15 18:05:15 -07:00
Sam Gateau
5410bc0945 FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix 2015-09-15 17:48:55 -07:00
Brad Hefta-Gaub
54972515dc make sure timer is owned 2015-09-15 17:04:40 -07:00
Sam Gateau
8ab96fe907 Bringin back full screen for stereo mode 2015-09-15 17:02:30 -07:00
Sam Gateau
f00e3829f1 Cleaning for PR 2015-09-15 16:54:04 -07:00
Howard Stearns
f6b5f3925a Place head at requested position in all modes. (At least, until we can figure out how to get underpose position cleanly without tilt.) 2015-09-15 16:43:52 -07:00
Howard Stearns
848bb4fccb Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines 
Added point and grab support to the AnimGraph
 2015-09-15 15:47:19 -07:00
Ryan Huffman
8c3d8bc7de Merge pull request #5809 from birarda/phrc 
timing fixes for default time_point on windows
 2015-09-15 15:29:30 -07:00
Sam Gateau
7b8e11e01c Debugging, looking good, no ready for final lighting 2015-09-15 15:22:45 -07:00
Stephen Birarda
8454cb916c avoid branching by using %= operator 2015-09-15 15:15:26 -07:00
Anthony J. Thibault
1948829ca8 Improved state machine for right hand. 
The hand state machine has the following features

* There's a idle to point animation, followed by a looping point hold state.
* There's a point to idle animation.
* The grab state is composed of a linear blend between an open and closed pose.

Additionally the C++ code will ramp on the left and right hand overlays,
This allows the fingers to be animated normally when the user is not actively
pointing or grabbing.
 2015-09-15 15:09:08 -07:00
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
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
Brad Hefta-Gaub
6521de8163 rework ScriptEngine and worker thread shutdown 2015-09-15 11:00:05 -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
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 Davis
4ce1db16f4 Merge pull request #5804 from ZappoMan/scriptEngineCleanup 
ScriptEngine Threading Repairs
 2015-09-15 08:47:11 -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
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
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
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
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
Brad Hefta-Gaub
18fbf896f1 first cut at moving entity scripts into ScriptEngine 2015-09-14 15:13:43 -07:00
Andrew Meadows
a72199a7df minor IK tuning 2015-09-14 14:44:17 -07:00
Ryan Huffman
15b809bd16 Merge pull request #5795 from birarda/phrc 
fix high resolution timing for VS2012 in networking
 2015-09-14 13:49:20 -07:00
Stephen Birarda
d82fd9a6ed Merge pull request #5797 from huffman/fix-assert 
Fix assert in AssetResourceRequest
 2015-09-14 13:40:13 -07:00
Ryan Huffman
f3b513866a Fix assert in AssetResourceRequest 2015-09-14 13:39:14 -07:00
Stephen Birarda
8308dbf4a3 Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill 
DO NOT MERGE: Cleanup asset requests on node kill
 2015-09-14 13:08:01 -07:00
Sam Gateau
3690d5a4c2 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug 2015-09-14 12:28:59 -07:00
Sam Gateau
6c63dc0444 work in progress 2015-09-14 12:28:33 -07:00
Ken Cooke
a818ed5377 Merge branch 'master' of https://github.com/kencooke/hifi 2015-09-14 12:28:16 -07:00
Ryan Huffman
29d26a1f9a Fix namespace issues std:: template specialization 2015-09-14 12:17:36 -07:00
Ken Cooke
6fe30e7156 Style fix, and use size_t instead of unsigned int. 2015-09-14 12:06:13 -07:00
Ryan Huffman
42d21e4dc1 Update AssetClient's node killed handling to check if node is asset server first 2015-09-14 11:56:47 -07:00
Ryan Huffman
e87fcb78cd Add proper cleanup of AssetRequest in AssetResourceRequest 2015-09-14 11:34:51 -07:00
Brad Davis
1bb15e28d6 Fixing differing highlights between left and right eyes in stereo modes 2015-09-14 11:24:28 -07:00
Ryan Huffman
b8c1c279c6 Update AssetRequest::State enum to use camelcase 2015-09-14 11:22:55 -07:00
Ryan Huffman
6468046c68 Update AssetClient callbacks to return whether a response was received 2015-09-14 11:22:34 -07:00
Stephen Birarda
302fd923b8 Merge branch 'master' of https://github.com/highfidelity/hifi into phrc 2015-09-14 11:21:37 -07:00
Stephen Birarda
f7f54010f5 fixes for portable hrc class on win 2015-09-14 11:21:25 -07:00
Stephen Birarda
2737e74432 fix includes for portable hrc 2015-09-14 11:21:18 -07:00
Stephen Birarda
9b926f6f04 add an hrc with proper resolution for < VC2015 2015-09-14 11:21:08 -07:00
Ken Cooke
bc5532bd0d Style fix, and use size_t instead of unsigned int. 2015-09-14 11:20:38 -07:00
Ken Cooke
984ea6f2e2 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-audio-pop 2015-09-14 10:35:59 -07:00
Ken Cooke
6afb6c80d0 Fix the loud audio pops at startup, due to SOXR returning less than desired output samples because of internal buffering. 2015-09-14 10:33:40 -07:00
Sam Gateau
0fcfacdd72 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug 2015-09-14 10:18:42 -07:00
Sam Gateau
3f2609e52a merging 2015-09-14 09:59:04 -07:00
Sam Gateau
9074d0d6e1 very first version of the TextureStorage working 2015-09-14 09:29:46 -07:00
Brad Hefta-Gaub
1f8599de13 Merge pull request #5790 from sethalves/quiet-compiler 
quiet compiler
 2015-09-14 09:24:08 -07:00
Brad Davis
61fb9924bf Fix procedural vec3 uniforms 2015-09-12 13:19:33 -07:00
Seth Alves
93dc0714f7 quiet compiler 2015-09-12 10:10:53 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Brad Hefta-Gaub
56118e4204 migrate Agent to use standard APIs of ScriptEngine 2015-09-11 22:12:42 -07:00
Brad Hefta-Gaub
54c56a92f1 move agent specific code out of ScriptEngine 2015-09-11 21:56:00 -07:00
Brad Hefta-Gaub
8395fb6eff normalize how ScriptCache::getScript() works relative to ResourceManager 2015-09-11 21:24:39 -07:00
Brad Hefta-Gaub
f85cb2c888 first cut at cleaning up ScriptEngine class 2015-09-11 19:12:09 -07:00
Seth Alves
e65ef93663 Merge pull request #5778 from jherico/homer 
Fixing some entity race condition crashes
 2015-09-11 17:54:53 -07:00
Howard Stearns
4ffe2d0747 Merge pull request #5786 from AndrewMeadows/ik-with-constraints 
inverse kinematics works with rotation constraints
 2015-09-11 17:34:50 -07:00
Ryan Huffman
2bb633d370 Merge pull request #5788 from birarda/master 
make node timeout less brittle (by giving it more time)
 2015-09-11 16:59:04 -07:00
Andrew Meadows
94b0074165 Merge pull request #5765 from ctrlaltdavid/20669-tidy 
Move cubic interpolation method to shared library
 2015-09-11 16:58:22 -07:00
Andrew Meadows
9c6060160a Merge pull request #5784 from howard-stearns/rationalize-rig-settings 
Rationalize rig settings
 2015-09-11 16:56:44 -07:00
Brad Davis
2daa5c3bf6 PR comment, fix extra variable decl 2015-09-11 16:54:18 -07:00