Andrzej Kapolka
181670f5d7
Fixes for parsing FBX text encoding.
2014-01-30 12:53:02 -08:00
Andrzej Kapolka
a7ebcf5a96
Layout fix.
2014-01-30 11:24:24 -08:00
Andrzej Kapolka
1bcf12ed3d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-30 11:15:42 -08:00
Andrzej Kapolka
8df4e884e4
Fix box color on hovering.
2014-01-30 11:15:03 -08:00
Andrew Meadows
524b92eeb0
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-01-30 09:56:48 -08:00
Stephen Birarda
84ef757af4
fix avatar count, HandData crash ( closes #1754 )
2014-01-30 09:45:09 -08:00
Andrew Meadows
4f6cadeab8
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-01-30 09:32:35 -08:00
Andrew Meadows
4b8e1f270f
Adding preliminary/temporary code for testing hand-vs-avatar collisions.
2014-01-30 09:31:07 -08:00
Andrew Meadows
f3f1539111
Splitting avatar collision check in two: vs hands and vs skeleton.
2014-01-30 09:28:21 -08:00
ZappoMan
ed0a2a5a18
Merge branch 'master' of https://github.com/worklist/hifi into scripting_work
...
Conflicts:
libraries/shared/src/SharedUtil.cpp
libraries/shared/src/SharedUtil.h
libraries/voxels/src/VoxelEditPacketSender.cpp
2014-01-29 19:49:36 -08:00
ZappoMan
c58f44f54a
Merge pull request #1735 from AndrewMeadows/fix-particle-avatar-collisions
...
Fix crash on shutdown caused by duplicate delete on a QObject
2014-01-29 17:54:23 -08:00
ZappoMan
08b06cc59c
support for global collision callbacks in JS
2014-01-29 17:52:17 -08:00
Andrzej Kapolka
64df9718f2
Working on object attributes.
2014-01-29 16:36:44 -08:00
Andrew Meadows
570b872eda
Removing build warning about out-of-order initialization in class ctor.
2014-01-29 14:43:01 -08:00
Andrew Meadows
b2d60ec1f8
Fixing iteration through list of avatars.
2014-01-29 14:36:22 -08:00
Andrew Meadows
f093a571c5
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Avatar.cpp
libraries/particles/src/ParticleCollisionSystem.cpp
libraries/shared/src/CollisionInfo.h
2014-01-29 14:12:22 -08:00
Andrzej Kapolka
e99b7ea92c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
interface/src/MetavoxelSystem.cpp
2014-01-29 13:34:19 -08:00
Andrzej Kapolka
4c70af51e8
Expand data automatically to encompass edits.
2014-01-29 13:30:54 -08:00
Andrew Meadows
82a4b7a4d1
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
...
Conflicts:
interface/src/Application.cpp
2014-01-29 13:20:42 -08:00
Stephen Birarda
33edcea5fb
resolve conflicts on merge with upstream master
2014-01-29 12:23:06 -08:00
Andrew Meadows
d757f20d22
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
...
Conflicts:
interface/src/Application.cpp
2014-01-29 11:41:39 -08:00
ZappoMan
616cfac293
fix init bug
2014-01-29 11:21:45 -08:00
Andrzej Kapolka
69a727c3e1
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-29 11:14:48 -08:00
Andrew Meadows
43f965c90a
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
2014-01-29 09:25:00 -08:00
ZappoMan
b36cc0bcf9
removed old cruft around mousePitch in Head and unified pitch
2014-01-29 02:09:49 -08:00
ZappoMan
98cdc656c4
more scripting support, including adding a Quat helper class that makes JS quat math easier
2014-01-29 00:56:08 -08:00
ZappoMan
434756a40f
removed some dead comments
2014-01-28 20:40:00 -08:00
ZappoMan
bcc7cfb15e
removed some debug
2014-01-28 20:38:47 -08:00
ZappoMan
9d87d58723
Merge branch 'master' of https://github.com/worklist/hifi into more_scripting
...
Conflicts:
libraries/particles/src/ParticlesScriptingInterface.cpp
2014-01-28 20:36:35 -08:00
ZappoMan
305e69def6
really get controller key, mouse, etc scripting working
2014-01-28 19:47:45 -08:00
Andrew Meadows
677341d207
fix for crash bug #1728 .
...
Moving _myAvatr to live in AvatarManager. Application still has a
pointer to it. Unfortunately the order of Application initialization
and destruction matters very much.
2014-01-28 18:04:42 -08:00
Andrzej Kapolka
674bc70223
Offset adjustment.
2014-01-28 15:50:13 -08:00
Andrzej Kapolka
f435f61467
Start the grid position off roughly at our feet.
2014-01-28 15:46:02 -08:00
Andrzej Kapolka
b6a15ea6c5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-01-28 15:12:32 -08:00
Andrzej Kapolka
e10ab8d546
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-28 15:10:34 -08:00
ZappoMan
5addc35cd8
hacking on controller events
2014-01-28 14:58:08 -08:00
Andrew Meadows
714dbf8493
Moving MY_AVATAR_KEY back into AvatarManager.cpp
2014-01-28 14:37:32 -08:00
Andrew Meadows
f972bfd024
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
...
Conflicts:
interface/src/avatar/AvatarManager.cpp
2014-01-28 14:30:59 -08:00
Andrew Meadows
1cc992a7f8
import --> include
2014-01-28 14:18:21 -08:00
Andrew Meadows
167acb8873
Adding avatars back into ParticleCollisionSystem.
...
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
2014-01-28 14:16:34 -08:00
Stephen Birarda
423e1598f0
use NodeSet in place of QSet<NodeType_t> where possible
2014-01-28 13:41:39 -08:00
Stephen Birarda
4de270b832
cleanup Node types, closes #1726
2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3
replace uint64_t with quint64 for Qt friendlyness
2014-01-28 12:35:42 -08:00
Stephen Birarda
3a706a2759
repair the count of avatars and servers
2014-01-28 12:31:25 -08:00
Stephen Birarda
2aaa9ce3f6
resolve conflicts on merge with upstream master
2014-01-28 12:30:43 -08:00
Stephen Birarda
b009cd8e67
repair more node communication problems after refactor
2014-01-28 12:25:44 -08:00
Andrzej Kapolka
cf05cf6178
Didn't need to disable depth writes after all (for now).
2014-01-28 12:03:41 -08:00
Andrzej Kapolka
3edb81baf4
Check for texture translucency, render translucent mesh parts after opaque
...
ones, without alpha testing, and with back face culling enabled.
2014-01-28 12:01:32 -08:00
ZappoMan
64afd17d14
include particle radius in model scaling
2014-01-28 11:49:11 -08:00
ZappoMan
dc25868403
cleanup
2014-01-28 11:26:55 -08:00
Andrzej Kapolka
d3dc43e853
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-28 11:12:30 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
Andrew Meadows
ade02c0259
Bug fix: update ALL avatars in the AvatarManager (rather than just one).
...
Reviewed with Birarda and pushed directly to upstream.
2014-01-28 09:32:58 -08:00
ZappoMan
1681dbb57b
Merge branch 'master' of https://github.com/worklist/hifi into particle_meshes
2014-01-28 09:26:54 -08:00
ZappoMan
568d5bc05d
first cut at particle meshes
2014-01-28 09:26:47 -08:00
Andrew Meadows
c4f429dcd0
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
2014-01-27 18:05:39 -08:00
Andrew Meadows
2b5675b077
Fix issue #1684 : particles collide against avatars again.
...
This a quick and dirty fix to resurrect particle-avatar collisions.
We rebuild and pass a list of AvatarData* to the
ParticleCollisionManager every call to update().
2014-01-27 18:01:53 -08:00
Andrzej Kapolka
9a892ea51a
Let's actually close our sessios on exit.
2014-01-27 17:03:35 -08:00
Andrzej Kapolka
1e4bfffdd8
Retain a shared node pointer, use the active socket. Fixed a compile warning.
2014-01-27 16:41:25 -08:00
Andrzej Kapolka
fbcd4cf363
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-27 15:50:45 -08:00
Andrzej Kapolka
d5695395c4
Basic editing with delta streaming up and running.
2014-01-27 15:49:50 -08:00
ZappoMan
f2cfb1634b
Merge pull request #1717 from stojce/19483
...
2nd Code Review for Job #19483
2014-01-27 14:23:39 -08:00
ZappoMan
5e4813ab11
more work on allowing for local particle trees
2014-01-27 13:50:05 -08:00
stojce
3fde4078c5
ignore double-click on disabled items
2014-01-27 21:48:26 +01:00
stojce
4d1992485f
removed unused QSound reference
2014-01-27 21:17:17 +01:00
stojce
c82a8a152e
Set JPG quality to 100
2014-01-27 20:59:46 +01:00
stojce
40ea552981
filename format changes
...
- new wav file
- changed filename format
2014-01-27 20:35:06 +01:00
stojce
74801da07f
#19491 - Implement in-app snapshots
2014-01-27 18:07:03 +01:00
ZappoMan
62b7e6e58d
implement local edits in ParticleScriptingInterface
2014-01-27 09:00:34 -08:00
Andrzej Kapolka
adc747fa93
Streaming fix.
2014-01-26 16:06:11 -08:00
Andrzej Kapolka
1ef6f5f7b3
MetavoxelDataPointer -> MetavoxelData, grid spacing as power of 2.
2014-01-26 13:23:10 -08:00
stojce
dcdbf729c9
importing file w/ double click
2014-01-26 17:57:21 +01:00
stojce
ef39d019ac
Voxel import fix
2014-01-26 16:28:21 +01:00
ZappoMan
c17476c985
Merge pull request #1683 from kordero/19487
...
Code Review for Job #19487
2014-01-25 12:25:44 -08:00
Lucas Crisman
28d6171be5
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-25 11:24:51 -03:00
Lucas Crisman
f56e4b0820
build error fix
2014-01-25 11:24:33 -03:00
stojce
b8db07be5f
CR fixes
2014-01-25 12:08:20 +01:00
stojce
f4698065ce
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-25 07:39:17 +01:00
Andrzej Kapolka
f61648c848
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-24 16:04:05 -08:00
Andrzej Kapolka
7f20750e80
Working on sending edits.
2014-01-24 16:03:25 -08:00
ZappoMan
f02bc95908
clear particles when switching domains
2014-01-24 11:07:27 -08:00
Lucas Crisman
3b767fff04
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-24 15:13:27 -03:00
Lucas Crisman
759448bef7
resolving reverted change on last merge
2014-01-24 15:13:14 -03:00
Lucas Crisman
cece4add27
Merge branch 'master' of git://github.com/worklist/hifi into 19487
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-01-24 15:01:24 -03:00
Brad Hefta-Gaub
0c891ddfa8
Merge branch 'master' of https://github.com/ZappoMan/hifi
2014-01-24 09:55:52 -08:00
AndrewMeadows
ea681f0d8f
Merge pull request #1669 from birarda/avatar-list
...
add an AvatarManager to house a separate list of Avatars from NodeList
2014-01-24 09:54:17 -08:00
Brad Hefta-Gaub
692358bf6e
fix windows builds
2014-01-24 09:51:17 -08:00
Stephen Birarda
9d71671a52
add extra debugging to packet mismatch
2014-01-24 09:10:27 -08:00
Lucas Crisman
482c501f3b
stats reduction on mirror enabled
2014-01-24 10:35:03 -03:00
Lucas Crisman
ef107e0a54
timer positioning when toggling BandwithMeter
2014-01-24 08:14:26 -03:00
Lucas Crisman
43d1678d18
position/sizes tweaks / moving stats and osciloscope when mirror is ON
2014-01-24 07:56:01 -03:00
Lucas Crisman
c3aa8167d6
click on stats to expand/contract them
2014-01-24 07:18:45 -03:00
Lucas Crisman
a2f8a61a69
stats font & color changes, styling audio & bandwidth meters
2014-01-24 05:06:55 -03:00
stojce
afa7a429b9
Fixing build after merge
2014-01-24 07:41:53 +01:00
stojce
0c2e55a53b
Merging with master
...
- resolve conflicts on GeometryCache
2014-01-24 07:31:22 +01:00
Lucas Crisman
0a94488b22
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-24 01:39:59 -03:00
Andrzej Kapolka
f73f16b0fb
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-23 18:12:52 -08:00
Andrzej Kapolka
c4254cd423
Fix OS X warning.
2014-01-23 18:08:45 -08:00
Andrzej Kapolka
4414c91f1e
Working on streaming edits.
2014-01-23 18:05:04 -08:00
Stephen Birarda
10cfd628aa
resolve conflicts on merge with upstream master
2014-01-23 17:52:30 -08:00
Stephen Birarda
2aac064a67
increase debug for Avatar removal from AvatarManager
2014-01-23 17:44:06 -08:00
Stephen Birarda
b495e6251d
add a weak pointer to the avatar mixer that owns the avatar
2014-01-23 17:39:14 -08:00
Lucas Crisman
f818b07dc8
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-23 22:18:33 -03:00
Stephen Birarda
3a127556e8
put back the important Avatar destructor
2014-01-23 17:10:24 -08:00
Stephen Birarda
8d2e9823de
remove notion of owning node from NodeData
2014-01-23 17:06:03 -08:00
Stephen Birarda
820132cb45
cleanup debug and Avatar destructor
2014-01-23 16:47:18 -08:00
Andrew Meadows
c33a437393
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-01-23 16:44:41 -08:00
AndrewMeadows
6120416cbb
Merge pull request #1627 from ey6es/metavoxels
...
Basic metavoxel editing interface (doesn't actually perform any edits yet).
2014-01-23 16:37:22 -08:00
Stephen Birarda
7762ea9f94
repair calls to broadcast to nodes
2014-01-23 16:28:35 -08:00
Andrew Meadows
afa1134282
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-01-23 16:24:43 -08:00
Andrzej Kapolka
e80eb03ba9
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
interface/src/Application.cpp
2014-01-23 16:13:42 -08:00
Stephen Birarda
4ebd5795fc
handle merge with nodelist-patches branch
2014-01-23 16:01:52 -08:00
Stephen Birarda
80106979a5
replace packetSenderNotify with signal/slot combo
2014-01-23 15:55:36 -08:00
Stephen Birarda
349c790cc7
NodeData cleanup thanks to separation from rendered avatars
2014-01-23 15:41:40 -08:00
Stephen Birarda
ed9118fd67
more NodeList QSet changes, closes #1660
2014-01-23 15:28:46 -08:00
Stephen Birarda
c432a34cfb
fix rendering of Avatars
2014-01-23 14:51:29 -08:00
Stephen Birarda
9ab1fc4c2c
resolve conflicts on merge with upstream/master
2014-01-23 14:43:04 -08:00
Stephen Birarda
2e548fb39c
complete migration of Avatar list to AvatarManager
2014-01-23 14:41:11 -08:00
Stephen Birarda
1f95d0c017
have avatar-mixer report avatar kills to all avatars
2014-01-23 12:47:27 -08:00
Philip Rosedale
f0417d187f
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-23 12:40:56 -08:00
Stephen Birarda
a9f1984676
add an AvatarManager that will keep Avatars in Application thread
2014-01-23 11:59:24 -08:00
Andrzej Kapolka
61d97454d7
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-23 11:54:08 -08:00
Andrzej Kapolka
b32b0a495a
Remove eyes' hovering on mouse avatar, voxels. Closes #1643 .
2014-01-23 11:49:34 -08:00
Philip Rosedale
c882104046
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-23 11:43:08 -08:00
Philip Rosedale
5e77f5643d
Merge pull request #1630 from birarda/nodelist-set
...
change node types of interest to a QSet
2014-01-23 11:42:37 -08:00
Philip Rosedale
d34bb53d53
Merge pull request #1657 from birarda/master
...
more NL repairs for concurrency issues, fix audio starve display
2014-01-23 11:41:34 -08:00
Philip Rosedale
8bba7b65eb
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-23 11:23:53 -08:00
Andrzej Kapolka
b5cba2786e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-23 11:21:07 -08:00
Andrzej Kapolka
4e3988f843
Have the drag-out box show up in the selected color.
2014-01-23 11:20:07 -08:00
Stephen Birarda
c54eacbf36
make sure starve is displayed even if ring buffer just received data
2014-01-23 11:15:21 -08:00
Stephen Birarda
24bed09473
DatagramProcessor need not be a pointer in Application
2014-01-23 11:13:03 -08:00
Stephen Birarda
b5a72ef669
more nodelist repairs for concurrency issues
2014-01-23 11:11:22 -08:00
Andrew Meadows
c9c6c99fa2
Merge branch 'master' of ssh://github.com/highfidelity/hifi into hand-vs-avatar
2014-01-23 10:58:28 -08:00
Andrew Meadows
fa3c3448f4
Adding option to disable hand collisions against their own avatar.
2014-01-23 10:55:51 -08:00
Lucas Crisman
95837b89c0
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-23 15:54:14 -03:00
Andrzej Kapolka
a5b0fe38ec
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-23 10:52:03 -08:00
Philip Rosedale
89414eb8f2
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-23 10:47:18 -08:00
Stephen Birarda
7efc9e2e78
move datagram processing back to separate thread
2014-01-23 10:32:23 -08:00
Andrew Meadows
2b5df3d512
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-01-23 08:53:42 -08:00
Philip Rosedale
11eaef6887
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-22 19:29:03 -08:00
Andrzej Kapolka
a3ffb1d8a3
Working on performing the actual edit.
2014-01-22 19:17:48 -08:00
Stephen Birarda
33257fc785
add debugging for UUID owner change on NodeList
2014-01-22 17:42:52 -08:00
Philip Rosedale
6c02a923a9
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-22 17:41:51 -08:00
Stephen Birarda
454a1cc6c9
only set UUID when not null, properly send UUID from data-server
2014-01-22 17:33:17 -08:00
Andrew Meadows
847503e437
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-01-22 17:00:55 -08:00
Philip Rosedale
9d3093ba2a
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-22 17:00:09 -08:00
Stephen Birarda
5214d53872
call UUID setter in Profile UUID update so it updates NodeList
2014-01-22 16:49:36 -08:00
Andrzej Kapolka
d082cfd705
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-22 16:35:04 -08:00
Philip Rosedale
bacfa15065
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-22 16:35:01 -08:00
Andrzej Kapolka
4c07d61257
Get value from editor.
2014-01-22 16:34:48 -08:00
Andrew Meadows
556526316f
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/avatar/Hand.h
libraries/particles/src/ParticleCollisionSystem.cpp
2014-01-22 16:21:49 -08:00
Stephen Birarda
ec04d5450b
Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set
2014-01-22 16:16:47 -08:00
Stephen Birarda
f4f828ab72
Merge pull request #1629 from ZappoMan/juridiction_improvements
...
Change JurisdictionListener and JurisdictionSender to not require virtual base class
2014-01-22 16:16:24 -08:00
Andrew Meadows
e4e495889d
added initial avatar-avatar collision stub
2014-01-22 16:06:49 -08:00
Andrzej Kapolka
ff4795d9a5
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-22 15:59:02 -08:00
Andrzej Kapolka
ba8791274f
Remove test script for now, working on actual edits.
2014-01-22 15:58:41 -08:00
stojce
becbd4cb1c
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-23 00:54:05 +01:00
ZappoMan
29ce6db285
Merge pull request #1628 from birarda/dialog-fix
...
updates to UpdateDialog ui loading
2014-01-22 15:31:28 -08:00
ZappoMan
e19c7e12b5
Merge pull request #1625 from birarda/logger-deadlock
...
fix LogDialog deadlock
2014-01-22 15:30:29 -08:00
stojce
7c4784bfbc
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-23 00:07:17 +01:00
Stephen Birarda
abddb969a5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-01-22 14:47:44 -08:00
Stephen Birarda
e9e2557576
change node types of interest to a QSet
2014-01-22 14:47:04 -08:00
Andrzej Kapolka
e545cfe406
Fix for planes not at the origin.
2014-01-22 14:33:47 -08:00
Stephen Birarda
6937ce035a
restore functionality of shouldSkipVersion
2014-01-22 14:25:06 -08:00
Brad Hefta-Gaub
85363f6603
Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements
2014-01-22 14:23:00 -08:00
Stephen Birarda
a0b859a8e3
remove unneeded includes in UpdateDialog
2014-01-22 14:19:57 -08:00
Andrzej Kapolka
e552134cf5
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
interface/src/Application.cpp
2014-01-22 14:19:26 -08:00
Stephen Birarda
d2e02c15d8
repair the UpdateDialog so it is a QDialog with no child QWidget
2014-01-22 14:17:56 -08:00
Philip Rosedale
5e4fad2476
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-22 14:17:15 -08:00
Brad Hefta-Gaub
6e9e21051d
first cut at move JurisdicionListener and JuridictionSender into non-mulitply derived classes
2014-01-22 14:05:31 -08:00
Andrzej Kapolka
c6deb0c450
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-22 13:58:44 -08:00
Andrzej Kapolka
f2cfd868a6
MetavoxelEditorDialog -> MetavoxelEditor.
2014-01-22 13:57:59 -08:00
Andrzej Kapolka
064f0cd3ab
Basic drag-out behavior for metavoxel editing.
2014-01-22 13:55:14 -08:00
Stephen Birarda
fb0f28cd7c
fix LogDialog deadlock by removing unneeded mutex, closes #1624
2014-01-22 13:46:37 -08:00
Lucas Crisman
cba616e6f2
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-22 18:36:41 -03:00
Andrew Meadows
09b2d4aa78
Added menu options for more detailed collision preferences.
2014-01-22 13:34:13 -08:00
Philip Rosedale
d068b668d8
add marker spheres at 1 meter away from origin for better avatar size testing
2014-01-22 12:48:10 -08:00
Lucas Crisman
a94fbe3ff5
voxels stats fixes
2014-01-22 17:42:34 -03:00
Stephen Birarda
a9ce6c7467
use NodeList ownerUUID for DataServerScriptingInterface, fix double UUID send
2014-01-22 12:00:26 -08:00
Stephen Birarda
d57aec9793
don't use separate NodeList owner UUID and Avatar UUID
2014-01-22 11:48:04 -08:00
Lucas Crisman
d86aa227a4
UI stats improvements: first cut
2014-01-22 16:42:09 -03:00
Brad Hefta-Gaub
aacad00791
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
...
Conflicts:
interface/src/Application.cpp
2014-01-22 11:16:21 -08:00
Stephen Birarda
42c6498fe4
add debugging for mesh and skeleton changes for other Avatars
2014-01-22 11:11:38 -08:00
Andrzej Kapolka
15021b6ebc
More work on metavoxel editing (track mouse ray intersection with grid).
2014-01-22 11:11:12 -08:00
Andrew Meadows
c40d93ddce
Fixing elasticity to range [0,1] during collisions.
2014-01-22 10:40:37 -08:00
stojce
7b1e64593c
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-22 18:41:00 +01:00
Brad Hefta-Gaub
74fe9893ba
make tipVelocity() world relative
2014-01-22 09:17:42 -08:00
Stephen Birarda
6b44172467
hook the user's avatar object into the Interface ScriptEngine
2014-01-22 09:13:25 -08:00
Brad Hefta-Gaub
fe5a8d9da2
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
...
Conflicts:
libraries/shared/src/PacketHeaders.cpp
2014-01-21 20:21:22 -08:00
Andrzej Kapolka
0a3d6ae5e0
More work on metavoxel editing (grid, etc.)
2014-01-21 19:31:56 -08:00
Andrzej Kapolka
d473b002a8
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-21 17:20:24 -08:00
Andrzej Kapolka
230b66680f
More work on the editor.
2014-01-21 17:20:12 -08:00
Stephen Birarda
8df40b5d60
clearly init the skeleton URL in profile
2014-01-21 17:07:40 -08:00
Stephen Birarda
105fb42b34
rewrite mesh and skeleton requests from data-server
2014-01-21 16:46:04 -08:00
Andrzej Kapolka
5b4447d0b9
More work on metavoxel editing.
2014-01-21 16:17:31 -08:00
Stephen Birarda
f13aa322fc
resolve conflicts in merge with upstream/master
2014-01-21 16:01:12 -08:00
Brad Hefta-Gaub
90c841ff01
add findClosestParticle() to JS interface
2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
03a9253748
remove usage of ParticleEditHandle from application
2014-01-21 14:07:46 -08:00
Andrew Meadows
da0d2c4776
Removing unecessary #include.
2014-01-21 14:00:16 -08:00
stojce
19c4b2b2ec
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-21 22:51:32 +01:00
Brad Hefta-Gaub
97b0ed2cc5
implemented support for PACKET_TYPE_PARTICLE_ERASE
2014-01-21 13:24:35 -08:00
Stephen Birarda
e08f4d2eba
more DataServerClient API tweaks
2014-01-21 13:13:57 -08:00
Andrzej Kapolka
d9589cd898
Starting on metavoxel editor dialog.
2014-01-21 11:43:15 -08:00
Andrzej Kapolka
5e908134ea
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-21 11:05:00 -08:00
Andrew Meadows
2a2f2f2da0
Remove debug cruft.
2014-01-21 10:45:43 -08:00
Andrew Meadows
e02c7bed18
Removing a magic number and collapsing two identical variables that hard-code the number of hands.
2014-01-21 10:11:20 -08:00
Stephen Birarda
3613773b79
cleanup DSC api, add scripting interface
2014-01-21 09:55:06 -08:00
Leonardo Murillo
a4c057b01f
PR fix
2014-01-21 11:27:03 -06:00
Leonardo Murillo
18a6d74165
removing comment
2014-01-21 11:24:23 -06:00
Leonardo Murillo
b2ef07f485
PR Fixes
2014-01-21 11:17:43 -06:00
Leonardo Murillo
cc147bc8bf
PR fixes
2014-01-21 10:39:29 -06:00
Leonardo Murillo
b972d4260c
PR Fixes
2014-01-21 10:31:16 -06:00
Leonardo Murillo
a9c294099e
Merge branch 'master' of github.com:/worklist/hifi
2014-01-21 10:00:00 -06:00
ZappoMan
6fd4903672
Merge pull request #1599 from hifialanwu/master
...
#19488 scripts save on exit and load on entry
2014-01-21 02:20:57 -08:00
Brad Hefta-Gaub
347933f1a5
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
...
Conflicts:
libraries/particles/src/Particle.cpp
libraries/particles/src/ParticleCollisionSystem.cpp
libraries/particles/src/ParticleTreeElement.cpp
2014-01-21 02:15:46 -08:00
aw
0eed041deb
scripts save on exit and load on entry
2014-01-20 22:58:01 -08:00
Brad Hefta-Gaub
3bcd02f8e3
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
...
Conflicts:
libraries/shared/src/PacketHeaders.cpp
2014-01-20 20:25:52 -08:00
Andrzej Kapolka
bf9fc65de4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-20 17:40:16 -08:00
Andrew Meadows
b0edc7ee6f
Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes-2
2014-01-20 17:39:41 -08:00
Stephen Birarda
d9ae27953b
move DataServerClient to shared for use in other targets
2014-01-20 17:12:52 -08:00
Stephen Birarda
80fcc87437
some spacing fixes in Profile
2014-01-20 17:09:03 -08:00
Stephen Birarda
0ac5ec0690
hook old data server functionality through profile
2014-01-20 17:05:31 -08:00
Stephen Birarda
cf40fb0ef8
repairs to new Qt'ed DataServer and DataServerClient
2014-01-20 16:55:14 -08:00
stojce
2b2ebea80b
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-21 00:59:05 +01:00
Stephen Birarda
d405d31edf
add data-server to hifi repo, abstract DataServerClient
2014-01-20 14:42:50 -08:00
Andrzej Kapolka
804ce83fa6
Get the base position/orientation directly from the avatar to prevent
...
jerkiness when flying with the Hydra. Also, restore arm lengths when the
Hydra becomes inactive.
2014-01-20 13:44:41 -08:00
Brad Hefta-Gaub
b4b3720fcf
move creatorTokenID management into Particle static members
2014-01-20 12:56:35 -08:00
Andrzej Kapolka
81ab68a529
Store hand position relative to body orientation/position.
2014-01-20 12:44:09 -08:00
stojce
c785ecf5ed
fixed file deselection
2014-01-20 21:43:43 +01:00
Andrew Meadows
61e1b25e70
ParticleTreeElement::_particles is now a QList<> instead of std::vector<> for faster erase()
2014-01-20 12:43:27 -08:00
Brad Hefta-Gaub
bc2830d0d3
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
...
Conflicts:
libraries/particles/src/ParticleCollisionSystem.cpp
2014-01-20 10:55:34 -08:00
Leonardo Murillo
3036142a38
Removing comments
2014-01-20 11:55:10 -06:00
Leonardo Murillo
04970be8a2
Removing comments
2014-01-20 11:52:26 -06:00
Leonardo Murillo
c9f2db1f90
Merge branch 'master' of github.com:/worklist/hifi
2014-01-20 11:51:29 -06:00
Leonardo Murillo
f6bc7a2c4b
I think last fixes
2014-01-20 11:51:17 -06:00
stojce
62e9459c12
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-20 18:32:57 +01:00
ZappoMan
17abbc4715
Merge pull request #1586 from PhilipRosedale/master
...
Clap script and better bird sounds
2014-01-20 09:06:28 -08:00
Leonardo Murillo
825c64e1d0
Anything obviously wrong?
2014-01-20 10:57:10 -06:00
stojce
f01c2fb935
deselect selected file; close dialog after import
2014-01-19 23:20:47 +01:00
stojce
daffadbac4
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-19 13:59:20 +01:00
Leonardo Murillo
3d5d02d5b0
Some more changes
2014-01-18 20:33:29 -06:00
Leonardo Murillo
7748002db7
More PR related changes
2014-01-18 20:27:56 -06:00
Leonardo Murillo
cd9f2fd240
Pull Request fixes
2014-01-18 20:17:47 -06:00
Leonardo Murillo
865045aae7
Merge branch 'master' of github.com:/worklist/hifi
2014-01-17 19:24:54 -06:00
Philip Rosedale
2fe666aa63
Merge pull request #1583 from birarda/nodelist-container
...
NodeList container repairs
2014-01-17 17:23:16 -08:00
Andrzej Kapolka
341f60da76
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-01-17 17:10:46 -08:00
Philip Rosedale
4547f07739
added fountain script
2014-01-17 17:10:15 -08:00
Andrzej Kapolka
470b83a55b
Got the sign backwards.
2014-01-17 17:04:22 -08:00
Andrzej Kapolka
765f98fadc
Remove unused variables, change orbit pitch behavior ( closes #1582 ).
2014-01-17 17:00:03 -08:00
Philip Rosedale
08c49bb68f
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-17 16:54:48 -08:00
Philip Rosedale
317af4c927
Merge pull request #1585 from AndrewMeadows/paddle-fixes
...
Paddle fixes
2014-01-17 16:50:10 -08:00
Andrew Meadows
0921999c3b
Removing menu option for where to hold the ball -- we always hold from the finger tip (approximately).
2014-01-17 16:37:44 -08:00
Andrew Meadows
6c6a59b252
Hand now holds a ball a bit forward, which prevents the body from colliding with the ball on throw.
2014-01-17 16:36:50 -08:00
Andrew Meadows
aac1764243
Re-enabling particle-avatar collisions.
2014-01-17 16:30:07 -08:00
Stephen Birarda
594165782a
repair badly scoped usage of QMutexLocker
2014-01-17 16:20:22 -08:00
Stephen Birarda
99cd6c8ce8
remove two unused variable warnings
2014-01-17 16:04:04 -08:00
Brad Hefta-Gaub
99f9ae9d3a
implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash
2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
1e0f1adb16
added lifetime to particles
2014-01-17 14:59:40 -08:00
Leonardo Murillo
91defcfd03
Merge branch 'master' of github.com:/worklist/hifi
2014-01-17 16:28:30 -06:00
Brad Hefta-Gaub
d4331db45a
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
...
Conflicts:
examples/gun.js
libraries/script-engine/src/ScriptEngine.cpp
2014-01-17 13:29:36 -08:00
ZappoMan
bb41fe6ddb
Merge pull request #1573 from stojce/19484
...
Code Review for Job #19484
2014-01-17 13:25:59 -08:00
Leonardo Murillo
a13d7b084f
Removing comment
2014-01-17 14:39:48 -06:00
Leonardo Murillo
99275dadd4
PR Changes
2014-01-17 14:39:34 -06:00
Leonardo Murillo
ff6a9b2052
PR fix
2014-01-17 14:05:38 -06:00
Leonardo Murillo
a4efe55bbf
changing dev version
2014-01-17 14:02:57 -06:00
stojce
99feb36d19
Merge branch 'master' of https://github.com/worklist/hifi into 19484
2014-01-17 20:57:23 +01:00
stojce
01b9bd61ad
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-17 20:56:40 +01:00
Leonardo Murillo
9582fadef4
Last changes
2014-01-17 13:44:03 -06:00
Atlante45
08de50f578
Fixed mouseVoxel getting resized all the time when flying over smaller voxel
2014-01-17 20:36:43 +01:00
Leonardo Murillo
93e4dc7d5a
PR Changes
2014-01-17 13:35:49 -06:00
Leonardo Murillo
e0761db6d1
Merge branch 'master' of github.com:/worklist/hifi
2014-01-17 13:35:18 -06:00
Philip Rosedale
f677198cc8
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-17 11:28:43 -08:00
Andrew Meadows
48796231ef
Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes
2014-01-17 11:26:04 -08:00
Andrew Meadows
f08e639cb2
fixes for avatar paddle-hands, plus some hackery for demo
2014-01-17 11:22:50 -08:00
Leonardo Murillo
82ecc9cc36
Merge branch 'master' of github.com:/worklist/hifi
2014-01-17 13:06:59 -06:00
Leonardo Murillo
b8aaf4e813
CR fixes
2014-01-17 13:06:54 -06:00
Andrzej Kapolka
7a4353428e
Fixed eye rotations.
2014-01-17 11:05:26 -08:00
stojce
4c77d9f1d2
fixing bad merge
2014-01-17 20:01:49 +01:00
Andrzej Kapolka
515cc5316c
Get rid of code to decay pitch on movement.
2014-01-17 10:54:44 -08:00
stojce
13f223ff12
Merge branch 'master' of https://github.com/worklist/hifi into 19484
2014-01-17 19:46:44 +01:00
stojce
36d21e812d
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-17 19:46:02 +01:00
Philip Rosedale
0d838d2e73
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-17 08:50:36 -08:00
Andrzej Kapolka
7fcd1ccf29
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-01-16 17:06:55 -08:00
Andrzej Kapolka
0e7692dfea
When the mouse is hidden, just look straight forward.
2014-01-16 16:59:50 -08:00
Andrzej Kapolka
8c6c521b65
Merge branch 'master' of https://github.com/highfidelity/hifi into debone
2014-01-16 16:38:07 -08:00
Andrzej Kapolka
c93e70e3cb
Merge pull request #1563 from birarda/master
...
have muting also mute local loopback, NodeList tweak
2014-01-16 16:37:47 -08:00
stojce
669ab213ef
fixing merge
2014-01-17 00:08:25 +01:00
Philip Rosedale
a4f13e8bdd
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-16 15:01:57 -08:00
Andrzej Kapolka
2e3c597d40
Scooping out more head bits.
2014-01-16 15:01:24 -08:00
Stephen Birarda
0ddf9520dd
if audio is muted don't loopback local audio, fixes #1561
2014-01-16 14:55:09 -08:00
Brad Hefta-Gaub
1cfbfe6611
fix 3d mode switch on/off issue
2014-01-16 14:54:08 -08:00
Andrzej Kapolka
50d224661c
Pruning more avatar bits.
2014-01-16 14:47:39 -08:00
stojce
2e5a1e1823
Merge
2014-01-16 23:15:02 +01:00
stojce
631106beb7
Rename mute menu
2014-01-16 23:10:23 +01:00
Andrzej Kapolka
cf40e76767
Merge branch 'master' of https://github.com/highfidelity/hifi into debone
2014-01-16 13:55:28 -08:00
Stephen Birarda
c2148d2aea
Merge pull request #1554 from ZappoMan/bugfixes
...
Fix the issue with voxels randomly disappearing in the client
2014-01-16 13:55:11 -08:00
Andrzej Kapolka
813c31050a
Merge branch 'master' of https://github.com/highfidelity/hifi into debone
2014-01-16 13:54:55 -08:00
Andrzej Kapolka
865b495e6c
Merge branch 'master' of https://github.com/worklist/hifi into debone
...
Conflicts:
interface/src/Audio.cpp
interface/src/Menu.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Webcam.cpp
interface/src/devices/Webcam.h
interface/src/renderer/FBXReader.cpp
2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
a76f5a088c
fixed comment
2014-01-16 13:19:21 -08:00
Brad Hefta-Gaub
a960330f34
fix voxel randomly disappearing bug
2014-01-16 13:17:41 -08:00
Brad Hefta-Gaub
f3074c1fcc
Merge branch 'master' of git://github.com/worklist/hifi into generic_thread_fix
2014-01-16 12:55:55 -08:00
Brad Hefta-Gaub
76d5ef5bc6
removed dead code
2014-01-16 12:54:28 -08:00
Brad Hefta-Gaub
f97ab1dafe
fixes leak of GenericThread and also fixes crash in octree servers on client disconnect
2014-01-16 12:53:32 -08:00
Andrzej Kapolka
3f08504e3e
Replaced missing functionality.
2014-01-16 12:39:07 -08:00
Philip Rosedale
46bd677a4a
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-16 11:51:54 -08:00
Philip Rosedale
aa2ee2526e
name file correctly
2014-01-16 11:51:46 -08:00
Brad Hefta-Gaub
8034538f41
removed redundant embedded ifdefs
2014-01-16 11:20:09 -08:00
stojce
150a667cd6
WL job #19484
...
- Move 'Fly to voxel on click' menu item;
- add shortcut for muting audio ...
2014-01-16 20:17:04 +01:00
Stephen Birarda
75152abe2c
fix unused variable warnings and constructor ordering
2014-01-16 09:52:29 -08:00
stojce
a401d822a3
Merge
2014-01-16 18:39:21 +01:00
Andrew Meadows
1266ffd0ca
merge of windows-build
...
Conflicts:
domain-server/src/DomainServer.cpp
interface/src/Application.cpp
interface/src/Menu.cpp
libraries/avatars/src/AvatarData.h
libraries/shared/src/NodeList.h
2014-01-16 09:00:13 -08:00
Andrew Meadows
2e1c2f3a61
merge upstream with local repo
2014-01-15 17:13:59 -08:00
Stephen Birarda
d7388c2288
Merge pull request #1537 from ZappoMan/stephens_requests
...
added option to disable local cache file
2014-01-15 17:07:43 -08:00
ZappoMan
ec3699da3b
Merge pull request #1543 from birarda/master
...
perform a proper oculus teardown if it isn't present
2014-01-15 17:04:52 -08:00
Andrew Meadows
4e51aee00b
Merge latest upstream into local repo.
2014-01-15 17:04:33 -08:00
Andrew Meadows
4b94e53acf
Removing Model::findSpherePenetrationWithJoint() which was experimental method that was not finally used.
2014-01-15 17:02:02 -08:00
Andrew Meadows
989b733de6
Removing magic numbers, but still only supporting 2 hands (the SkeletonModel currently has two hands hardcoded).
2014-01-15 16:59:49 -08:00
Stephen Birarda
0f7d86a111
perform a proper oculus teardown if it isn't present
2014-01-15 16:52:03 -08:00
Stephen Birarda
a694425823
clarify output for star generation time
2014-01-15 16:26:01 -08:00
Andrzej Kapolka
2c7b6b9696
Skeleton removal checkpoint; compiles, but there are a few bits missing.
2014-01-15 15:14:50 -08:00
Brad Hefta-Gaub
f445a391b7
added back arpa/inet.h and ifaddrs.h for mac and unix
2014-01-15 15:03:03 -08:00
stojce
50ad5a4ec8
alternate css background settings for selected items in QTreeView
2014-01-15 23:38:34 +01:00
stojce
9244bd5717
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-15 23:14:58 +01:00
stojce
8e2879e5ff
Layout fixes
2014-01-15 23:14:45 +01:00
Andrew Meadows
32f3621855
merge upstream work into local repo
2014-01-15 14:13:48 -08:00
Andrew Meadows
235b6f0c36
Adding disk collision proxy for hand paddles.
2014-01-15 14:05:57 -08:00
Andrew Meadows
ee6a3263bc
Changing where the "hand palms" are drawn. Will back them up with collision proxies soon.
2014-01-15 14:02:17 -08:00
Leonardo Murillo
746b45d939
Moving ifdef to xml
2014-01-15 15:08:47 -06:00
Leonardo Murillo
9df1517f02
Merge branch 'master' of github.com:/worklist/hifi
2014-01-15 15:02:22 -06:00
Brad Hefta-Gaub
952365a1b7
clean up comments and tab spacing
2014-01-15 12:50:36 -08:00
Brad Hefta-Gaub
f1e98720d0
added option to disable local cache file
2014-01-15 12:29:54 -08:00
Brad Hefta-Gaub
477840904b
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
2014-01-15 12:09:26 -08:00
ZappoMan
dfb70ee397
Merge pull request #1527 from PhilipRosedale/master
...
New voxelBird example script
2014-01-15 12:07:39 -08:00
Philip Rosedale
bade957a21
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-15 11:18:45 -08:00
stojce
b17d4a3ec9
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-15 20:18:34 +01:00
Leonardo Murillo
1b687848d1
Unneeded include
2014-01-15 12:47:19 -06:00
Leonardo Murillo
f975c8ff69
Removing unneeded vars
2014-01-15 12:45:26 -06:00
Leonardo Murillo
f187ac0f98
Removing comment
2014-01-15 12:44:22 -06:00
Leonardo Murillo
dd2392f74b
Finishing changes
2014-01-15 12:40:56 -06:00
Leonardo Murillo
049be6a569
Finishing changes
2014-01-15 12:40:40 -06:00
Brad Hefta-Gaub
7bfda0d60e
removed pthread.h
2014-01-15 10:30:05 -08:00
Brad Hefta-Gaub
135cafb665
Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build
2014-01-15 10:21:40 -08:00
Brad Hefta-Gaub
170dbe6e85
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Lucas Crisman
73dfc5dd58
Merge branch 'master' of git://github.com/worklist/hifi into 19485
2014-01-15 14:50:59 -03:00
Lucas Crisman
24103740da
equal sign shortcut for Reset Avatar Size on Application keyPress Event
2014-01-15 14:50:25 -03:00
Leonardo Murillo
80946b10b3
Merge
2014-01-14 22:12:37 -06:00
Leonardo Murillo
f9bb98680d
Using Qt Designer .ui file instead of manually coding dialog
2014-01-14 21:57:28 -06:00
Brad Hefta-Gaub
eb55dd26e5
added glewInit
2014-01-14 19:18:01 -08:00
Philip Rosedale
a702c6a868
merge fix
2014-01-14 17:24:24 -08:00
Philip Rosedale
7f09aff297
Added voxelBird example script
2014-01-14 17:12:14 -08:00
Andrew Meadows
af3fae7bbf
Merge upsteam master into current project (experimental hand paddles)
...
Conflicts:
interface/src/avatar/Avatar.cpp
libraries/avatars/src/AvatarData.cpp
2014-01-14 16:39:46 -08:00
Andrzej Kapolka
7e4fcb43f2
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
2014-01-14 16:31:30 -08:00
Stephen Birarda
e76a37f48b
resolve conflicts on merge with upstream master
2014-01-14 16:26:02 -08:00
Andrzej Kapolka
617453da8c
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
2014-01-14 16:22:41 -08:00
Andrew Meadows
761fdc9d84
Adding methods to Model for accessing hand info and computing hand collisions.
2014-01-14 16:19:57 -08:00
Stephen Birarda
540378262d
Merge branch 'master' of https://github.com/worklist/hifi into domain-change
2014-01-14 16:19:37 -08:00
Andrzej Kapolka
242597bbda
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
2014-01-14 16:19:10 -08:00
Andrew Meadows
22679687c5
Minor cleanup: moved #include out of header and into cpp file.
2014-01-14 16:17:37 -08:00
Stephen Birarda
6b2f72f14d
repair reference to _targetScale in MyAvatar
2014-01-14 16:17:07 -08:00
Andrzej Kapolka
4c2b67f6f3
Fix compile error.
2014-01-14 16:16:06 -08:00
Stephen Birarda
599e3bb9e5
resolve conflicts on merge with upstream master
2014-01-14 16:15:58 -08:00
Andrew Meadows
a08b7b3fd8
Adding initial Agent::findSphereCollision() implementation and removing some debug log spam.
2014-01-14 16:15:41 -08:00
Stephen Birarda
77ee27e5d7
resolve conflicts on merge with upstream master
2014-01-14 16:12:42 -08:00
Andrzej Kapolka
96a88e194c
Merge branch 'master' of https://github.com/worklist/hifi into armstrong
2014-01-14 16:10:31 -08:00
Stephen Birarda
274989935d
resolve conflicts on merge with upstream master
2014-01-14 16:09:12 -08:00
Stephen Birarda
767a241105
Merge remote-tracking branch 'upstream/master' into nodelist-container
2014-01-14 16:08:58 -08:00
Stephen Birarda
8676ac38f9
foreach spacing and reference repairs
2014-01-14 15:54:09 -08:00
Andrzej Kapolka
5d88953f12
First cut at stretching the arms out and aligning forearms with wrists.
...
Closes #1423 , #1504 .
2014-01-14 15:27:28 -08:00
Stephen Birarda
4ea14a51fc
remove the SerialInterface
2014-01-14 13:14:15 -08:00
Stephen Birarda
987c639e36
initial newline removal from all QDebug calls
2014-01-14 13:09:22 -08:00
Stephen Birarda
bdc31a3b48
replace the DomainChangeListener class with a signal/slot combo
2014-01-14 11:38:05 -08:00
Stephen Birarda
9efb391ecf
repair crazy references to node ponter from old iterator style
2014-01-14 10:50:06 -08:00
Stephen Birarda
57f977668f
replace the Node mutex with a QMutex
2014-01-14 10:15:31 -08:00
Stephen Birarda
53d435006c
more follow mode cleanup, fix silent node iterator
2014-01-14 10:07:26 -08:00
Stephen Birarda
cbcdeb570b
pull all available datagrams in Application processDatagrams
2014-01-14 10:01:11 -08:00
Brad Hefta-Gaub
a39c20e4d4
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
2014-01-14 09:18:52 -08:00
Leonardo Murillo
4a4b483532
Resolving conflicts
2014-01-14 10:31:47 -06:00
Leonardo Murillo
24bedc90a7
Resolving conflicts
2014-01-14 10:30:52 -06:00
Andrzej Kapolka
c163b513d2
Working on allowing visitors to modify, as well as read, data.
2014-01-13 18:09:28 -08:00
Stephen Birarda
3ab7a6d9d5
move network packet processing to main thread
2014-01-13 17:58:48 -08:00
Stephen Birarda
7d1a64ca8c
change NodeList container to QHash with QSharedPointer
2014-01-13 17:09:21 -08:00
Andrzej Kapolka
ce03853da5
Merge branch 'master' of https://github.com/worklist/hifi into retryagain
2014-01-13 16:13:38 -08:00
Andrzej Kapolka
0694a7d4a5
When we fail to download textures or geometry, retry after steadily increasing
...
delays. Closes #1471 .
2014-01-13 16:09:36 -08:00
Brad Hefta-Gaub
3af4703230
Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build
2014-01-13 15:58:28 -08:00
Brad Hefta-Gaub
2217d79200
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
2014-01-13 15:57:52 -08:00
Brad Hefta-Gaub
e60446a632
more windows build work
2014-01-13 15:57:31 -08:00
Brad Hefta-Gaub
392ff94ebe
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
interface/src/DataServerClient.cpp
interface/src/avatar/MyAvatar.cpp
libraries/avatars/src/AvatarData.h
2014-01-13 15:06:26 -08:00
Andrzej Kapolka
f21436a29e
Fix (hopefully) for warning on Windows build.
2014-01-13 15:02:46 -08:00
Brad Hefta-Gaub
b947d1e80c
more surgical removal of WebCam with HAVE_LIBVPX
2014-01-13 15:00:15 -08:00
Andrzej Kapolka
9d831a2ab5
Orbit around voxel center, limit hover distance.
2014-01-13 14:43:59 -08:00
Brad Hefta-Gaub
b6b9ca881c
removed more LIBVPX code by ifdef
2014-01-13 14:43:50 -08:00
stojce
4cb84bf617
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-13 23:31:48 +01:00
stojce
06ecf03180
Layout fix (notes from Grayson)
2014-01-13 23:04:19 +01:00
Andrzej Kapolka
7abb7d9ccd
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-13 14:03:08 -08:00
Stephen Birarda
42e3bcfe91
allow fade scale to get smaller than minimum avatar scale
2014-01-13 13:52:41 -08:00
Andrzej Kapolka
2d5df38907
Persist the user orientation as well as the position, show up a couple meters
...
in front of (and facing) target. Closes #1367 .
2014-01-13 13:51:51 -08:00
Stephen Birarda
3f2c6504a6
fix for avatar scale bug, closes #1506
2014-01-13 12:27:47 -08:00
Brad Hefta-Gaub
83f62de69f
removed some openGL hacks from windowshacks.h because we don't need them with correct setup
2014-01-13 12:16:35 -08:00
Brad Hefta-Gaub
3f03145386
fix ordering and includes for oculusmanager and 3dtv
2014-01-13 10:11:08 -08:00
Leonardo Murillo
ca16acef6b
Checkpoint
2014-01-13 07:37:47 -06:00
Brad Hefta-Gaub
98efbade9b
clean up windowshacks.h
2014-01-13 01:09:29 -08:00
Brad Hefta-Gaub
a290017746
more type mismatch warning fixes
2014-01-13 00:46:43 -08:00
Brad Hefta-Gaub
55babbf7b6
windows type mismatch warning fixes
2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
08c9dfbea7
fixed windows warnings related to truncating char
2014-01-12 23:32:03 -08:00
Brad Hefta-Gaub
9ccaba3ca8
snprintf windows fixes
2014-01-12 23:26:13 -08:00
Brad Hefta-Gaub
9e24996f39
more isnan() hacks
2014-01-12 23:11:06 -08:00
Brad Hefta-Gaub
a3022f538d
more windows fixes
2014-01-12 23:08:01 -08:00
Brad Hefta-Gaub
d92d043e8f
more windows build fixes
2014-01-12 22:52:06 -08:00
Brad Hefta-Gaub
2017f850c4
more windows float warning and error fixes
2014-01-12 22:07:37 -08:00
Brad Hefta-Gaub
19012e2f6d
more windows build fixes isnan
2014-01-12 22:05:55 -08:00
Brad Hefta-Gaub
a8fc7f44c0
Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build
2014-01-12 21:47:19 -08:00
Brad Hefta-Gaub
32792a8e66
move windowshacks
2014-01-12 21:46:55 -08:00
Brad Hefta-Gaub
2d8b2b2530
clean up windows warnings
2014-01-12 21:36:55 -08:00
Brad Hefta-Gaub
a94e371e5c
fix more windows warnings
2014-01-12 21:27:25 -08:00
Brad Hefta-Gaub
c90c1e4063
more LIBVPX workarounds
2014-01-12 19:59:17 -08:00
Brad Hefta-Gaub
ff72e25a34
more windows build work
2014-01-12 15:31:06 -08:00
Brad Hefta-Gaub
08bb783777
more windows build work
2014-01-12 14:49:15 -08:00
Brad Hefta-Gaub
8d7cb5d0be
add HAVE_LIBVPX around webcam implementation
2014-01-11 23:00:17 -08:00
Brad Hefta-Gaub
c7ec767565
near/far apparently don't work as variables in windows
2014-01-11 22:38:08 -08:00
Brad Hefta-Gaub
b0e913bfce
add Audio back to win32
2014-01-11 22:30:55 -08:00
Brad Hefta-Gaub
6de68ce31c
remove LIBVPX from webcam
2014-01-11 22:08:15 -08:00
Brad Hefta-Gaub
776f0e4585
fix up avatar.h and floats
2014-01-11 21:48:35 -08:00
Brad Hefta-Gaub
a34d4acb71
more windows build, first cut at getting opengl working, more disabling VPX
2014-01-11 21:39:45 -08:00
stojce
0c4bee8d12
save and restore dialog settings
2014-01-12 00:33:46 +01:00
stojce
623def0964
File filter
...
Display extensions
2014-01-11 21:03:49 +01:00
stojce
d81968df51
refactoring
2014-01-11 15:30:03 +01:00
stojce
227326e3b7
Import button opacity
2014-01-11 14:40:22 +01:00
stojce
382d061b30
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-11 11:25:26 +01:00
Brad Hefta-Gaub
825c1c8876
fix windows warnings
2014-01-11 00:07:35 -08:00
Brad Hefta-Gaub
73c8dc495b
changed all fmin to std::min
2014-01-10 21:42:08 -08:00
Brad Hefta-Gaub
26adabf130
removed voxel addSphere since it wasn't compiling and was old debug code
2014-01-10 21:39:03 -08:00
Brad Hefta-Gaub
731209d8cb
remove unused PerfStats class more missing header changes
2014-01-10 19:47:23 -08:00
Brad Hefta-Gaub
5725a92cfe
get rid of arpa/inet.h and netdb.h
2014-01-10 18:13:23 -08:00
Brad Hefta-Gaub
9bc4a3df41
switch from pthread mutex to QMutex
2014-01-10 18:01:36 -08:00
Andrew Meadows
e18ae78ce1
merge pull #1499
2014-01-10 16:30:22 -08:00
Andrew Meadows
f2d0d445c2
yet another merge after competing pull requests
2014-01-10 16:03:48 -08:00
Andrzej Kapolka
415935a594
Merge branch 'master' of https://github.com/worklist/hifi into fixery
2014-01-10 16:03:40 -08:00
Andrzej Kapolka
de0472cfc1
Merge pull request #1498 from birarda/remove-curl
...
remove curl dependency by removing starfield loading from URL
2014-01-10 16:02:17 -08:00
Andrzej Kapolka
355321c8b5
Merge branch 'master' of https://github.com/worklist/hifi into fixery
2014-01-10 16:01:18 -08:00
Andrew Meadows
8799ad133e
merge again after some competing pull requests were processed
2014-01-10 16:00:08 -08:00
Andrew Meadows
d28ed70ca9
merge pull request 1446
2014-01-10 15:55:38 -08:00
Andrzej Kapolka
a7c14f1f17
Only register movement if the hand isn't new.
2014-01-10 15:53:50 -08:00
Philip Rosedale
ea0f7c1e05
Merge pull request #1475 from ZappoMan/local_voxel_cache
...
Local voxel cache & some bug fixes
2014-01-10 15:53:47 -08:00
Andrzej Kapolka
5283e51927
Start out disabled.
2014-01-10 15:51:12 -08:00
Andrzej Kapolka
a7e9434c96
Tweaked constants.
2014-01-10 15:50:14 -08:00
Stephen Birarda
1c3259c8cf
remove the starfield URL loading code, closes #1497
2014-01-10 15:33:43 -08:00
Andrzej Kapolka
515b40ecc3
Attempt to disable Hydra hands after five seconds without movement.
2014-01-10 15:00:14 -08:00
stojce
a1207d28a0
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-10 23:47:35 +01:00
stojce
80561b6861
removed size hint from sag icons
2014-01-10 23:47:18 +01:00
Andrzej Kapolka
38118fdab0
When we start setting the fake coefficients after we set the real ones, make
...
sure all of the other coefficients are zero.
2014-01-10 14:42:05 -08:00
stojce
d5e07a5c75
Add import configuration
...
remove unused icons
remove redundant QLabels
2014-01-10 23:26:58 +01:00
Andrzej Kapolka
4ae5203f38
Remove unused constant.
2014-01-10 14:10:33 -08:00
Andrzej Kapolka
9fa170494c
I believe what we really want to decay is the mouse pitch.
2014-01-10 14:04:46 -08:00
Leonardo Murillo
1c2b27f0f4
Checkpoint
2014-01-10 15:18:24 -06:00
Andrzej Kapolka
e97970d961
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-10 12:27:04 -08:00
Andrzej Kapolka
131af0cf16
I believe this should fix the "Joint/model not in model list" errors.
2014-01-10 12:26:11 -08:00
Leonardo Murillo
da2f814b7a
Merge branch 'master' of github.com:/worklist/hifi
2014-01-10 14:08:22 -06:00
Leonardo Murillo
ede32cfadc
Checkpoint
2014-01-10 14:08:10 -06:00
Philip Rosedale
f0460bac5f
Merge pull request #1492 from stojce/19466
...
Code Review for Job #19466
2014-01-10 11:19:43 -08:00
Brad Hefta-Gaub
50fa6be829
Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache
2014-01-09 19:41:15 -08:00
ZappoMan
88232f320c
Merge pull request #1469 from birarda/kill-leap
...
remove leap integration
2014-01-09 19:40:58 -08:00
Brad Hefta-Gaub
cdb4b8c5f3
Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache
2014-01-09 18:52:34 -08:00
Leonardo Murillo
eb52ded4ad
Styling + others
2014-01-09 20:34:02 -06:00
Leonardo Murillo
664a1a7677
Checkpoint
2014-01-09 20:12:39 -06:00
Brad Hefta-Gaub
5b14a4eed3
removed dead code
2014-01-09 14:52:40 -08:00
Brad Hefta-Gaub
6e95c52444
make local voxel cache properly switch to different cache file when switching domains
2014-01-09 14:51:04 -08:00
Leonardo Murillo
9dd37344b8
checkpoint
2014-01-09 16:14:51 -06:00
Brad Hefta-Gaub
c181d0a849
first cut at local voxel cache
2014-01-09 12:05:09 -08:00
Lucas Crisman
e1aa74a5df
equal sign key as shortcut for Reset Avatar Size
2014-01-09 15:00:55 -03:00
stojce
5b678cb24d
Layout fix
2014-01-09 18:15:39 +01:00
Leonardo Murillo
efb173e1d4
Preliminary update dialog work
2014-01-08 21:20:43 -06:00
stojce
6dc9ea8a2e
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-08 19:25:00 +01:00
Leonardo Murillo
d44126ac33
Get version XML and store latest version as application property
2014-01-08 08:30:50 -06:00
Leonardo Murillo
251416ab0a
Merge branch 'master' of github.com:/worklist/hifi
2014-01-07 14:39:18 -06:00
stojce
cc543f4313
Added custom icons (QFileIconProvider)
2014-01-07 00:41:11 +01:00
Andrzej Kapolka
8b2212b6cf
Fix for "red ball" issue with no skeleton: use avatar position for head
...
position.
2014-01-06 12:08:42 -08:00
Stephen Birarda
9eb31b48cc
remove the Leap integration
2014-01-06 11:09:59 -08:00
Leonardo Murillo
314c4ffcfa
Using applicationVersion() instead of const wherever version is specified
2014-01-06 09:24:29 -06:00
Leonardo Murillo
ba79b1b329
Using BUILD_VERSION to setApplicationVersion
2014-01-06 09:18:10 -06:00
stojce
8855a32526
removed unused widgets
2014-01-06 11:15:15 +01:00
stojce
11bf9b8a50
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-05 23:45:37 +01:00
stojce
f0015939c4
removed unused elements from import dialog (preview box and import to clipboard checkbox)
2014-01-05 23:45:22 +01:00
Brad Hefta-Gaub
abf8e83c33
change Voxels JS interface to be more clear
2014-01-05 11:09:16 -08:00
Brad Hefta-Gaub
0df02618ee
use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces
2014-01-04 03:16:47 -08:00
Andrzej Kapolka
2b15fdf78f
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-03 17:49:34 -08:00
Andrzej Kapolka
aa9fc290a5
Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior.
2014-01-03 16:46:11 -08:00
Andrew Meadows
6518e70688
Minor cast enforcement during initialization.
2014-01-03 16:27:57 -08:00
Andrew Meadows
1882c9e43b
Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix
...
Conflicts:
libraries/particles/src/ParticleCollisionSystem.cpp
2014-01-03 16:26:17 -08:00
Philip Rosedale
83101d3d11
reduce elasticity to be less than 1
2014-01-03 15:31:16 -08:00
Philip Rosedale
2cf5efc4a8
Merge pull request #1449 from PhilipRosedale/mirror
...
Mirror
2014-01-03 15:25:28 -08:00
Philip Rosedale
2286916fbb
Don’t render head if inside it!
2014-01-03 15:00:42 -08:00
Philip Rosedale
65340f1667
Tweaked mirror distances
2014-01-03 14:33:54 -08:00
Stephen Birarda
91b07d93c8
Merge pull request #1440 from PhilipRosedale/buckyballs
...
Removed some more old balls/hair/particle code, added local-only version of buckyballs to try playing with
2014-01-03 14:21:29 -08:00
stojce
594a20e248
Merge branch 'master' of https://github.com/worklist/hifi into 19466
2014-01-03 22:53:30 +01:00
stojce
2814cca9af
#19466 - Add avatar scale to preferences panel
2014-01-03 21:02:56 +01:00
Andrzej Kapolka
1003393101
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-03 11:11:04 -08:00
Stephen Birarda
a61e214c9a
simplify loopback trigger for injected audio
2014-01-03 10:16:59 -08:00
ZappoMan
ec1f08b140
Merge pull request #1443 from birarda/master
...
open up more audio to JS
2014-01-03 10:12:44 -08:00
Stephen Birarda
f24eff33fe
open up ASI playSound method to ScriptEngine
2014-01-03 09:38:05 -08:00
Stephen Birarda
443c94a88f
repairs to AudioMixer and audio injection flow
2014-01-02 17:15:46 -08:00
Philip Rosedale
3fe972791c
remove unused mohawk and hair physics
2014-01-02 17:12:34 -08:00
Philip Rosedale
2ad3aea729
Cleanup to move BuckyBalls prototype to own class file
2014-01-02 17:02:04 -08:00
ZappoMan
696afd7875
more warnings fixes
2014-01-02 16:18:49 -08:00
ZappoMan
f1da6bf90b
fix various compiler warnings on gcc
2014-01-02 15:58:03 -08:00
Philip Rosedale
b9d68ec087
removed old ParticleSystem class
2014-01-02 15:53:11 -08:00
Philip Rosedale
739a02c022
merge fixes
2014-01-02 15:46:37 -08:00
Andrzej Kapolka
460a9aacb8
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-02 15:45:27 -08:00
Philip Rosedale
c286f84d97
removed trigger being used for toy ball catching
2014-01-02 15:38:21 -08:00
ZappoMan
366209668d
Merge pull request #1431 from stojce/19463
...
Code Review for Job #19463
2014-01-02 15:38:15 -08:00
Andrzej Kapolka
f03139dbe5
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-02 15:38:07 -08:00
Andrzej Kapolka
ed4ad1cea9
Removed some unused code.
2014-01-02 15:37:56 -08:00
Stephen Birarda
594bd58774
add AudioScriptingInterface to expose playSound to JS
2014-01-02 15:35:28 -08:00
Philip Rosedale
8f48ca0e95
Merge pull request #1437 from ey6es/master
...
Restore bent arm behavior when pointing (lost in ball removal). Fix compile warning.
2014-01-02 15:26:33 -08:00
Philip Rosedale
c47ace6d7f
Merge pull request #1436 from birarda/master
...
changes to audio injector for overlapped sounds in preparation for JS
2014-01-02 15:24:47 -08:00
Stojce Slavkovski
3848028365
changed locking to QMutexLocker
2014-01-03 00:11:24 +01:00
Andrzej Kapolka
0461335887
Align hand with forearm in mouse-pointing mode.
2014-01-02 14:56:29 -08:00
Stojce Slavkovski
b7bcdf8f8c
QMutex reference
2014-01-02 23:56:28 +01:00
Stojce Slavkovski
f583013776
Merge branch 'master' of https://github.com/worklist/hifi into 19463
2014-01-02 23:19:07 +01:00
Stojce Slavkovski
c0fcecad2c
Jenkins build fix
2014-01-02 23:18:39 +01:00
Stojce Slavkovski
27e211de8d
possible fix for jenkins build error
2014-01-02 23:10:21 +01:00
Andrzej Kapolka
7178147535
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-02 13:23:39 -08:00
Andrzej Kapolka
6c27569e9b
Fix arm bending, compile warning.
2014-01-02 13:23:15 -08:00
Stephen Birarda
3a45fb8533
cleanup new API for sound injection
2014-01-02 12:31:01 -08:00
Stephen Birarda
674c19a570
leverage new AudioInjector API for throw and catch sounds
2014-01-02 12:17:18 -08:00
Stojce Slavkovski
31fa8ad1fb
Merge branch 'master' of https://github.com/worklist/hifi into 19463
2014-01-02 21:06:28 +01:00
Andrew Meadows
68c09c5b74
Merge 'threedtv' of https://github.com/ZappoMan/hifi for pull 1430
2014-01-02 11:59:57 -08:00
Stephen Birarda
a0cf2c8fb1
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-02 09:00:14 -08:00
Philip Rosedale
a9d21faa7e
Merge branch 'master' of https://github.com/worklist/hifi into buckyballs
2014-01-01 10:45:38 -08:00
Philip Rosedale
d1e9c25d00
bucky balls!
2014-01-01 10:45:06 -08:00
ZappoMan
48b2d7d3fa
scripting for particle to voxel collisions
2013-12-31 11:33:43 -08:00
ZappoMan
651d2d0c81
rename voxels and particles scripting interfaces
2013-12-31 09:41:35 -08:00
ZappoMan
9194a53410
change to setScript() since it does more than update
2013-12-30 15:55:57 -08:00
Stojce Slavkovski
cd4fcb993f
removed unused 'LogDisplay' class
2013-12-29 23:52:26 +01:00
Stojce Slavkovski
aa75763b27
Merge branch 'master' of https://github.com/worklist/hifi into 19463
2013-12-29 22:54:41 +01:00
ZappoMan
788bb530f8
added comment
2013-12-28 13:02:27 -08:00
ZappoMan
47f45c3af1
make sure camera is configured on connect
2013-12-28 13:00:25 -08:00
ZappoMan
6f2a1b9802
cleanup
2013-12-28 12:51:50 -08:00
ZappoMan
32b2fb8f21
cleanup
2013-12-28 12:08:24 -08:00
ZappoMan
a43844447c
first cut at 3D TV support
2013-12-28 10:07:33 -08:00
Philip Rosedale
e3a77ef139
tuning
2013-12-26 20:20:57 -08:00
Philip Rosedale
74380260b3
Grab includes rotation
2013-12-26 19:07:02 -08:00
Stojce Slavkovski
e0255721da
Search keyword highlighter
2013-12-24 22:15:19 +01:00
Stojce Slavkovski
840d1a33ef
Reveal log file
...
- change log location lo application data folder
- reveal file in Finder (Explorer) implementation
2013-12-23 21:23:47 +01:00
Stojce Slavkovski
505ed5bc64
Storing log to file - initial
2013-12-22 23:55:21 +01:00
Stojce Slavkovski
ee1eb25dfa
replace LogDisplay with File logger
...
- added abstract logger interface
2013-12-22 18:56:53 +01:00
Stojce Slavkovski
3d44ab9939
Dialog layout
2013-12-22 15:06:40 +01:00
Philip Rosedale
9b3973c2e4
removed headers
2013-12-21 18:07:40 -08:00
Philip Rosedale
58a73dfede
yet again remove the test _balls now that we have a particle server
2013-12-21 18:06:04 -08:00
Philip Rosedale
03d192574d
typo
2013-12-20 22:57:35 -08:00
Philip Rosedale
bad47bd527
Fixed chat height
2013-12-20 15:33:56 -08:00
Stephen Birarda
10eb8985f4
remove the double catch sound
2013-12-20 15:29:12 -08:00
Philip Rosedale
cf3dc47c18
debug off
2013-12-19 23:16:04 -08:00
Philip Rosedale
b6ac73bb57
merge
2013-12-19 23:12:11 -08:00
Philip Rosedale
f4a28850cf
Merge remote-tracking branch 'upstream/master'
2013-12-19 23:05:37 -08:00
Stephen Birarda
a01a17c30a
hook throw and catch sounds to Hand class ball tests
2013-12-19 17:24:30 -08:00
Stephen Birarda
3f4b4178ff
remove the test injector code from Application
2013-12-19 15:25:39 -08:00
Stephen Birarda
7ed609633a
complete the test injector stub
2013-12-19 15:23:31 -08:00
Stephen Birarda
0eb22fdc60
Merge branch 'master' of https://github.com/worklist/hifi into injected-audio
2013-12-19 15:17:10 -08:00
Stephen Birarda
bdf8c4b9b2
implement threaded send for AudioInjector
2013-12-19 15:17:03 -08:00
Philip Rosedale
6a941a024d
Merge remote-tracking branch 'upstream/master'
2013-12-19 15:01:58 -08:00
Philip Rosedale
38b59f96d3
Merge pull request #1412 from ZappoMan/bugfixes
...
Implement support for adjusting particles to clock skew
2013-12-19 15:01:01 -08:00
Philip Rosedale
9f7e79e3c1
bigger catch radius, tweak sounds, different new ball button
2013-12-19 14:59:15 -08:00
ZappoMan
d71bc248f4
support adjusting particles based on clockSkew
2013-12-19 14:49:58 -08:00
Leonardo Murillo
44a24496cc
Missing line feed
2013-12-19 16:31:38 -06:00
Stephen Birarda
2409b5f784
complete inital test of AudioInjector API
2013-12-19 13:46:37 -08:00
ZappoMan
72649f1ac9
adjust flight times correctly in stats tracking
2013-12-19 13:29:45 -08:00
ZappoMan
bfbaf265dd
first cut at added clockSkew support to nodes and PING/PING_REPLY
2013-12-19 13:14:14 -08:00
Stephen Birarda
4c15c54535
Merge branch 'master' of https://github.com/worklist/hifi into injected-audio
2013-12-19 12:42:06 -08:00
Stephen Birarda
b035f74f94
fix for build busters with changed AbstractAudioInterface
2013-12-19 12:39:57 -08:00
Stephen Birarda
eac3b6be65
add AudioInjector class to pull samples from URL and inject
2013-12-19 12:28:37 -08:00
Philip Rosedale
c0f3ec5b6a
merge fix
2013-12-19 10:55:00 -08:00
Philip Rosedale
c287e37691
Reverted key mapping change since Andrzej fixed the underlying problem.
2013-12-19 10:02:43 -08:00
Philip Rosedale
77751df992
Revert "Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac)"
...
This reverts commit d68a551940
.
2013-12-19 10:01:55 -08:00
ZappoMan
f7793a0f08
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
2013-12-19 09:51:07 -08:00
ZappoMan
e2b7e08398
revert back to timestamps, fix a couple other bugs
2013-12-19 09:50:53 -08:00
Leonardo Murillo
c3b222cfc2
Print assignment request details to log
2013-12-19 11:23:55 -06:00
Philip Rosedale
abd0951696
Merge remote-tracking branch 'upstream/master'
2013-12-18 20:55:57 -08:00
Philip Rosedale
09e5b8ea4a
slaps sound only on impact with velocity
2013-12-18 20:55:27 -08:00
Philip Rosedale
9980065659
Merge pull request #1406 from ZappoMan/particle_blinky_bug
...
Fix Particle Blinkiness on Clock Skew, and remove all global time stamps from wire formats
2013-12-18 20:02:38 -08:00
ZappoMan
5b36953e81
cleanup clockSkew debug options and remove some chatty logs
2013-12-18 19:33:52 -08:00
Andrzej Kapolka
f10dccb1b8
Fix for menu shortcuts; just include widget library rather than using awkward
...
workaround.
2013-12-18 17:28:21 -08:00
Philip Rosedale
d68a551940
Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac)
2013-12-18 17:13:51 -08:00
ZappoMan
6b0d7c30f0
added debugging option for forced clock skew
2013-12-18 16:58:49 -08:00
ZappoMan
41490991ff
Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface
...
Conflicts:
interface/src/Application.h
2013-12-18 15:50:03 -08:00
Andrzej Kapolka
3f0b5aa748
Build fix.
2013-12-18 13:56:30 -08:00
Stojce Slavkovski
d72c4e4f65
removed commented code
2013-12-18 20:40:15 +01:00
Stojce Slavkovski
45d926da41
CR fixes
2013-12-18 20:37:45 +01:00
ZappoMan
4f3f6c0327
fixed build buster
2013-12-18 10:42:35 -08:00
ZappoMan
8549894ff8
add support for palm and tip spatial data to JS interface
2013-12-18 09:53:47 -08:00
ZappoMan
efdef1ad35
added all buttons triggers and joysticks
2013-12-18 09:33:48 -08:00
ZappoMan
70e9781ad9
CR feedback new class names
2013-12-18 08:42:34 -08:00
Stojce Slavkovski
a2ad70524f
Merge branch 'master' of https://github.com/worklist/hifi into 19461
2013-12-18 17:36:33 +01:00
Stojce Slavkovski
397eb13680
removed legacy resources path locator
2013-12-18 08:05:34 +01:00
Stojce Slavkovski
4c1226ffd9
Merge branch 'master' of https://github.com/worklist/hifi into 19461
2013-12-18 08:00:55 +01:00
Philip Rosedale
13be1ea825
added catch, throw, new ball sounds. Tuned ball speed for handball.
2013-12-17 22:08:52 -08:00
Philip Rosedale
b3bb33e48c
Merge remote-tracking branch 'upstream/master'
2013-12-17 20:12:31 -08:00
Philip Rosedale
e6847961f5
reduced damping for thrown balls, turned off screen flash
2013-12-17 20:11:53 -08:00
ZappoMan
a59650beac
Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface
2013-12-17 19:50:39 -08:00
Andrzej Kapolka
45c31cece3
Removed insertion test code.
2013-12-17 18:23:12 -08:00
Andrzej Kapolka
a90dbe314b
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
2013-12-17 18:10:39 -08:00