Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 15:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25619 commits 74 branches 59 tags 1.2 GiB
Commit graph

25619 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
8b2ded1b79 handle case where QVariant is not QVariantMap 2015-05-13 13:16:06 -07:00
ZappoMan
b4f15304ba standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color 2015-05-13 13:12:47 -07:00
Seth Alves
2ec660bd42 try out smaller collision margins 2015-05-13 13:00:57 -07:00
ZappoMan
4fecd33115 use new macros in Line entity 2015-05-13 12:38:11 -07:00
Seth Alves
8102e534dd Merge pull request #4856 from birarda/master 
fix for audio-mixer ignore of deleteLater
 2015-05-13 12:36:58 -07:00
Bradley Austin Davis
a0097bcff8 Fixing offscreen rendering on retina display, even without a proxy window 2015-05-13 12:26:46 -07:00
ZappoMan
095b7701d8 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 2015-05-13 12:12:12 -07:00
Stephen Birarda
ca87d64dc7 fix for audio-mixer shutdown hang, removing spaces 2015-05-13 12:03:21 -07:00
Brad Davis
ad5f1214bf Fix error when deleting web item 2015-05-13 11:58:18 -07:00
Seth Alves
80749195e6 don't ddeTracker->init if HAVE_DDE isn't set 2015-05-13 11:44:42 -07:00
David Rowe
7319c7b767 Fix face-tracked head rotation for Faceshift, also 2015-05-13 11:35:04 -07:00
David Rowe
5050171d30 Fix face-tracked head disappearing into body 
Normalize quaternion to ensure that acos(r.w) is valid (r.w <= 1.0) and
r.w = 1.0 when r.x = r.y = r.z = 0.0.
 2015-05-13 11:34:19 -07:00
Sam Cake
8324268ec8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 11:32:39 -07:00
Stephen Birarda
12a8f1436d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-05-13 11:27:01 -07:00
Philip Rosedale
96b761357b Merge pull request #4853 from huffman/remove-scripts-tip 
Remove scripts 'Tip' label and fix tool window heights
 2015-05-13 11:21:49 -07:00
Sam Cake
65e83df214 Generating the SH from the cube map! 2015-05-13 11:08:18 -07:00
Philip Rosedale
a5c49b7a13 Merge pull request #4813 from ctrlaltdavid/20532 
CR for 20532 - Default face tracking to Use Camera for first time users
 2015-05-13 11:06:46 -07:00
Brad Davis
9b6c20d93c Merge remote-tracking branch 'upstream/master' into web-entity 2015-05-13 09:49:53 -07:00
Bradley Austin Davis
fc825f6632 Fixing the loading of local HTML so it works on both OSX and win32 2015-05-13 09:46:24 -07:00
Ryan Huffman
7ff9422717 Fix runningScripts and tool window height 2015-05-13 09:45:18 -07:00