Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 04:37:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36752 commits 74 branches 59 tags 1.2 GiB
Commit graph

14873 commits

Author SHA1 Message Date
ericrius1
5b52b5e5e7 Merge branch 'master' into polylineOptimizations 2015-12-17 11:41:34 -08:00
ericrius1
2aaefbcfcb refactoring, adding headers 2015-12-17 11:32:48 -08:00
Ryan Huffman
3da5cf1fe5 Merge pull request #6684 from birarda/read-type-assert 
fix reading of empty or malformed packets
 2015-12-17 11:26:47 -08:00
Seth Alves
eb173815f5 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-17 11:08:05 -08:00
Stephen Birarda
06e9731fe4 don't attempt to read an empty or malformed packet 2015-12-17 11:07:36 -08:00
Stephen Birarda
08f42c08d9 use a ternary for single assignment 2015-12-17 10:54:32 -08:00
Stephen Birarda
286b984d6f serve SHTML files with HTML MIME type 2015-12-17 10:48:33 -08:00
samcake
927cdc0880 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-17 10:30:04 -08:00
samcake
d8a71db929 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-17 10:11:03 -08:00
samcake
8d4d0d4e9a FIxing the bad returned value per reference 2015-12-17 10:08:40 -08:00
Clément Brisset
40272faa3f Merge pull request #6679 from hyperlogic/tony/particle-system-invalidated-iterator-fix 
ParticleEffectEntityItem: fix for invalid iterator increment
 2015-12-17 09:43:39 -08:00
Seth Alves
32fb4decd5 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-17 07:32:52 -08:00
Brad Hefta-Gaub
24dde9ea92 Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-12-16 21:28:42 -08:00
Brad Hefta-Gaub
0b9bd858a7 implement support for pose ScriptEndpoints 2015-12-16 21:28:27 -08:00
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
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
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -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
Andrew Meadows
ff83f8fc37 fix crash mode when leaving domain with handgun 2015-12-16 15:11:47 -08:00
Andrew Meadows
c14433979b fix crash mode when model late to get collision URL 2015-12-16 15:11:47 -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
David Rowe
b25fc5be6c Don't send a domain-server check in when shutting down 2015-12-17 09:52:34 +13: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
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
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
ericrius1
61bad36d5c tweaks 2015-12-15 18:49:04 -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
ericrius1
d9c93130e5 In a state where non uniform random vals are clear 2015-12-15 18:02:11 -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
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
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
Anthony J. Thibault
ab85e2967a AnimExpression: support for unary not. 2015-12-15 13:18:30 -08:00
Anthony J. Thibault
22756d168b Changed grammar to support boolean and and or. 2015-12-15 10:35:35 -08:00
Anthony J. Thibault
2b0ed55077 Merge branch 'master' into tony/anim-expressions 2015-12-15 10:35:19 -08:00
ericrius1
dca83a054e Changed additiveBlending to emitterShouldTrail 2015-12-15 10:30:57 -08:00
ericrius1
c561a53f7c Going to change additive blending to world position prop 2015-12-15 09:56:28 -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
ericrius1
8d691f2132 light ball 2015-12-14 11:44:42 -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
ericrius1
3d782f1307 fixed merge conflicts 2015-12-14 10:11:49 -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
Brad Hefta-Gaub
2815cb0fef first cut at adding advanced and developer menu groupings 2015-12-12 18:12:36 -08:00
Brad Hefta-Gaub
63c3f7c1a7 Merge pull request #6637 from Atlante45/warnings-win 
Warning cleanup
 2015-12-12 13:00:55 -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
Bradley Austin Davis
ae1345bb13 Adding nsight instrumenting to the QML render thread 2015-12-11 11:00:33 -08:00
samcake
94b6ca4450 FIxing the bad lambda capture for local variables 2015-12-11 10:48:58 -08:00
Bradley Austin Davis
265bd8ee67 Moving QML rendering off the main thread 2015-12-11 10:28:31 -08:00
Brad Hefta-Gaub
a7a924153a Merge pull request #6617 from huffman/entity-query-keyhole 
Add keyhole radius to OctreeQuery
 2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub
b5e07d9af5 Merge pull request #6625 from howard-stearns/scriptable-anim-var-triggers 
Scriptable anim var triggers
 2015-12-11 09:21:15 -08:00
Brad Hefta-Gaub
ff49ed7a65 Merge pull request #6621 from samcake/controllers 
Fixing the Collision Geometry display
 2015-12-11 09:15:52 -08:00
Ryan Huffman
87e30a2157 Remove EntityQuery version and just append new data to end 2015-12-11 09:03:39 -08:00
Howard Stearns
e8ffa598a2 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptable-anim-var-triggers 2015-12-10 20:40:42 -08:00
Howard Stearns
dfec222c81 Report animation triggers to normal javascript animationStateHandlers, and update away.js as an example. 2015-12-10 20:39:01 -08:00
samcake
5d395ae54f Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-10 18:06:43 -08:00
Brad Hefta-Gaub
a472d293bb Merge pull request #6599 from jherico/aeryn-sdl2 
Moving SDL2 to external plugin
 2015-12-10 18:02:15 -08:00
