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

36823 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
3db68e3151 add model joints to debugging 2016-01-04 18:16:20 -08:00
Seth Alves
2d246a840f better packing for qvector of bools 2016-01-04 18:14:29 -08:00
Seth Alves
0b9f92e50f fix quat (un)packing 2016-01-04 18:01:48 -08:00
Seth Alves
69839b4b16 better packing of qvector of quats 2016-01-04 17:50:25 -08:00
Seth Alves
3026415f03 add some missing property handling boilerplate 2016-01-04 16:17:00 -08:00
Seth Alves
202a6ae294 debugging 2016-01-04 15:56:08 -08:00
Seth Alves
ccf29e3772 debugging 2016-01-04 15:52:58 -08:00
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -08:00
Seth Alves
d0c6604be8 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 15:05:54 -08:00
Seth Alves
5beba58e5f debugging 2016-01-04 15:05:08 -08:00
Seth Alves
10f5682a3e Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 15:03:36 -08:00
Seth Alves
bd35532c5d debugging 2016-01-04 15:02:45 -08:00
Seth Alves
1ad4e39a85 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 14:58:59 -08:00
Seth Alves
ef8673610f debugging 2016-01-04 14:58:13 -08:00
Seth Alves
f06ae21da4 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 14:52:31 -08:00
Seth Alves
cd92a9fa1a adjust timestamps 2016-01-04 14:51:43 -08:00
Seth Alves
38b41298d6 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 14:49:37 -08:00
Seth Alves
9a708f2e74 try splitting edit into 2 packets 2016-01-04 14:48:49 -08:00
Seth Alves
bb7a1515c6 Merge 10.0.0.234:src/hifi-master into set-model-entity-joints 2016-01-04 14:43:23 -08:00
Seth Alves
6c8eb90ee0 debugging 2016-01-04 14:42:37 -08:00
Seth Alves
9a979f4abf update doppelganger script 2016-01-04 14:18:24 -08:00
Seth Alves
e18298c974 Merge branch 'doppelganger' of github.com:imgntn/hifi into set-model-entity-joints 2016-01-04 14:16:30 -08:00
Seth Alves
7f2e0cd103 expose a way to set translation and rotation of all model joints at once 2016-01-04 14:13:08 -08:00
Seth Alves
2147b0d78e fix locking 2016-01-04 12:31:58 -08:00
Seth Alves
c9ed36f9a6 include joint data in script properties 2016-01-04 12:31:45 -08:00
Seth Alves
ef7438958b better debugging prints for model joints 2016-01-04 12:30:55 -08:00
Seth Alves
768934ae11 update entity timestamps when sending joint information 2016-01-04 11:29:15 -08:00
Seth Alves
9e49fcf0a4 include model-joints in debugging output 2016-01-04 11:29:01 -08:00
Seth Alves
8eef1624cb Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 09:27:59 -08:00
Brad Hefta-Gaub
5b177404d5 Merge pull request #6749 from jherico/resource_override 
Allow a script to set a resource override.
 2016-01-04 09:17:38 -08:00
Brad Davis
3b4f5d36a5 PR feedback 2016-01-03 12:29:32 -08:00
Brad Hefta-Gaub
ec8a2ae093 Merge pull request #6739 from jherico/qml_window 
Support QML and Web content in overlay windows
 2016-01-03 10:18:26 -10:00
Brad Hefta-Gaub
c17e8a6d9e Merge pull request #6753 from jherico/sdl_fix 
Fix SDL breakage due to missing init
 2016-01-03 10:11:19 -10:00
Brad Hefta-Gaub
02835fc960 Merge pull request #6702 from hyperlogic/tony/soft-attachments 
Soft Attachment Support
 2016-01-03 08:46:16 -10:00
Seth Alves
fa043f3648 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-03 06:29:41 -08:00
Seth Alves
b190b2757e Merge pull request #6751 from hyperlogic/tony/model-entity-item-animation-fix 
ModelEntityItem: Fix for missing pre-rotations for animated models.
 2016-01-01 07:08:24 -08:00
Brad Davis
a0196f0cde Ensure we don't hang if the QML thread doesn't shutdown 2015-12-31 15:23:39 -08:00
Brad Davis
67e32cc1f0 Consolidating URL handling, exposing to all QML objects 2015-12-31 14:14:48 -08:00
Philip Rosedale
60bc023d6e Merge pull request #6754 from PhilipRosedale/master 
Show hand-sphere search line and point just with hand direction again
 2015-12-31 13:53:21 -08:00
Philip Rosedale
85a0dfa21a remove debug line 2015-12-31 13:49:24 -08:00
Philip Rosedale
f4389c3b1f Add head-to-hand mixing ratio, default to zero (hands only) 2015-12-31 13:36:24 -08:00
Brad Davis
462cc325e5 Cleanup, moving some QML objects to OffscreenUI 2015-12-31 12:39:56 -08:00
Philip Rosedale
c18a2fc264 blend 50/50 between head and hands for search 2015-12-31 11:56:37 -08:00
Philip Rosedale
0d4ac4387a Show hand-sphere search line and point just with hand direction again 2015-12-31 11:46:35 -08:00
Brad Davis
7d71a187d8 Fix SDL breakage due to missing init 2015-12-31 08:47:27 -08:00
Brad Davis
a883891197 Expose the username to scripts (and thus QML) 2015-12-30 22:28:16 -08:00
Brad Davis
000130617e Allow input devices to break up their mappings into multiple files 2015-12-30 22:28:10 -08:00
Brad Davis
c77b66f88c Make navigation directions into axes 2015-12-30 22:28:08 -08:00
Brad Davis
3eddf8d4a4 Allow and conditionals to be initialized from simple pairs 2015-12-30 22:24:34 -08:00
Brad Davis
4c26627622 Add navigation actions and wire them up in the standard controller 2015-12-30 17:14:40 -08:00