Stojce Slavkovski
|
ee1eb25dfa
|
replace LogDisplay with File logger
- added abstract logger interface
|
2013-12-22 18:56:53 +01: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 |
|
Stojce Slavkovski
|
45d926da41
|
CR fixes
|
2013-12-18 20:37:45 +01:00 |
|
Stojce Slavkovski
|
4c1226ffd9
|
Merge branch 'master' of https://github.com/worklist/hifi into 19461
|
2013-12-18 08:00:55 +01:00 |
|
Andrzej Kapolka
|
6cffce5b31
|
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
|
2013-12-17 16:57:25 -08:00 |
|
ZappoMan
|
ccd6058412
|
get abstract menu class to work
|
2013-12-17 13:55:17 -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 |
|
Stojce Slavkovski
|
57b4148867
|
Dialog position / toggle
|
2013-12-17 22:12:24 +01:00 |
|
Stojce Slavkovski
|
3e1c857a2e
|
Merge branch 'master' of https://github.com/worklist/hifi into 19461
|
2013-12-17 22:11:29 +01:00 |
|
Stojce Slavkovski
|
841d491b2f
|
Merge branch 'master' of https://github.com/worklist/hifi into 19461
|
2013-12-17 20:44:51 +01:00 |
|
ZappoMan
|
a2f1b3e325
|
Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bug
|
2013-12-17 11:35:49 -08:00 |
|
ZappoMan
|
74d9c05c44
|
added particle server details to voxel stats dialog
|
2013-12-17 11:32:20 -08:00 |
|
Philip Rosedale
|
35e7cfddba
|
Made drumming and slaps into menu choices from ‘Hand Options’
|
2013-12-17 11:20:26 -08:00 |
|
Stojce Slavkovski
|
365d1eea10
|
Merge branch 'master' of https://github.com/worklist/hifi into 19461
Conflicts:
interface/src/Menu.h
|
2013-12-17 20:15:40 +01:00 |
|
Stojce Slavkovski
|
cc6f7ed4cc
|
display all log data on load
|
2013-12-17 03:07:57 +01:00 |
|
Stojce Slavkovski
|
5a27ded669
|
Merge branch 'master' of https://github.com/worklist/hifi into 19461
Conflicts:
interface/src/Application.cpp
|
2013-12-16 22:57:47 +01:00 |
|
Andrzej Kapolka
|
6888dc4eeb
|
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
|
2013-12-16 13:44:44 -08:00 |
|
Stojce Slavkovski
|
e788d746d4
|
added dialog for log data
- importing Inconsolata.otf on application level
- style sheet for dialog
- changed menu behaviour for log data
|
2013-12-16 22:43:17 +01: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
|
f8830ed9b1
|
cleaned up hand target code a bit
|
2013-12-16 12:04:16 -08:00 |
|
ZappoMan
|
f9b7c23857
|
correct handleing of app shutdown and scripting enging termination
|
2013-12-16 11:26:30 -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
|
5ec9017d3b
|
More metavoxel bits.
|
2013-12-11 18:00:17 -08:00 |
|
Philip Rosedale
|
4707733563
|
Removed avatar balls
|
2013-12-06 16:26:02 -08:00 |
|
Andrzej Kapolka
|
d374716c7d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-12-05 17:09:19 -08:00 |
|
Philip Rosedale
|
3f957bbf5d
|
Rave out!
|
2013-12-05 16:46:11 -08:00 |
|
Andrzej Kapolka
|
b90c5bdae8
|
Option to render collision proxies, more general avatar penetration test, fix
for meshes with only one joint influence.
|
2013-12-05 14:00:38 -08:00 |
|
ZappoMan
|
9faef65ccc
|
first cut at splitting out octree base classes
|
2013-12-03 17:32:02 -08:00 |
|
ZappoMan
|
0e501f4439
|
Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets
Conflicts:
interface/src/Menu.cpp
interface/src/Menu.h
|
2013-11-27 15:44:51 -08:00 |
|
ZappoMan
|
2ce9937126
|
major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item
|
2013-11-26 17:27:08 -08:00 |
|
Philip Rosedale
|
f27039853c
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-11-26 11:25:26 -08:00 |
|
Philip Rosedale
|
09ca2a45db
|
Add local audio monitor option, tweak turning with head
|
2013-11-26 11:25:06 -08:00 |
|
Stephen Birarda
|
ec909a6c13
|
add a mutex lock and unlock on Menu instance creation
|
2013-11-26 10:58:02 -06:00 |
|
ZappoMan
|
63a82af449
|
allow client to set voxels MaxPPS in Preferences
|
2013-11-25 15:13:31 -08:00 |
|
ZappoMan
|
d13ebf6095
|
more menu cleanup removing developer options that are now defunct
|
2013-11-25 14:44:34 -08:00 |
|
ZappoMan
|
de26b950f8
|
cleanup menu defaults
|
2013-11-25 14:25:09 -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
|
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
|
5cc5d9bba8
|
Progress towards shadow maps.
|
2013-11-20 16:23:54 -08:00 |
|
Andrzej Kapolka
|
df8fbf8f72
|
More general, angle-driven form of driving based on lean.
|
2013-11-19 11:09:02 -08:00 |
|
Andrzej Kapolka
|
5e933b0815
|
Working on basic Faceshift drive.
|
2013-11-18 18:06:01 -08:00 |
|
ZappoMan
|
73c1ef9997
|
fix macos menu placement for About, Preferences, and Quit
|
2013-11-17 00:01:32 -08:00 |
|
Andrzej Kapolka
|
7249e5293c
|
Added a slider in the preferences to control the amount of Faceshift eye
deflection.
|
2013-11-15 10:17:52 -08:00 |
|
ZappoMan
|
34668e8716
|
add Paste To Voxel
|
2013-11-13 23:04:51 -08:00 |
|
Philip Rosedale
|
f3b6e21a6d
|
Voxel click to fly is now an option in the Tools Menu
|
2013-11-08 14:34:15 -08:00 |
|
Andrzej Kapolka
|
ebe3ef4b22
|
Toggle for the leap hands.
|
2013-11-07 17:20:52 -08:00 |
|