samcake
c74bbda663 Nothing fancy 2015-12-10 18:02:02 -08:00
samcake
40bf721ac5 Fixing merging problem 2015-12-10 17:16:06 -08:00
samcake
3728a9c6f0 Merging with Master 2015-12-10 16:55:30 -08:00
samcake
20f3d6abe1 REmoving comments 2015-12-10 16:52:03 -08:00
samcake
dffb83a488 Potentially working correctly 2015-12-10 16:31:00 -08:00
Howard Stearns
f6cd04680d Merge pull request #6618 from hyperlogic/tony/sixense-debug-draw-fix 
Fix for sixense debug draw after migration to plugin.
 2015-12-10 16:14:43 -08:00
Howard Stearns
585911fe98 Merge pull request #6612 from sethalves/no-physics-until-ready 
No physics until ready
 2015-12-10 16:09:49 -08:00
Anthony J. Thibault
1af780a664 Fix for sixense debug draw after move to plugin. 
static variables used to hold a Singleton cannot be shared across dll boundaries by default.
This uses the globalInstance template to store the instance as a property on the QApplication.
 2015-12-10 15:05:27 -08:00
samcake
5805cc8f2b Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry 2015-12-10 14:59:04 -08:00
Ryan Huffman
6acf3603d0 Update naming and number of entity query version 2015-12-10 14:58:08 -08:00
Brad Davis
98263f0c0d Moving sdl2 to external plugin 2015-12-10 14:56:41 -08:00
Ryan Huffman
cfcc07da2e Fix current version for EntityQuery 2015-12-10 14:49:28 -08:00
Ryan Huffman
46d645376b Fix misspelling of entities 2015-12-10 14:38:44 -08:00
Ryan Huffman
b6ecd539df Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole 2015-12-10 14:36:03 -08:00
Ryan Huffman
b5e3dce376 Add keyhole radius to OctreeQuery 2015-12-10 14:34:28 -08:00
Anthony J. Thibault
652ce5501f Expose Avatar default pose to JavaScript 
New JavaScript API to get the avatar's default pose.

   MyAvatar.getDefaultJointRotation(index);
   MyAvatar.getDefaultJointTranslation(index);

See `examples/tPose.js` for example usage
 2015-12-10 13:57:31 -08:00
Atlante45
a1df320ffb Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-10 13:37:34 -08:00
Atlante45
03ee07c8b7 Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-10 13:37:20 -08:00
Brad Hefta-Gaub
e133bd867a Merge pull request #6600 from jherico/aeryn-sixense 
Moving Sixense to external plugin
 2015-12-10 13:33:17 -08:00
Seth Alves
8ca6c7acc3 Merge pull request #6611 from Atlante45/attachments 
Fix Attachments jitter
 2015-12-10 11:46:19 -08:00
Seth Alves
dbde0b641e Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready 2015-12-10 11:38:08 -08:00
Seth Alves
d10221f53a merge from upstream 2015-12-10 11:21:36 -08:00
Seth Alves
3a35df191a remove an off-brand change 2015-12-10 11:19:26 -08:00
Seth Alves
1467a9d2eb handle initial simulation of _model 2015-12-10 11:17:40 -08:00
Brad Hefta-Gaub
589adde41e Merge pull request #6541 from howard-stearns/correct-target-frame-rate 
Don't limit avatar rendering when not vsync'd
 2015-12-10 11:17:23 -08:00
Atlante45
6f29d9e7b8 Use strongly typed enum instead of nested alias 2015-12-10 11:10:09 -08:00
James B. Pollack
d21e4ff5e1 Merge pull request #6592 from huffman/script-engine-fixes 
Fix concurrency issues for bools in ScriptEngine
 2015-12-10 10:48:54 -08:00
Brad Davis
645695d5d5 Moving sixense to external plugin 2015-12-10 10:44:23 -08:00
Seth Alves
2dd40beed5 formatting 2015-12-10 10:42:25 -08:00
Seth Alves
33a65385e8 Merge branch 'unix_fix' of github.com:jherico/hifi into no-physics-until-ready 2015-12-10 10:29:13 -08:00
Seth Alves
d243132b5c quiet some logging 2015-12-10 10:28:24 -08:00
Seth Alves
b4ef2b4a08 quiet some logging 2015-12-10 10:27:31 -08:00
Bradley Austin Davis
5053fcd113 Fix unix builds 2015-12-10 10:19:13 -08:00
Howard Stearns
dd011e8bc4 Freakin' xcode ^S. 2015-12-10 10:05:01 -08:00
Howard Stearns
d731875c5b Fix dependencies for Linux builds. 2015-12-10 09:58:53 -08:00