Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 07:36:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23015 commits 25 branches 0 tags 1.1 GiB
Commit graph

2046 commits

Author SHA1 Message Date
David Rowe
f3147ab3e4 Move 3D notifications up as old ones are deleted 2015-01-21 17:58:50 -08:00
David Rowe
567ac9eb2f Update 3D notification positions as avatar moves 2015-01-21 17:08:31 -08:00
Philip Rosedale
6567fcfe0b Added shootable blocks on platform, grenade, buttons for making grid of targets 2015-01-21 16:17:25 -08:00
David Rowe
be6c6ed8ca Add 3D notifications on a simple vertical plane 2015-01-21 16:10:33 -08:00
Thijs Wenker
62b95d1558 Merge branch '20224' of github.com:thoys/hifi into 20245 2015-01-22 01:10:14 +01:00
Thijs Wenker
724b56ed8c HMD.getHUDLookAtPosition2D -> HMD.HUDLookAtPosition2D 2015-01-22 01:09:16 +01:00
Philip Rosedale
e02e0088af Improvements to gun to add shootable targets on a platform 2015-01-21 13:58:48 -08:00
Ryan Huffman
2171427bbd Update style.css to use pt instead of px for proper rendering on hidpi screens 2015-01-21 12:31:06 -08:00
Philip Rosedale
ffbe924734 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-21 09:12:15 -08:00
Thijs Wenker
9c2f6c78a8 Merge branch '20224' of github.com:thoys/hifi into 20245 
Conflicts:
	examples/notifications.js
 2015-01-21 17:26:22 +01:00
David Rowe
42b9ee8e77 Lint: Preferred control constructs 2015-01-21 08:14:45 -08:00
David Rowe
adba46f90c Lint: Preferred operators 2015-01-21 08:14:44 -08:00
David Rowe
63310fac50 Lint: Syntax 2015-01-21 08:14:44 -08:00
David Rowe
ce0c91628a Lint: Declaration order 2015-01-21 08:14:43 -08:00
David Rowe
c4b024e510 Lint: Variable declarations 2015-01-21 08:14:42 -08:00
David Rowe
e35c6be45e Lint: White space 2015-01-21 08:14:41 -08:00
Thijs Wenker
719f76d42f Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-21 15:09:11 +01:00
Thijs Wenker
9e51bece63 More accurate HMD-cursor on virtual keyboard, thanks Simon and @ctrlaltdavid for the help on this! 2015-01-21 15:07:32 +01:00
Philip Rosedale
e95cd30be6 better reticle, balls drop properly on table 2015-01-20 16:30:50 -08:00
Ryan Huffman
1f86edbfbf Remove console.log from entityList.html 2015-01-20 12:47:19 -08:00
Ryan Huffman
1a6557c72d Remove removeEntity from entityList.html 2015-01-20 12:46:26 -08:00
Ryan Huffman
3a287a08ab Fix removal of entity list menu item 2015-01-20 12:43:49 -08:00
Ryan Huffman
bc21faeefb Add entityListTool.toggleVisible 2015-01-20 12:41:58 -08:00
Ryan Huffman
903921e11f Update entity list to auto-refresh list on start 2015-01-20 12:40:31 -08:00
Ryan Huffman
891f6fa513 Move entity list to edit menu 2015-01-20 12:40:16 -08:00
Ryan Huffman
8202c84c79 Add entity list menu option 2015-01-20 12:37:39 -08:00
Ryan Huffman
0d9dbaccf7 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-20 11:44:13 -08:00
Philip Rosedale
0f368f52fb first cut of billiards.js, good enough to play with a bit 2015-01-20 09:46:18 -08:00
Thijs Wenker
6bad7a6002 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-17 01:35:35 +01:00
Ryan Huffman
d3a6a411fb Update entity list to use list.js more directly 2015-01-16 16:23:29 -08:00
David Rowe
b2cadbe36a Stop notifications of all users at startup 2015-01-16 15:24:26 -08:00
Brad Hefta-Gaub
cc9ae17964 Merge pull request #4122 from PhilipRosedale/master 
Improvements to gun adding floating targets that topple
 2015-01-15 21:34:22 -08:00
Philip Rosedale
abad341244 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-15 17:35:12 -08:00
Philip Rosedale
a07b5a9723 laser pointers to guns, toppling targets (press 't') 2015-01-15 17:34:52 -08:00
David Rowe
61caf5e4b4 Fix path to hydraMove.js 2015-01-15 17:24:25 -08:00
Stephen Birarda
cdaecbd846 Update lobby.js 2015-01-15 16:40:13 -08:00
Stephen Birarda
336f28e014 repair to places array length 2015-01-15 15:00:42 -08:00
Stephen Birarda
00f4e92e06 fix places array grab 2015-01-15 14:58:49 -08:00
Thijs Wenker
5de4f8f249 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	examples/libraries/virtualKeyboard.js
 2015-01-15 22:59:05 +01:00
Thijs Wenker
12136e5305 cursor follows look at rotation now 2015-01-15 22:25:59 +01:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
Ryan Huffman
92b99237a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-15 11:13:01 -08:00
Ryan Huffman
705e6181a1 Move entity delete action to function 2015-01-15 11:12:46 -08:00
Brad Hefta-Gaub
d5d4b4ee18 Merge pull request #4113 from huffman/edit-entity-click 
Update editEntities to do an accurate pick when the mouse is idle
 2015-01-15 11:04:34 -08:00
Brad Hefta-Gaub
fbc040759e Merge pull request #4112 from cozza13/20270 
CR for Job #20270 - Change reference of global.js
 2015-01-15 11:03:52 -08:00
