Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76374 commits 71 branches 56 tags 1.2 GiB
Commit graph

76374 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Back
f6baa2432a design feedback 2019-02-14 17:27:05 -08:00
Sam Gateau
0d6bf79139
Merge pull request #14924 from amerhifi/feature/quest 
Case 21032: Quest lifecycle start/stop fix. Partial fix to pause/resume
 2019-02-14 17:19:19 -08:00
amer cerkic
272b941b17 removed an obselete variable 2019-02-14 17:14:28 -08:00
Sam Gateau
34db48d3a3 Merging and resolving conflict 2019-02-14 17:03:44 -08:00
Anthony Thibault
a3407b96b0 Merge branch 'master' into bug-fix/revert-anim-pose-optimization 2019-02-14 16:56:17 -08:00
Sam Gateau
6168001ad4
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80 
Case 21159: fixes for more grab bugs
 2019-02-14 16:52:03 -08:00
amer cerkic
165ec3feca removing unused reference no longer reachable 2019-02-14 16:41:28 -08:00
amer cerkic
72200618d9 cleanup of my debugging items 2019-02-14 16:38:15 -08:00
amer cerkic
7037e14d09 merging from upstream 2019-02-14 16:31:04 -08:00
David Back
46ff3a8405 add select/clear all buttons to entity type dropdown 2019-02-14 16:16:33 -08:00
Anthony Thibault
39b4eaac34 Revert "AnimPose operator* optimizations" 
This reverts commit 569bef50fd.
 2019-02-14 16:13:00 -08:00
Anthony Thibault
f0e163b4df Revert "AnimPose::inverse() optimization" 
This reverts commit 5c7e81584c.
 2019-02-14 16:10:26 -08:00
David Back
7cffcf2215 error handling, warnings for duplicate textures 2019-02-14 16:09:48 -08:00
Ryan Huffman
e800a6e030 Update hard-coded vec3 zero with Vec3.ZERO 2019-02-14 15:56:17 -08:00
Sam Gateau
fc1d3df613 Merge branch 'brown' of github.com:samcake/hifi into brown 2019-02-14 15:44:26 -08:00
Sam Gateau
522a9ed7c1 Keeping only the minimum for quest 2019-02-14 15:43:36 -08:00
Simon Walton
75901a1e37
Merge pull request #14853 from SimonWalton-HiFi/installer-removes 
Case 20496: Windows (NSIS) installer shouldn't remove unselected component upon reinstall
 2019-02-14 15:41:25 -08:00
Sam Gateau
98a5ec84a9 Adjusting the HUD operator render job to shave an extra framebuffer 2019-02-14 15:35:02 -08:00
Andrew Meadows
b94655260d don't traverse for fullUpdate on changed view 2019-02-14 14:54:10 -08:00