Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 20:36:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36396 commits 25 branches 0 tags 1.1 GiB
Commit graph

997 commits

Author SHA1 Message Date
ericrius1
1cdee11784 Merge branch 'master' into polylineOptimizations 2015-12-21 12:49:00 -08:00
Seth Alves
d71cecbc61 Merge pull request #6675 from AndrewMeadows/crash-fix 
fix crash when visiting new domain with gun in hand
 2015-12-20 06:24:44 -08:00
David Rowe
9a7c0cb182 Typo noticed in passing 2015-12-18 15:12:03 +13:00
ericrius1
2aaefbcfcb refactoring, adding headers 2015-12-17 11:32:48 -08:00
Seth Alves
489d4099a7 add locationChanged to model entities 2015-12-16 15:21:20 -08:00
Andrew Meadows
c14433979b fix crash mode when model late to get collision URL 2015-12-16 15:11:47 -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
ericrius1
3d782f1307 fixed merge conflicts 2015-12-14 10:11:49 -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
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
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Atlante45
a07d7494f0 More OS X warning cleanup 2015-12-11 14:20:36 -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
Atlante45
03ee07c8b7 Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-10 13:37:20 -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
Seth Alves
2dd40beed5 formatting 2015-12-10 10:42:25 -08:00
Seth Alves
a59af2c1b2 Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready 2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c make entity-tree a global. change how network-requests to load model geometry are triggered 2015-12-10 09:03:53 -08:00
James B. Pollack
4e93f3ae81 respect visibility yay 2015-12-09 18:26:13 -08:00
James B. Pollack
b4c272aaa1 sam just left 2015-12-09 17:28:45 -08:00
Atlante45
1d513cfbba Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-09 15:09:19 -08:00
Seth Alves
47df744552 Merge branch 'update-model-during-simulate' of github.com:sethalves/hifi into no-physics-until-ready 2015-12-09 12:40:18 -08:00
Seth Alves
4d60c7bbc0 update model location with SpatiallyNestable's locationChanged call 2015-12-09 10:42:32 -08:00
Brad Hefta-Gaub
1356fb15aa Merge pull request #6591 from jherico/zaan 
Add sphere and cube triangle counts to displayed stats
 2015-12-08 13:27:37 -08:00
Bradley Austin Davis
011a43d5f2 Add sphere and cube triangle counts to displayed stats 2015-12-08 11:08:22 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
Clément Brisset
390836b64e Merge pull request #6431 from huffman/proto-received-message 
Combine Packet and PacketList into ReceivedMessage on receiving end
 2015-12-07 09:58:52 -08:00
Atlante45
18198cb6fb Fix missing override 2015-12-07 08:36:49 -08:00
Seth Alves
96e9580473 change some more parameters back to being pass-by-reference, where it's safe 2015-12-07 05:30:19 -08:00
Seth Alves
a948ae5f19 children of avatar joints might be right, now 2015-12-06 10:48:00 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Atlante45
cb758ca6b4 Fix override warnings on XCode 7 2015-12-04 08:55:43 -08:00
Atlante45
180ffcc456 Typo (English is weird) 2015-12-03 15:01:18 -08:00
Atlante45
591025850b Fix particle shader 2015-12-03 15:01:18 -08:00
Atlante45
bd23a4137e Move toGlm to GLMHelpers 2015-12-03 15:01:17 -08:00
Atlante45
9c5486fb4b More particle work 2015-12-03 15:01:17 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
ericrius1
5f881e7650 polylines now take color as a uniform 2015-12-03 13:46:29 -08:00
ericrius1
07430fb75a Merge branch 'master' into polylineOptimizations 2015-12-02 15:59:32 -08:00
ericrius1
191f7f2c22 no audio for now 2015-12-01 16:22:11 -08:00
ericrius1
71d361ed3b fixed hydra paint, adding more interactive brushes 2015-11-30 17:06:35 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Ryan Huffman
99dd9646bc Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-30 10:20:13 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
Seth Alves
4b5fec4b00 clean up, minimize diff 2015-11-26 08:36:41 -08:00