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

14806 commits

Author SHA1 Message Date
Anthony J. Thibault
2eecb61da5 Prefer erase over repeated pop_front calls 2015-12-16 19:08:31 -08:00
samcake
7bc815448e The material colors for diffuse and emissive are now gamma corrected by default 2015-12-16 18:14:43 -08:00
Seth Alves
b83579e6e5 include queryAABox in physics-induced sends 2015-12-16 17:25:49 -08:00
Anthony J. Thibault
3b1ba67a88 ModelEntityItem: Fix for incorrect animations with preTranslations 
ModelEntities that were playing animations on models with local pivot offsets were not working correctly.
Specifically, the windmill animation in the demo domain.

We now compose a matrix containing all of the FBX's preTranslation, preRotation and postTranformations.
 2015-12-16 17:08:22 -08:00
Anthony J. Thibault
1b08563079 ParticleEffectEntityItem: fix for invalid iterator increment 
Was causing an assert in debug, due to calling ++ on an invalid iterator.
In release this might lead to memory corruption.
 2015-12-16 16:56:49 -08:00
samcake
1b1365fd40 Exposing the tone curve in the js api 2015-12-16 16:32:53 -08:00
Seth Alves
0500c21e00 unmangle merge 2015-12-16 16:09:52 -08:00
Seth Alves
9e5116bf4f Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting 2015-12-16 15:56:31 -08:00
Seth Alves
ea202c5271 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-16 15:44:44 -08:00
Seth Alves
489d4099a7 add locationChanged to model entities 2015-12-16 15:21:20 -08:00
samcake
c0faf978f8 Introducing a setting for the tone curve 2015-12-16 15:21:09 -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
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
Seth Alves
d3c57821c0 call a method on actions before each physics simulation step. use this to attempt to dejitter held objects 2015-12-16 14:00:04 -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
Seth Alves
10b82945a6 formatting 2015-12-16 10:16:01 -08:00
Seth Alves
45d19167c9 fix a couple of missing-parent bugs 2015-12-16 10:09:46 -08:00
AlessandroSigna
08f7591787 Fix misspelling 2015-12-16 10:02:47 -08:00
samcake
7c8f12b9c4 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-16 09:55:37 -08:00
samcake
b4b541178d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-16 09:42:06 -08:00
Seth Alves
b55596689f Merge branch 'fix/fbx-texture' of github.com:zzmp/hifi into near-grab-via-parenting 2015-12-16 06:39:35 -08:00
samcake
1364329886 FIxing the compil bug by checking security of the call with assert and avoiding the compilation error 2015-12-15 22:07:06 -08:00
Zach Pomerantz
3280894e29 Load texture by convention with .obj 2015-12-15 19:30:15 -08:00
Seth Alves
0003c607ea Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-15 18:46:21 -08:00
samcake
a60ef4fb5a Finalize the names 2015-12-15 18:32:30 -08:00
samcake
c2feec16de Cleaning the code 2015-12-15 18:24:16 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00
Andrew Meadows
7baee8c391 use glm::clamp() instead of std::min() and max() 2015-12-15 18:18:08 -08:00
Andrew Meadows
c3823de353 setClampedTargetScale()-->setTargetScaleVerbose() 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
Anthony J. Thibault
30480f126b Improved idle to walk forward transition 
Hooked up a transition animation from idle to walk in the animation json.
Also fixed a bug in the AnimBlendLinearMove which was preventing the interpolation
into idle from being correct.
 2015-12-15 17:26:17 -08:00
Seth Alves
1c0231c416 quiet some debugging prints 2015-12-15 16:46:16 -08:00
Seth Alves
951db42146 only send queryAABox if something about the location changed 2015-12-15 16:17:49 -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
Brad Hefta-Gaub
6420a43858 fix type 2015-12-15 15:35:17 -08:00
Seth Alves
0ac06bad5c more AACube plumbing 2015-12-15 15:31:02 -08:00
Seth Alves
2b800d711f queryAACube to and from scriptvalues 2015-12-15 15:18:43 -08:00
Seth Alves
b9f0a87a25 if a server can't get the queryAACube but received one from an interface, use the received one 2015-12-15 14:43:14 -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
Seth Alves
0013d58365 include queryAACube when scripts make changes 2015-12-15 14:25:02 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
Seth Alves
a3631ea1d1 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-15 10:12:49 -08:00
samcake
2bbd5d86b8 cleaning indentation 2015-12-15 09:46:18 -08:00
samcake
e70ab472af Merging with upstream master/graphics 2015-12-14 18:38:29 -08:00
samcake
84d1e3b123 Merged with upstream master 2015-12-14 18:30:24 -08:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -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
ed2d45d0b6 HMD Mirror looks correct 2015-12-14 16:18:44 -08:00
Seth Alves
165c41d843 add a way to remember which entities couldn't be properly placed in octree due to missing parents 2015-12-14 14:19:19 -08:00
Anthony J. Thibault
3f0cdb3c02 Merge branch 'master' into tony/js-avatar-default-pose 2015-12-14 11:19:24 -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
Seth Alves
008065ba38 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Andrew Meadows
0b7b9dcfda Merge pull request #6640 from ZappoMan/menuGroups 
first cut at adding advanced and developer menu groupings
 2015-12-14 08:58:19 -08:00
