Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 13:36:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74487 commits 75 branches 59 tags 1.2 GiB
Commit graph

74487 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Wayne Chen
e7e42e3430 adding steam linking 2018-12-04 10:03:40 -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
Clément Brisset
56ac34f9d1
Merge pull request #14506 from Atlante45/fix/misc-agent 
Fix various AC bugs
 2018-12-03 14:18:12 -08:00
Clément Brisset
62f21822ce
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash 
Fix Agent crash on shutdown
 2018-12-03 14:17:35 -08:00
Zach Fox
5b8c9d7cc1 Merge branch 'master' of github.com:highfidelity/hifi into payOut1 2018-12-03 12:11:55 -08:00
Thijs Wenker
f38f39c84d ignore shortcuts in TEXTAREA elements 2018-12-03 19:42:57 +01:00
Zach Fox
2776839dff
Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval 
Fix MS20117: Prevent HTML link from appearing in Wallet notification
 2018-12-03 10:27:32 -08:00
David Back
a05e831333
Merge branch 'master' into draggableNumberFixes76-master 2018-12-03 09:42:58 -08:00
Anthony Thibault
c0bf832e39 Head and Hand offsets for Vive Trackers now function as expected 
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now.  This gives you the ability to adjust
the offsets of the pucks to the hands/head.  For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
 2018-12-02 16:18:36 -08:00
Angus Antley
a73f74d63c Merge remote-tracking branch 'upstream/master' into jointNameMapping 2018-11-30 21:29:29 -08:00
Wayne Chen
43b5a14180 fixing missing header function 2018-11-30 20:25:35 -08:00
Wayne Chen
ef12b1128b Merge branch 'master' of git://github.com/highfidelity/hifi into loginInitiative2 2018-11-30 20:18:04 -08:00
Shannon Romano
3c43f44119
Merge pull request #14462 from huffman/fix/key-light-angle 
Swap key light directions in Create
 2018-11-30 19:28:53 -08:00
Shannon Romano
0d2b0903d8
Merge pull request #14469 from huffman/fix/draggable-input-tabbable 
Fix draggable inputs not being tabbable
 2018-11-30 19:28:11 -08:00
Shannon Romano
5afff69b78
Merge pull request #14505 from huffman/fix/create-empty-rgb-field 
Fix empty rgb field in Create going black
 2018-11-30 18:19:44 -08:00
Clément Brisset
0dac8580ee
Merge pull request #14492 from Atlante45/fix/audio-mixer-crash-master 
Fix audio mixer crash
 2018-11-30 17:03:36 -08:00
Zach Fox
0d66d230c5 Merge branch 'master' of github.com:highfidelity/hifi into payOut1 2018-11-30 16:45:03 -08:00
Zach Fox
051b7cfbb8 Fix MS20117: Prevent HTML link from appearing in Wallet notification 2018-11-30 16:12:21 -08:00
Wayne Chen
224ad28ed7 lowering banner/adding space btwn cancel/signup 2018-11-30 13:09:54 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2 2018-11-30 13:05:17 -08:00
Wayne Chen
c8783776fe removing mousearea, fixing continue button 2018-11-30 13:02:29 -08:00
Shannon Romano
f3c0118602
Merge pull request #14454 from NissimHadar/19991-MacAppData 
case 19991 - implement AppData for Mac
 2018-11-30 11:38:21 -08:00