Brad Hefta-Gaub
|
9a38b36f59
|
Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
|
2017-03-24 08:12:11 -07:00 |
|
Brad Hefta-Gaub
|
aa1883ba85
|
Merge pull request #9979 from jherico/crash_fix
Fix crash in render-perf-test
|
2017-03-24 08:10:37 -07:00 |
|
Brad Hefta-Gaub
|
20bc32fc89
|
Merge pull request #9980 from birarda/bug/ac-agent-audio
make sure the AC agent has an AudioScriptingInterface
|
2017-03-23 15:13:24 -07:00 |
|
Zach Fox
|
a231b57472
|
Merge pull request #9962 from birarda/cmake-with-space
Fix failing POST_BUILD steps on Windows with spaces in build path
|
2017-03-23 11:41:38 -07:00 |
|
samcake
|
73227f6598
|
Merge pull request #9958 from highfidelity/smarter_textures
New texture streaming system
|
2017-03-23 09:44:31 -07: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 |
|
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 |
|
Triplelexx
|
c7b9492620
|
revert removing rightUnitVec
.....
|
2017-03-22 19:14:20 +00: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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
a3828ce45c
|
Fixing comment
|
2017-03-21 13:42:24 -07:00 |
|
Triplelexx
|
6d664fd668
|
add getForward, getFront returns getForward
getForward better describes the returned vector as a direction
|
2017-03-21 19:54:32 +00: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 |
|
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 |
|
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
|
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 |
|
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 |
|
Stephen Birarda
|
c9d1916eea
|
fix for build with win path with spaces
|
2017-03-20 18:24:19 -07:00 |
|
Atlante45
|
73dd2abdaf
|
Delete old sitting points code
|
2017-03-20 17:29:44 -07:00 |
|
samcake
|
e05abf2a2f
|
Fixing the spherical harmonics gneration
|
2017-03-20 16:41:21 -07:00 |
|
Brad Davis
|
e482eac437
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-03-20 16:22:13 -07:00 |
|
samcake
|
5a6478c660
|
Merge pull request #9952 from jherico/smarter_textures
Return existing textures when matching hash for a previously found live texture
|
2017-03-20 15:48:52 -07:00 |
|
samcake
|
03e1c5e0f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-03-20 15:10:09 -07:00 |
|
trent
|
3b8636b75c
|
Doubled-ish the size of the physics status icons, fixed texture coordinates to be right-side up.
|
2017-03-20 17:55:52 -04:00 |
|