Ryan Huffman
bf6d63cf0c Make accurateRay parameter required 2015-01-15 10:59:24 -08:00
Ryan Huffman
dcb4d9f02d Update editEntities to do accurate pick on mouse idle 2015-01-15 10:57:35 -08:00
Ryan Huffman
1b9b7b6797 Merge branch 'master' of github.com:highfidelity/hifi into update-properties-layout 
Conflicts:
	examples/html/entityProperties.html
 2015-01-15 10:53:07 -08:00
Chris Collins
d6a3b94c73 Changed references of global.js to a var 
Changed references of global.js to a var
 2015-01-15 10:48:31 -08:00
Ryan Huffman
dbb978e278 Update style and layout of entity properties window 2015-01-15 10:22:39 -08:00
Stephen Birarda
79d214619d update lobby for new places API 2015-01-14 18:18:26 -08:00
Thijs Wenker
80a81043ed Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 
Conflicts:
	interface/src/Menu.cpp
 2015-01-15 02:28:31 +01:00
Brad Hefta-Gaub
89967fbe7a Merge pull request #4104 from AndrewMeadows/inertia 
store density in EntityItem instead of mass
 2015-01-14 17:17:45 -08:00
Philip Rosedale
fead12acca Merge pull request #4102 from cozza13/20268 
CR for Job #20268 - Change hands for gun scripts
 2015-01-14 15:52:04 -08:00
Ryan Huffman
10f8e54903 Update style of properties windows 2015-01-14 15:50:42 -08:00
Clément Brisset
ce12e61a27 Merge pull request #4101 from huffman/fix-rotation-image 
Fix rotation handles not showing up
 2015-01-14 15:49:09 -08:00
Andrew Meadows
f90b128ac3 use density instead of mass in scripts/UI 2015-01-14 15:48:05 -08:00
Chris Collins
6ce71d9655 Fix library and placement reference 
Fix library reference and switch the gun hand.
 2015-01-14 13:54:34 -08:00
Ryan Huffman
e7eb12202a Fix rotation handles not showing up 2015-01-14 09:41:34 -08:00
Thijs Wenker
2611e2f364 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-14 15:40:46 +01:00
Brad Hefta-Gaub
7e55d79ab7 Merge pull request #4099 from huffman/update-entity-properties 
Add missing model properties to entity property window
 2015-01-13 17:12:06 -08:00
Clément Brisset
3034b8f733 Merge pull request #4091 from ctrlaltdavid/20229 
CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript
 2015-01-13 17:07:17 -08:00
Andrew Meadows
26ab79e840 Merge pull request #4097 from huffman/update-camera-hud 
Enable and update camera tool
 2015-01-13 17:07:04 -08:00
Andrew Meadows
b4ee7b684c Merge pull request #4070 from cozza13/20259 
CR for Job #20259 - Fix up bad links on bot scripts
 2015-01-13 17:06:36 -08:00
Thijs Wenker
e3c5558470 toggle magnifier when keyboard visibility changes 2015-01-14 01:18:53 +01:00
Thijs Wenker
38d49854cb hide cursor 2015-01-14 01:06:44 +01:00
Ryan Huffman
c51cac6381 Remove Model List dialog 2015-01-13 15:38:28 -08:00
Ryan Huffman
7ddec78cd5 Add list.min.js for entity list tool 2015-01-13 15:36:25 -08:00
Ryan Huffman
9e8458edd9 Add support for teleport, delete, and filtering in entity list 2015-01-13 15:35:30 -08:00
Ryan Huffman
ce60a410cf Reenable entity list tools 2015-01-13 15:34:26 -08:00
Thijs Wenker
74d56fb754 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-13 22:42:02 +01:00
Thijs Wenker
7b88deef16 Implement UI sounds for virtualKeyboard & notifications 2015-01-13 22:08:35 +01:00
Ryan Huffman
00f7bf7efe Remove 'Edit Properties...' in favor of properties window 2015-01-13 10:12:15 -08:00
Ryan Huffman
96f75df831 Add missing model properties to entity property window 2015-01-13 10:09:05 -08:00
Ryan Huffman
0c58572d32 Reduce size of camera tool cubes 2015-01-13 08:45:11 -08:00
Ryan Huffman
e873df9680 Remove mode buttons from camera tool and increase size 2015-01-13 08:39:59 -08:00
Ryan Huffman
aad49e4404 Update camera tool to only show when edit entities is enabled 2015-01-13 08:26:32 -08:00
Ryan Huffman
80351a768e Enable camera tool 2015-01-13 08:26:11 -08:00
Atlante45
2b48d31cbb Move scripts to correct directory 2015-01-12 17:48:54 -08:00
Clément Brisset
10331c52a8 Merge pull request #4094 from birarda/master 
repairs to AudioScriptingInterface playSound
 2015-01-12 16:18:41 -08:00
Stephen Birarda
661221a189 repairs to AudioScriptingInterface playSound 2015-01-12 16:04:00 -08:00
Thijs Wenker
7acb4e4716 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-13 00:43:47 +01:00
Stephen Birarda
208af5cbca Revert "don't play muzak from lobby to avoid error" 
This reverts commit 69f5c769b8.
 2015-01-12 15:14:49 -08:00
Chris Collins
8f3aba3585 Removing double entry of gun.js 
Removing double entry of gun.js
 2015-01-12 14:39:13 -08:00
Andrew Meadows
22d500bd54 Merge pull request #4074 from huffman/rescale-properties 
Add rescale button to edit properties window
 2015-01-12 14:22:45 -08:00
Andrew Meadows
9f1a612865 Merge pull request #4073 from Atlante45/editModels 
editModels => hydraGrab
 2015-01-12 14:21:02 -08:00