Ken Cooke
67d6965f14 Revert "Fix the broken skybox and simplify a bit the vertex shader used" 
This reverts commit 68134aafe5.
 2015-12-13 16:14:38 -08:00
Seth Alves
270d5fc8e1 remove commented-out code 2015-12-13 06:44:34 -08:00
Seth Alves
f3acec5177 whitespace 2015-12-13 06:44:15 -08:00
Seth Alves
076e2b73a1 make AABox encoder and decode safer 2015-12-13 06:44:06 -08:00
Brad Hefta-Gaub
2815cb0fef first cut at adding advanced and developer menu groupings 2015-12-12 18:12:36 -08:00
Seth Alves
7f11d2a4fe whitespace 2015-12-12 14:45:02 -08:00
Brad Hefta-Gaub
63c3f7c1a7 Merge pull request #6637 from Atlante45/warnings-win 
Warning cleanup
 2015-12-12 13:00:55 -08:00
Seth Alves
1492fd6090 merge from upstream 2015-12-12 12:37:57 -08:00
Seth Alves
24fb43e8cd first steps toward a puffed-out query-box for child entities 2015-12-12 12:33:14 -08:00
Atlante45
b8495a6912 Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win 2015-12-11 18:05:47 -08:00
samcake
b3acde4462 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-11 17:49:00 -08:00
Atlante45
eb8fc2e156 Fix last of the windows warnings 2015-12-11 17:37:36 -08:00
Seth Alves
8ec84bdde8 don't simulate model until it has geometry 2015-12-11 17:35:18 -08:00
Atlante45
7472673dae More warning fixes 2015-12-11 17:23:12 -08:00
Clément Brisset
c160a98c5c Merge pull request #6636 from samcake/controllers 
Fix the broken skybox and simplify a bit the vertex shader used
 2015-12-11 17:06:33 -08:00
Atlante45
4bfa279b1b Merge branch 'warnings-win' of github.com:Atlante45/hifi into warnings-win 2015-12-11 17:02:57 -08:00
Atlante45
b7ba3c5f17 More warning fixes 2015-12-11 17:02:03 -08:00
Atlante45
b7478c4594 Fix gcc warning 2015-12-11 16:38:19 -08:00
samcake
7ee066b9ed Merge branch 'controllers' of https://github.com/samcake/hifi into red 2015-12-11 16:35:18 -08:00
Atlante45
c782b01fde More warning fixes 2015-12-11 16:31:27 -08:00
Atlante45
d9583064f1 Move QOpenGL wrappers to the gl lib 2015-12-11 16:31:27 -08:00
Atlante45
8bd301e45e More warning fixes 2015-12-11 16:31:27 -08:00
Atlante45
5300963183 More warning fixes 2015-12-11 16:31:27 -08:00
Atlante45
79fdb2e882 Fix warnings on windows 64bit 2015-12-11 16:31:27 -08:00
Atlante45
9e51947c25 More warning fixes 2015-12-11 16:31:27 -08:00
Atlante45
0f49653da3 More OS X warning cleanup 2015-12-11 16:31:27 -08:00
Atlante45
146581714a More warning fixes 2015-12-11 16:17:41 -08:00
Atlante45
f308ef7aa9 Move QOpenGL wrappers to the gl lib 2015-12-11 16:17:17 -08:00
samcake
68134aafe5 Fix the broken skybox and simplify a bit the vertex shader used 2015-12-11 16:14:55 -08:00
James B. Pollack
f61ce98527 Merge pull request #6635 from sethalves/fix-flashlight-crash 
don't crash when a child no longer has a containing element
 2015-12-11 16:10:00 -08:00
Atlante45
d3224bfde3 More warning fixes 2015-12-11 16:03:44 -08:00
Atlante45
da63357254 More warning fixes 2015-12-11 15:42:15 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Seth Alves
920e2941b9 don't crash when a child no longer has a containing element 2015-12-11 15:31:56 -08:00
Bradley Austin Davis
04b8251a83 Refactoring escrow due to long unsignaled syncs reported by Philip 2015-12-11 15:05:38 -08:00
Atlante45
f72eb679c6 More warning fixes 2015-12-11 15:04:33 -08:00
Atlante45
a07d7494f0 More OS X warning cleanup 2015-12-11 14:20:36 -08:00
Brad Hefta-Gaub
30fd96b509 Merge pull request #6613 from jherico/threaded_qml 
Moving QML rendering off the main thread
 2015-12-11 11:43:04 -08:00