Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 23:46:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60835 commits 75 branches 59 tags 1.2 GiB
Commit graph

60835 commits

This branch
This branch
All branches
Author SHA1 Message Date
druiz17
d0eb6a3ad0 remove comments 2017-10-10 09:45:41 -07:00
Ryan Huffman
9c120f1194 Update AssetMappingsScriptingInterface to not open file for activity event 2017-10-10 09:44:13 -07:00
druiz17
003395b256 removing whitespace 2017-10-10 09:43:02 -07:00
Daniela
a46ef56af9 Merge with hifi:master. Packet Headers version were increased. 2017-10-10 17:26:33 +01:00
druiz17
9ff1b2c815 Merge branch 'master' of github.com:highfidelity/hifi into far-grab-nondynamic 2017-10-10 09:17:16 -07:00
druiz17
fc41155ce1 saving work 2017-10-10 09:17:01 -07:00
Ken Cooke
b026a0461d Fix clang warnings for left-shift of signed int 2017-10-10 09:13:06 -07:00
Olivier Prat
db9a9e723c Merged with master 2017-10-10 12:11:23 +02:00
Cain Kilgore
583b0c521e Open 2017-10-10 03:40:48 +01:00
Cain Kilgore
e9f4dee56d WL 21562 - Fix the error in the Asset Browser 2017-10-10 03:39:13 +01:00
Nissim Hadar
1a932fbaf0 Corrected error in html. 2017-10-09 19:10:30 -07:00
Nissim Hadar
c9be5ea100 Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone 2017-10-09 18:01:48 -07:00
Seth Alves
559f229bd1 Merge pull request #11552 from SamGondelman/animationMaster 
Cherry-pick "Model asks for renderUpdate if animating" into master
 2017-10-09 17:57:19 -07:00
Seth Alves
8ac1875a91 Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login 
Find nearby entities at login
 2017-10-09 17:54:44 -07:00
Seth Alves
3cef3779df Merge branch 'master' of github.com:highfidelity/hifi into linux-clang-build 2017-10-09 17:34:50 -07:00
Seth Alves
aa08053a28 fix osx build 2017-10-09 17:34:43 -07:00
Nissim Hadar
71f567f15a Merge branch 'master' into hazeZone 2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Seth Alves
f349ba3674 replace parent avatar-id with avatar-self-id when exporting entities 2017-10-09 15:32:45 -07:00
Zach Fox
b81a8a95ea Final fixes 2017-10-09 15:23:22 -07:00
Seth Alves
58534a5a6d Merge pull request #11550 from druiz17/fix-test-audio 
fixed looping sample sound bug
 2017-10-09 15:21:24 -07:00
Chris Collins
e5a980d093 Merge pull request #11553 from highfidelity/RC-56 
Beta Release 56 - Includes up to Developer Release 7208
 2017-10-09 15:09:00 -07:00
Zach Fox
38b95b5403 Instructions HTML file and flow 2017-10-09 15:07:14 -07:00
Seth Alves
d1d2b8a4da don't export avatar-parent sessions IDs into json 2017-10-09 14:02:20 -07:00
Chris Collins
0d84d88a08 Merge pull request #11551 from SamGondelman/animation 
Model asks for renderUpdate if animating
 2017-10-09 14:00:11 -07:00
SamGondelman
ee02fa9a91 model asks for renderUpdate if animating 
(cherry picked from commit 873ae9b9d6)
 2017-10-09 13:55:48 -07:00
SamGondelman
873ae9b9d6 model asks for renderUpdate if animating 2017-10-09 13:36:38 -07:00
Chris Collins
789217ebb4 Merge pull request #11510 from highfidelity/RC-56 
Beta Release 56 - Includes up to Developer Release 7208
 2017-10-09 12:30:47 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Seth Alves
13da20e1f0 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-09 12:18:09 -07:00
Seth Alves
54204833df add a getParentTree call for overlays 2017-10-09 12:17:56 -07:00
Zach Fox
acdd1e32e4 First round 2017-10-09 12:11:07 -07:00
Anthony Thibault
13919907de Merge pull request #11539 from Nex-Pro/patch-1 
Fixed typo in qWarning message.
 2017-10-09 12:10:27 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
SamGondelman
3acbd7820b build error 2017-10-09 11:48:54 -07:00
druiz17
cd97ab0fdf fixed looping sample sound bug 2017-10-09 11:39:57 -07:00
Stephen Birarda
1fb7b0df7a re-bake new default avatar to compress mesh 2017-10-09 10:57:34 -07:00
Andrew Meadows
bbde1bcd63 move stuff out of writelock when possible 2017-10-09 10:42:42 -07:00
Stephen Birarda
78c5e84140 update to re-baked hipsFixed avatar 2017-10-09 10:33:35 -07:00
Stephen Birarda
198dbf83c3 fix name in mannequin FST 2017-10-09 10:33:34 -07:00
Stephen Birarda
429e037534 fix path to mannequin FBX from FST 2017-10-09 10:33:34 -07:00
Stephen Birarda
72b23a0fbb update default avatar to be better with oculus grab triggers 2017-10-09 10:33:34 -07:00
Andrew Meadows
0bcecdbe66 be picky when finding nearby entities at login 2017-10-09 10:27:46 -07:00
Andrew Meadows
0f4e7fb532 workaround for bad physics polling on login 2017-10-09 10:27:46 -07:00
Seth Alves
3ca8334e3e Merge branch 'master' of github.com:highfidelity/hifi into linux-clang-build 2017-10-09 09:50:50 -07:00
Seth Alves
4d2f16efc3 allow project to be built with clang on Linux 2017-10-08 18:01:41 -07:00
Thijs Wenker
895f79fd80 Merge pull request #11548 from ctrlaltdavid/move-shapes 
Move Shapes app files from scripts directory to marketplace directory
 2017-10-09 02:37:15 +02:00
Thijs Wenker
bd74386997 Merge pull request #11543 from ctrlaltdavid/21496 
Add script that tests setting your listening position and orientation
 2017-10-09 01:15:22 +02:00
David Rowe
765f3fc381 Move Shapes app files from scripts directory to marketplace directory 2017-10-09 10:38:40 +13:00
Bradley Austin Davis
c92588685b Merge pull request #11533 from SamGondelman/modelMaster 
Fix model loading for real this time
 2017-10-08 10:23:13 -07:00