Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 14:48:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33084 commits 25 branches 0 tags 1.1 GiB
Commit graph

4277 commits

Author SHA1 Message Date
Howard Stearns
a820682816 Merge pull request #5901 from hyperlogic/tony/gangsta-lean 
Threshold based walking/leaning while in HMD.
 2015-09-25 15:51:39 -07:00
Thijs Wenker
9ed1397a63 Merge branch 'master' of https://github.com/worklist/hifi into 20672 2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD. 
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
 2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Thijs Wenker
6d4e4af0a5 ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer 2015-09-24 22:02:22 +02:00
Brad Hefta-Gaub
d14820d3ef Merge pull request #5880 from thoys/20668 
Worklist job #20668 - JS: Add option to listen audio from camera
 2015-09-23 20:40:32 -07:00
samcake
46e9c463fc Merge pull request #5885 from ZappoMan/batchOptimizations 
Batch optimizations
 2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Anthony J. Thibault
90a551214e Fix for AnimDebugDraw crash on shutdown. 2015-09-23 11:09:43 -07:00
David Rowe
eda12fd3af Don't look straight ahead in fullscreen mirror 2015-09-22 16:15:54 -07:00
Andrew Meadows
3af1329be2 Merge pull request #5825 from thoys/20655 
CR for Job #20655 - Add ability to close one script from another script
 2015-09-22 14:52:39 -07:00
Philip Rosedale
c09ac51d75 Merge pull request #5871 from ctrlaltdavid/20688 
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
 2015-09-22 10:17:28 -07:00
Thijs Wenker
90b89cbb45 Merge branch 'master' of https://github.com/worklist/hifi into 20655 2015-09-22 18:44:25 +02:00
Thijs Wenker
dfb9034b4e - delete new AudioListenerMode menu on script ending 
- style fix (function naming)
 2015-09-22 15:45:57 +02:00
Thijs Wenker
617f048883 Added JS interface to change audio listening position / orientation in Interface 
- MyAvatar.audioListenerMode  change using:   MyAvatar.FROM_HEAD    , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition   and  MyAvatar.customListenOrientation are for manual listening positions
 2015-09-22 13:40:33 +02:00
David Rowe
30dc07b621 Code tidying 2015-09-21 21:22:36 -07:00
David Rowe
0f85c28098 Fix HMD 3rd person view 2015-09-21 21:08:13 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
samcake
a485d3d6de Fixing the rendering of ProceduralSkybox 2015-09-21 15:21:48 -07:00
David Rowe
46524632fe Fix eyeball directions in fullscreen HMD view 2015-09-21 14:18:33 -07:00
David Rowe
7ffde27224 Fix HMD fullscreen mirror view 2015-09-21 14:04:32 -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
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Brad Hefta-Gaub
0ba1e8c945 remove renderingInWorldInterface signals 2015-09-18 09:49:57 -07:00
Brad Hefta-Gaub
7840f122dc add reload all support for entity scripts 2015-09-16 16:46:46 -07: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
Thijs Wenker
9992f4b5c5 Made stopping scripts by hash (path/url) more tolerable and fixed stopping script functionality in ScriptDiscoveryService: 
made stopScript(string) to stop script by url or path and stopScriptName(string) to stop by filename
 2015-09-16 01:16:58 +02: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
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
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
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -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
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
9b81842850 Merge branch 'master' into homer 
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
 2015-09-11 16:31:18 -07:00
Brad Davis
e458eb7ae9 Merge pull request #5734 from sethalves/octree-shared-pointers 
octree uses shared pointers
 2015-09-11 16:00:04 -07:00
Howard Stearns
f8f2a067a1 whitespace 2015-09-11 12:59:07 -07:00
Howard Stearns
02fba12a48 Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings 2015-09-11 11:53:19 -07:00
Howard Stearns
67ce0966d1 Rationalize the rig state setters. 2015-09-11 11:52:20 -07:00
Brad Davis
7fecd3261d Fixing bad merge 2015-09-11 11:40:57 -07:00
Brad Davis
244795b629 Merge branch 'homer' into temp 
Conflicts:
	interface/src/Application.cpp
 2015-09-11 11:21:29 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
42d1ab3745 Remove accidentally added header 2015-09-11 14:21:55 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Brad Davis
e9edbb9dd1 Can't promote readlock to writelock 2015-09-10 22:52:40 -07:00
Brad Davis
aa989c3687 Fixing some entity race condition crashes 2015-09-10 20:53:17 -07:00
David Rowe
4aa553c183 Stop DDE and EyeTracker early but don't destroy until later in shutdown 2015-09-10 14:53:56 -07:00
Andrew Meadows
35b894872d Merge pull request #5753 from ctrlaltdavid/20671 
Terminate DDE earlier during shut-down and always at start-up
 2015-09-10 07:46:53 -07:00
