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

76880 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roxanne Skelly
1154414a07 remove unneeded marketplaceInject.js 2019-02-15 12:36:35 -08:00
Roxanne Skelly
6d38dcbfad Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-15 12:33:44 -08:00
Roxanne Skelly
2c4f485079 QmlMarketplace invert arrow direction on sort. 2019-02-15 12:31:01 -08:00
Thijs Wenker
74ce98a075 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor 2019-02-15 20:57:20 +01:00
Thijs Wenker
556a55ff16 Better scale and texture checks 2019-02-15 20:55:27 +01:00
SamGondelman
87ab255115 finish moving materials to rendering 2019-02-15 11:49:20 -08:00
Sam Gateau
6edf7e7907
Merge pull request #14931 from jherico/fix/vive_crash 
Case 21230: Fix crash in vive and interleaved stereo plugins
 2019-02-15 11:41:03 -08:00
Brad Davis
a5f84ab51a Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 11:37:13 -08:00
luiscuenca
b670f72e84 fix warning on linux 2019-02-15 12:35:17 -07:00
Roxanne Skelly
fb524f8900 Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace 2019-02-15 11:35:06 -08:00
John Conklin II
7008330641
Merge pull request #14921 from NissimHadar/fixMacError 
Compilation error on Qt 5.12
 2019-02-15 11:28:55 -08:00
David Back
158e255319
Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities 
Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js
 2019-02-15 11:25:42 -08:00
John Conklin II
5f0db88a20
Merge pull request #14914 from raveenajain/gltf_tangents 
Case 21165: tangent attribute
 2019-02-15 11:24:21 -08:00
Sam Gateau
5e9eeccb95
Merge pull request #14930 from NissimHadar/fixCMake 
Case 21241: Fix CMake problem for ubuntu build of nitpick
 2019-02-15 11:23:58 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
Roxanne Skelly
be98fb1ac7 Standalone Tags - checkpoint 2019-02-15 11:21:40 -08:00
Brad Davis
a786a832d9 Fix android release build APK 2019-02-15 11:10:30 -08:00
SamGondelman
25b31cfc72 merge with master 2019-02-15 11:08:24 -08:00
Clément Brisset
3c60aaff96
Merge pull request #14922 from AndrewMeadows/avoid-entity-update-storm 
Case 21232: avoid entity update storm from entity-server
 2019-02-15 11:01:08 -08:00
Howard Stearns
490ef3542e update for marketplace-in-qml, and make specific to username 2019-02-15 10:58:09 -08:00
amantley
7119bc5972 reverted the scale optimization in animspline.cpp 2019-02-15 10:54:02 -08:00
Brad Davis
5483971855 Fix crash in vive and interleaved stereo plugins 2019-02-15 10:46:08 -08:00
amantley
0fcaa695ba Merge remote-tracking branch 'upstream/master' into animArmIK 2019-02-15 10:35:33 -08:00
amantley
d6dfaacf6f adding ifdef for android os 2019-02-15 10:35:25 -08:00
Brad Davis
0b171ffe13 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 10:31:04 -08:00
David Back
af25a7bf6e
Merge pull request #14919 from dback2/selectAllClearAll 
Case 19930: Entity List - add select/clear all to entity type dropdown
 2019-02-15 10:12:30 -08:00
NissimHadar
b77f40d300 Revert due to stable build problem on Ubuntu. 2019-02-15 09:52:57 -08:00
Howard Stearns
8a6f2b221b Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 09:47:18 -08:00
Anthony Thibault
702f1c8e74
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization 
Revert anim pose optimization
 2019-02-15 09:42:27 -08:00
Howard Stearns
30c0dda9ed Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 09:27:48 -08:00
Simon Walton
748747da2d
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist 
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
 2019-02-15 09:24:34 -08:00
luiscuenca
c966f71cb1 More fixes 2019-02-15 10:17:37 -07:00
amerhifi
78c4679f71
Merge pull request #4 from highfidelity/feature/quest 
Merge pull request #14924 from amerhifi/feature/quest
 2019-02-15 08:55:11 -08:00
luiscuenca
98c321c718 Fix warnings 2019-02-15 09:40:49 -07:00
NissimHadar
8b2d9c36af Adding client profile combo. 2019-02-15 08:39:29 -08:00
amantley
425413419a fixed merge conflict in avatar.h 2019-02-15 08:26:54 -08:00
Angus Antley
07af2c525e tweaked ulnar radial limit and extend limit 2019-02-15 07:31:28 -08:00
Angus Antley
382a03929e changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint 2019-02-15 07:06:43 -08:00
Angus Antley
f8554d10a8 starting cleanup 2019-02-14 23:45:45 -08:00
Ryan Huffman
ab5c4a927b Fix asset browser being hidden in incorrect way on server switch 2019-02-14 22:18:42 -08:00
Sam Gateau
13b5390243 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-14 21:01:44 -08:00
amantley
40196dcb40 wrist action works in rig now 2019-02-14 18:17:31 -08:00
amantley
5c26bbec5c moving the theta calculation to rig 2019-02-14 18:06:20 -08:00
luiscuenca
624a53449f Merge branch 'master' into flowCpp 
# Solved Conflicts:
#	interface/src/avatar/MyAvatar.cpp
 2019-02-14 18:55:43 -07:00
David Back
41abacbc6f always overwrite, tweak warning 2019-02-14 17:51:32 -08:00
luiscuenca
88eae0f2ec Remove test functions 2019-02-14 18:49:49 -07:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode 
Case 20962: Billboard mode improvements
 2019-02-14 17:44:48 -08:00
David Back
e944e284a6 design feedback 2019-02-14 17:37:58 -08:00
Shannon Romano
3b5b077a3e
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector 
Case 21066: restore shape caching in ShapeManager
 2019-02-14 17:33:33 -08:00
luiscuenca
3e66bce112 set useFlow function 2019-02-14 18:30:37 -07:00