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

25596 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Stephen Birarda
4de006f9b9 handle OAuth access token retrieval 2015-05-14 12:22:23 -07:00
Eric Levin
ebb590e58a added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script 2015-05-14 11:46:52 -07:00
Seth Alves
41d77e6146 Merge pull request #4852 from AndrewMeadows/nova 
improved distributed simulation ownership negotiation
 2015-05-14 11:40:49 -07:00
Eric Levin
3393b60aba added hydraHockeyGrab.js, which constrains moving object to xz plane and disables rotation 2015-05-14 11:39:04 -07:00
Stephen Birarda
fabe19a92c ask for OAuth token directly 2015-05-14 11:19:07 -07:00
Stephen Birarda
aff83be768 handle account disconnection from DS settings 2015-05-14 11:03:41 -07:00
Ryan Huffman
0cd60782e7 Add error handling to JSConsole 2015-05-14 11:00:30 -07:00
Stephen Birarda
033007cce6 use viewHelpers to create HF account button 2015-05-14 10:45:26 -07:00
Clément Brisset
a3dc7def7b Merge pull request #4870 from sethalves/quiet-model-log-spam 
don't allow buildModelMesh to spam logs when it encounters flawed models
 2015-05-14 19:36:57 +02:00
Seth Alves
1e2e4001b1 don't allow buildModelMesh to spam logs when it encounters flawed models 2015-05-14 10:24:02 -07:00
Philip Rosedale
e0e026c639 Merge pull request #4862 from birarda/master 
fixes for other avatar receive stats rendering
 2015-05-14 10:19:09 -07:00
Sam Cake
06d353ad30 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-14 10:17:42 -07:00
Andrew Meadows
81d06e0dc3 Merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-14 10:09:55 -07:00
Seth Alves
5a0f0972da Merge pull request #4867 from PhilipRosedale/hockeygame 
first version, air hockey game
 2015-05-14 09:18:42 -07:00
Brad Hefta-Gaub
d1f52231be Merge pull request #4863 from samcake/orange 
Using the skymap for ambient lighting
 2015-05-14 09:12:46 -07:00
Brad Hefta-Gaub
979a6fb682 Merge pull request #4868 from jherico/web 
Make web entities responsive to mouse
 2015-05-14 09:12:12 -07:00
David Rowe
ff7b2016b4 Add option to auto mute microphone after lose face tracking 2015-05-14 08:50:43 -07:00
David Rowe
95a565627c Make DDE isTracking() behave the same as Faceshift's 2015-05-14 08:49:44 -07:00
Andrew Meadows
c631f85bf9 cleanup of simulation ownership/update logic 2015-05-14 08:43:54 -07:00
Brad Davis
a77816617d Make web entities interactive (via the mouse) if they're not locked. 2015-05-14 01:15:20 -07:00
Philip Rosedale
1e01aeb9ed first version, air hockey game 2015-05-13 23:11:24 -07:00
Brad Davis
e20d2ffb15 Merge typo 2015-05-13 21:39:04 -07:00
Brad Davis
c94b8b6e30 Merge branch 'master' into dk1 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-05-13 21:25:56 -07:00
Seth Alves
baf4157da0 Merge pull request #4859 from ZappoMan/typeSafePropertyCleanup 
Clean up Entity Properties and Macros to be more type-safe friendly and consistent
 2015-05-13 20:52:03 -07:00
Brad Hefta-Gaub
99cd3989c6 Merge pull request #4865 from sethalves/fix-ray-intersection 
sam's mesh code
 2015-05-13 20:46:05 -07:00
Brad Hefta-Gaub
b799b89dbc Merge pull request #4861 from thoys/20540 
CR for Job #20540 - Additions to Planky
 2015-05-13 20:40:58 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
ZappoMan
0dcb89fce7 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-13 20:33:10 -07:00
Brad Hefta-Gaub
5da0a8d7a3 Merge pull request #4860 from howard-stearns/entity-sound 
Entity sound.
 2015-05-13 20:07:44 -07:00
Philip Rosedale
4811697de3 Merge pull request #4866 from sethalves/fix-grab.js-entity-picking 
have grab.js do *accurate* picking!
 2015-05-13 19:52:09 -07:00
Seth Alves
098158870a Merge pull request #4864 from ctrlaltdavid/build-warnings 
Fix some double/float mismatch build warnings on Windows
 2015-05-13 19:43:05 -07:00
Seth Alves
73fa1af24a have grab.js do *accurate* picking! 2015-05-13 19:38:19 -07:00
Seth Alves
9a8ece8980 nm fix that in another branch 2015-05-13 19:36:11 -07:00
Seth Alves
3b2b068ac9 fix entity selection in grab.js 2015-05-13 19:35:03 -07:00
ZappoMan
c1b4e3bbb7 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 2015-05-13 18:30:01 -07:00
Seth Alves
9935b2ba22 Merge branch 'master' of github.com:highfidelity/hifi into fix-ray-intersection 2015-05-13 18:17:07 -07:00
Howard Stearns
b79a58c0c8 Whitespace. 2015-05-13 18:07:51 -07:00
Stephen Birarda
52ce9af375 fix updateSetting conditionals after merge 2015-05-13 17:53:21 -07:00
Stephen Birarda
62c0aff16a handle falsy values returned from valueForKeyPath 2015-05-13 17:52:46 -07:00
Stephen Birarda
e9a2cbdc9a handle falsy values for valueForKeyPath 2015-05-13 17:49:54 -07:00
Brad Hefta-Gaub
072a982fe3 Merge pull request #4851 from huffman/fix-edit-properties-width 
Remove nowrap from entity tool property labels
 2015-05-13 17:45:57 -07:00
Stephen Birarda
0c2c6a41a2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-05-13 17:36:40 -07:00
Stephen Birarda
69fb6c73ac remove gui only feature in domain-server 2015-05-13 17:33:44 -07:00
David Rowe
2032d36b1f Fix double/float mismatch build warnings 2015-05-13 17:32:40 -07:00
Stephen Birarda
93973eecd1 resolve conflicts on merge with upstream/master 2015-05-13 17:13:33 -07:00
Sam Cake
43c42c2f4e Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-13 17:13:10 -07:00
ZappoMan
045c0141e8 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-13 17:09:21 -07:00
Brad Hefta-Gaub
3b7acae8a2 Merge pull request #4850 from jherico/web-entity 
Web entity
 2015-05-13 17:02:55 -07:00
Sam Cake
d13106f4c9 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 16:00:42 -07:00