Brad Davis
c8069ba73c
Working on magballs polish
2015-09-03 20:09:54 -07:00
Howard Stearns
41daea7d92
Merge pull request #5710 from sethalves/fix-stuck-avatars
...
Fix stuck avatars
2015-09-03 16:26:07 -07:00
Seth Alves
36ca789d92
fix differential avatar-joint sending to work if more than 2 avatars are in the domain
2015-09-03 14:08:04 -07:00
Brad Davis
70ffe10057
Use a constant log file and rollover accumulated logs to a new file based on startup, time or size
2015-09-02 21:56:58 -07:00
Brad Hefta-Gaub
25673831c2
Merge pull request #5689 from jherico/lisa
...
Adding 'web3d' overlay type
2015-09-02 21:31:38 -07:00
Brad Davis
1f83d04423
Fix oculus crash on switching display plugin to something else
2015-09-02 18:28:43 -07:00
Brad Davis
b6ef2e314f
Adding 'web3d' overlay type
2015-09-02 18:25:49 -07:00
Brad Hefta-Gaub
b199e9e593
Merge pull request #5703 from jherico/marge
...
Support HTML colors in overlays
2015-09-02 17:58:44 -07:00
Howard Stearns
389e752b6e
Merge pull request #5695 from AndrewMeadows/dysprosium
...
avoid bad joints when computing avatar bounding capsule
2015-09-02 15:58:42 -07:00
Brad Davis
54b7a063e2
Support HTML colors in overlays
2015-09-02 15:56:37 -07:00
Andrew Meadows
992bd5c9d2
fix sixense and vive rotation readings for palms
2015-09-02 11:37:36 -07:00
Andrew Meadows
eb78b39bea
fix typo that broke build and remove warning
2015-09-02 11:31:05 -07:00
Andrew Meadows
b7d892cfcd
Merge pull request #5691 from ctrlaltdavid/display-names-in-front
...
Only render display names if in front of camera
2015-09-01 19:59:06 -07:00
Andrew Meadows
a7d57d7c60
cleanup whitespace
2015-09-01 14:31:47 -07:00
Andrew Meadows
4a7a384c65
avoid bad joints when computing bounding capsule
2015-09-01 14:12:14 -07:00
Seth Alves
76923583ee
Interface only sends joint data to avatar-mixer if they have changed enough since the last send
2015-09-01 13:31:34 -07:00
Andrew Meadows
7410baedf0
merge highfidelity/master into andrew/copernicium
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
libraries/animation/src/Rig.cpp
libraries/animation/src/Rig.h
2015-09-01 11:08:01 -07:00
David Rowe
2b17eafef4
Only render display names in front of camera
2015-09-01 10:24:50 -07:00
Seth Alves
7b6d267c06
Merge pull request #5675 from AndrewMeadows/darmstadtium
...
remove PhysicsEntity class
2015-09-01 10:06:01 -07:00
Andrew Meadows
bdcc68ce36
fix bug: allow IK to iterate more than once
...
also changed name of parentTransform to be rootTransform
for more correctness
2015-09-01 09:51:14 -07:00
Andrew Meadows
fba7478c52
remove menu items for legacy IK options
2015-09-01 09:51:14 -07:00
Andrew Meadows
bb63267e30
fix hand IK rotations or all models
2015-09-01 09:45:14 -07:00
Seth Alves
752c787f0b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-28 12:50:31 -07:00
Brad Davis
b7dd47efcb
Merge pull request #5674 from birarda/master
...
cleanup of some warnings
2015-08-27 23:34:43 -07:00
Ryan Huffman
4dadfb8ea6
Merge pull request #5668 from ctrlaltdavid/20648
...
Auto refresh entities list upon display of Entities tab
2015-08-27 21:50:11 -07:00
Stephen Birarda
1d6f43e0d0
cleaned up some warnings
2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892
remove PhysicsEntity class
2015-08-27 18:22:12 -07:00
David Rowe
c9d799f5e0
Auto refresh entities list upon display of Entities tab
2015-08-27 13:32:00 -07:00
Seth Alves
e97e7de19c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-27 13:19:15 -07:00
Howard Stearns
96c74ebbd5
Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations.
...
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
2015-08-27 12:25:40 -07:00
Brad Hefta-Gaub
79a9694d4a
Merge pull request #5648 from ctrlaltdavid/20663
...
Clean Interface.ini after a crash
2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
176860c612
Merge pull request #5649 from larsnaesbye/master
...
Move i18n to own dir, update FA
2015-08-27 10:46:29 -07:00
Seth Alves
435863d1f0
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 17:33:59 -07:00
Brad Davis
270f2f7a3b
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00
Merge pull request #5661 from sethalves/linux-memory-debugger
...
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Seth Alves
d2eb3108d5
Merge pull request #5644 from howard-stearns/eye-correction-application
...
eye correction correction
2015-08-26 14:46:48 -07:00
Seth Alves
696e34b996
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Seth Alves
23dbbcc7bb
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 09:42:20 -07:00
Brad Hefta-Gaub
aa80fc9127
Merge pull request #5653 from jherico/homer
...
Remove items from the VR menu properly
2015-08-26 09:14:48 -07:00
Andrew Meadows
45c846572e
Merge pull request #5645 from jherico/maggie
...
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
Brad Hefta-Gaub
b19f1e0631
Merge pull request #5658 from ctrlaltdavid/20653
...
Add Desktop object to JavaScript with width and height properties
2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub
1cd699de9d
Merge pull request #5657 from birarda/master
...
fix for 0 entity avg ping
2015-08-25 22:27:44 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
f176003dad
Fixing aspect ratio on stereo plugins
2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de
Remove items from the QML version of the menu when they are removed from the main menu
2015-08-25 19:05:29 -07:00
David Rowe
9d3d104ec3
Add Desktop object to JavaScript with width and height properties
2015-08-25 16:13:36 -07:00
David Rowe
1f541832b6
Reword dialog
2015-08-25 14:24:15 -07:00
Seth Alves
0708fabddf
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-25 13:13:55 -07:00
Stephen Birarda
6f14eb2206
fix for 0 entity avg ping
2015-08-25 12:35:34 -07:00
