Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 10:55:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36251 commits 76 branches 59 tags 1.2 GiB
Commit graph

36251 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df Move OctreeSendThread to the OctreeServer 2015-12-16 14:27:26 -08:00
Atlante45
51ec7ae2ed Keep UUID of node in send thread 2015-12-16 14:27:26 -08:00
Atlante45
3cd1eea1dc Use weak pointer to the Node instead of strong ownership 2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c Assignment don't inherit from NodeData 
This is an artefact from an old design that stuck around
 2015-12-16 14:27:26 -08:00
Atlante45
562d9ac2de Forward QThread's finished signal in GenericThread 2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2 Remove OctreeServer's static instance 2015-12-16 14:27:26 -08:00
Atlante45
09701fdcf1 deadlock 101 2015-12-16 14:27:26 -08:00
Atlante45
b65cdd2865 Add logging categories to assignment client. 2015-12-16 14:27:26 -08:00
Atlante45
bd7fa266cf Bit of cleanup 2015-12-16 14:27:26 -08:00
Anthony Thibault
0c1ae5bb61 Merge pull request #6657 from AndrewMeadows/avatar-capsule-2 
Correct collision capsule for scaled avatars
 2015-12-16 11:36:08 -08:00
Ryan Huffman
a422103e89 Merge pull request #6662 from AlessandroSigna/overlays 
Exposing emmisive property of the Image3DOverlay
 2015-12-16 10:29:34 -08:00
AlessandroSigna
08f7591787 Fix misspelling 2015-12-16 10:02:47 -08:00
Seth Alves
4429890cd8 Merge pull request #6668 from zzmp/fix/fbx-texture 
Load texture by convention with .obj
 2015-12-16 06:47:02 -08:00
Brad Davis
1e5793893b Merge pull request #6665 from ZappoMan/rightClickMenu 
fix bug in simulated left click - make qml menus work
 2015-12-15 21:40:00 -08:00
Zach Pomerantz
3280894e29 Load texture by convention with .obj 2015-12-15 19:30:15 -08:00
Clément Brisset
7c8f019507 Merge pull request #6663 from birarda/baseball 
update link to bat script in createBatButton.js
 2015-12-15 19:26:33 -08:00
Seth Alves
13a1eec48c Merge pull request #6658 from AndrewMeadows/linux-input-plugins 
correct input plugin load path on linux
 2015-12-15 18:39:27 -08:00
Andrew Meadows
0e1e5db7eb only need one animateScaleChanges() implementation 2015-12-15 18:18:08 -08:00
Andrew Meadows
7baee8c391 use glm::clamp() instead of std::min() and max() 2015-12-15 18:18:08 -08:00
Andrew Meadows
9b0c199ed7 updateAvatarPhysicsShape-->addAvatarToSimulation 2015-12-15 18:18:08 -08:00
Andrew Meadows
c3823de353 setClampedTargetScale()-->setTargetScaleVerbose() 2015-12-15 18:18:08 -08:00
Andrew Meadows
cd1e3810ca set the scale of avatar on login, don't animate 2015-12-15 18:18:08 -08:00
Andrew Meadows
bab07516f0 fix size of rendered bounding capsule 2015-12-15 18:18:08 -08:00
Andrew Meadows
33634cdaa1 properly delete departing avatars 2015-12-15 18:18:08 -08:00
Andrew Meadows
e9f52b1211 properly scale avatar collision shape 2015-12-15 18:18:08 -08:00
Brad Hefta-Gaub
76da3a14ac fix bug in simulated left click - make qml menus work 2015-12-15 17:58:07 -08:00
Stephen Birarda
13c83bb262 update link to bat script in createBatButton.js 2015-12-15 17:23:29 -08:00
Brad Davis
29516619ee Merge pull request #6661 from ZappoMan/rightClickMenu 
first cut at simulating mouse/reticle behavior with input contorllers
 2015-12-15 16:08:59 -08:00
AlessandroSigna
8e7a2ac536 Exposing emmisive property of the Image3DOverlay 2015-12-15 15:41:36 -08:00
Brad Hefta-Gaub
aa53900fa3 CR feedback 2015-12-15 15:40:50 -08:00
Brad Hefta-Gaub
6420a43858 fix type 2015-12-15 15:35:17 -08:00
Brad Hefta-Gaub
3e1e85aa18 Merge pull request #6659 from ctrlaltdavid/20757 
Fix signal connection to ScriptEngine::finished()
 2015-12-15 14:42:24 -08:00
Brad Hefta-Gaub
5a355bd22f Merge pull request #6653 from hyperlogic/tony/model-entity-animation-fix 
ModelEntityItem: fix for incorrect joint mapping
 2015-12-15 14:29:06 -08:00
Brad Hefta-Gaub
7d43504c0c Merge pull request #6615 from hyperlogic/tony/js-avatar-default-pose 
Expose Avatar default pose to JavaScript
 2015-12-15 14:27:53 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
David Rowe
541af36794 Fix signal connection to ScriptEngine::finished 2015-12-16 09:12:07 +13:00
Andrew Meadows
51ff8f096e correct input plugin load path on linux 2015-12-15 08:43:04 -08:00
Brad Hefta-Gaub
1bcf275b53 Merge pull request #6652 from samcake/red 
Fix Full screen mirror behavior
 2015-12-14 18:12:19 -08:00
samcake
571ccb3c20 cleaning up the code 2015-12-14 17:14:45 -08:00
Anthony J. Thibault
617fda7832 ModelEntityItem: fix for incorrect joint mapping 
This could happen when switching the animation url between fbx files
with different joint mappings.  Only the first one would take effect.

This should fix the issue in the demo domain, with the contorted doll model.
 2015-12-14 17:07:53 -08:00
samcake
9f1f0798cb cleaning up the code 2015-12-14 17:04:26 -08:00
samcake
ed2d45d0b6 HMD Mirror looks correct 2015-12-14 16:18:44 -08:00
Anthony J. Thibault
3f0cdb3c02 Merge branch 'master' into tony/js-avatar-default-pose 2015-12-14 11:19:24 -08:00
Clément Brisset
205bc1b790 Merge pull request #6641 from ZappoMan/removeFeatureCruft 
Remove the blue sphere while speaking
 2015-12-14 10:39:05 -08:00
samcake
1597d3d466 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2015-12-14 10:25:22 -08:00
samcake
2aad26154e THis should fix the mirror and the skybox issue 2015-12-14 10:24:51 -08:00