Stephen Birarda
69f5c769b8 don't play muzak from lobby to avoid error 2015-01-12 10:07:20 -08:00
Thijs Wenker
636073474c Merge branch '20224' of github.com:thoys/hifi into 20224 2015-01-12 09:40:27 +01:00
Ryan Huffman
8d8352946b Add rescale button to edit properties window 2015-01-09 10:01:58 -08:00
Atlante45
5ab0df3288 removed editModels 2015-01-08 18:31:10 -08:00
Atlante45
22e7c6d507 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels 
Conflicts:
	examples/editModels.js
 2015-01-08 18:30:38 -08:00
Chris Collins
9ca0df0796 Small fixes to scripts 
-merge duplicate gun scripts
-fix url of sit
 2015-01-08 16:05:32 -08:00
Atlante45
a46080cbf2 editModels > hydraGrab 2015-01-08 11:24:02 -08:00
Thijs Wenker
c791422fab make gamepads and A (select key) and B (delete character) button function 2015-01-08 02:22:08 +01:00
Philip Rosedale
a04ce68fba Merge pull request #4063 from ZappoMan/restoreLookAt 
restore camera lookAt and keepLookingAt features
 2015-01-07 16:31:07 -08:00
Thijs Wenker
da95d413a0 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-07 23:25:05 +01:00
Thijs Wenker
40b4a17ba8 include globals.js from runnable scripts for now. 2015-01-07 23:14:31 +01:00
ZappoMan
806e691bbf restore camera lookAt and keepLookingAt features 2015-01-07 13:41:07 -08:00
Chris Collins
d15ae92e1e Guitar fix 
Guitar position fix
 2015-01-07 13:40:36 -08:00
Brad Hefta-Gaub
23559743d9 Merge pull request #4060 from PhilipRosedale/gun 
Added improved gun to /examples
 2015-01-07 13:16:09 -08:00
Brad Hefta-Gaub
49508733aa Merge pull request #4053 from cozza13/20254 
CR for Job #20254 - Additional Script updates
 2015-01-07 13:14:34 -08:00
Philip Rosedale
9bf56516e0 Added improved gun to /examples 2015-01-07 13:02:00 -08:00
Chris Collins
3a75a6f920 Minor typo fix 
Minor typo fix
 2015-01-07 12:57:40 -08:00
Thijs Wenker
527576eeba or not... 2015-01-07 21:38:31 +01:00
Thijs Wenker
6771252eab seems like you need to offset the include from the script that uses it 2015-01-07 21:34:34 +01:00
Thijs Wenker
4fdcdf095c trying to fix url 2015-01-07 21:27:14 +01:00
Ryan Huffman
eafe1ae951 Update position of grid-to-avatar to be at the left foot 2015-01-07 12:15:36 -08:00
Ryan Huffman
fbdc509428 Increase size of url input boxes 2015-01-07 12:15:14 -08:00
Ryan Huffman
92fc08fa70 Update property list window to only show after selection 2015-01-07 12:14:47 -08:00
Thijs Wenker
ff6cae738b fixed library paths 2015-01-07 20:47:59 +01:00
Thijs Wenker
19eec81173 moved goTo.js and virtualKeyboardTextEntityExample.js to the right category folder 2015-01-07 20:46:39 +01:00
Thijs Wenker
2d56070eae Merge branch 'master' of https://github.com/highfidelity/hifi into 20224 
Conflicts:
	examples/controllers/oculus/virtualKeyboard.js
	examples/libraries/virtualKeyboard.js
	examples/virtualKeyboard.js
 2015-01-07 20:45:18 +01:00
David Rowe
40274df279 Add downloads information changed event for JavaScript 2015-01-07 11:20:46 -08:00
Chris Collins
53f24954e0 Updates based on PR comments 
Commented out Camera.stopLooking and Camera.keepLookingAt . This can be
put back when we merge back the C++ issue.
 2015-01-07 11:15:30 -08:00
Thijs Wenker
0ec25acc9c Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-07 14:39:27 +01:00
Chris Collins
816e369c08 More Script updates 
More Script updates
 2015-01-06 22:32:45 -08:00
Chris Collins
0a1a64b7e6 Script updates and fixes to highfidelity-public 
Script updates and fixes to highfidelity-public
 2015-01-06 17:04:42 -08:00
David Rowe
8b0d859686 Add method to access downloads information in JavaScript 2015-01-06 15:54:07 -08:00
Chris Collins
95f8447191 Incremental update to scripts cleanup 
-Moved more of the scripts around
-Fixed up the location on assets on start. e.g. gun.js
-Removed additional Scripts.
 2015-01-06 15:47:25 -08:00
Chris Collins
602275a0f7 First pass moving scripts into an example folder. 
This is just a quick first pass to move some of the scripts into an
examples folder. There are also a couple of obvious deletions.
 2015-01-06 11:16:40 -08:00
Andrew Meadows
278be3d31b remove use of "radius" property for entities 
use "dimensions" instead
 2015-01-05 18:13:50 -08:00
Andrew Meadows
ec86f0bd50 fixing toyball.js to work under Bullet 2015-01-05 17:30:50 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Brad Hefta-Gaub
125dc5010e Merge pull request #4039 from AndrewMeadows/inertia 
Bullet physics part 2
 2015-01-05 13:10:55 -08:00
Brad Hefta-Gaub
58a2a5eb83 Merge pull request #4027 from huffman/grid-shader-updates 
Grid shader updates
 2015-01-05 13:00:05 -08:00
Andrew Meadows
21b2d14956 converting existing JS scripts to use new damping 
Old formula the scripts were using:  v *= damping

So a value of 0.999 was "little damping" and a value of 0.001 was "very strong damping",
but now that is reversed.

New formula: v *= (1 j- damping)^dt

A damping value of 0.001 now means "very little damping"
and a value of 0.999 means "very strong damping".
 2015-01-05 11:25:15 -08:00
