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
30fdb595dd
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-01-28 11:14:21 -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
4deb9936ba
Don't add the specular alpha in the model fragment shaders.
2014-01-27 17:44:13 -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
e01f317cba
remove QUiTools include, not needed
2014-01-22 14:20:40 -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
Andrzej Kapolka
aabff3f141
Adjust the fog density; getting different results on Linux vs. OS X.
2014-01-22 14:17:02 -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