Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 11:04:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25581 commits 75 branches 59 tags 1.2 GiB
Commit graph

25581 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sam Cake
238d3751c5 cleaning up the SH generation 2015-05-13 16:00:05 -07:00
Howard Stearns
ef187b390b Server versioning. 2015-05-13 15:52:05 -07:00
Howard Stearns
dc2e923583 Ordering for packets. 2015-05-13 15:51:11 -07:00
Howard Stearns
8324da2f7f Whitespace formatting/indentation. 2015-05-13 15:48:22 -07:00
Howard Stearns
6ebeb7a22e Another constexpr. 2015-05-13 15:47:47 -07:00
Seth Alves
0db5ddc5b7 port code from samcake's model branch 2015-05-13 15:43:16 -07:00
Philip Rosedale
0a65c06e2b Merge pull request #4857 from sethalves/smaller-collision-margins 
Smaller collision margins
 2015-05-13 15:22:45 -07:00
Stephen Birarda
57fa3d8c53 fixes for other avatar receive stats rendering 2015-05-13 14:43:31 -07:00
Philip Rosedale
28643b8145 Merge pull request #4858 from birarda/domain-paths 
handle fail case in DS updateSetting
 2015-05-13 14:28:27 -07:00
Stephen Birarda
225b41d163 don't do dumb things with memory 2015-05-13 14:18:48 -07:00
Brad Davis
3b7e8a69b5 Attempting to fix threading issues with web entities 2015-05-13 14:00:41 -07:00
Seth Alves
3f8f5fd82e Merge branch 'master' of github.com:highfidelity/hifi into smaller-collision-margins 2015-05-13 13:56:29 -07:00
Howard Stearns
76e39fc95b constexpr => const for Windows compiler. 2015-05-13 13:56:10 -07:00
Seth Alves
711752bff1 rather than call setMargin, clench in all the points of a collision-hull toward the center of the hull by the margin amount 2015-05-13 13:54:24 -07:00
Howard Stearns
1a87ca04da Entity sound. 2015-05-13 13:18:02 -07:00