Thijs Wenker
08c48f0779 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-03 15:02:58 +01:00
Ryan Huffman
cf04c3313a Update inWorldTestTone.js to play in front of avatar 2015-01-02 11:43:41 -08:00
Thijs Wenker
f0320caad3 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-02 19:16:06 +01:00
Ryan Huffman
50bbeae30b Disable camera tool temporarily 2014-12-31 15:40:11 -08:00
Thijs Wenker
605e895de7 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2014-12-31 21:17:03 +01:00
Ryan Huffman
a8de290482 Update grid alpha 2014-12-31 11:12:02 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
48285b21c4 remove voxel related scripts 2014-12-30 20:50:07 -08:00
Thijs Wenker
c73b496cac press X button with gamepad 2014-12-31 02:25:55 +01:00
Thijs Wenker
398e88107c renamed virtualKeyboardLocation.js to goTo.js as discussed 2014-12-31 01:53:10 +01:00
Thijs Wenker
33a4f80300 hide keyboard after submit 2014-12-31 01:49:01 +01:00
Thijs Wenker
a0e209276b textbox visibility 2014-12-31 01:46:01 +01:00
Thijs Wenker
1365ecede3 removed unused variables 2014-12-31 01:42:19 +01:00
Thijs Wenker
e856d302d3 - improved keyboard visibility setting 
- added posibility to teleport to location through hmd
 2014-12-31 01:37:51 +01:00
Thijs Wenker
11d66ae83f fixed text entity height 2014-12-31 00:51:34 +01:00
Ryan Huffman
cf798e0a2f Fix orbit camera capturing mouse 2014-12-30 15:30:25 -08:00
Ryan Huffman
0105906dc7 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	examples/editEntities.js
 2014-12-30 15:02:59 -08:00
Ryan Huffman
2b835e621c Rename 2D -> HUD, 3D -> World in Overlays 2014-12-30 14:50:17 -08:00
Thijs Wenker
a8122e5a85 virtualKeyboard.js - scale 50% 
virtualKeyboardLocation.js - toggle visibility with Enter/Return key
virtualKeyboardTextEntityExample.js - attempt to fix character glyphs
 2014-12-30 23:30:48 +01:00
Ryan Huffman
ea69dcaf29 Update grid colors 2014-12-30 13:10:23 -08:00
Clément Brisset
ecdf415954 Merge pull request #4016 from huffman/grid-tools-overlay 
Grid tools overlay
 2014-12-30 12:18:13 -08:00
Ryan Huffman
1da253d39f Remove duplicate minorGridWidth variable 2014-12-30 12:13:40 -08:00
Ryan Huffman
16bf4e87e6 Remove unused function 2014-12-30 11:34:59 -08:00
Ryan Huffman
a0cb40597b Remove gridControls.html 2014-12-30 11:31:47 -08:00
Ryan Huffman
552a421f24 Update grid tool to be an overlay 2014-12-30 11:31:29 -08:00
Ryan Huffman
fbd189bde3 Rename minorGridSpacing to minorGridWidth 2014-12-30 11:28:10 -08:00
Ryan Huffman
fdba41a69d Add grid colors to Grid 2014-12-30 11:27:16 -08:00
Ryan Huffman
9a6bce3767 Add getters/setters to Grid 2014-12-30 11:26:44 -08:00
Ryan Huffman
a474243f08 Update to ignore mouseRelease events if mousePress event handles by tool 2014-12-30 11:21:50 -08:00
Thijs Wenker
4eec066d69 split up virtualKeyboard script in a library and two script that will use it: 
virtualKeyboardLocation.js - Location through virtual keyboard
virtualKeyboardTextEntityExample.js - Initial example for virtual keyboard
 2014-12-30 19:51:53 +01:00
Thijs Wenker
d299f3f0c5 no 3d mode for now 2014-12-29 23:10:15 +01:00
Thijs Wenker
8b6753f5f0 Merge branch '20224' of https://github.com/thoys/hifi into 20224 2014-12-29 21:13:34 +01:00
Thijs Wenker
e38aa89418 Overwrite keypress of Enter key 2014-12-29 21:11:34 +01:00
Thijs Wenker
89aa3f262c Merge branch 'master' of https://github.com/worklist/hifi into 20224 2014-12-29 14:53:42 +01:00
Chris Collins
e105ba61e8 Fix for model uploading to work 
Fix for model uploading to work. The deleted elements were causing an
error when trying to upload models.
 2014-12-23 11:01:25 -08:00
Andrew Meadows
3e087bd75e Merge pull request #3990 from ZappoMan/entityScriptsAndEvents 
Entity Scripts bug fixes/improvements
 2014-12-19 16:02:00 -08:00
Ryan Huffman
7249a7e299 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-12-19 15:27:33 -08:00
Ryan Huffman
588d7e62f4 Update camera-controls.svg url 2014-12-19 15:18:26 -08:00
Ryan Huffman
30e2a9c13f Add notifications.js to defaultScripts 2014-12-19 14:18:44 -08:00
Ryan Huffman
eaad95c949 Merge pull request #3985 from Adrianl3d/20221 
changes as per list
 2014-12-19 11:36:52 -08:00
ZappoMan
32ea38b938 added leaveAllEntities support 2014-12-19 11:33:25 -08:00
ZappoMan
97d617bd17 revert some prototype script stuff for now 2014-12-19 11:01:35 -08:00
ZappoMan
d43ec2ee28 revert some prototype script stuff for now 2014-12-19 11:00:41 -08:00
Ryan Huffman
2e96bbe38b Merge branch 'master' of github.com:highfidelity/hifi into camera-display 2014-12-19 10:37:47 -08:00
Ryan Huffman
15389b5fce Add camera UI to camera tool 2014-12-19 10:37:21 -08:00
ZappoMan
cfa5e5c61b Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-19 10:35:18 -08:00
Adrianl3d
51121554e5 clean up code 
intentations lines 263 264
 2014-12-20 04:28:39 +10:00
