David Rowe
|
bbffa6474b
|
Add users.js to default scripts
|
2015-03-11 10:32:14 -07:00 |
|
David Rowe
|
532e4feebb
|
Remove dead code and fix typos
|
2015-03-11 10:30:09 -07:00 |
|
Ryan Huffman
|
6c978c0ff3
|
Add look.js
Merges both lookWithMouse and lookWithTouch, and updates mouse look to
only work with right-click
|
2015-03-11 10:27:38 -07:00 |
|
David Rowe
|
22ff97fd27
|
Make visible by default
|
2015-03-11 10:25:24 -07:00 |
|
David Rowe
|
d36399c65d
|
Add heading
|
2015-03-11 10:21:49 -07:00 |
|
David Rowe
|
c30bf5667f
|
Fix teleporting to user
|
2015-03-11 10:15:34 -07:00 |
|
Ryan Huffman
|
e4f7e35587
|
Hide edit tools when inactive
|
2015-03-11 10:10:11 -07:00 |
|
David Rowe
|
ad08a7dde2
|
Position window at bottom left of screen
|
2015-03-11 09:37:18 -07:00 |
|
David Rowe
|
a3c4429e0b
|
Longer wait until requesting status again after request error
|
2015-03-11 09:36:26 -07:00 |
|
David Rowe
|
d071bc50a4
|
Change from paragraph of usernames to single column of usernames
|
2015-03-10 17:20:08 -07:00 |
|
Brad Hefta-Gaub
|
6f24a62758
|
Merge pull request #4414 from birarda/master
workaround for missing touch begin event in 5.4.x
|
2015-03-10 17:09:33 -07:00 |
|
Stephen Birarda
|
3579bb46ab
|
handle touch update without a touch begin event
|
2015-03-10 17:04:30 -07:00 |
|
Philip Rosedale
|
2e85cf7459
|
Merge pull request #4413 from birarda/master
fix stereo to stereo resampling via soxr
|
2015-03-10 16:09:31 -07:00 |
|
Stephen Birarda
|
8ede9fb39b
|
fix stereo to stereo resampling
|
2015-03-10 15:50:30 -07:00 |
|
Seth Alves
|
cf20596d6d
|
Merge pull request #4406 from ZappoMan/svoFromURL
Support for importing from a network URL
|
2015-03-10 15:41:41 -07:00 |
|
David Rowe
|
4e8fcd47c0
|
Show/hide users window with menu item
|
2015-03-10 13:51:25 -07:00 |
|
Philip Rosedale
|
182a1a726d
|
remove debug
|
2015-03-10 13:34:16 -07:00 |
|
Philip Rosedale
|
2d6c51ac77
|
Detect moving objects before catching them
|
2015-03-10 13:32:56 -07:00 |
|
David Rowe
|
59762175e4
|
Grow/shrink window as size of users list changes
|
2015-03-10 12:44:34 -07:00 |
|
ZappoMan
|
e16961c958
|
removed dead code
|
2015-03-10 12:36:31 -07:00 |
|
ZappoMan
|
feddea821a
|
cleanup import from file vs url
|
2015-03-10 12:35:12 -07:00 |
|
David Rowe
|
a4fe9c1a12
|
Click on username to TP to them
|
2015-03-10 12:32:48 -07:00 |
|
ZappoMan
|
5facb39aa7
|
support for import entities from network URL
|
2015-03-10 12:21:37 -07:00 |
|
David Rowe
|
63d8da0233
|
Display user names in 2D window
|
2015-03-10 10:57:47 -07:00 |
|
David Rowe
|
d25d3bc6ab
|
Get users online from Web API
|
2015-03-10 10:57:46 -07:00 |
|
Andrew Meadows
|
a758ccd75a
|
Merge pull request #4402 from birarda/master
add underlying controls for user discoverability
|
2015-03-10 08:30:46 -07:00 |
|
Stephen Birarda
|
2f22c0cd96
|
cleanup username API from GlobalServicesScriptingInterface
|
2015-03-09 16:28:01 -07:00 |
|
Seth Alves
|
99300a5bc8
|
merge from master
|
2015-03-09 13:39:51 -07:00 |
|
Andrew Meadows
|
51d05cc43e
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/networking/src/PacketHeaders.cpp
|
2015-03-09 08:51:49 -07:00 |
|
Seth Alves
|
08c3fa6363
|
merge from upstream
|
2015-03-08 17:29:05 -07:00 |
|
Seth Alves
|
cdeda67942
|
Collision Model url
|
2015-03-07 20:25:18 -08:00 |
|
Seth Alves
|
1bf8054cec
|
Collision Model
|
2015-03-07 20:24:50 -08:00 |
|
Seth Alves
|
f6948193f1
|
add fields for collision model url
|
2015-03-07 20:24:11 -08:00 |
|
Seth Alves
|
72ebae72c0
|
allow adding entities with model urls that end in .obj
|
2015-03-07 20:22:32 -08:00 |
|
Andrew Meadows
|
ba6e66f169
|
merge upstream/master into andrew/isentropic
|
2015-03-07 18:03:49 -08:00 |
|
Andrew Meadows
|
5b854857c1
|
fix JS scripts to use radians per second
in entity properties
|
2015-03-07 18:02:41 -08:00 |
|
David Rowe
|
d112c455e2
|
Add hmdDefaults.js script
|
2015-03-06 17:49:31 -08:00 |
|
Brad Hefta-Gaub
|
fd6f8c7792
|
Merge pull request #4382 from huffman/import-export
Improvements to Import/Export entities
|
2015-03-06 16:31:57 -08:00 |
|
Ryan Huffman
|
b3631de93c
|
Remove print statements from entityList.js
|
2015-03-06 12:03:36 -08:00 |
|
Ryan Huffman
|
9247ccd7b3
|
Remove ExportMenu.js and ModelImporter.js
|
2015-03-05 13:55:22 -08:00 |
|
Ryan Huffman
|
08b905095d
|
Remove Paste Models and rename Import/Export to Entities
|
2015-03-05 13:54:27 -08:00 |
|
Ryan Huffman
|
a2617b2c96
|
Update editEntities import/export
|
2015-03-05 13:52:59 -08:00 |
|
Stephen Birarda
|
8f2dc7e38b
|
resolve conflicts on merge with upstream master
|
2015-03-03 12:22:25 -08:00 |
|
Brad Hefta-Gaub
|
b88d52a310
|
Merge pull request #4363 from huffman/block-restricted-users
Add permission-checking to edit entities
|
2015-03-03 11:04:46 -08:00 |
|
Stephen Birarda
|
03de43d451
|
simplify notifications.js after chat removal
|
2015-03-03 10:22:57 -08:00 |
|
Stephen Birarda
|
cf227b94de
|
remove global services example that leveraged xmpp
|
2015-03-03 10:17:53 -08:00 |
|
Stephen Birarda
|
a893f11ad7
|
remove load script from message that used xmpp
|
2015-03-03 10:17:29 -08:00 |
|
Clément Brisset
|
5ef86f88f5
|
Merge pull request #4364 from huffman/save-on-blur
Fix properties window changes not taking affect when losing focus
|
2015-03-03 08:35:49 -08:00 |
|
Ryan Huffman
|
98e0f235cc
|
Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users
|
2015-03-02 14:47:26 -08:00 |
|
Brad Hefta-Gaub
|
6d8ccfbc2a
|
Merge pull request #4357 from huffman/update-light-entity-properties
Update light entity properties
|
2015-03-02 13:51:48 -08:00 |
|
Ryan Huffman
|
f739bf2116
|
Fix properties window changes not taking affect when losing focus
|
2015-03-02 11:20:00 -08:00 |
|
Ryan Huffman
|
26e3b331ee
|
Update editEntities.js lock checking to use event instead of polling
|
2015-03-02 10:42:09 -08:00 |
|
Ryan Huffman
|
0638459052
|
Add permission-checking to edit entities
|
2015-03-02 09:51:41 -08:00 |
|
Ryan Huffman
|
a48c428f42
|
Update highlighted handle color
|
2015-02-27 15:29:00 -08:00 |
|
Ryan Huffman
|
dc2cb93cce
|
Add degrees symbol to rotation degrees text
|
2015-02-27 15:11:43 -08:00 |
|
Ryan Huffman
|
a0d9e92c64
|
Update size of rotation overlay
|
2015-02-27 15:11:23 -08:00 |
|
Ryan Huffman
|
4f4ab144b2
|
Update handle colors and up/down arrow image
|
2015-02-27 15:10:56 -08:00 |
|
Ryan Huffman
|
cd3281521c
|
Update size of rotation degrees text
|
2015-02-27 15:08:29 -08:00 |
|
Ryan Huffman
|
3ffd47a0b0
|
Update editEntities rotation arrows
|
2015-02-27 15:08:13 -08:00 |
|
Ryan Huffman
|
20f3d23ae7
|
Update editEntities to use new light properties
|
2015-02-27 13:46:26 -08:00 |
|
Brad Hefta-Gaub
|
addc729654
|
Merge pull request #4350 from huffman/multi-select
Multi select properties for edit entities
|
2015-02-27 10:54:42 -08:00 |
|
Brad Hefta-Gaub
|
08dc883b0e
|
Merge pull request #4351 from huffman/update-light-properties
Update light properties (primarily for editEntities.js)
|
2015-02-27 10:54:19 -08:00 |
|
Brad Hefta-Gaub
|
e78b2ced4a
|
Merge pull request #4349 from huffman/no-nearby-entities-msg
Add message to edit entities list for when no entities are nearby
|
2015-02-27 10:53:17 -08:00 |
|
Sam Gateau
|
c7eeebe52c
|
and fixing a bug with shadowing of lightmapped surface
|
2015-02-26 18:07:43 -08:00 |
|
Sam Gateau
|
74f0d98fd6
|
REfining the naming and introducing an orientation offset
|
2015-02-26 17:44:04 -08:00 |
|
Sam Gateau
|
f6a9bd1870
|
REfining the naming and introducing an orientation offset
|
2015-02-26 17:26:41 -08:00 |
|
Ryan Huffman
|
74bc48ce55
|
Add message to edit entities list for when no entities are nearby
|
2015-02-26 14:34:32 -08:00 |
|
Ryan Huffman
|
ecc003c5e1
|
Adjust colors for disabled input elements
|
2015-02-26 14:23:25 -08:00 |
|
Ryan Huffman
|
3c5f11e6ed
|
Add initial support for multi-selection in properties window
|
2015-02-26 14:23:11 -08:00 |
|
Sam Gateau
|
96d5a2ab42
|
fixing tab maybe
|
2015-02-26 12:10:08 -08:00 |
|
Sam Gateau
|
bc8d688cde
|
fixing tab maybe
|
2015-02-26 12:04:33 -08:00 |
|
Ryan Huffman
|
c3a7257439
|
Remove unused light properties from entity properties window
|
2015-02-26 11:03:06 -08:00 |
|
Sam Gateau
|
fcb293d0b2
|
CLean up before pr
|
2015-02-26 10:45:00 -08:00 |
|
Sam Gateau
|
a757229c0e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-02-25 19:18:01 -08:00 |
|
Sam Gateau
|
b4cb5ca9d1
|
add an example script to control the sun light
|
2015-02-25 19:09:18 -08:00 |
|
Brad Hefta-Gaub
|
8c26be49d7
|
Merge pull request #4330 from huffman/edit-off-on-domain-change
Turn editEntities off on domain change
|
2015-02-24 20:11:39 -08:00 |
|
Brad Hefta-Gaub
|
9ded2699e2
|
Merge pull request #4327 from thoys/20364
CR for Job #20364 - Add toggle to turn off sounds in notifications.js
|
2015-02-24 20:06:57 -08:00 |
|
Philip Rosedale
|
573390b429
|
fix dice for collision shapes, add angular velocity
|
2015-02-24 11:55:41 -08:00 |
|
Philip Rosedale
|
9d021a1a1e
|
remove unused line
|
2015-02-24 11:49:12 -08:00 |
|
Philip Rosedale
|
7489b468f3
|
give angular velocity to the thrown ball
|
2015-02-24 11:48:35 -08:00 |
|
Ryan Huffman
|
c9818c184a
|
Update editEntities to turn off when switching domains
|
2015-02-24 10:47:55 -08:00 |
|
Thijs Wenker
|
793116b90c
|
ability to mute all notifications or just certain types
|
2015-02-23 21:00:26 +01:00 |
|
Andrew Meadows
|
f2fc781523
|
change shapeType to use strings in billiards.js
|
2015-02-23 11:42:36 -08:00 |
|
Andrew Meadows
|
456acd8833
|
merge upstream/master into andrew/bispinor
|
2015-02-23 11:41:40 -08:00 |
|
Andrew Meadows
|
d5733f3782
|
Merge pull request #4318 from PhilipRosedale/master
Billiard balls are now textured models
|
2015-02-20 17:59:33 -08:00 |
|
Andrew Meadows
|
27e6f99deb
|
use strings for shapeType for JS Entity properties
|
2015-02-20 16:54:58 -08:00 |
|
Ryan Huffman
|
cf0b13f869
|
Update notifications.js audio to be local-only
|
2015-02-20 14:22:59 -08:00 |
|
Brad Hefta-Gaub
|
5d6d9bb1d4
|
Merge pull request #4320 from huffman/fix-camera-move-on-mirror
Fix entity camera tool from taking over in mirror mode
|
2015-02-20 10:40:03 -08:00 |
|
Brad Hefta-Gaub
|
32bbc8d551
|
Merge pull request #4317 from birarda/master
dynamically grab animation URL as model URL from model
|
2015-02-20 10:39:30 -08:00 |
|
Ryan Huffman
|
c665a3873d
|
Fix entity camera tool from taking over in mirror mode
|
2015-02-20 10:11:55 -08:00 |
|
Philip Rosedale
|
66d1eeb327
|
Add textured models as balls
|
2015-02-19 21:11:51 -08:00 |
|
Stephen Birarda
|
51ad631c54
|
dynamically grab animation URL as model URL from model
|
2015-02-19 13:14:46 -08:00 |
|
David Rowe
|
a947cda0b2
|
Update SVG URL to Amazon S3
|
2015-02-18 13:02:37 -08:00 |
|
Clément Brisset
|
87f4ae2425
|
Merge pull request #4304 from thoys/20245
CR for Job #20245 - Implement UI sounds for virtualKeyboard & notifications
|
2015-02-18 09:55:34 -08:00 |
|
Thijs Wenker
|
d10f37291b
|
check if sounds are downloaded before play thanks @Atlante45
|
2015-02-18 18:25:16 +01:00 |
|
Clément Brisset
|
7183400e43
|
Merge pull request #4305 from ctrlaltdavid/20308
CR for Job #20308 - Refine progress.js
|
2015-02-18 08:10:57 -08:00 |
|
Andrew Meadows
|
1c8f1bbcdd
|
Merge pull request #4299 from talentraspel/20338
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…
|
2015-02-17 17:47:47 -08:00 |
|
Thijs Wenker
|
96b3114a36
|
style
|
2015-02-17 23:37:37 +01:00 |
|
Thijs Wenker
|
4d12a6d81c
|
Merge branch 'master' of https://github.com/worklist/hifi into 20245
Conflicts:
examples/notifications.js
|
2015-02-17 23:30:58 +01:00 |
|
Kai Ludwig
|
4048627de7
|
2n try: removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script.
|
2015-02-17 18:50:20 +01:00 |
|
Kai Ludwig
|
fa1bcc43e6
|
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script.
|
2015-02-17 18:40:20 +01:00 |
|
Andrew Meadows
|
5cd1950bed
|
Merge pull request #4297 from huffman/fix-mouse-look-clash
Fix mouse look clash
|
2015-02-17 09:33:50 -08:00 |
|
Andrew Meadows
|
d896f3a811
|
Merge pull request #4252 from thoys/20224
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
|
2015-02-17 09:03:17 -08:00 |
|
Ryan Huffman
|
97e70920ce
|
Move handling of add model buttons to mouseRelease
|
2015-02-17 08:23:39 -08:00 |
|
Ryan Huffman
|
d1f7a730ad
|
Make add-model button non-selectable
|
2015-02-17 08:23:11 -08:00 |
|
Brad Hefta-Gaub
|
f6ff0665ca
|
Merge pull request #4286 from huffman/fix-nat-dims
Fix "reset to natural dimensions" when dimensions not known
|
2015-02-13 16:31:34 -08:00 |
|
Ryan Huffman
|
2df850eb8d
|
Fix natural dimensions check
|
2015-02-13 15:02:16 -08:00 |
|
Ryan Huffman
|
0495833ca6
|
Disallow entity models to be reset to natural dimensions if unknown
|
2015-02-13 15:00:37 -08:00 |
|
Brad Hefta-Gaub
|
5c048db5f5
|
Merge pull request #4284 from sethalves/fix-butterflies
if butterflies stop moving, they are no longer kinematic, so give them a velocity
|
2015-02-13 12:45:08 -08:00 |
|
Seth Alves
|
6ff4f8c2c0
|
give butterflies an initial velocity so that they are on the kinematics list
|
2015-02-13 11:52:23 -08:00 |
|
Brad Hefta-Gaub
|
59b2c38eb1
|
Merge pull request #4277 from huffman/fix-select-box
Update editEntities to not select new entity when edit tools are off
|
2015-02-13 10:50:11 -08:00 |
|
Andrew Meadows
|
d69efa03d8
|
Merge pull request #4276 from birarda/master
repairs to memory management for AudioInjectors
|
2015-02-13 10:15:07 -08:00 |
|
Thijs Wenker
|
062c2cbcee
|
HUD LookAt positions could be NULL now if whenever they're out of range
HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D()
HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()
|
2015-02-12 22:55:44 +01:00 |
|
Ryan Huffman
|
813673b720
|
Fix grid tool not showing minor grid width
|
2015-02-12 13:19:09 -08:00 |
|
Ryan Huffman
|
a3d09e6adc
|
Fix edit grid not showing up
|
2015-02-12 13:18:58 -08:00 |
|
Ryan Huffman
|
51ce8c7100
|
Update editEntities to not select new entity when edit tools are off
|
2015-02-12 13:09:37 -08:00 |
|
Stephen Birarda
|
0154ac9734
|
final script repairs for new AudioInjector API
|
2015-02-12 11:52:20 -08:00 |
|
Stephen Birarda
|
1120a5f963
|
use new injector API in inWorldTestTone
|
2015-02-12 11:50:48 -08:00 |
|
Stephen Birarda
|
eda7d8ffb1
|
use new injector APIs in movable script
|
2015-02-12 11:49:01 -08:00 |
|
Stephen Birarda
|
70e085009b
|
use injector restart in airGuitar script
|
2015-02-12 11:44:14 -08:00 |
|
Stephen Birarda
|
5715642e04
|
fix for restart API in lobby script
|
2015-02-12 11:13:30 -08:00 |
|
Stephen Birarda
|
ea52cea5dd
|
more cleanup for AudioInjector mem management
|
2015-02-12 10:56:40 -08:00 |
|
Stephen Birarda
|
7becf62ba9
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-12 10:28:04 -08:00 |
|
Brad Hefta-Gaub
|
fa5eebd93e
|
Merge pull request #4269 from AndrewMeadows/thermonuclear
ModelEntityItem gets _shapeType
|
2015-02-12 10:06:01 -08:00 |
|
Andrew Meadows
|
5bb504ad55
|
Merge pull request #4268 from huffman/remove-upload-model
Remove upload from file from editEntities.js
|
2015-02-12 08:57:22 -08:00 |
|
Stephen Birarda
|
e3c4ead323
|
remove unecessary injector stops
|
2015-02-11 16:23:57 -08:00 |
|
Stephen Birarda
|
05b7cd819e
|
use isPlaying property instead of getter
|
2015-02-11 16:21:45 -08:00 |
|
Stephen Birarda
|
f9174366dc
|
fixes for new injector API in other scripts
|
2015-02-11 16:20:48 -08:00 |
|
Stephen Birarda
|
d8646f6ea0
|
repairs for new injector API in air guitar script
|
2015-02-11 16:17:10 -08:00 |
|
Stephen Birarda
|
6a5c0fd9f2
|
repairs for new injector API in lobby script
|
2015-02-11 16:16:01 -08:00 |
|
Thijs Wenker
|
cb09656624
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-02-11 22:58:27 +01:00 |
|
Thijs Wenker
|
2c52c9c3c0
|
fixes for the virtualKeyboardTextEntityExample
|
2015-02-11 22:57:59 +01:00 |
|
Andrew Meadows
|
9f59addbc2
|
merge upstream/master into andrew/thermonuclear
|
2015-02-11 13:35:28 -08:00 |
|
Ryan Huffman
|
957686e12e
|
Remove upload from file from editEntities.js
|
2015-02-11 09:04:56 -08:00 |
|
Andrew Meadows
|
13c953494c
|
Merge pull request #4264 from huffman/entity-resize
Increase entity-resize timeout to 2 minutes
|
2015-02-11 09:02:26 -08:00 |
|
Andrew Meadows
|
68c1e9ef71
|
Merge pull request #4260 from birarda/master
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
|
2015-02-11 09:02:18 -08:00 |
|
Andrew Meadows
|
d9b57de649
|
merge upstream/master into andrew/thermonuclear
|
2015-02-11 08:56:34 -08:00 |
|
Andrew Meadows
|
ac8db02029
|
add ShapeType to UI of entity properties editor
|
2015-02-11 08:54:35 -08:00 |
|
Ryan Huffman
|
6eca8610b6
|
Increase entity-resize timeout to 2 minutes
|
2015-02-10 15:54:04 -08:00 |
|
Brad Hefta-Gaub
|
3e8f7dc3da
|
Merge pull request #4263 from huffman/text-size
Increase size of text entity
|
2015-02-10 15:04:32 -08:00 |
|
Ryan Huffman
|
9997ef1b97
|
Increase size of text entity
|
2015-02-10 14:23:00 -08:00 |
|
Stephen Birarda
|
fe79d8902e
|
replace data with metaverse for highfidelity urls
|
2015-02-10 10:05:38 -08:00 |
|
Ryan Huffman
|
39cc6c86ae
|
Update selected entity color to have more contrast
|
2015-02-10 09:03:48 -08:00 |
|
Ryan Huffman
|
8d65caaaef
|
Update entity list search input to be full width with margin
|
2015-02-10 09:03:21 -08:00 |
|
Ryan Huffman
|
7ac3bd3ee8
|
Add padding to buttons in entity list
|
2015-02-10 09:02:53 -08:00 |
|
Thijs Wenker
|
1d5afba1fa
|
removed some console noise
|
2015-02-09 18:40:36 +01:00 |
|
Thijs Wenker
|
e53b38e497
|
style / make sure the magnifier isn't rendered when we don't want it
|
2015-02-09 17:16:54 +01:00 |
|
Thijs Wenker
|
d810283d5a
|
just show the instructions the first 2 times
|
2015-02-09 16:47:00 +01:00 |
|
Thijs Wenker
|
8251542b78
|
show instructions whenever the first gamepad is plugged since the script is loaded
|
2015-02-07 14:35:14 +01:00 |
|
Thijs Wenker
|
0a41033c85
|
- set cursor invisible when virtual-keyboard is shown.
- get rid of the invisible cursor/magnifier states when cleaning up keyboard.
|
2015-02-07 13:58:11 +01:00 |
|