Andrzej Kapolka
|
2d41540dbc
|
Fix for default point size.
|
2014-09-08 12:23:13 -07:00 |
|
Andrzej Kapolka
|
f60cea7935
|
Double the point size on "Retina" displays.
|
2014-09-08 12:10:53 -07:00 |
|
Brad Hefta-Gaub
|
8068117f0c
|
Merge pull request #3368 from chansensturm/audio-noise
New Audio Buffer, Format, Tone Generator, Pink Noise Generator, and Gain objects
|
2014-09-08 11:28:02 -07:00 |
|
Craig Hansen-Sturm
|
431fcbcf6c
|
coding standard / SLOT selectAudioSourceSine440 linkage / tone gen amplitude parameter
|
2014-09-08 11:18:14 -07:00 |
|
Brad Hefta-Gaub
|
fe3f0cd358
|
Merge pull request #3355 from stojce/19964
Code Review for Job #19964
|
2014-09-06 15:43:27 -07:00 |
|
Brad Hefta-Gaub
|
d342f9281f
|
Merge pull request #3357 from huffman/19968
Code Review for Job #19968
|
2014-09-06 15:42:02 -07:00 |
|
Brad Hefta-Gaub
|
a77739f31c
|
Merge pull request #3369 from ctrlaltdavid/20007
Code Review for Job #20007
|
2014-09-06 15:36:29 -07:00 |
|
David Rowe
|
5ebe6962a4
|
Make scripts loaded with Script.load() not persist
|
2014-09-06 09:59:47 -07:00 |
|
Craig Hansen-Sturm
|
f309875069
|
formatting/renaming
|
2014-09-06 02:50:37 -07:00 |
|
Craig Hansen-Sturm
|
7a5ec429d1
|
audio rendering loop now uses input-gain, tone-generator, noise-generator, and post-generator-gain objects / audiobuffer object now shared between all new audio objects / zero buffer copy between new objects / inline tone-generator code removed / new audio options for generators
|
2014-09-06 02:29:48 -07:00 |
|
Craig Hansen-Sturm
|
1cdb01e072
|
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise
|
2014-09-05 18:31:02 -07:00 |
|
Craig Hansen-Sturm
|
68fa44f845
|
audio menu changes to support tone and noise generators
|
2014-09-05 18:30:39 -07:00 |
|
Andrzej Kapolka
|
c9d22ea07e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-09-05 18:04:15 -07:00 |
|
Andrew Meadows
|
bd8fc75305
|
fix bug: zero velocity when teleporting to new locations
|
2014-09-05 17:51:18 -07:00 |
|
Andrzej Kapolka
|
0b2d0a0b07
|
Fix for mouse events.
|
2014-09-05 17:30:19 -07:00 |
|
Andrew Meadows
|
1d7ac23aa1
|
removed signed/unsigned comparison
|
2014-09-05 17:10:13 -07:00 |
|
Andrzej Kapolka
|
c2cd23a54c
|
Mouse coordinate fix.
|
2014-09-05 17:07:37 -07:00 |
|
Andrew Meadows
|
5c75b53c0d
|
removed singed/unsigned comparisons
|
2014-09-05 17:06:42 -07:00 |
|
Andrzej Kapolka
|
5bdad18ade
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-09-05 16:45:15 -07:00 |
|
Andrzej Kapolka
|
7f6b3d3649
|
Dimension fixes for Retina displays.
|
2014-09-05 16:44:45 -07:00 |
|
Philip Rosedale
|
b311017c9a
|
Merge pull request #3361 from AndrewMeadows/inertia
expose the _measured_ MyAvatar.getVelocity() to JS
|
2014-09-05 15:34:34 -07:00 |
|
Andrzej Kapolka
|
37b4fe5166
|
Fix for deferred lighting/ambient occlusion when glow effect is disabled.
|
2014-09-05 14:16:12 -07:00 |
|
Andrew Meadows
|
9c2bfa35f7
|
restore position integration in Avatar::simulate()
|
2014-09-05 14:10:10 -07:00 |
|
Andrzej Kapolka
|
98c51f87d2
|
Make sure edit colors are either 100% opaque or 100% transparent.
|
2014-09-05 14:00:27 -07:00 |
|
Andrzej Kapolka
|
b278857091
|
Wireframe option, fix for shadow menu group.
|
2014-09-05 13:51:22 -07:00 |
|
Andrew Meadows
|
ff09a0d41b
|
merge upstream/master into andrew/inerita
|
2014-09-05 11:47:49 -07:00 |
|
Andrew Meadows
|
7be411b4ca
|
expose _measured_ MyAvatar velocity to JS
|
2014-09-05 11:44:13 -07:00 |
|
Brad Hefta-Gaub
|
9648c0d64e
|
Merge pull request #3343 from AndrewMeadows/ragdoll
Ragdoll Part 12: first pass avatar skeleton collides with voxels
|
2014-09-04 23:09:08 -07:00 |
|
stojce
|
3339b92a49
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
|
2014-09-05 07:45:55 +02:00 |
|
Andrzej Kapolka
|
c340445f33
|
Hopefully, a fix for the Windows build; looks like "near" is a keyword.
|
2014-09-04 17:42:33 -07:00 |
|
Andrzej Kapolka
|
b275af48ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-09-04 17:26:34 -07:00 |
|
Andrzej Kapolka
|
137d3738fc
|
Fix for preview render.
|
2014-09-04 17:23:09 -07:00 |
|
Andrzej Kapolka
|
21f3f2b90e
|
Switch to deferred lighting for metavoxels.
|
2014-09-04 17:17:44 -07:00 |
|
Andrew Meadows
|
27621b316d
|
clarify how the size of the cube is computed
|
2014-09-04 15:41:24 -07:00 |
|
Andrew Meadows
|
faf31f268e
|
use QHash, not QVector, for Octree content query
|
2014-09-04 15:20:07 -07:00 |
|
Ryan Huffman
|
d54dc5f2aa
|
Merge branch 'master' of github.com:highfidelity/hifi into 19935
Conflicts:
interface/src/Menu.h
|
2014-09-04 12:05:17 -07:00 |
|
Clément Brisset
|
cc6d70c5ab
|
Merge pull request #3336 from huffman/19995
Code Review for Job #19995
|
2014-09-04 11:37:35 -07:00 |
|
stojce
|
9820e73c8e
|
layout tweaks
|
2014-09-04 20:15:54 +02:00 |
|
stojce
|
6d38904adb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
|
2014-09-04 20:06:55 +02:00 |
|
Ryan Huffman
|
2b5759bb39
|
Update chat to close on ESC
|
2014-09-04 10:53:51 -07:00 |
|
Brad Hefta-Gaub
|
0d69122ec1
|
Merge pull request #3344 from huffman/19944
Code Review for Job #19944
|
2014-09-04 10:25:53 -07:00 |
|
Andrew Meadows
|
1e19566e93
|
fix for bad avatar bounding shape on resize
|
2014-09-04 09:53:07 -07:00 |
|
Ryan Huffman
|
51e616d122
|
Add margin to chat window for titlebar + menu
|
2014-09-04 07:20:27 -07:00 |
|
Ryan Huffman
|
bbc1bbdf47
|
Merge branch 'master' of github.com:highfidelity/hifi into 19968
|
2014-09-04 06:56:37 -07:00 |
|
AndrewMeadows
|
8223481ecb
|
Merge pull request #3341 from huffman/19967
Code Review for Job #19967
|
2014-09-03 16:51:19 -07:00 |
|
stojce
|
f07f270dee
|
restore default buttons events
|
2014-09-04 01:22:17 +02:00 |
|
stojce
|
f12f45adec
|
Layout fixes
|
2014-09-04 00:55:36 +02:00 |
|
Andrew Meadows
|
e120697a9b
|
merge upstream/master into andrew/ragdoll
|
2014-09-03 15:49:32 -07:00 |
|
AndrewMeadows
|
bd55da4a83
|
Merge pull request #3335 from ZappoMan/virtualEntities
Model Server to Entity Server Refactoring
|
2014-09-03 15:48:58 -07:00 |
|
Andrzej Kapolka
|
a02656070f
|
Added some comments.
|
2014-09-03 14:43:11 -07:00 |
|