Brad Hefta-Gaub
821cbe610c Merge pull request #3975 from ctrlaltdavid/20212 
CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion
 2014-12-19 09:55:45 -08:00
Ryan Huffman
93aaa38c4c Add camera orientation overlay 2014-12-19 09:03:04 -08:00
Thijs Wenker
e913095af5 Merge branch 'master' of https://github.com/worklist/hifi into 20216 
Conflicts:
	interface/CMakeLists.txt
 2014-12-19 13:53:33 +01:00
Ryan Huffman
5b89208068 Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/overlays/Cube3DOverlay.cpp
 2014-12-18 16:46:17 -08:00
Ryan Huffman
1776b2dee2 Update line3d in editModels to use start instead of position 2014-12-18 16:41:41 -08:00
Ryan Huffman
5537fb970b Update scripts to use instead of for line3d 2014-12-18 16:23:24 -08:00
Adrianl3d
af1591277c changes as per list 
removed dummy code, remove mic mute state at startup, some text changes.
 2014-12-19 04:17:36 +10:00
Thijs Wenker
99b0cca8f3 realsenseHands.js example 2014-12-18 00:08:20 +01:00
Ryan Huffman
cb7f5a5b45 Roll gridTool.js back temporarily 2014-12-17 12:41:58 -08:00
Thijs Wenker
e883d1dbb7 3d mode 2014-12-17 21:21:51 +01:00
Brad Hefta-Gaub
61ec1bdd6a Merge pull request #3977 from huffman/fix-minor-grid 
Fix minor grid spacing not updating
 2014-12-17 09:13:32 -08:00
Ryan Huffman
b95eac759e Fix minor grid spacing not updating 2014-12-17 08:52:48 -08:00
ZappoMan
85c8951734 really remove the debug settings from Model rendering 2014-12-16 13:57:22 -08:00
Ryan Huffman
a9223f5887 Remove text from label 2014-12-12 15:45:31 -08:00
Ryan Huffman
2fab404f7f Reorganize selectionManager selection checking 2014-12-12 15:35:39 -08:00
Ryan Huffman
dde9b92dbd Update SelectionManager -> selectionManager 2014-12-12 15:31:54 -08:00
Ryan Huffman
33b4c614ea Add buttons for moving selection to grid and resetting to natural dimensions 2014-12-12 15:28:57 -08:00
Ryan Huffman
a5cbc9b3e2 Fix properties window to work with undo/redo 2014-12-12 15:28:22 -08:00
Ryan Huffman
1a90a81037 Add id to properties window 2014-12-12 15:27:56 -08:00
Ryan Huffman
d1f5bf2e3c Add rotation to properties window 2014-12-12 15:27:30 -08:00
Ryan Huffman
b8737ad525 Update 'f' focus to only work when something is selected 2014-12-12 15:26:07 -08:00
David Rowe
1ab9129616 Update laserPointer.js to detect pointing with Leap Motion or similar 2014-12-11 21:31:23 -08:00
Brad Hefta-Gaub
31cbd6e88c Merge pull request #3954 from ctrlaltdavid/20226 
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
 2014-12-11 14:33:24 -08:00
Atlante45
b7d9023645 Don't stop defaultScripts 2014-12-11 12:06:24 -08:00
Stephen Birarda
76cf122d74 Merge pull request #3950 from birarda/master 
use higher resolution images in lobby
 2014-12-11 11:24:19 -08:00
Stephen Birarda
230b8740bf add higher resolution images to lobby 2014-12-11 11:23:27 -08:00
AndrewMeadows
bb6f976699 Merge pull request #3945 from ZappoMan/someCleanup 
AudioRefector-ectomy
 2014-12-11 10:39:41 -08:00
Brad Hefta-Gaub
cfe0b28504 Merge pull request #3948 from huffman/lobby-black-panels 
Update lobby to use new URLs + black panels in place of H
 2014-12-10 20:16:22 -08:00
Ryan Huffman
0c746168ef Update lobby to use new URLs + black panels in place of H 2014-12-10 19:48:05 -08:00
Brad Hefta-Gaub
de5702157b Merge pull request #3946 from Atlante45/lobby_in_default 
Lobby in defaultScripts
 2014-12-10 17:27:14 -08:00
Atlante45
ccf8d0a787 DefaultScript.js doesn't appear in running scripts 2014-12-10 16:55:40 -08:00
Atlante45
ff372c5f4e Added lobby.js to default scripts 2014-12-10 16:53:21 -08:00
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Ryan Huffman
9c9bfeed33 Add missing 'var' to local variable 2014-12-10 14:27:37 -08:00
Ryan Huffman
961f629074 Fix indentation, 4 -> 2 2014-12-10 14:26:42 -08:00
Ryan Huffman
7515c26d71 Merge remote-tracking branch 'upstream/master' into lobby-reorder 2014-12-10 14:17:47 -08:00
Ryan Huffman
a24acb4858 Fix style 2014-12-10 14:15:43 -08:00
Ryan Huffman
6fa1d7a7bd Update lobby to start on the second row 2014-12-10 14:08:59 -08:00
Atlante45
10a6428277 Chess board correct orientation 2014-12-10 10:37:54 -08:00
David Rowe
ff6db7a9fa Merge branch 'master' into 20226 2014-12-09 19:20:30 -08:00
David Rowe
3ea3a497c6 Update scripts to use new textSize() method 2014-12-09 18:33:29 -08:00
Brad Hefta-Gaub
69f7a89003 Merge pull request #3937 from Atlante45/mouse_pick_in_oculus 
Mouse pick improvments
 2014-12-09 18:33:25 -08:00
