ZappoMan
41f6650b20
implement movable independent camera with hydra
2014-02-07 01:23:30 -08:00
ZappoMan
77e7f336d5
scriptable camera
2014-02-06 20:03:57 -08:00
Stephen Birarda
97a7369c76
remove senderWithAddress from NodeList
2014-02-06 14:43:46 -08:00
Stephen Birarda
6f638fa62c
have domain-server create a UUID for unidentified nodes, closes #1840
2014-02-06 10:34:34 -08:00
Stephen Birarda
f92f9ec0c2
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-06 09:28:03 -08:00
ZappoMan
f657a3efe9
remove local cache option
2014-02-05 20:02:01 -08:00
Stephen Birarda
26c961dc66
send identity packets when changes occur between keyframes
2014-02-04 14:24:13 -08:00
Andrew Meadows
a5aff81881
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
2014-01-31 17:44:13 -08:00
Andrew Meadows
ed93d8db39
Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar.
2014-01-31 17:42:48 -08:00
Stephen Birarda
217135a8d6
repairs to VoxelImporter to remove QCoreApplication warning
2014-01-31 11:00:44 -08:00
Stephen Birarda
a5b0675f24
sendPingPackets method need not be static
2014-01-31 09:58:29 -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
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
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
2aaa9ce3f6
resolve conflicts on merge with upstream master
2014-01-28 12:30:43 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
stojce
74801da07f
#19491 - Implement in-app snapshots
2014-01-27 18:07:03 +01: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
Lucas Crisman
c3aa8167d6
click on stats to expand/contract them
2014-01-24 07:18:45 -03:00
Stephen Birarda
10cfd628aa
resolve conflicts on merge with upstream master
2014-01-23 17:52:30 -08:00
Lucas Crisman
f818b07dc8
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-23 22:18:33 -03: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
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
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
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
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
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
Stephen Birarda
7efc9e2e78
move datagram processing back to separate thread
2014-01-23 10:32:23 -08:00
Andrzej Kapolka
a3ffb1d8a3
Working on performing the actual edit.
2014-01-22 19:17:48 -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
Lucas Crisman
cba616e6f2
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-22 18:36:41 -03:00
Lucas Crisman
d86aa227a4
UI stats improvements: first cut
2014-01-22 16:42:09 -03:00
Andrzej Kapolka
15021b6ebc
More work on metavoxel editing (track mouse ray intersection with grid).
2014-01-22 11:11:12 -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
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
105fb42b34
rewrite mesh and skeleton requests from data-server
2014-01-21 16:46:04 -08:00
Stephen Birarda
f13aa322fc
resolve conflicts in merge with upstream/master
2014-01-21 16:01:12 -08:00
Brad Hefta-Gaub
03a9253748
remove usage of ParticleEditHandle from application
2014-01-21 14:07:46 -08:00
Leonardo Murillo
b2ef07f485
PR Fixes
2014-01-21 11:17:43 -06:00
Leonardo Murillo
a9c294099e
Merge branch 'master' of github.com:/worklist/hifi
2014-01-21 10:00:00 -06:00
aw
0eed041deb
scripts save on exit and load on entry
2014-01-20 22:58:01 -08:00
Stephen Birarda
d405d31edf
add data-server to hifi repo, abstract DataServerClient
2014-01-20 14:42:50 -08: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
Brad Hefta-Gaub
1e0f1adb16
added lifetime to particles
2014-01-17 14:59:40 -08:00
Leonardo Murillo
99275dadd4
PR Changes
2014-01-17 14:39:34 -06:00
Leonardo Murillo
93e4dc7d5a
PR Changes
2014-01-17 13:35:49 -06: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
Brad Hefta-Gaub
1cfbfe6611
fix 3d mode switch on/off issue
2014-01-16 14:54:08 -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
Andrzej Kapolka
3f08504e3e
Replaced missing functionality.
2014-01-16 12:39:07 -08:00
Leonardo Murillo
746b45d939
Moving ifdef to xml
2014-01-15 15:08:47 -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
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
Leonardo Murillo
80946b10b3
Merge
2014-01-14 22:12:37 -06:00
Stephen Birarda
e76a37f48b
resolve conflicts on merge with upstream master
2014-01-14 16:26:02 -08:00
Stephen Birarda
599e3bb9e5
resolve conflicts on merge with upstream master
2014-01-14 16:15:58 -08:00
Stephen Birarda
77ee27e5d7
resolve conflicts on merge with upstream master
2014-01-14 16:12:42 -08:00
Stephen Birarda
767a241105
Merge remote-tracking branch 'upstream/master' into nodelist-container
2014-01-14 16:08:58 -08:00
Stephen Birarda
4ea14a51fc
remove the SerialInterface
2014-01-14 13:14:15 -08:00
Stephen Birarda
bdc31a3b48
replace the DomainChangeListener class with a signal/slot combo
2014-01-14 11:38:05 -08:00
Stephen Birarda
53d435006c
more follow mode cleanup, fix silent node iterator
2014-01-14 10:07:26 -08:00
Leonardo Murillo
24bedc90a7
Resolving conflicts
2014-01-14 10:30:52 -06: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
Brad Hefta-Gaub
2217d79200
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
2014-01-13 15:57:52 -08:00
Andrzej Kapolka
9d831a2ab5
Orbit around voxel center, limit hover distance.
2014-01-13 14:43:59 -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
731209d8cb
remove unused PerfStats class more missing header changes
2014-01-10 19:47:23 -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
Leonardo Murillo
1c2b27f0f4
Checkpoint
2014-01-10 15:18:24 -06:00
Leonardo Murillo
ede32cfadc
Checkpoint
2014-01-10 14:08:10 -06:00
Leonardo Murillo
664a1a7677
Checkpoint
2014-01-09 20:12:39 -06: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
Brad Hefta-Gaub
c181d0a849
first cut at local voxel cache
2014-01-09 12:05:09 -08:00
Leonardo Murillo
efb173e1d4
Preliminary update dialog work
2014-01-08 21:20:43 -06:00
Leonardo Murillo
d44126ac33
Get version XML and store latest version as application property
2014-01-08 08:30:50 -06:00
Stojce Slavkovski
f583013776
Merge branch 'master' of https://github.com/worklist/hifi into 19463
2014-01-02 23:19:07 +01: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
Stojce Slavkovski
ee1eb25dfa
replace LogDisplay with File logger
...
- added abstract logger interface
2013-12-22 18:56:53 +01: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
Stojce Slavkovski
45d926da41
CR fixes
2013-12-18 20:37:45 +01:00
ZappoMan
70e9781ad9
CR feedback new class names
2013-12-18 08:42:34 -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
ZappoMan
4bfdce3910
Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface
...
Conflicts:
libraries/avatars/src/HandData.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2013-12-17 15:25:12 -08:00
ZappoMan
a6e6205a57
first cut at scriptable controller
2013-12-17 15:23:09 -08:00
Andrzej Kapolka
a5c8531aa1
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
...
Conflicts:
interface/src/Application.cpp
2013-12-17 13:46:44 -08:00
ZappoMan
74d9c05c44
added particle server details to voxel stats dialog
2013-12-17 11:32:20 -08:00
ZappoMan
8f1fbec057
added versioning to SVO files and Particle inHand support
2013-12-16 19:49:22 -08:00
Andrzej Kapolka
6888dc4eeb
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
2013-12-16 13:44:44 -08:00
ZappoMan
6203e9dc2e
Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/Hand.cpp
2013-12-16 12:11:33 -08:00
ZappoMan
524a41468c
multiple scripts running at same time, menu interface for scripts
2013-12-16 09:16:51 -08:00
ZappoMan
e2fbb7beb4
first cut at splitting out scripting engine from agent to add to client
2013-12-14 08:14:38 -08:00
Philip Rosedale
1b1fdd3dc4
add menu option for sixense filter
2013-12-13 15:21:32 -08:00
Andrzej Kapolka
41c7b9ce29
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
...
Conflicts:
interface/src/Application.cpp
2013-12-13 15:00:05 -08:00
ZappoMan
5830f1134e
add particle collisions with voxels
2013-12-12 17:52:22 -08:00
Andrzej Kapolka
652be27910
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
2013-12-12 15:36:37 -08:00
ZappoMan
50b93d1e2b
added easy access to creating a ParticleEditHandle for a know particle ID
2013-12-12 12:40:38 -08:00
ZappoMan
1a6f730659
add findClosestParticle()
2013-12-12 12:24:07 -08:00
ZappoMan
28c5d5b7bf
removed unused variable
2013-12-12 11:01:37 -08:00
Andrzej Kapolka
5ec9017d3b
More metavoxel bits.
2013-12-11 18:00:17 -08:00
ZappoMan
4acadabaa5
adding better support for ParticleEditHandle to allow access to particles after being created
2013-12-11 17:46:18 -08:00
ZappoMan
03c72134cb
first cut at creatorTokenIDs for creating particles
2013-12-11 15:38:52 -08:00
ZappoMan
ae1576b9f5
CR cleanup and add shootParticle() to application
2013-12-10 17:07:11 -08:00
Andrzej Kapolka
6ba750a963
More progress on generic attributes, metavoxel node management.
2013-12-10 15:44:48 -08:00
ZappoMan
2783770e2b
got particles sending from server to client and rendering
2013-12-09 13:29:44 -08:00
ZappoMan
2ca628fdf1
first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles
2013-12-09 11:45:32 -08:00
ZappoMan
2b27c91550
Merge branch 'master' of https://github.com/worklist/hifi into particle_server
...
Conflicts:
interface/src/VoxelSystem.cpp
interface/src/VoxelSystem.h
2013-12-04 11:40:54 -08:00
ZappoMan
bc715085a9
Merge pull request #1304 from PhilipRosedale/master
...
Voxel drumming, search function to find leaf voxel containing a point
2013-12-04 11:28:39 -08:00
Stephen Birarda
eb316a450a
Merge pull request #1298 from ZappoMan/move_hideshow_to_thread
...
Move Hide/Show local voxels to a dedicated thread
2013-12-04 11:27:14 -08:00
ZappoMan
9faef65ccc
first cut at splitting out octree base classes
2013-12-03 17:32:02 -08:00
Stephen Birarda
8fbd1e4cfb
repairs after merge with upstream master
2013-12-03 12:28:44 -08:00
Stephen Birarda
3277cb49a6
Merge remote-tracking branch 'upstream/master' into cleanup
2013-12-03 12:21:03 -08:00
Philip Rosedale
a84e97c54a
Removed obsolete HandControl class, files
2013-12-03 08:29:17 -08:00
Stephen Birarda
141394a664
replace UDPSocket with QUDPSocket
2013-12-02 13:34:29 -08:00
ZappoMan
44f92fb47c
Merge pull request #1297 from PhilipRosedale/master
...
Voxel editing with hands, flying by pointing hands
2013-12-02 12:46:04 -08:00
ZappoMan
76b3bd4e6e
Move Hide/Show local voxels to a dedicated thread so that it doesn't slow performance of voxel packet processing
2013-12-02 12:08:45 -08:00
Andrzej Kapolka
635eb7c52d
Merge branch 'master' of https://github.com/worklist/hifi into noculus
2013-12-02 09:55:27 -08:00
Philip Rosedale
7ab9cc9c14
Voxel editing with hands, flying and rotation with hands
2013-12-02 00:17:06 -08:00
Philip Rosedale
2456c26207
changed function name so less confusing
2013-12-01 20:46:42 -08:00
Philip Rosedale
ea850368de
First working voxel insertion at fingertip
2013-12-01 20:16:14 -08:00
Philip Rosedale
9680941500
Add palm velocity
2013-11-29 14:50:18 -08:00
ZappoMan
7f9d0849bd
added more client side voxel stats including lost packets, out of order packets, and average flight time
2013-11-27 13:37:47 -08:00
Andrzej Kapolka
fa5f8b093c
Screw it; just use the standard mouse hiding.
2013-11-26 15:07:40 -08:00
Andrzej Kapolka
bdba05785e
Mouse pointer fix fix.
2013-11-26 15:00:49 -08:00
Andrzej Kapolka
600b05fcc9
Oculus mouse pointer fix.
2013-11-26 14:50:43 -08:00
Andrzej Kapolka
c5406c47a6
Moved Oculus code out of Application, started on using StereoConfig to get
...
actual values to replace the magic numbers.
2013-11-26 11:59:06 -08:00
Andrzej Kapolka
083800dc59
Glow/shrink avatars when killed, send kill message when we move between
...
domains, locations, etc.
2013-11-22 16:23:40 -08:00
Andrzej Kapolka
3137e9a3e6
Don't leave out the head when we draw our shadow.
2013-11-21 13:57:55 -08:00
Andrzej Kapolka
f38e74c51c
Merge branch 'master' of https://github.com/worklist/hifi into shadowplay
2013-11-21 11:18:56 -08:00
Andrzej Kapolka
3cf47f8d5c
Merge branch 'master' of https://github.com/worklist/hifi into shadowplay
2013-11-21 11:08:45 -08:00
Andrzej Kapolka
7bc65136c7
Merge branch 'master' of https://github.com/worklist/hifi into sicksense
2013-11-21 11:00:09 -08:00
Andrzej Kapolka
4bcc6fdc0d
More progress on shadows.
2013-11-20 18:27:59 -08:00
Andrzej Kapolka
5cc5d9bba8
Progress towards shadow maps.
2013-11-20 16:23:54 -08:00
ZappoMan
6881d9fb36
fix to crash in client side VoxelSceneStats crash
2013-11-19 22:57:42 -08:00
Andrzej Kapolka
1f2fe5ddee
Rudimentary Sixense (Razer Hydra) support.
2013-11-15 18:06:32 -08:00
ZappoMan
34668e8716
add Paste To Voxel
2013-11-13 23:04:51 -08:00
ZappoMan
8de113e65c
adding jurisdiction details to voxel stats dialog
2013-11-13 14:22:57 -08:00
ZappoMan
19515c80fd
Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats
...
Conflicts:
interface/src/Application.cpp
2013-11-07 16:44:34 -08:00
Andrzej Kapolka
0c8799bb3d
Tweaks to voxel editing: edit from farther away, expand cubes to make sure
...
they show up over voxels, initialize voxel scale with moused-over scale.
2013-11-05 12:12:54 -08:00
ZappoMan
581e0adecf
Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats
...
Conflicts:
interface/src/Application.cpp
2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3
first cut at new voxel scene stats
2013-11-05 10:29:56 -08:00
Andrzej Kapolka
b2ed29dbff
Work around precision issues with multiplying matrices with high translation
...
magnitudes (by using relative translation).
2013-11-04 16:49:12 -08:00
Andrzej Kapolka
33c61937ab
Remove unused parameters.
2013-11-04 11:31:05 -08:00
ZappoMan
c18de72dd4
work on debugging stutter behavior, mostly debugging and cleanup
2013-11-03 19:06:06 -08:00
ZappoMan
6fd3c9714f
fixed header file merge conflict
2013-11-01 14:37:46 -07:00
ZappoMan
b3aac56d29
first cut a variable point size point rendering
2013-11-01 14:33:06 -07:00
Andrzej Kapolka
fdc44f5ec4
Have the hand fall to the side when the mouse is hidden.
2013-10-31 16:06:42 -07:00
ZappoMan
fbc3a4d2c1
first cut at user adjustable LOD
2013-10-29 16:16:58 -07:00
stojce
4fe9964e5a
reset view
...
- reset icon
- resetView signal
2013-10-28 18:19:31 +01:00
stojce
b09e657ecc
click mirror behaviour
...
- shrink function - restore mirror window view and set forward
fullscreen view
2013-10-27 09:57:00 +01:00
stojce
f675b198cb
RearView Tools
...
- moved to separate class
- new icon/button for restore view
-
2013-10-26 21:10:05 +02:00
Don Park
e44b0af9b6
make updateWindowTitle public, call it after Menu loads data into the Profile
2013-10-25 11:36:50 -07:00
Don Park
dc420beaf2
updateWindowTitle()
2013-10-25 10:09:34 -07:00
ZappoMan
015adeedcb
first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA
2013-10-24 13:22:31 -07:00
ZappoMan
161367c899
fix rear view mirror mode to only render self
2013-10-23 11:58:01 -07:00
Andrzej Kapolka
a568e71e37
Merge pull request #1099 from stojce/19433
...
Code Review for Job #19433
2013-10-23 10:03:36 -07:00
stojce
2fcb246923
close button on rear mirror view
2013-10-22 20:42:31 +02:00
stojce
890313b8ca
- fixed aspect ratio on mirror view
...
- stop rendering voxel selectors on mirror view
2013-10-21 23:55:08 +02:00
ZappoMan
023a521948
some debug timing and voxel stats display
2013-10-21 14:39:05 -07:00
stojce
b45525ae21
Mirror View initial setup
2013-10-21 08:28:38 +02:00
Stephen Birarda
fa146e302d
remove 16-bit node IDs and replace with UUIDs
2013-10-17 11:49:41 -07:00
ZappoMan
6f9fdfba2f
make mouse cursor hiding more aware of focused window and bounds
2013-10-14 11:39:48 -07:00
ZappoMan
e91127bc5c
implement hide cursor on no mouse movement
2013-10-11 14:56:37 -07:00
ZappoMan
c6df36a40b
Merge pull request #1047 from stojce/19434
...
Code Review for Job #19434
2013-10-11 12:52:13 -07:00
Philip Rosedale
43e01ee105
Merge pull request #1039 from birarda/data-server
...
add ability to jump to a user's domain and location
2013-10-10 15:37:21 -07:00
Stephen Birarda
9112efaa36
move username change to Login, add lastPosition and lastDomain
2013-10-09 13:00:05 -07:00
Philip Rosedale
8dc84fc841
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 11:44:56 -07:00
Philip Rosedale
ce2e31ddd5
reconnecting particle cloud
2013-10-08 22:21:55 -07:00
Stephen Birarda
85edb93710
add a Profile class to hold user data from data-server
2013-10-08 12:13:45 -07:00
stojce
16d10775dc
#19434 restore window position on start
...
- store position and size on app end
- restore position and size on app start
2013-10-07 21:04:36 +02:00
stojce
a0f23d409e
Merging changes
2013-09-28 13:16:50 +02:00
Philip Rosedale
0fbabe9891
Merge pull request #984 from ZappoMan/voxel_geo_shader
...
Voxel Geometry Shader Experiment
2013-09-26 17:22:55 -07:00
ZappoMan
552d9fadd8
rearranged menus, some hacking on voxel shader
2013-09-26 14:51:57 -07:00
Andrzej Kapolka
4dec183262
Enlarge heads when they're moused over.
2013-09-26 12:07:13 -07:00
Andrzej Kapolka
63efeccb13
Renaming for clarity.
2013-09-25 17:38:37 -07:00
Freddy
36104d0b06
remove unused older voxel grab thrust
2013-09-23 23:04:27 -07:00
ZappoMan
3d4341cee4
hacking on voxel geometry shader
2013-09-23 15:18:45 -07:00
Andrzej Kapolka
a04ced633e
Include the face model URL in the same packet as the avatar voxel URL.
2013-09-19 16:35:25 -07:00
LionTurtle
394e660ac3
Use WASD to move nudge guide instead of mouse.
...
Nudge can be completed with return/enter key now.
Nudge is now accessible in any voxelEditMode.
2013-09-13 17:51:10 -07:00
LionTurtle
0251349221
Change nudge UI to be more consistent with classic editing UI.
...
Add menu option for Delete and fix delete for VoxelSelectMode.
2013-09-13 13:41:26 -07:00
LionTurtle
b0803c1267
Merge remote-tracking branch 'upstream/master'
2013-09-09 16:54:34 -07:00
LionTurtle
ac878c9c63
UI for nudge completed!
2013-09-09 16:53:31 -07:00
Andrzej Kapolka
ddf92b39c7
Fix for off-axis ambient occlusion.
2013-09-08 17:52:35 -07:00
LionTurtle
59943dc2e8
Merge branch 'nudge'
...
Conflicts:
interface/src/Menu.cpp
libraries/voxels/src/VoxelTree.h
2013-09-05 17:58:39 -07:00