stojce
|
7e250bc899
|
Remove custom styling
|
2014-08-23 00:16:25 +02:00 |
|
AndrewMeadows
|
4f3f0989f5
|
Merge pull request #3313 from ctrlaltdavid/libovr_readme
Bring libovr build instructions up to date
|
2014-08-22 09:27:04 -07:00 |
|
David Rowe
|
cd81d6fc07
|
Bring libovr build instructions up to date
|
2014-08-21 19:24:09 -07:00 |
|
Andrzej Kapolka
|
5c77317cfd
|
Fix for flashing when painting textures.
|
2014-08-21 18:07:30 -07:00 |
|
Andrzej Kapolka
|
6e06b63709
|
For splat textures, use transparent white as a default.
|
2014-08-21 16:33:09 -07:00 |
|
Andrzej Kapolka
|
530f5b0df8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-21 16:00:30 -07:00 |
|
Andrzej Kapolka
|
e152e0c2be
|
Detachment fix.
|
2014-08-21 15:22:34 -07:00 |
|
Clément Brisset
|
6a6670a962
|
Merge pull request #3307 from AndrewMeadows/inertia
JS scripts can set spine rotation
|
2014-08-21 11:07:39 -07:00 |
|
AndrewMeadows
|
ff9f079704
|
Merge pull request #3308 from Atlante45/record_feature
Record feature Scripted UI
|
2014-08-21 09:56:02 -07:00 |
|
Andrew Meadows
|
328167464f
|
Merge branch '19908' of github.com:huffman/hifi into huffman-19908
Conflicts:
interface/src/Menu.cpp
|
2014-08-21 09:21:24 -07:00 |
|
Atlante45
|
022109a249
|
Added timestamps to the scripted UI
|
2014-08-20 19:36:56 -07:00 |
|
Andrzej Kapolka
|
72500630b0
|
Basic splatting.
|
2014-08-20 19:26:06 -07:00 |
|
Andrew Meadows
|
7e4c72445e
|
JS scripts set joint animation priorities
|
2014-08-20 17:14:59 -07:00 |
|
Atlante45
|
4922592cfa
|
Debug tweaks
|
2014-08-20 15:21:33 -07:00 |
|
Andrzej Kapolka
|
416d9bac2e
|
Working on texture rendering.
|
2014-08-20 14:48:02 -07:00 |
|
Andrew Meadows
|
a01d3781d9
|
simplified SkeletonModel::maybeUpdateLeanRotation()
|
2014-08-20 12:48:52 -07:00 |
|
Clément Brisset
|
c76afe7d4a
|
Merge pull request #3298 from PhilipRosedale/master
First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering
|
2014-08-20 10:16:25 -07:00 |
|
Philip Rosedale
|
5e94070aa0
|
Merge pull request #3304 from huffman/19864
Add AppKit as a dependency in interface CMakeLists.txt
|
2014-08-19 22:31:54 -07:00 |
|
Ryan Huffman
|
6b1671c598
|
Add AppKit as a dependency in interface CMakeLists.txt
|
2014-08-19 22:17:09 -07:00 |
|
Philip Rosedale
|
8e958b49c0
|
Merge pull request #3303 from Atlante45/record_feature
Record feature JS API + File Format
|
2014-08-19 21:25:18 -07:00 |
|
Philip Rosedale
|
c68ed81691
|
fixes per code review
|
2014-08-19 20:54:08 -07:00 |
|
Philip Rosedale
|
8e024982d5
|
Merge pull request #3301 from huffman/19864
Code Review for Job #19864
|
2014-08-19 20:48:30 -07:00 |
|
Ryan Huffman
|
3d940469de
|
Increase display name drawing distance
|
2014-08-19 19:41:31 -07:00 |
|
Ryan Huffman
|
42de56381a
|
Update blue audio sphere name and angle to draw at
|
2014-08-19 19:40:27 -07:00 |
|
Ryan Huffman
|
3b7260c434
|
Fix blue audio sphere not showing correctly
|
2014-08-19 19:22:11 -07:00 |
|
Ryan Huffman
|
8bc5f86666
|
Add Audio Sphere menu option
|
2014-08-19 19:21:53 -07:00 |
|
Atlante45
|
72c60ee69c
|
Remove used variable
|
2014-08-19 19:01:50 -07:00 |
|
Andrzej Kapolka
|
7cf7f188f8
|
Yet more texture bits.
|
2014-08-19 18:55:18 -07:00 |
|
Atlante45
|
c21d1a41e5
|
Removed debug messages
|
2014-08-19 18:30:14 -07:00 |
|
Andrew Meadows
|
8c4f0968d8
|
remove unused JointState::setRotation() method
|
2014-08-19 17:33:06 -07:00 |
|
Andrew Meadows
|
1a8a2d9156
|
Add Avatar submenu to main menu for non-debug stuff
|
2014-08-19 17:26:01 -07:00 |
|
Atlante45
|
b028b845f4
|
Fox audio recording not being triggerred from JS
|
2014-08-19 17:22:05 -07:00 |
|
Atlante45
|
b13604f968
|
JS API for recording
|
2014-08-19 16:43:26 -07:00 |
|
Atlante45
|
db8869a34d
|
File format implementation + threading tweaks
|
2014-08-19 16:42:43 -07:00 |
|
Philip Rosedale
|
d685e5c8b9
|
Added roll strafe, pitch ascend, more tuning movement
|
2014-08-19 16:05:01 -07:00 |
|
Andrzej Kapolka
|
3136e4df76
|
More texture progress.
|
2014-08-19 15:28:15 -07:00 |
|
Andrzej Kapolka
|
a9c4ce2a6a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-19 14:21:42 -07:00 |
|
Andrzej Kapolka
|
e854656a7f
|
Rather than using a boolean to indicate "colorness," use a different class.
More texture bits.
|
2014-08-19 14:20:47 -07:00 |
|
Ryan Huffman
|
284c4d8ac0
|
Merge branch 'master' of github.com:highfidelity/hifi into 19864
Conflicts:
interface/CMakeLists.txt
|
2014-08-19 11:59:53 -07:00 |
|
Andrew Meadows
|
f511fe2657
|
Ragdoll cannot assume skeleton's rootIndex is 0
some Models have extra "joints" not part of the normal skeleton
|
2014-08-19 11:31:50 -07:00 |
|
Philip Rosedale
|
8fe1457776
|
removed unneeded audio and light stats from main stats screen
|
2014-08-19 10:14:13 -07:00 |
|
Philip Rosedale
|
1d13a6c05d
|
Stabilize face shift head camera movement with velocity filtering
|
2014-08-19 09:37:11 -07:00 |
|
Philip Rosedale
|
9d44f5e4f7
|
measure face shift frame time rather than use constant
|
2014-08-19 08:18:19 -07:00 |
|
Philip Rosedale
|
7b86f668a6
|
Add SPACE to scripting JS, change reset to apostrophe
|
2014-08-18 23:22:55 -07:00 |
|
Philip Rosedale
|
8d2433382a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-08-18 21:32:48 -07:00 |
|
Philip Rosedale
|
39b370979c
|
JS calls for head motion/rotation that allow avatar flying with head movement
|
2014-08-18 21:32:40 -07:00 |
|
Atlante45
|
29830916ba
|
Fix bug introduced in CR
|
2014-08-18 21:06:32 -07:00 |
|
Andrzej Kapolka
|
23a4c21ce1
|
Only allow heightfield brushes on heightfield attributes.
|
2014-08-18 18:29:19 -07:00 |
|
Andrzej Kapolka
|
5b8ff07449
|
Working on heightfield textures.
|
2014-08-18 18:21:48 -07:00 |
|
Atlante45
|
c113dd350e
|
Moved members to MyAvatar
|
2014-08-18 16:25:38 -07:00 |
|