Brad Hefta-Gaub
9c1be46893 Merge pull request #3929 from huffman/new-entities-default 
New entities default
 2014-12-09 18:00:25 -08:00
AndrewMeadows
1697636db5 Merge pull request #3933 from ZappoMan/entityCollisions 
move emit of collisions to after done moving entities, so that callbacks can delete entities
 2014-12-09 17:46:41 -08:00
Philip Rosedale
756e1b4d63 Merge pull request #3935 from PhilipRosedale/master 
option to suppress lobby text for now, defaults to true
 2014-12-09 17:40:03 -08:00
Philip Rosedale
96c3a0edbd option to suppress lobby text for now, defaults to true 2014-12-09 17:39:05 -08:00
Atlante45
b197558b87 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 16:46:13 -08:00
Atlante45
0a4f74cf9c Single reticle in the lobby 2014-12-09 16:29:45 -08:00
Ryan Huffman
ec62c6833c Make editEntities a default script and remove editVoxels.js 2014-12-09 12:15:22 -08:00
Ryan Huffman
a63d0e7770 Rename newEditEntities.js to editEntities.js 2014-12-09 12:15:22 -08:00
Stephen Birarda
55ec455f77 Merge pull request #3928 from huffman/entity-tool-settings 
Entity tool settings
 2014-12-09 12:14:17 -08:00
ZappoMan
895e22fcdb removed debug code 2014-12-09 12:12:04 -08:00
ZappoMan
79fc8a5a71 remove debug ryans rotate problem 2014-12-09 11:58:01 -08:00
Ryan Huffman
19ba2a1f84 Remove print statement 2014-12-09 08:56:29 -08:00
Ryan Huffman
2696f71be9 Update edit entities to disable on wasd or arrow keys 2014-12-09 08:54:28 -08:00
Ryan Huffman
e5aee44ceb Add setting save/load to grid tool 2014-12-09 08:51:04 -08:00
ZappoMan
3c09ca71cb move emit of collisions to after done moving entities, so that callbacks can delete entities 2014-12-08 18:09:49 -08:00
Clément Brisset
db751ca0c4 Merge pull request #3924 from ZappoMan/entityCollisions 
make collision callbacks work as entity methods
 2014-12-08 16:47:25 -08:00
ZappoMan
0d636314ba fixed CR feedback 2014-12-08 16:20:39 -08:00
Brad Hefta-Gaub
39b1f73976 Merge pull request #3921 from Atlante45/tabs_to_spaces 
Tabs to spaces
 2014-12-08 15:55:05 -08:00
ZappoMan
7449821a9b add ID to the properties dialog box 2014-12-08 15:06:50 -08:00
ZappoMan
efbe8ce757 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions 2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06 make collision callbacks work 2014-12-08 14:15:03 -08:00
Ryan
7fffcd3b53 Swap out the lobby model for the one with the correct light value 2014-12-08 12:47:37 -08:00
Atlante45
716fca6ae7 tabs to spaces 2014-12-08 11:49:55 -08:00
Clément Brisset
681a1a3297 Merge pull request #3917 from ctrlaltdavid/20202 
CR for Job #20202 - Add "backgroundVisible" property to text overlays
 2014-12-08 11:43:52 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
ZappoMan
aefeda37bd more debugging 2014-12-08 09:41:58 -08:00
Philip Rosedale
732b40f68c Merge pull request #3918 from ZappoMan/acEntityCrash 
Ac entity crash
 2014-12-08 09:16:40 -08:00
ZappoMan
0f5930a43d add identifyEntity() to butterflies script 2014-12-08 06:50:28 -08:00
Philip Rosedale
60c2a89292 Merge pull request #3915 from ZappoMan/modelRayPick 
Proper Model Ray Picking
 2014-12-07 14:19:26 -08:00
Ryan Huffman
a53e1c69fd Merge pull request #3914 from thoys/20163 
CR for Job #20163 - Implement virtual keyboard for use in HMD
 2014-12-07 10:22:34 -08:00
ZappoMan
8dd1a2815f use precision picking in newEditEntities 2014-12-06 15:43:17 -08:00
ZappoMan
91fd574eb5 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-06 15:28:54 -08:00
Thijs Wenker
351819708b style fixes 2014-12-06 23:50:30 +01:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
David Rowe
dbb547507d Merge branch 'master' into 20202 2014-12-06 11:14:45 -08:00
David Rowe
ca62e61579 Update scripts with text overlays to use new backgroundAlpha property 2014-12-06 11:11:52 -08:00
David Rowe
4ee99ef38a Remove dead code that's causing problems 2014-12-06 11:03:28 -08:00
David Rowe
fd00ad95ca Fix voxel size text display 2014-12-06 09:24:30 -08:00
Brad Hefta-Gaub
2bf93bd9f0 Merge pull request #3913 from huffman/entity-tool-property-fixes 
Entity tool property fixes + add script property
 2014-12-06 00:40:18 -08:00
Thijs Wenker
ccdb13c951 virtualkeyboard: moved files to hifi public bucket 2014-12-06 00:33:33 +01:00
Ryan Huffman
a89411fd5e Add script URL to properties tool 2014-12-05 15:27:40 -08:00
Ryan Huffman
896a34212b Fix sections not properly updating in properties tool 2014-12-05 15:27:24 -08:00
Andrzej Kapolka
01c209ef07 Merge pull request #3912 from PhilipRosedale/master 
Add gamepad warp to headMove, remove step turning when head rotated
 2014-12-05 15:27:03 -08:00
Philip Rosedale
2c8b1721cc Add warp from right ('O') button on gamepad 2014-12-05 14:06:41 -08:00
ZappoMan
d5fbe5b6b4 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-05 12:48:00 -08:00
Brad Hefta-Gaub
a3fbaab957 Merge pull request #3911 from huffman/entity-tool-window-polish 
Entity Properties Tool Window Polish
 2014-12-05 12:38:43 -08:00
