James B. Pollack
08986dcb17
Merge pull request #5669 from ZappoMan/breakdanceToy
...
first cut at breakdance toy
2015-08-28 16:36:00 -07:00
Brad Davis
f353d34479
Merge pull request #5680 from highfidelity/revert-5677-bart
...
Revert "Add common vector constants to JS"
2015-08-28 16:27:31 -07:00
Brad Davis
08e4fe2dc2
Revert "Add common vector constants to JS"
2015-08-28 16:26:56 -07:00
Seth Alves
f6fbf4f324
fix whitespace
2015-08-28 14:08:30 -07:00
Brad Hefta-Gaub
1e2374da87
Merge pull request #5677 from jherico/bart
...
Add common vector constants to JS
2015-08-28 13:43:13 -07:00
Seth Alves
7614cababb
adjust whitespace
2015-08-28 13:21:34 -07:00
Brad Davis
2aa1976b5d
Add common vector constants to JS, add some missing quaternionin functionality
2015-08-28 13:05:39 -07:00
Seth Alves
752c787f0b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-28 12:50:31 -07:00
Seth Alves
540af4afcb
remove unneeded call to computeShapeInfoWorker
2015-08-28 12:47:04 -07:00
Seth Alves
0ca9b60be5
Merge pull request #5671 from birarda/ice-server-crash
...
don't read ice-server packets that are too small
2015-08-28 12:46:23 -07:00
Seth Alves
a5cd3ff046
release _threadRunning if decompressVolumeDataAsync exits early
2015-08-28 11:04:56 -07:00
Seiji Emery
c704fb7b12
Fixed to follow signal naming conventions, and added null check
2015-08-28 11:01:30 -07:00
Seth Alves
1ac5c19f44
if someone else changes a polyvox, we need to localy recompute the collision shape
2015-08-28 10:39:23 -07:00
Seiji Emery
9353eaf35a
Added signal to detect + close address bar when user clicks outside of it
2015-08-28 10:33:30 -07:00
Seth Alves
92b5fe3457
fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags
2015-08-28 10:31:28 -07:00
Seth Alves
0bcd6b8ec5
remove no-longer-used #define
2015-08-28 10:30:56 -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
Anthony J. Thibault
21c6ba9bdf
updated avatar.json to match current gist.
2015-08-27 21:27:37 -07:00
Anthony J. Thibault
19e91bb392
Added basic interpolation support to AnimStateMachine
2015-08-27 21:26:31 -07:00
Anthony J. Thibault
3286a32afc
Initial version of AnimStateMachine.
...
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
2015-08-27 20:41:53 -07:00
Andrew Meadows
614fad0811
remove warnings from linux build
2015-08-27 19:12:25 -07:00
Nex Pro
b2e5cc7c4e
Fixed list problems when list contains more than 200 entries. And some style fixes.
2015-08-28 02:29:01 +01:00
Stephen Birarda
c5c73b7809
remove _ipd variable from OculusLegacyDisplayPlugin
2015-08-27 18:26:55 -07:00
Stephen Birarda
8ea20b5e5e
fix warning on string literal call to qFatal
2015-08-27 18:26:55 -07:00
Stephen Birarda
f7d32add0c
wrap OVR variables in ifdef for MAJOR_VERSION >= 6
2015-08-27 18:26:55 -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
Brad Hefta-Gaub
542b124146
first cut at breakdance toy
2015-08-27 16:12:33 -07:00
Stephen Birarda
b4e624a64d
don't read packets that are too small
2015-08-27 15:38:18 -07:00
Philip Rosedale
d0db56a4a6
Merge pull request #5667 from howard-stearns/rig-menu-toggle
...
Rig Menu Toggle and new animations
2015-08-27 13:52: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
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
