Seth Alves
e97e7de19c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-27 13:19:15 -07:00
Leonardo Murillo
dd5d58a5e1
Merge pull request #5663 from birarda/master
...
don't request a cert from peer in HTTPSManager
2015-08-27 12:46:24 -07:00
Stephen Birarda
783bc4dafb
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-08-27 12:44:42 -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
David Rowe
0399c5ca35
Merge branch 'master' into 20664
2015-08-27 12:13:15 -07:00
David Rowe
005851a74a
Increase default entity search radius to 100m
2015-08-27 12:13:04 -07:00
David Rowe
a553022adf
Update entities list as search radius value is changed
2015-08-27 11:11:05 -07:00
David Rowe
d628a88f52
Fix some invalid HTML
2015-08-27 11:10:20 -07:00
David Rowe
1880b263d4
Add entity search radius field to entities list
2015-08-27 11:09:55 -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
Brad Hefta-Gaub
7b2f944f48
Merge pull request #5561 from ericrius1/particleExtensions
...
Extended Particle entity to allow for more varied effects
2015-08-27 10:45:03 -07:00
Anthony J. Thibault
637e3b0a15
Added triggers to AnimVariantMap.
2015-08-27 10:41:01 -07:00
Anthony J. Thibault
778521f664
Improvement to bone link rendering when bones are large.
2015-08-27 10:21:23 -07:00
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Seth Alves
b09de4ff65
fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there.
2015-08-26 21:51:28 -07:00
Seth Alves
435863d1f0
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 17:33:59 -07:00
Brad Hefta-Gaub
87c604a475
Merge pull request #5655 from jherico/sideshow-bob
...
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 16:44:35 -07:00
Anthony J. Thibault
b7a9b54628
Better AnimDebugDraw rendering
2015-08-26 16:42:08 -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
Andrew Meadows
0835b79e33
Merge pull request #5646 from birarda/ds-cleanup
...
de-bloat the domain-server by adding a gatekeeper
2015-08-26 15:42:43 -07:00
Brad Hefta-Gaub
cd2cd90d8f
Merge pull request #5664 from sethalves/quiet-obj-reader
...
ifdef out debug prints in OBJ reader
2015-08-26 15:32:17 -07:00
Seth Alves
f53704051f
ifdef out debug prints in OBJ reader
2015-08-26 15:09:58 -07:00
Stephen Birarda
cd7d0f383b
allow editors who can't be verified in the short term
2015-08-26 15:07:29 -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
8646900dda
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 13:08:41 -07:00
Stephen Birarda
0fc2713be1
don't request a cert from peer in HTTPSManager
2015-08-26 12:40:09 -07:00
Anthony J. Thibault
c1333e16ed
Merge branch 'master' into ajt/new-anim-system
2015-08-26 11:59:03 -07:00
Anthony Thibault
b5bfc84521
Merge pull request #5662 from AndrewMeadows/copper
...
fix Vectors::MIN
2015-08-26 11:54:59 -07:00
Andrew Meadows
f857ccfe16
fix Vectors::MIN
2015-08-26 11:46:50 -07:00
ericrius1
5586c2ff17
fixed ordering of bitsream reading for old svo files with particle entities
2015-08-26 11:45:19 -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
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
ericrius1
f25b75093c
cleaned up conditional bitstream parsing
2015-08-26 09:44:29 -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 Hefta-Gaub
029c59fb77
Merge pull request #5654 from jherico/barney
...
Fix stereo modes aspect ratio
2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub
5d5c1584c3
Merge pull request #5659 from jherico/nelson
...
Fix UserInputMapper event generation
2015-08-25 22:14:37 -07:00
Seth Alves
6f46832069
clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct
2015-08-25 21:30:38 -07:00
Anthony J. Thibault
0c02a338f2
Added support for setting Variants in the json file.
...
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63
AnimVariantMap is used in eval, MyAvatar loads avatar.json via url
2015-08-25 20:28:17 -07:00
samcake
fda9827100
Merge pull request #5529 from SeijiEmery/gputest
...
gputest
2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
073567558e
Fix UserInputMapper event generation
2015-08-25 19:15:06 -07:00
Brad Davis
f176003dad
Fixing aspect ratio on stereo plugins
2015-08-25 19:05:31 -07:00