Brad Hefta-Gaub
1de7db390e Merge pull request #3908 from PhilipRosedale/master 
Orbiting sound example, ability to set injector position, better butterflies
 2014-12-05 12:37:42 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
David Rowe
f5a1c26492 Add backgroundAlpha property to 2D and 3D text overlays 2014-12-05 11:08:00 -08:00
Ryan Huffman
849397288e Update properties tool to be a resizable table 2014-12-05 10:46:35 -08:00
Ryan Huffman
0ece6c0968 Update properties window to show properties for locked entities 2014-12-05 10:43:15 -08:00
Philip Rosedale
bc609016a9 remove debug 2014-12-05 08:59:41 -08:00
Philip Rosedale
c5247ca65b Add ability to set injector properties during playing, and orbitingSound.js 2014-12-05 08:45:00 -08:00
Philip Rosedale
dbf64b2de7 Merge pull request #3898 from DaveDubUK/walk-JS-1.12 
Version 1.12 of the walk.js script
 2014-12-04 16:29:19 -08:00
Thijs Wenker
c0ba9e73c2 fixed font height bq 2014-12-05 01:07:49 +01:00
Philip Rosedale
47c2ea95f4 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-04 16:07:28 -08:00
Thijs Wenker
a7185738e9 virtualkeyboard: scaling text in input box 2014-12-05 00:52:36 +01:00
Clément Brisset
26340353ac Merge pull request #3897 from ZappoMan/rayPickWork 
Work on improving pickable entities - Lights Optionally pickable, Spheres & Text pick properly, other bug fixes
 2014-12-04 15:43:17 -08:00
Ryan Huffman
ba3f051c8c Disable the warp button in gamepad.js 2014-12-04 15:11:16 -08:00
Ryan Huffman
3bbee640fb Make gamepad mirror button toggle 2014-12-04 14:48:03 -08:00
Ryan Huffman
500b8a49d1 Add button to gamepad.js to toggle mirror mode 2014-12-04 14:17:24 -08:00
Ryan Huffman
e3a34f6db0 Add multi-speed control to gamepad.js 2014-12-04 12:17:31 -08:00
Thijs Wenker
5e2d1c3364 more comfortable movement setting 2014-12-04 21:15:10 +01:00
Brad Hefta-Gaub
3a396b3256 Merge pull request #3900 from huffman/entity-tools-fix-rp-rotation 
Fix entity tool rotation to rotate around registration point
 2014-12-04 11:41:22 -08:00
Ryan Huffman
1ee45e8bd1 Fix entity tool rotation to rotate around registration point 2014-12-04 11:24:56 -08:00
Brad Hefta-Gaub
cab1be25ed Merge pull request #3899 from huffman/entity-tools-fix-registration-point 
Entity tools fix registration point
 2014-12-04 11:04:27 -08:00
Ryan Huffman
1f82831bcc Fix call to getRelativeCenterPosition 2014-12-04 10:47:09 -08:00
Clément Brisset
a7a7ad775e Merge pull request #3896 from huffman/fix-entity-selection 
Fix entity tool selection when inactive
 2014-12-04 10:39:42 -08:00
Ryan Huffman
acd5495b2a Add getRelativeCenterPosition 2014-12-04 10:29:10 -08:00
Ryan Huffman
b2c5b19fd7 Remove print 2014-12-04 10:20:02 -08:00
Ryan Huffman
efdc8f5494 Fix stretch tools to work correctly with registrationPoint 2014-12-04 10:19:51 -08:00
DaveDubUK
f223f51fa6 Version 1.12 of the walk.js script 2014-12-04 18:15:25 +00:00
Ryan Huffman
53f195eec4 Fix position of overlays when registrationPoint is not centered 2014-12-04 10:05:34 -08:00
Ryan Huffman
f48d304df0 Add registrationPoint to SelectionManager 2014-12-04 10:03:54 -08:00
Ryan Huffman
74acf9513b Fix entity tool selection when inactive 2014-12-04 08:47:18 -08:00
Philip Rosedale
dd8deeea59 simpler butterflies script that doesn't put as much traffic on entity server 2014-12-03 22:39:11 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub
96c3bfceef Merge pull request #3889 from huffman/entity-tools-polish-2 
Entity tools polish - round 2
 2014-12-03 14:31:27 -08:00
