Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 15:13:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74635 commits 69 branches 56 tags 1.2 GiB
Commit graph

74635 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wayne Chen
37beab3ab3 fixing the desktop tablet problem again 2018-12-05 09:36:56 -08:00
Wayne Chen
40053ef13a make sure android still functions as expected 2018-12-05 09:10:17 -08:00
Wayne Chen
328e1ebc27 autotester param fully functional 2018-12-05 08:51:13 -08:00
Wayne Chen
3d99ffc459 outing oculus login 2018-12-05 08:25:01 -08:00
Wayne Chen
a2a4d2ff89 removing trailing debug 2018-12-05 08:21:11 -08:00
Wayne Chen
a30f4ed0b3 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-05 08:17:06 -08:00
Wayne Chen
07599c02c8 true reversion of scrips param 2018-12-05 08:16:54 -08:00
NissimHadar
936119b246 Merge branch '20116_nitpick_v1.2' of https://github.com/NissimHadar/hifi into 20116_nitpick_v1.2 2018-12-05 07:41:36 -08:00
SamGondelman
58396b845f move back to plugin thread 
(cherry picked from commit 98d3f6a9d1191031cda1ff040e69093ef6824f1c)
 2018-12-04 17:38:48 -08:00
Wayne Chen
4daa943510 fixing scripts param/reverting some qml 2018-12-04 17:17:58 -08:00
Wayne Chen
2a77a29f8a
Delete LoginScreenDialog.qml 2018-12-04 17:07:03 -08:00
Wayne Chen
57b21730de Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-04 17:01:56 -08:00
Wayne Chen
3951203b55 adding tablet bg/no movement in login state 2018-12-04 16:50:01 -08:00
NissimHadar
15f95aafa5 WIP. 2018-12-04 16:41:19 -08:00
SamGondelman
0c64d1227a fix vive crash 2018-12-04 16:41:03 -08:00
amantley
edab74caa4 mapped the model joint names to hifi compliant joint names in FBX serializer 2018-12-04 16:20:46 -08:00
Brad Hefta-Gaub
77e1c98264
Merge pull request #14528 from sethalves/fix-delete-home 
work around menu-item name hash collision for Home
 2018-12-04 15:04:25 -08:00
John Conklin II
725cf6c526
Merge pull request #14518 from hyperlogic/bug-fix/puck-offsets 
Head and Hand offsets for Vive Trackers now function as expected
 2018-12-04 14:25:02 -08:00
Wayne Chen
2d8b638370 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-04 14:19:28 -08:00
Wayne Chen
a24cd41367 getting textfield into focus 2018-12-04 14:19:09 -08:00
Adam Smith
763e6d1a95
Merge pull request #14444 from SamGondelman/actionData 
Case 19861: Fix: Shouldn't be able to write actionData from script
 2018-12-04 11:25:00 -08:00
Adam Smith
864e9ca8ae
Merge pull request #14443 from SamGondelman/hud 
Case 19660: Fix HUD crash
 2018-12-04 11:10:43 -08:00
John Conklin II
e4b68f1d38
Merge pull request #14455 from samcake/one 
case 20041: Package all the graphics related objects and functions in Application in the Graphics Engine
 2018-12-04 10:46:45 -08:00
Simon Walton
f3236e0843 Remove FST joint members from AvatarData 2018-12-04 10:45:32 -08:00
Wayne Chen
1375e85f2c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-04 10:21:12 -08:00
sabrina-shanman
ed1684967f Remove straggler HFMSimpleFormat.cpp 2018-12-04 10:08:14 -08:00
Wayne Chen
e7e42e3430 adding steam linking 2018-12-04 10:03:40 -08:00
sabrina-shanman
1c9beed44f Fix ModelFormatRegistry Dependency inheritance being private 2018-12-04 09:30:05 -08:00
sabrina-shanman
3c38b43a65 Fix compilation error due to static variable definition in MIMETypeLibrary header file 2018-12-04 09:30:04 -08:00
sabrina-shanman
a63888cac8 Remove unused default constructor for GLTFSerializer 2018-12-04 09:30:04 -08:00
sabrina-shanman
a04c822ef0 Oops, ModelFormatRegistry needs to be defined as a Dependency before it can be used by DependencyManager 2018-12-04 09:30:04 -08:00
sabrina-shanman
da9f37bb39 Fix up HFMFormatRegistry to accept subclass factory unique pointers 2018-12-04 09:30:04 -08:00
sabrina-shanman
19459c15a5 Split MIMETypeLibrary file type detection into three separate functions 2018-12-04 09:30:04 -08:00
sabrina-shanman
660d8c4e92 Remove unused mapping parameter from MIME type detection 2018-12-04 09:30:04 -08:00
sabrina-shanman
0da4669370 Replace ReadWriteLockable with std::lock_guard in HFMFormatRegistry/ModelFormatRegistry 2018-12-04 09:30:04 -08:00
sabrina-shanman
6ec0e42ded Remove locks from MIMETypeLibrary 2018-12-04 09:30:04 -08:00
sabrina-shanman
bf1c5f2fa5 Make Serializer::Factory stored by HFMFormatRegistry unique_ptr 2018-12-04 09:30:03 -08:00
sabrina-shanman
30c4830bd8 Make Serializers use SimpleFormat 2018-12-04 09:30:03 -08:00
sabrina-shanman
2178baf1a8 Create SimpleFormat 2018-12-04 09:29:57 -08:00
Sam Gateau
d2ff4d4674 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-12-03 20:52:43 -08:00
Anthony Thibault
7f2e427584 Added DropAfterDelay strategy to Vive Tracker Calibration Dialog 
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
 2018-12-03 18:56:45 -08:00
Simon Walton
eb097af796 Remove all .fst downloads from AvatarData and its derived classes 2018-12-03 17:42:39 -08:00
Seth Alves
541d0ab4d6 work around menu-item name hash collision for Home 2018-12-03 17:33:04 -08:00
Wayne Chen
dc3381d4a9 updating artwork 2018-12-03 17:28:10 -08:00
Simon Walton
9315c546d3 Initial version - move updateJoints() to derived class 2018-12-03 16:26:47 -08:00
Wayne Chen
22bf4fc5c4 removing fromBody 2018-12-03 16:11:13 -08:00
Wayne Chen
5beb810604 adding more steam login flow 2018-12-03 16:09:10 -08:00
Zach Fox
ab184c5c2b Authorized Script to Coupon 2018-12-03 15:16:06 -08:00
birarda
c959dd7024 release avatar entity and traits locks sooner to avoid deadlock 2018-12-03 14:57:38 -08:00
amantley
f7fcf503c2 removed joint lean from fbxSerializer. it was unused 2018-12-03 14:50:57 -08:00