Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 13:16:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38361 commits 25 branches 0 tags 1.1 GiB
Commit graph

38361 commits

This branch
This branch
All branches
Author SHA1 Message Date
howard-stearns
fa40e347ee Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-27 13:35:02 -08:00
James B. Pollack
86b2a67f72 Merge pull request #6891 from sethalves/avatar-updates-query-cube 
Avatar updates query cube
 2016-01-27 13:04:03 -08:00
Howard Stearns
f00ec8de5d Merge pull request #6947 from huffman/fix-entity--mkdir 
Update entity server to always make resource directory if it does not…
 2016-01-27 13:03:00 -08:00
Brad Hefta-Gaub
5ea4cb6900 Merge pull request #6949 from birarda/installer-sixense 
pull missing Sixense DLLs from external project
 2016-01-27 12:17:59 -08:00
Stephen Birarda
6385309c9d Merge pull request #6939 from huffman/injector-timing-fixes 
Injector timing fixes
 2016-01-27 11:34:26 -08:00
Seth Alves
18a1f0884e Merge pull request #6884 from ericrius1/junkyardReset 
Junkyard reset script
 2016-01-27 11:19:02 -08:00
Ryan Huffman
8764eda479 Merge branch 'master' of https://github.com/highfidelity/hifi into injector-timing-fixes 2016-01-27 11:03:52 -08:00
Howard Stearns
0d257b82fa Merge pull request #6934 from hyperlogic/tony/anim-pre-post-rot-support 
Avatar Developer Menu: added animation debug options
 2016-01-27 10:39:25 -08:00
Ryan Huffman
607f23618d Fix compiler warning for float->int conversion 2016-01-27 10:36:44 -08:00
Ryan Huffman
a3b2dd2295 Add proper loop handling in injector 2016-01-27 10:14:05 -08:00
Brad Hefta-Gaub
dc6662d115 Merge pull request #6943 from jherico/attachments 
Attachment dialog in overlay
 2016-01-26 22:51:40 -08:00
Brad Davis
f53aaa1d64 Removing old attachment dialog, updating menu code 2016-01-26 21:55:42 -08:00
Brad Davis
2956557c5f Adding overlay compatible combo-box 2016-01-26 21:55:41 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Brad Hefta-Gaub
881a94cd19 Merge pull request #6950 from jherico/qml 
Small QML fixes
 2016-01-26 21:30:46 -08:00
Brad Davis
0a6be80578 Added some disabled modal focus protection code 2016-01-26 18:50:55 -08:00
Brad Davis
fbee221966 Fix tool window breaking when visible while edit.js reloads 2016-01-26 18:15:41 -08:00
Brad Davis
9a8d56da77 Center new windows without a defined position 2016-01-26 17:25:36 -08:00
Brad Davis
fee920723a Cleaning up test project 2016-01-26 17:25:20 -08:00
Anthony Thibault
0fdfb69cae Merge pull request #6938 from AndrewMeadows/reduce-hip-swing 
reduce hips swing driven by head orientation when wearing HMD
 2016-01-26 17:00:31 -08:00
Brad Davis
940b095013 Removing menu logspam 2016-01-26 16:59:37 -08:00
Brad Davis
5f38c5265c Fixing potential crash in dialog popups 2016-01-26 16:59:19 -08:00
Brad Davis
cea57a111b Desktop cleanup 2016-01-26 16:56:33 -08:00
Brad Davis
8dc066fc00 Fix the recursive launching of load script from URL 2016-01-26 16:49:23 -08:00
Ryan Huffman
2717c027e8 Merge pull request #6932 from birarda/console 
various installer fixes and improvements
 2016-01-26 16:39:31 -08:00
Stephen Birarda
8ba0e3bc6e give dev shortcuts a specific name too 2016-01-26 16:21:18 -08:00
Stephen Birarda
e6a8fd192c use the VS2011 DLLs bundled with sixense for installer 2016-01-26 15:54:08 -08:00
James B. Pollack
d8dbb717d5 Update junkyardResetEntityScript.js 2016-01-26 14:06:17 -08:00
Ryan Huffman
a731a571e0 Update entity server to always make resource directory if it does not exist 2016-01-26 13:50:58 -08:00
Anthony J. Thibault
33993b8c44 AnimClip: removed unused static member. 2016-01-26 13:34:21 -08:00
samcake
462758ebdd Merge pull request #6863 from zzmp/feat/boom-shadow 
Tie shadow frustum to boom offset
 2016-01-26 13:33:57 -08:00
Seth Alves
1cc0aa18bb Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube 2016-01-26 13:31:07 -08:00
Seth Alves
1fefe0fa0e when an avatar moves a child entity around, it has to invoke MovingEntitiesOperator to keep the local octree up-to-date 2016-01-26 13:30:55 -08:00
Ryan Huffman
8d3d4b1e02 Merge pull request #6946 from birarda/audio-mixer-coma 
add some debug for audio injector wrap case
 2016-01-26 13:29:58 -08:00
Stephen Birarda
b6f478e087 add some debug for audio injector wrap case 2016-01-26 13:10:02 -08:00
howard-stearns
e145cf60be cleanup init 2016-01-26 13:01:29 -08:00
ericrius1
e6379fcaa8 Naming changes 2016-01-26 12:57:41 -08:00
Zach Pomerantz
2da2bc60db Tie shadow frustum to boom offset 2016-01-26 12:26:16 -08:00
Stephen Birarda
0a413904a0 use non PR-specific names for close prompt 2016-01-26 12:09:45 -08:00
Stephen Birarda
6daeefef68 remove the correct startup shortcut during uninstall 2016-01-26 12:08:26 -08:00
howard-stearns
1d49c8f368 Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-26 12:00:31 -08:00
howard-stearns
2e7f1cbb3f Align avatar animation with LOD visibility. 2016-01-26 11:59:18 -08:00
Stephen Birarda
4115d52d91 default shortcut options off for PR builds 2016-01-26 11:46:37 -08:00
Stephen Birarda
068de5203c use specific shortcut names for PR builds 2016-01-26 11:40:50 -08:00
Anthony Thibault
81b04f2e75 Merge pull request #6942 from ctrlaltdavid/20792 
Fix Quat.equal()
 2016-01-26 11:28:23 -08:00
Stephen Birarda
79a2b7f213 make sure shell var context is correct for AppData 2016-01-26 11:17:54 -08:00
David Rowe
4e9fc02af5 Fix typos noticed in passing 2016-01-27 08:03:14 +13:00
David Rowe
1bfb941057 Fix Quat.equal() 2016-01-27 08:03:13 +13:00
howard-stearns
ed98e65bab Merge branch 'master' of https://github.com/highfidelity/hifi 2016-01-26 11:00:21 -08:00
Anthony J. Thibault
69d833a6c0 AnimClip: consistent application of translations 
Apply animation translation the same way regardless of state of usePreAndPostPoseFromAnimation.
 2016-01-26 10:53:21 -08:00