Ryan Huffman
d08337326c Update selection box color to red 2014-12-03 12:59:51 -08:00
Stephen Birarda
f0b0c5fe0b change warp button to button face right 2014-12-03 11:08:41 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Ryan Huffman
5c5c66b265 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2 2014-12-03 08:40:38 -08:00
Ryan Huffman
4e78003520 Fix issue with selection boxes not being hidden 2014-12-02 18:03:00 -08:00
Ryan Huffman
f25d509363 Remove unused lastPlaneIntersection 2014-12-02 17:50:34 -08:00
Ryan Huffman
aa067bc153 Update UpDown translation to follow the mouse as other tools do 2014-12-02 17:49:25 -08:00
Ryan Huffman
c4ca7e1b18 Remove clearSelections from findClickedEntity - it shouldn't handle it 2014-12-02 16:01:40 -08:00
Ryan Huffman
30a7b60958 Update checkMove to only update rotation handles instead of all handles 2014-12-02 16:01:09 -08:00
Ryan Huffman
0fb0169ff2 Move baseOfEntityProjectionOverlay update to updateHandles() 2014-12-02 16:00:33 -08:00
Ryan Huffman
2f1ceb922a Increase size of selection boxes 2014-12-02 15:59:56 -08:00
Ryan Huffman
2b5a4e4563 Add selection boxes in multi-selection mode 2014-12-02 15:56:43 -08:00
Ryan Huffman
77365ec282 Move entity selection to click event and add ability to deselect 2014-12-02 15:49:45 -08:00
ZappoMan
bb6e302d69 support toggle of light picking in newEditEntities.js 2014-12-02 15:23:05 -08:00
Ryan Huffman
167ab05de4 Default 'Allow Select Large/Small Models' to true 2014-12-02 15:19:51 -08:00
ZappoMan
a47a0377ef Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-02 14:57:30 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Philip Rosedale
1ce201c04f add same for rotation 2014-12-02 14:33:19 -08:00
Philip Rosedale
2f11501e5b Fix constant movement with hydra by adding null zone for thrust 2014-12-02 14:28:46 -08:00
Ryan Huffman
89b3a4d987 Fix selection shadow not updating when grid moves 2014-12-02 12:17:10 -08:00
Ryan Huffman
9d9a7ead5b Remove unnecessary overlay property updates 2014-12-01 16:39:36 -08:00
Ryan Huffman
a8eb49a822 Remove now-unused *Offset variables 2014-12-01 16:38:40 -08:00
Ryan Huffman
ce4d407378 Update normalizeDegrees to be exclusive on the -180 end 2014-12-01 16:12:18 -08:00
Ryan Huffman
06ab17987b Fix position of rotation degrees display 
The position of the display was not always correct depending on the
camera orientation relative to the selection.
 2014-12-01 16:08:50 -08:00
Ryan Huffman
4f0683dc5e Fix stretch tools not following mouse correctly 2014-12-01 15:07:03 -08:00
Ryan Huffman
da568c96ce Add rotation degrees overlay 2014-12-01 12:24:51 -08:00
Ryan Huffman
2c524cd70c Darken colors of selection/highlight boxes 2014-12-01 12:24:34 -08:00
Ryan Huffman
1950ce5a4b Add option for white grid color 2014-12-01 12:24:24 -08:00
AndrewMeadows
1b5b4c0b44 Merge pull request #3872 from ZappoMan/cleanupMenus 
remove Entities developer menu items from C++ menu, make them available through script
 2014-12-01 09:29:56 -08:00
Philip Rosedale
709a40516d Add auto-turn of body when head is beyond 45 degrees 2014-11-29 12:17:38 -08:00
ZappoMan
85ca03199e remove Entities developer menu items from C++ menu, make them available through script 2014-11-26 17:53:41 -08:00
David Rowe
5871ecd85c Stop incrementing counter after limit reached 2014-11-26 12:03:27 -08:00
Brad Hefta-Gaub
883fda241f Merge pull request #3864 from huffman/entity-tools-front-draw 
Update entity tools to draw grabbers in front
 2014-11-25 12:55:16 -08:00
Ryan Huffman
75d560744b Update rotation handles to drawInFront = true 2014-11-25 12:34:03 -08:00
Brad Hefta-Gaub
c4ea6bac1d Merge pull request #3863 from huffman/overlay-front-draw 
Overlay Front Draw
 2014-11-25 12:27:21 -08:00
Ryan Huffman
b3ca6fda72 Update entity tool grabbers look and size 2014-11-25 12:04:11 -08:00
Ryan Huffman
b97870f32e Update extra entity tool stretch handles to be optionally visible 2014-11-25 12:01:29 -08:00
Ryan Huffman
9020fee31a Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw 2014-11-25 09:53:18 -08:00
Ryan Huffman
1b1482bab3 Adjust size of stretch overlays to be smaller 2014-11-24 21:00:04 -08:00
Andrew Meadows
8966ab32d8 add lifetime to gun bullets 2014-11-24 20:37:52 -08:00
Ryan Huffman
664de8215f Merge pull request #3850 from Adrianl3d/master 
Added notifications.js
 2014-11-24 10:38:37 -08:00
Adrianl3d
ffe66cd5c5 Clean up code 
Fix code to standards
 2014-11-25 04:23:00 +10:00
ZappoMan
345735fa8c tweaks 2014-11-23 20:50:39 -08:00
ZappoMan
a95b6dbabd hacking on global functions 2014-11-23 20:36:33 -08:00
ZappoMan
3ee6d6a6db work in making entity script mixable and inheritable 2014-11-23 20:12:52 -08:00
ZappoMan
80c1f5038c Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks 2014-11-23 11:39:05 -08:00
ZappoMan
f23d8f6c20 text sizing tweaks 2014-11-23 11:21:05 -08:00
ZappoMan
437af06245 switch to 3d text for description 2014-11-23 11:16:33 -08:00
Thijs Wenker
e12f64bae4 virtual-keyboard: 
- added keycodes
- resizes the example text entity based on text size
- adds the author of the text entity in the bottom right corner
 2014-11-23 17:15:14 +01:00
ZappoMan
53bd8fd6d2 handle no description and blank panels better 2014-11-22 21:30:58 -08:00
ZappoMan
efe202b7e8 make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby 2014-11-22 21:25:43 -08:00
ZappoMan
310e31377d handle line wrapping in description 2014-11-22 14:49:56 -08:00
ZappoMan
f014025b81 first cut at lobby tweaks 2014-11-22 14:28:06 -08:00
ZappoMan
93755e6506 fix bugs in unloading scripts when changing domains 2014-11-22 11:53:50 -08:00
Adrianl3d
2edd252576 Fix persist time 
Set persist time to 10 secs
 2014-11-22 21:47:14 +10:00
Philip Rosedale
983975e872 lets you grab an object and turn it near your face to better see it 2014-11-21 20:05:36 -06:00
Adrianl3d
6a66351e7f Clean up code 
Fix indentations, whitespace, and layout
 2014-11-22 10:39:34 +10:00