Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 08:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52927 commits 25 branches 0 tags 1.1 GiB
Commit graph

52927 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
73227f6598 Merge pull request #9958 from highfidelity/smarter_textures 
New texture streaming system
 2017-03-23 09:44:31 -07:00
Dante Ruiz
e708c6478e Merge branch 'tablet-popup' into tablet-help 2017-03-23 17:35:45 +01:00
Dante Ruiz
dfa6174069 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-23 17:34:50 +01:00
Seth Alves
ec331f495d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:25:56 -07:00
Seth Alves
62f10204d9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:25:48 -07:00
Seth Alves
4799c33c25 Merge pull request #9975 from hyperlogic/bug-fix/tablet-spawn-location 
Tablet spawn orientation now takes hand orientation into account.
 2017-03-23 08:22:25 -08:00
Dante Ruiz
af97c7275e Use loadQMlSource if no stack is aviable 2017-03-23 17:03:24 +01:00
Stephen Birarda
b53cb5934b make sure the AC agent has an AudioScriptingInterface 2017-03-22 23:35:29 -07:00
Brad Davis
944255a37b Fix crash in render-perf-test 2017-03-22 22:44:05 -07:00
Brad Davis
3a40fd886f Fix comparison between GL stamps and GPU stamps 2017-03-22 18:11:20 -07:00
Brad Davis
4868a1618a Add initialization to sampler stamp 2017-03-22 18:10:54 -07:00
Brad Davis
893fcba283 Return the correct format and internal format combo for depth textures 2017-03-22 17:14:40 -07:00
Seth Alves
df875ab504 make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches 2017-03-22 16:21:45 -07:00
Triplelexx
6a17e328e8 fix myVisibility typo 2017-03-22 22:13:39 +00:00
Brad Davis
9a3686fc1a Fixing merge conflict 2017-03-22 14:55:11 -07:00
Triplelexx
09cbace975 remove unused getBodyForwardDirection 2017-03-22 21:54:21 +00:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Andrew Meadows
a463013d90 Merge pull request #9960 from samcake/blue 
Fix Ambient Lighting equation
 2017-03-22 14:13:31 -07:00
Chris Collins
05c40d2930 Merge pull request #9933 from mittens/hotfix/obj-texture-fix 
Fixed the texture assignment for the OBJ loader
 2017-03-22 13:19:01 -07:00
trent
c71e57753b Removing changes (albeit benign ones) from another PR. 2017-03-22 15:23:40 -04:00
Triplelexx
c7b9492620 revert removing rightUnitVec 
.....
 2017-03-22 19:14:20 +00:00
trent
36619cd2e4 Fixed issue with duplicate physics status icons per sub-object. 2017-03-22 15:07:29 -04:00
Triplelexx
216f20ed2c rename fronts to forwards 2017-03-22 19:03:39 +00:00
Triplelexx
d1db04f93a fix lost forwardOffset declaration 2017-03-22 18:57:00 +00:00
Triplelexx
fd312f6bf8 rename fronts to forwards 2017-03-22 18:49:34 +00:00
Triplelexx
31ec9b832f rename fronts to forwards 2017-03-22 18:43:30 +00:00
Triplelexx
c2cff55427 rename fronts to forwards 2017-03-22 18:41:06 +00:00
trent
83d69e65b3 Merge branch 'master' of https://github.com/highfidelity/hifi into 21215 2017-03-22 14:20:37 -04:00
Dante Ruiz
3a89654111 saving work 2017-03-22 19:14:53 +01:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account. 
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
 2017-03-22 11:03:03 -07:00
Triplelexx
2fc8dd48de change testFront to testForward 2017-03-22 17:13:45 +00:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Seth Alves
bd32104bc1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-22 08:41:59 -08:00
Ryan Huffman
1285f2a9eb Merge pull request #9937 from thoys/boppo 
El Boppo the Clown punching bag game
 2017-03-22 09:30:54 -07:00
Thijs Wenker
dff67886d0 CR Changes - remove double constructor, use creation function instead 2017-03-22 17:28:10 +01:00
Dante Ruiz
7423bf6ca1 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-22 16:33:29 +01:00
Dante Ruiz
a44704c4fe merging with tablet-ui 2017-03-22 16:32:37 +01:00
Brad Davis
e60108cc8c PR comments 2017-03-21 17:26:24 -07:00
Triplelexx
2515563a0b change getFront to getForward 2017-03-21 22:35:07 +00:00
Triplelexx
6e740a5fbb change Mat4 getFront to getForward 2017-03-21 22:33:37 +00:00
Triplelexx
66d697873f change mat4test back to getFront 
premature, including in seperate commit
 2017-03-21 22:31:06 +00:00
Triplelexx
8df0395754 change getFrontDirection to getForwardDirection 2017-03-21 22:28:12 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
Triplelexx
248c932d50 inline getFront 2017-03-21 22:11:18 +00:00
Seth Alves
93341556ff Merge pull request #9973 from druiz17/tablet-misspelled-function-call 
fix error from using a misspelled function
 2017-03-21 13:30:37 -08:00
Dante Ruiz
d2c139ce6e fix error from using a misspelled function 2017-03-21 22:25:45 +01:00
kunalgosar
f09ee92fe1 spacing issues 2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5 spacing issues 2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4 fixed back button on marketplace 2017-03-21 14:12:54 -07:00