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

28992 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
2fc158246d decouple FPS from rotation rate during mouse drag 2015-07-23 17:30:50 -07:00
Stephen Birarda
974108734a add a comment for size guard 2015-07-23 17:17:59 -07:00
Stephen Birarda
f919d2985b don't attempt to send the avatar billboard if too large 2015-07-23 17:17:15 -07:00
Sam Gateau
ded95a3dde removing dead code 2015-07-23 16:58:21 -07:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Sam Gateau
d56b5f39fb strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels 2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f Introducing the download Framebuffer call on the context to capture a snapshot 2015-07-23 16:15:10 -07:00
Howard Stearns
05fae0e977 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 16:12:42 -07:00
Brad Davis
2ac6304752 Merge pull request #5404 from ZappoMan/renderBug 
Fix rendering of primitive objects on Windows
 2015-07-23 19:10:54 -04:00
Howard Stearns
25e9893d0e Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 16:06:04 -07:00
Howard Stearns
e59304ae74 Merge pull request #5406 from huffman/variadic-print 
Update script print() to be variadic
 2015-07-23 18:03:37 -05:00
Howard Stearns
16525dc737 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 15:41:00 -07:00
Howard Stearns
cc26f5165b Supply neck index per new protocol. 2015-07-23 15:40:33 -07:00
ZappoMan
8007fba909 add type to shader include 2015-07-23 15:37:56 -07:00
Howard Stearns
878f7129f4 Merge pull request #5 from sethalves/rig 
Rig
 2015-07-23 17:32:41 -05:00
Ryan Huffman
396bb613f8 Avoid creating a new variable in js print 2015-07-23 15:32:40 -07:00
Ryan Huffman
5f33ac5459 Update script print() to be variadic 2015-07-23 15:30:54 -07:00
Andrew Meadows
f40feba36d Merge remote-tracking branch 'andrew/boron' into bromine 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
 2015-07-23 15:29:53 -07:00
Seth Alves
849715953d Merge pull request #5405 from AndrewMeadows/bohrium 
fix for underdamped avatar rotation momentum
 2015-07-23 15:26:49 -07:00
Seth Alves
fb9d38bedb Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-23 15:17:15 -07:00
Howard Stearns
69e776e240 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 15:16:44 -07:00
Seth Alves
d5400e2b9d Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-23 15:14:23 -07:00
Seth Alves
1e19e46aa6 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 15:14:19 -07:00
Seth Alves
33c97a1833 get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes 2015-07-23 15:14:10 -07:00
Howard Stearns
eea3ce4369 Make an actual rig in the test case. 2015-07-23 15:11:21 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Howard Stearns
81e0a1e629 Better name for signal. 2015-07-23 15:09:06 -07:00
Howard Stearns
9593668110 Bring animation file headers up to date. 2015-07-23 15:08:22 -07:00
ZappoMan
e6262de864 CR feedback 2015-07-23 14:56:52 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
Andrew Meadows
b26f4b0c8d fix for underdamped avatar rotation momentum 2015-07-23 14:49:15 -07:00
Howard Stearns
9f8fad0b8f Merge pull request #4 from sethalves/rig 
Rig
 2015-07-23 16:32:56 -05:00
ZappoMan
1177ffd439 more hacking 2015-07-23 14:12:52 -07:00
ZappoMan
96e83e3ed4 remove gl_FrontMaterial 2015-07-23 14:11:28 -07:00
ZappoMan
9496b6c024 more hacking 2015-07-23 13:56:59 -07:00
ZappoMan
5774af0856 more hacking 2015-07-23 13:38:08 -07:00
ZappoMan
a0666d5e99 testing windows render bug 2015-07-23 13:17:12 -07:00
Seth Alves
4566d16402 move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected 2015-07-23 13:03:38 -07:00
ZappoMan
91d317f964 testing windows render bug 2015-07-23 12:42:55 -07:00
samcake
fecb0e3675 Merge pull request #5398 from ZappoMan/removeTextureRescale 
remove rescaling of textures
 2015-07-23 11:22:38 -07:00
David Rowe
ad7167c67a Merge branch 'master' into 20602 2015-07-23 11:22:05 -07:00
ZappoMan
720f6ec529 completely remove six sense lasers 2015-07-23 11:17:22 -07:00
samcake
805e7326e0 Merge pull request #5396 from ZappoMan/deadCodeRemoval 
remove non-batch versions of GeometryCache renderXYZ() methods
 2015-07-23 11:11:35 -07:00
David Rowe
7c4f6b665b Use a default eye diameter for models without eyes, e.g., the masks 2015-07-23 11:04:58 -07:00
ZappoMan
f4ec09a48b move renderLaserPointers() into a draw item 2015-07-23 10:42:22 -07:00
Niraj Venkat
9ccf316513 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-23 10:36:46 -07:00
Brad Hefta-Gaub
ea7238f17b Merge pull request #5400 from jherico/homer 
Preserve normals buffer during lighting resolution
 2015-07-23 09:53:51 -07:00
Seth Alves
5a1c1446cd Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-23 09:46:48 -07:00
Seth Alves
57eb798d63 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 09:46:41 -07:00