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

37256 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
656a7da70a Merge pull request #6779 from ZappoMan/onlyNotifyOwner 
only emit collision events if you're the owner
 2016-01-06 16:14:29 -05:00
Brad Hefta-Gaub
6ac8d081dc include debug log in collision example 2016-01-06 13:02:07 -08:00
Brad Hefta-Gaub
d4e039ea7a include debug log in collision example 2016-01-06 13:00:50 -08:00
Brad Hefta-Gaub
a5f618ef33 include debug log in collision example 2016-01-06 12:54:14 -08:00
Brad Hefta-Gaub
edc132efce fix warning 2016-01-06 12:53:57 -08:00
Zach Pomerantz
bcb01feb94 Merge branch 'render-shape' of http://github.com/Atlante45/hifi into feat/render-shape 2016-01-06 11:46:16 -08:00
Atlante45
b68572fdd0 Cleanup renderShapes render loop 2016-01-06 11:43:17 -08:00
Zach Pomerantz
9bc661adc8 Cleanup for style/dead code 2016-01-06 11:42:58 -08:00
Brad Hefta-Gaub
0b43685f1e Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner 2016-01-06 11:26:05 -08:00
Andrew Meadows
b8b113844f reduced avatar max fly speed from 300 to 30 2016-01-06 11:22:58 -08:00
Brad Hefta-Gaub
a3ceb3a298 Merge pull request #6781 from sethalves/fix-network-version-number 
fix network version number
 2016-01-06 11:11:00 -08:00
Brad Davis
44b9bc7115 Force active focus on the address bar line while address bar is visible 2016-01-06 11:10:05 -08:00
Seth Alves
096ab44311 fix network version number 2016-01-06 11:01:31 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Brad Hefta-Gaub
f3aeaec6a9 Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner 2016-01-06 10:58:50 -08:00
Seth Alves
8800a74186 Merge pull request #6778 from imgntn/mousegrabfix 
Only grab/release mouse grab with left button
 2016-01-06 10:36:36 -08:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -08:00
Zach Pomerantz
d8ff133cc6 Fix include in gpu-test 2016-01-05 18:11:24 -08:00
Zach Pomerantz
da50eacaad Resolve Hash const function and include per Jenkins 2016-01-05 18:08:28 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
Brad Davis
e4913a56ab Merge pull request #6775 from sethalves/fix-polyvox-rendering 
update polyvox shader to track changes in packDeferredFragment
 2016-01-05 20:24:33 -05:00
Brad Davis
4a9c558809 Merge pull request #6776 from Atlante45/fix/lambda-crash 
Cleanup web entity connections
 2016-01-05 20:23:51 -05:00
Zach Pomerantz
948dc26d24 Add debug statement for invalid ShapeKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
444a014252 Delay renderEngine init for GLBackend init 2016-01-05 17:20:08 -08:00
Zach Pomerantz
4eff377258 Change Slots->Slot to be congruous with gpu 2016-01-05 17:20:08 -08:00
Zach Pomerantz
258a414404 Add ShapeKey::NO_PIPELINE for shapes without Shape::Pipeline 2016-01-05 17:20:08 -08:00
Zach Pomerantz
df54d1dcc9 Fix render::Shape::Pipeline ownership by storing shared_ptr in map 2016-01-05 17:20:08 -08:00
Zach Pomerantz
ad329a9331 Return nullptr if no pipeline is found 2016-01-05 17:20:08 -08:00
Zach Pomerantz
63444aac72 Back to shapeContext, compiling 2016-01-05 17:20:08 -08:00
Zach Pomerantz
cf35974f02 Move shapeContext to jobContext 2016-01-05 17:20:08 -08:00
Zach Pomerantz
dfcb74c3be Split renderItems to Lights/Shapes 2016-01-05 17:20:08 -08:00
Zach Pomerantz
7913ca7f3b Render using ShapeRender, pickPipeline in renderItems 2016-01-05 17:20:08 -08:00
Zach Pomerantz
c725fd1520 Add specialized ShapeRender for deferred 2016-01-05 17:20:08 -08:00
Zach Pomerantz
c0800abdc5 Add virtual ~Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
e96b1fa881 Return copies of local vars in Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
74c4930034 Remove DrawBackround task 2016-01-05 17:20:08 -08:00
Zach Pomerantz
1a3a9be605 Use PipelinePointer for rendering Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
59a354ea8c Change payload interface to return ShapeKey, not MaterialKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
16bb861046 Add render::Shape to abstract ModelRender 2016-01-05 17:20:08 -08:00
Seth Alves
722fe46a27 Merge pull request #6777 from AndrewMeadows/whitespace 
nothing but whitespace
 2016-01-05 17:14:19 -08:00
Brad Hefta-Gaub
2435e160a8 only emit collision events if you're the owner 2016-01-05 16:56:24 -08:00
James B. Pollack
8c7c436ef2 fix 2016-01-05 16:54:18 -08:00
Clément Brisset
a2135dfdd2 Merge pull request #6720 from ctrlaltdavid/20760 
Fix particle radius and rgba start, middle, finish interpolation
 2016-01-05 16:48:13 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
ericrius1
eb44e54d87 fixed merge conflicts 2016-01-05 16:28:22 -08:00
ericrius1
882ec9fe80 Using offset from intersection point to center of object for insta-grab 2016-01-05 16:24:15 -08:00
Seth Alves
086ea66c04 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 16:24:10 -08:00
David Rowe
4d7ed6b68f Whitespace 2016-01-06 13:20:44 +13:00
Brad Hefta-Gaub
5fad7aa51b Merge pull request #6774 from imgntn/targetsfix 
Fix Wall Targets Collision Callback
 2016-01-05 16:18:59 -08:00
James B. Pollack
7c18359fba cleanup 2016-01-05 16:17:11 -08:00