Atlante45
|
5c88485eb9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks
|
2014-09-02 13:58:05 -07:00 |
|
Clément Brisset
|
54315e26a8
|
Merge pull request #3334 from ctrlaltdavid/19992
Code Review for Job #19992
|
2014-09-02 13:11:53 -07:00 |
|
Atlante45
|
049e0d763d
|
Added ControlACs script
|
2014-09-02 12:57:19 -07:00 |
|
Atlante45
|
61467f7f3d
|
Added ControlledAC script
|
2014-09-02 12:56:51 -07:00 |
|
Atlante45
|
872ec21822
|
Added removeLastTool() to toolBar.js
|
2014-09-02 12:55:15 -07:00 |
|
Thijs Wenker
|
1c41734569
|
Avatar.setLoop is now Avatar.setPlayerLoop
|
2014-08-30 15:50:20 +02:00 |
|
Atlante45
|
9b5b83117f
|
CR
|
2014-08-29 14:25:05 -07:00 |
|
David Rowe
|
518fa7936c
|
Increase model uploader menu width to accommodate large fonts
|
2014-08-28 17:25:35 -07:00 |
|
Atlante45
|
1a131b0e29
|
Removed some debug + fixed some checks
|
2014-08-28 11:50:18 -07:00 |
|
Atlante45
|
a6bf9d7b90
|
Handle URL recordings + some safety checks
|
2014-08-28 11:42:39 -07:00 |
|
Atlante45
|
691ace7cc6
|
Looping option
|
2014-08-27 19:05:39 -07:00 |
|
Atlante45
|
b1ca1e9840
|
Script to play recording on ACs
|
2014-08-26 18:24:09 -07:00 |
|
Atlante45
|
41461cd322
|
Added option to playback from current location
|
2014-08-26 17:23:50 -07:00 |
|
Brad Hefta-Gaub
|
a51cace167
|
Merge pull request #3319 from Atlante45/sitting_points_not_disappearing_when_switching_to_fake_domain
fix sitting points on domain switch
|
2014-08-25 18:42:19 -07:00 |
|
Atlante45
|
1acce5c725
|
fix sitting points on domain switch
|
2014-08-25 18:02:30 -07:00 |
|
Clément Brisset
|
91946e048f
|
Merge pull request #3318 from ctrlaltdavid/19915
Code Review for Job #19915
|
2014-08-25 16:49:02 -07:00 |
|
Craig Hansen-Sturm
|
4f346bfe62
|
addresses more coding-standard spacing issues
|
2014-08-25 13:07:52 -07:00 |
|
Craig Hansen-Sturm
|
fd5e3d61dc
|
minor cleanup of playSoundOrbit.js + playSound.js
|
2014-08-25 10:55:11 -07:00 |
|
Craig Hansen-Sturm
|
848144d98c
|
Merge remote-tracking branch 'upstream/master'
|
2014-08-24 22:17:30 -07:00 |
|
Craig Hansen-Sturm
|
4cd1f4afef
|
add support for head-shadow/penumbra filter for positional audio streams
|
2014-08-24 22:17:07 -07:00 |
|
David Rowe
|
761387854d
|
Extrude per mouse movement in voxel space instead of screen space
|
2014-08-22 10:09:10 -07:00 |
|
David Rowe
|
c8ac5f584a
|
Convert to vector maths
|
2014-08-22 09:29:08 -07:00 |
|
AndrewMeadows
|
ff9f079704
|
Merge pull request #3308 from Atlante45/record_feature
Record feature Scripted UI
|
2014-08-21 09:56:02 -07:00 |
|
Atlante45
|
022109a249
|
Added timestamps to the scripted UI
|
2014-08-20 19:36:56 -07:00 |
|
Atlante45
|
56f7f88d75
|
Changed icon URLs to the right ones
|
2014-08-20 18:17:38 -07:00 |
|
Atlante45
|
8f9a322318
|
Recording UI
|
2014-08-20 18:04:17 -07:00 |
|
Atlante45
|
e3ab6476ca
|
Recorder.js first draft
|
2014-08-20 15:21:18 -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
|
8e024982d5
|
Merge pull request #3301 from huffman/19864
Code Review for Job #19864
|
2014-08-19 20:48:30 -07:00 |
|
Thijs Wenker
|
415e58c8bd
|
Frisbee script
|
2014-08-20 02:19:53 +02:00 |
|
Philip Rosedale
|
95e0d5928e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-08-19 16:40:04 -07:00 |
|
Philip Rosedale
|
d685e5c8b9
|
Added roll strafe, pitch ascend, more tuning movement
|
2014-08-19 16:05:01 -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 |
|
Clément Brisset
|
8de49c9a87
|
Merge pull request #3299 from ctrlaltdavid/19840
Ignore empty "embedded" textures
|
2014-08-19 10:36:17 -07:00 |
|
David Rowe
|
1a80bd98f0
|
Ignore empty "embedded" textures
Blender 2.71 exporter "embeds" external textures as empty binary blobs
|
2014-08-19 10:25:18 -07:00 |
|
Philip Rosedale
|
51922d68ab
|
dead zones
|
2014-08-18 23:42:42 -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 |
|
AndrewMeadows
|
86aa9a1dcf
|
Merge pull request #3289 from ctrlaltdavid/19840
Code Review for Job #19840
|
2014-08-18 15:05:26 -07:00 |
|
David Rowe
|
f7addad5ac
|
Update progress background image to use copy on S3
|
2014-08-14 17:20:00 -07:00 |
|
David Rowe
|
29f4f5b21a
|
Support FBX files with embedded textures
|
2014-08-14 11:18:10 -07:00 |
|
David Rowe
|
8c913fe8c1
|
Add progress dialog and ability to cancel during the model upload
|
2014-08-13 10:23:59 -07:00 |
|
David Rowe
|
fbaeeef014
|
Merge branch 'master' into 19840
Resolved conflicts in editModels.js
|
2014-08-11 20:59:37 -07:00 |
|
Ryan Huffman
|
6437ca1b50
|
Update commands for speechControl.js
|
2014-08-11 16:52:06 -07:00 |
|
David Rowe
|
53602c2ef2
|
Miscellaneous tidying
|
2014-08-11 10:55:31 -07:00 |
|
David Rowe
|
0b979d2e1e
|
Disabled SVO model uploading: server doesn't support SVO file uploads
|
2014-08-11 10:54:46 -07:00 |
|
David Rowe
|
f12973d5d0
|
Cater for multiple mapping values
|
2014-08-11 10:12:47 -07:00 |
|
David Rowe
|
9a21f1c355
|
Fix FST file reading and writing
|
2014-08-08 21:51:14 -07:00 |
|
David Rowe
|
54ea86d6be
|
Fix texture directory display and validation
|
2014-08-08 20:40:15 -07:00 |
|