Brad Hefta-Gaub
f29bcd8b6a Merge pull request #5755 from jherico/lisa 
Fix possible hang when switching out of Oculus mode
 2015-09-09 19:24:00 -07:00
Brad Davis
382de2b4aa Fix possible hang when switching out of Oculus mode 2015-09-09 14:09:01 -07:00
Howard Stearns
ed2ed525b2 Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate. 2015-09-09 12:15:48 -07:00
David Rowe
01d7e68dbb Terminate DDE earlier during shut-down and always at start-up 2015-09-09 11:29:57 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Howard Stearns
26f63a44fc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 15:30:22 -07:00
Howard Stearns
27f4bca0a4 Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! 
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
 2015-09-08 14:49:58 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
25aeda2e18 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-08 08:40:51 -07:00
Howard Stearns
d472fd66ff Cleanup. 2015-09-07 17:26:22 -07:00
Howard Stearns
efeaf21305 Checkpoint smoother. 2015-09-07 16:32:51 -07:00
Howard Stearns
0065c64b31 Snapshot of no-judder, before cleanup. 2015-09-07 09:57:05 -07:00
James B. Pollack
670c5ee484 Merge pull request #5723 from jherico/lisa 
Toggle mute while holding the hydras
 2015-09-06 21:45:47 -07:00
David Rowe
6923e3ce70 Fix logging of intentionally crashing Interface 2015-09-06 16:28:55 -07:00
Brad Davis
644e81e20b Toggle mute while holding the hydras 2015-09-04 16:19:58 -07:00
Brad Hefta-Gaub
b63e15f2e9 fix a bug in bad PPS calculation 2015-09-04 15:06:56 -07:00
Howard Stearns
d3106de7c1 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-04 14:32:58 -07:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Anthony J. Thibault
df28c7bf1a Merge branch 'master' into ajt/new-anim-system 2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db Merge pull request #5684 from rabedik/fxaa 
Post-process anti-aliasing effect
 2015-09-04 09:01:39 -07:00
Howard Stearns
c0fec44f32 Menu item to switch between threaded and not (without restart!). 2015-09-03 19:34:25 -07:00
Anthony J. Thibault
3716d5612b Merge branch 'master' into ajt/new-anim-system 2015-09-03 19:20:06 -07:00
Howard Stearns
32eb51d0fa Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-03 13:55:57 -07:00
Brad Davis
1f83d04423 Fix oculus crash on switching display plugin to something else 2015-09-02 18:28:43 -07:00
Anthony J. Thibault
de31b92fd5 Merge branch 'master' into ajt/new-anim-system 2015-09-02 17:53:56 -07:00
Andrew Meadows
992bd5c9d2 fix sixense and vive rotation readings for palms 2015-09-02 11:37:36 -07:00
Howard Stearns
8cf71f285d Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-01 16:03:40 -07:00
Stephen Birarda
33f6933544 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-01 14:36:16 -06:00
Anthony J. Thibault
2401e6cc4b Merge branch 'master' into ajt/new-anim-system 2015-09-01 10:58:38 -07:00
Stephen Birarda
de2bfd0d0d some QThread cleanup and fix in Socket 2015-08-31 11:30:31 -07:00
Stephen Birarda
fa0abe2972 resolve conflicts on merge with upstream/master 2015-08-31 10:51:12 -07:00
Anthony J. Thibault
54aa0677f6 Merge branch 'master' into ajt/new-anim-system 2015-08-31 10:47:50 -07:00
Raffi Bedikian
59a758b5ec Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
Seth Alves
752c787f0b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-28 12:50:31 -07:00
Stephen Birarda
1d6f43e0d0 cleaned up some warnings 2015-08-27 18:26:55 -07:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Howard Stearns
b3a919a5ca Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-27 13:46:12 -07:00
Seth Alves
e97e7de19c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-27 13:19:15 -07:00
Stephen Birarda
229015a5da don't allow asset-server upload if no server present 2015-08-27 12:21:38 -07:00
Brad Hefta-Gaub
79a9694d4a Merge pull request #5648 from ctrlaltdavid/20663 
Clean Interface.ini after a crash
 2015-08-27 10:52:25 -07:00
Anthony J. Thibault
a04f356857 Merge branch 'master' into ajt/new-anim-system 2015-08-27 09:32:53 -07:00
Seth Alves
435863d1f0 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 17:33:59 -07:00
Ryan Huffman
4105b7369c Remove AssetScriptingInterface 2015-08-26 15:55:29 -07:00
Brad Davis
270f2f7a3b Fixing framerate limit, moving vsync to 2d plugin 2015-08-26 15:47:45 -07:00