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

24458 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
c46f21152f Add velocity filtering to DDE head movement 
Based on filtering code in Faceshift.cpp.
 2015-04-16 15:47:02 -07:00
Seth Alves
ea8dcfa5b5 read UUIDs as UUIDs rather than as strings. more debugging prints 2015-04-16 15:33:43 -07:00
Seth Alves
d7881f1891 adjust logic for releasing ownership of simulation 2015-04-16 15:15:28 -07:00
David Rowe
3e484ee208 Add menu item for enabling DDE filtering 2015-04-16 15:04:25 -07:00
David Rowe
23d56f5bd0 Remove current DDE filtering 2015-04-16 14:51:55 -07:00
Seth Alves
d7059d8f2d add code for uuids in wire protocol. some debugging prints 2015-04-16 14:46:38 -07:00
Sam Gateau
3872c01340 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-04-16 14:38:18 -07:00
Sam Gateau
f06556ba12 migrate the various list to sort the rendering from explicit names to a more generic key based map 2015-04-16 14:37:39 -07:00
Brad Davis
a624ff43c4 Nothing to see here, move along 2015-04-16 14:10:29 -07:00
Andrew Meadows
619d1ba191 rename to measureAcceleration 2015-04-16 14:09:33 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Andrew Meadows
1acb90e23a merge upstream/master into andrew/isothermal 2015-04-16 13:48:47 -07:00
Andrew Meadows
b7ca69d4e1 fix typo 2015-04-16 13:46:26 -07:00
Andrew Meadows
5180e7e715 measure linear velocity of moving objects 2015-04-16 13:44:17 -07:00
Brad Davis
d72bb71030 Merge pull request #4636 from samcake/orange 
Introduce the gpu::Framebuffer and its sidekick the gpu::Swapchain
 2015-04-16 13:39:04 -07:00
Seth Alves
96eba3ca11 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-16 12:32:08 -07:00
Seth Alves
4d1df0f12e Merge pull request #4652 from AndrewMeadows/bispinor 
more consistency of ShapeType for model entities
 2015-04-16 12:32:02 -07:00
Seth Alves
bce269ada2 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-16 12:31:25 -07:00
Andrew Meadows
94c6053d52 fix formatting 2015-04-16 12:15:03 -07:00
Andrew Meadows
21d669f2f1 use computed shape type 2015-04-16 12:13:41 -07:00
Andrew Meadows
83d54eb46b merge upstream/master into andrew/bispinor 2015-04-16 12:07:22 -07:00
Seth Alves
b30b9a0a30 don't update _simulatorIDChangedTime unless the value is different than the current one. if a script changes an entity, attempt to claim ownership 2015-04-16 12:03:34 -07:00
Sam Gateau
9466cf9345 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-16 10:27:13 -07:00
Seth Alves
df37b853f7 setup test of lockout-period oafter simulator-owner-id change 2015-04-16 08:57:57 -07:00
Clément Brisset
3c67c69745 Merge pull request #4651 from ZappoMan/HMDToolsTweaks 
Some small tweaks
 2015-04-16 16:10:43 +02:00
Bradley Austin Davis
36ca9132cc More build failure fixes 2015-04-16 01:02:13 -07:00
Bradley Austin Davis
f700607a65 Working on OSX functionality 2015-04-15 23:08:55 -07:00
ZappoMan
ffb5ea50b1 expose avatar settings to JS 2015-04-15 17:00:50 -07:00
ZappoMan
1a1fe11111 switch HMD tools hot-key 2015-04-15 17:00:20 -07:00
Seth Alves
6c4d232ad9 respond to code review 2015-04-15 16:08:15 -07:00
Seth Alves
e3a90b80a4 fix typo in comment 2015-04-15 16:04:18 -07:00
Stephen Birarda
1058a61ddd only look for OpenMP on UNIX 2015-04-15 15:21:35 -07:00
Stephen Birarda
134704412a check for OpenMP on non Win32 platforms 2015-04-15 15:13:39 -07:00
Stephen Birarda
6d53bb2809 remove extra directives from vhacd-util cmake 2015-04-15 14:48:42 -07:00
Stephen Birarda
b25d22aa53 use debug/release for IDE handling of V-HACD 2015-04-15 14:38:24 -07:00
Andrew Meadows
f09fd226e3 Merge pull request #4649 from birarda/master 
add vim plugin files to gitignore
 2015-04-15 14:27:29 -07:00
Andrew Meadows
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity 
Myavatar targetvelocity
 2015-04-15 14:22:02 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Stephen Birarda
faf7850d7c remove plugin specific ignored files 2015-04-15 12:38:24 -07:00
Brad Davis
aba2b395a6 Working on testing the QML ui 2015-04-15 12:35:30 -07:00
Stephen Birarda
8b41a952b3 update instructions for new build folder placement 2015-04-15 12:19:38 -07:00
Stephen Birarda
08b155146a move externals from build-ext inside the build folder 2015-04-15 12:12:21 -07:00
Seth Alves
c87dca5ba0 remove debug print 2015-04-15 11:58:12 -07:00
Stephen Birarda
9213561977 add vim plugin files to gitignore 2015-04-15 11:34:59 -07:00
Seth Alves
51ac44a9b7 try to increase chances the interface gives up simulation ownership 2015-04-15 11:34:42 -07:00
David Rowe
2f970ae962 Terminate DDE process gracefully 2015-04-15 11:07:00 -07:00
Seth Alves
62b59b7ccc remove uneeded debug print 2015-04-15 11:02:12 -07:00
Seth Alves
afca5440f0 entity-server will automatically clear simulation-owner ID if it doesn't get an update for 2 seconds 2015-04-15 10:58:56 -07:00
Sam Gateau
cd1bbb2855 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 10:16:28 -07:00
Sam Gateau
8b97d2585a fixing syntax issues 2015-04-15 10:16:04 -07:00