Dante Ruiz
|
ae111ff2e9
|
Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto
|
2017-03-23 18:25:31 +01:00 |
|
Seth Alves
|
9a59d4d83e
|
Merge pull request #9982 from sethalves/tablet-ui
Tablet ui -- merge from upstream
|
2017-03-23 08:52:18 -08:00 |
|
Seth Alves
|
ff3fc244d1
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-23 09:50:53 -07:00 |
|
Seth Alves
|
1c62a80bc2
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-23 09:50:45 -07:00 |
|
Seth Alves
|
817a5335a0
|
Merge pull request #9981 from druiz17/tablet-popup
Use loadQMlSource if no stack is aviable when calling PushOnToStack
|
2017-03-23 08:49:41 -08:00 |
|
samcake
|
73227f6598
|
Merge pull request #9958 from highfidelity/smarter_textures
New texture streaming system
|
2017-03-23 09:44:31 -07: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 |
|
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 |
|
Brad Davis
|
9a3686fc1a
|
Fixing merge conflict
|
2017-03-22 14:55:11 -07: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 |
|
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 |
|
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 |
|
Brad Davis
|
e60108cc8c
|
PR comments
|
2017-03-21 17:26:24 -07: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 |
|
Seth Alves
|
a51c1e5a78
|
Merge pull request #9971 from sethalves/tablet-ui
Tablet ui
|
2017-03-21 13:05:38 -08:00 |
|
Seth Alves
|
a93fbc00b5
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 14:05:08 -07:00 |
|
Seth Alves
|
91cac892d2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 14:04:58 -07:00 |
|
Brad Davis
|
a3828ce45c
|
Fixing comment
|
2017-03-21 13:42:24 -07:00 |
|
Chris Collins
|
4c789c44aa
|
Merge pull request #9922 from birarda/bug/stuck-ess
fix a couple of ESS issues during ES/ESS restart
|
2017-03-21 12:44:53 -07:00 |
|
Seth Alves
|
14027d4acb
|
Merge pull request #9968 from druiz17/tablet-xbox
Fixed the third eye for the xbox controller
|
2017-03-21 11:03:53 -08:00 |
|
Seth Alves
|
4c26bcd93e
|
Merge pull request #9969 from sethalves/tablet-ui
unmangle merge
|
2017-03-21 11:03:10 -08:00 |
|
Seth Alves
|
04a334fd07
|
unmangle merge
|
2017-03-21 11:02:18 -08:00 |
|
Dante Ruiz
|
bf3c5dbf0e
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox
|
2017-03-21 19:47:16 +01:00 |
|
Dante Ruiz
|
1811a2edc7
|
fixed third eye laser
|
2017-03-21 19:45:00 +01:00 |
|
Seth Alves
|
c5a5c1c642
|
Merge pull request #9967 from sethalves/tablet-ui
Tablet ui -- merge from upstream
|
2017-03-21 09:26:57 -08:00 |
|
Seth Alves
|
1da6349505
|
merge from upstream
|
2017-03-21 10:26:02 -07:00 |
|
Ryan Huffman
|
13222468e3
|
Merge pull request #9712 from huffman/feat/edit-particle-icon
Add particle system overlay in edit.js
|
2017-03-21 10:02:52 -07:00 |
|
Seth Alves
|
ef026dd235
|
Merge pull request #9966 from sethalves/tablet-ui
Tablet ui - merge from upstream
|
2017-03-21 08:44:33 -08:00 |
|
Seth Alves
|
cc4ddd1387
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-21 08:43:35 -08:00 |
|
Seth Alves
|
b0b3fe2f2f
|
Merge pull request #9965 from vladest/tablet-ui-script-logs
Scripts debug window in Tablet UI
|
2017-03-21 08:35:12 -08:00 |
|
Andrew Meadows
|
b2abe5aa04
|
Merge pull request #9956 from mittens/master
Tweaks to the Physics Simulation Ownership Icon Rendering
|
2017-03-21 09:29:50 -07:00 |
|
Brad Hefta-Gaub
|
b7f48644af
|
Merge pull request #9955 from druiz17/tablet-edit-selecting
Fix edit.js from deselecting an object when trying to delete it
|
2017-03-21 09:27:30 -07:00 |
|
Brad Hefta-Gaub
|
ac309df3d1
|
Merge pull request #9946 from sethalves/model-scripting-1
Model scripting
|
2017-03-21 09:26:32 -07:00 |
|
Chris Collins
|
3f30909579
|
Merge pull request #9961 from Atlante45/feat/delete_dead_code
Delete old sitting points code
|
2017-03-21 08:03:46 -07:00 |
|
Chris Collins
|
ea13151d55
|
Merge pull request #9945 from mnafees/21233
21233: Remove Scripts Editor option from Edit menu and all related files
|
2017-03-21 08:01:36 -07:00 |
|
Vladyslav Stelmakhovskyi
|
fb0adae0b1
|
Scripts debug window in Tablet UI
|
2017-03-21 15:04:38 +01:00 |
|
Zach Pomerantz
|
b6d111369f
|
Merge pull request #9935 from zzmp/fix/audio-initialization
Fix data race in audio output initialization
|
2017-03-21 00:23:28 -04:00 |
|
Zach Pomerantz
|
20ea13e00a
|
Merge pull request #9897 from zzmp/record/noise-gate
Add AudioNoiseGate to recordings played through Interface
|
2017-03-21 00:21:20 -04:00 |
|
Atlante45
|
73dd2abdaf
|
Delete old sitting points code
|
2017-03-20 17:29:44 -07:00 |
|
Faye Li
|
9cab8b6c4a
|
end of day commit
|
2017-03-20 17:04:29 -07:00 |
|