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

2084 commits

Author SHA1 Message Date
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
David Rowe
334f26c84f Display some progress while waiting at 0% and limit speed of advance 2015-02-06 21:43:21 -08:00
David Rowe
4cd1d54f15 Fix progress bar's SVG dimensions 2015-02-06 21:42:58 -08:00
Thijs Wenker
e3ca1efe6b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-07 00:34:38 +01:00
Brad Hefta-Gaub
390d2be48f Merge pull request #4189 from birarda/android 
add the gvr-interface target for GearVR
 2015-02-06 14:07:28 -08:00
Stephen Birarda
0b10d0d1dc add an example script for the portal 2015-02-06 10:38:23 -08:00
Stephen Birarda
65418b8b67 remove the text comparisons from images dir 2015-02-06 10:02:44 -08:00
Brad Hefta-Gaub
f8d62d332a Merge pull request #4222 from jherico/text-renderer 
Text renderer refactor to use signed distance field font rendering
 2015-02-05 21:58:41 -08:00
Brad Hefta-Gaub
9058e9116a Merge pull request #4233 from ctrlaltdavid/fix-lookwithmouse 
Don't hide mouse events from C++ GUI
 2015-02-05 11:38:04 -08:00
Brad Hefta-Gaub
16717b322e Merge pull request #4237 from huffman/edit-user-data 
Edit user data
 2015-02-05 11:37:30 -08:00
Ryan Huffman
6863895533 Remove value from animation settings textarea 2015-02-05 11:19:18 -08:00
Ryan Huffman
850de6e67e Add User Data to entity properties panel 2015-02-05 11:19:01 -08:00
Ryan Huffman
1e11e658a8 Update drag/drop distance to be based on cameraManager.enabled rather than camera mode 2015-02-05 10:18:34 -08:00
Ryan Huffman
2343da0a8a Update drag/drop distance while in non-independent mode 2015-02-05 10:16:51 -08:00
Ryan Huffman
41720dbc4b Add drag-drop functionality for placing entities 2015-02-05 10:07:31 -08:00
David Rowe
c0ac9333e9 Don't hide mouse events from C++ GUI 2015-02-04 23:04:06 -08:00
Brad Davis
e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer 2015-02-04 21:04:47 -08:00
Thijs Wenker
d270979f95 Instructions initial 2015-02-04 23:19:56 +01:00
Brad Hefta-Gaub
8b1a226d8e Merge pull request #4230 from huffman/fix-select-shadow 
Fix rotation of selection shadow for editEntities
 2015-02-04 14:03:19 -08:00
Brad Hefta-Gaub
18f67aabec Merge pull request #4229 from huffman/fix-text-default-props 
Update the default properties for text entities
 2015-02-04 13:58:52 -08:00
Ryan Huffman
0e28f66906 Fix rotation of selection shadow for editEntities 2015-02-04 13:45:06 -08:00
Ryan Huffman
efed79d76c Update the default properties for text entities 2015-02-04 13:37:11 -08:00
Brad Hefta-Gaub
83d397ed98 Merge pull request #4223 from cozza13/20299 
CR for Job #20299 - Add lookwithmouse.js to default scripts.
 2015-02-04 13:33:14 -08:00
Thijs Wenker
38aab9570b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-04 19:55:12 +01:00
Ryan Huffman
3af025574f Decrease distance from object when focusing 2015-02-04 10:45:24 -08:00
Ryan Huffman
02d828443b Update zoom sensitivity when using keys 2015-02-04 10:44:54 -08:00
Ryan Huffman
36238bb5df Update editEntities to use left click for select 2015-02-04 10:43:55 -08:00
Ryan Huffman
09752589b8 Reenable on/off button 2015-02-04 10:43:28 -08:00
Ryan Huffman
4fbc7a5dcd Add focus easing and auto-focus to menu and settings 2015-02-04 10:42:01 -08:00
Ryan Huffman
01a00b5127 Disable editEntities always-on 2015-02-04 10:40:50 -08:00
Chris Collins
ee49ce08cb Added the script look with mouse to default script 
Look with touch does not work on PC’s or any mouse that does not accept
two finger touch. I have therefore added look with mouse to default
scripts.
 2015-02-04 09:53:38 -08:00
Brad Davis
f471597a73 Merge branch 'develop' into text-renderer 2015-02-03 23:07:19 -08:00
Brad Davis
3ead8fc8a2 Adding some more example images 2015-02-03 22:32:03 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
David Rowe
ca302e305b Add progress.js to defaultScripts.js 2015-02-03 16:17:06 -08:00
David Rowe
78bcf3ddcb Update SVG URLs to use S3 files 2015-02-03 16:15:10 -08:00
David Rowe
8dd87aff16 Adjust size of 2D progress bar 2015-02-03 14:27:43 -08:00
David Rowe
46352d34ce Make 3D progress bar match up with notifications 2015-02-03 14:27:43 -08:00
David Rowe
fdf4aeaeab Display 3D progress bar 2015-02-03 14:27:42 -08:00
David Rowe
7beb5bf25f Show and hide progress bar per downloads status 2015-02-03 14:27:41 -08:00
David Rowe
9b6a81cfb0 Display 2D progress bar 2015-02-03 14:27:41 -08:00
David Rowe
1fdebf63a4 Add progress.js; calculate download percent complete value 2015-02-03 14:27:40 -08:00
Brad Hefta-Gaub
b5e62922a2 Merge pull request #4215 from huffman/edit-changes 
A few improvements to editEntities.js
 2015-02-03 13:55:59 -08:00
Ryan Huffman
e2b6be2a92 Fix focus behavior when selecting an item without shift 2015-02-03 11:58:39 -08:00
Ryan Huffman
7f0fdbe23e Make auto-focus in editEntities always use ease-on-focus 2015-02-03 11:50:58 -08:00
Ryan Huffman
814d585086 Make the entity list always visible 2015-02-03 11:44:38 -08:00
Ryan Huffman
ba5a96f541 Add Window.setFocus 2015-02-03 11:44:22 -08:00
Ryan Huffman
74dfd29708 Remove Mass from entity properties window 2015-02-03 11:44:01 -08:00
Philip Rosedale
35aeb86acc First version, dice script 2015-02-02 23:15:18 -08:00
Philip Rosedale
2ae6514c87 Merge pull request #4200 from PhilipRosedale/master 
Planet simulation script
 2015-02-02 21:31:47 -08:00
Philip Rosedale
aa86db202c Merge branch 'master' of https://github.com/worklist/hifi 2015-02-02 07:05:04 -08:00
Brad Davis
0726f7cd21 Example images from text rendering test 2015-02-01 19:49:01 -08:00
Thijs Wenker
d695e8b251 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-02 00:18:18 +01:00
Brad Davis
acf0b292e9 Adding example images 2015-01-31 21:53:34 -08:00
Ryan Huffman
a98829ed8a Fix editEntities.js automatically turning on 2015-01-30 13:12:00 -08:00
Philip Rosedale
dfb1cffbd7 Add planet simulation 2015-01-30 10:24:26 -08:00
Ryan Huffman
0d1488e44f Fix editEntities.js includes 2015-01-30 10:03:37 -08:00
Thijs Wenker
8f5f53c14b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-30 18:50:01 +01:00
Ryan Huffman
77c78689d1 Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on 2015-01-30 09:28:09 -08:00
Ryan Huffman
018a4af9d6 Update camera tool to wrap cursor to window bounds rather than keep at center 2015-01-30 09:22:39 -08:00
Ryan Huffman
cddce8f795 Update editEntities to always be on + use right click for select 2015-01-30 09:21:27 -08:00
Ryan Huffman
5d8825f5eb Remove call to gridTool.mousePressEvent 2015-01-30 08:56:37 -08:00
Thijs Wenker
adc7ed5f72 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-30 02:37:00 +01:00
Ryan Huffman
d06d8b8f01 Merge branch 'master' of github.com:highfidelity/hifi into revert-grid 
Conflicts:
	examples/libraries/gridTool.js
 2015-01-29 17:27:58 -08:00
Ryan Huffman
7017fdbac0 Update style of grid tools 2015-01-29 16:59:58 -08:00
Ryan Huffman
0307448ec3 Fix color index for entity grid tool 2015-01-29 16:59:37 -08:00
Ryan Huffman
eb69720af4 Update when grid tool window is shown 2015-01-29 16:58:48 -08:00
Ryan Huffman
c00346e8cb Revert "Remove gridControls.html" 
This reverts commit a0cb40597b.
 2015-01-29 16:45:19 -08:00
Brad Hefta-Gaub
8a32bd2eed Merge pull request #4164 from ctrlaltdavid/20183 
CR for 20183 Add Oculus support to notifications.js
 2015-01-29 13:38:49 -08:00
Thijs Wenker
34fd44c081 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-29 22:32:26 +01:00
Brad Hefta-Gaub
f5e092c0d2 Merge pull request #4187 from huffman/parallel-script-loading 
Parallel script loading
 2015-01-29 13:26:37 -08:00
Brad Hefta-Gaub
07d049ef2b Merge pull request #4188 from PhilipRosedale/master 
Add menu to paddleBall for hand choice
 2015-01-29 10:56:57 -08:00
Philip Rosedale
0c3f4b894c Menu for handedness, that really works. 2015-01-29 10:53:50 -08:00
Brad Hefta-Gaub
838cb41646 Merge pull request #4163 from PhilipRosedale/master 
Popcorn & building blocks scripts, some fixes
 2015-01-29 09:28:23 -08:00
Ryan Huffman
3447fea1db Revert "Update grid tool to be an overlay" 
This reverts commit 552a421f24.

Conflicts:
	examples/libraries/gridTool.js
 2015-01-28 16:01:04 -08:00
Ryan Huffman
1b81ee17ab Update how orbit-by-key is appleid 2015-01-28 12:23:58 -08:00
Ryan Huffman
09af7ed10f Remove extra print statement 2015-01-28 12:21:58 -08:00
Ryan Huffman
a775476cfa Remove editEntities move-by-arrow-key completely 2015-01-28 12:21:50 -08:00
Ryan Huffman
55f41eb452 Update gridTool to not use clone 2015-01-28 12:20:08 -08:00
Ryan Huffman
135c8c1bdf Disable move entity by arrows 2015-01-28 12:19:54 -08:00
Ryan Huffman
5633be0e92 Add ability to move orbit camera using keys 2015-01-28 12:19:42 -08:00
Ryan Huffman
e1ca6d5048 Disable editentities auto-off when moving avatar 2015-01-28 12:16:28 -08:00
Thijs Wenker
46618db697 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	interface/src/ui/ApplicationOverlay.h
 2015-01-28 19:35:17 +01:00
Philip Rosedale
a85c6aa956 fix tabs? 2015-01-28 09:49:45 -08:00
Philip Rosedale
b515a0468b Merge branch 'master' of https://github.com/worklist/hifi 2015-01-28 09:35:07 -08:00
Philip Rosedale
117e6abb46 remove debug and PR fixes 2015-01-28 09:34:15 -08:00
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
David Rowe
2ee1570a40 Merge branch 'master' into 20276 2015-01-27 16:38:41 -08:00
Ryan Huffman
1ba398c0e3 Remove blank line 2015-01-27 15:57:27 -08:00
Ryan Huffman
defb796c1e Update editEntities to auto-focus on selection 2015-01-27 15:56:24 -08:00
Thijs Wenker
3e4f4ecc6b addOverlay rather than cloneOverlay now that we have a TextureCache for the ImageOverlay 2015-01-28 00:39:19 +01:00
Thijs Wenker
6947436994 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-27 22:29:49 +01:00
Brad Hefta-Gaub
0c4dc4100d Merge pull request #4176 from huffman/fix-inspect 
Fix inspect + editEntities cameras from clashing
 2015-01-27 13:05:33 -08:00
Brad Hefta-Gaub
0c53193e79 Merge pull request #4175 from cozza13/20283 
CR for Job #20283 - Clean up scripts that have recently been added.
 2015-01-27 13:05:17 -08:00
Andrew Meadows
6b6e846378 Merge pull request #4177 from ZappoMan/fixGlitches 
Some physics improvements
 2015-01-27 13:02:11 -08:00
Chris Collins
283a056a43 remove VRui 
remove VRui
 2015-01-27 11:37:31 -08:00
Ryan Huffman
80002551f9 Update editEntities camera to not enable if camera is in independent mode 2015-01-27 11:28:39 -08:00
Ryan Huffman
2556b4790b Update inspect.js to not activate if camera is in independent mode 2015-01-27 11:28:20 -08:00
Chris Collins
411541b884 Tidy up some scripts. 
Tidy up scripts. Make some changes to some script references and
reorganize.
 2015-01-27 11:04:50 -08:00
Philip Rosedale
e8f4783bea border, new size for blocks, smoother hydra grab action 2015-01-26 22:06:59 -08:00
Philip Rosedale
8b5a451886 Grab now correctly adds linear velocity so that you can grab and throw things 2015-01-26 21:09:21 -08:00
Philip Rosedale
005cd2ba53 Add block building toolset, first version 2015-01-26 20:44:47 -08:00
Philip Rosedale
bf0cde060c Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 20:35:34 -08:00
Philip Rosedale
e0c9af853c remove 'STICKS' mode, add drop line to better tell what something you are holding is above 2015-01-26 20:19:46 -08:00
Atlante45
cf631bf3fc Remove unnecessary stopAnimation in script to get rid of sacades 2015-01-26 19:20:47 -08:00
Philip Rosedale
6d3a9f7bc0 merge fix 2015-01-26 18:43:42 -08:00
Atlante45
64f8495681 Fixed mapped rotation + doubled it 2015-01-26 18:20:08 -08:00
Philip Rosedale
dd352e5a1a Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 17:31:35 -08:00
Philip Rosedale
a1babe3a33 Put paddle exactly in hand, add animation of fingers gripping paddle 2015-01-26 17:20:31 -08:00
Atlante45
4b3291d946 Some cleanup in hydraGrab.js 2015-01-26 17:11:49 -08:00
Philip Rosedale
bfdbe2e675 Detach both guns on shutdown 2015-01-26 16:25:07 -08:00
ZappoMan
d9835701b0 added comment 2015-01-26 12:48:57 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
Thijs Wenker
ffb35666e1 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-26 19:37:27 +01:00
David Rowe
c8a755df1b Remove unused variable 2015-01-26 08:32:23 -08:00
Philip Rosedale
09527cc264 hit target 2015-01-25 21:52:08 -08:00
Philip Rosedale
67632fa589 remove debug 2015-01-25 21:51:12 -08:00
Philip Rosedale
901044fc53 First version, popcorn machine 2015-01-25 21:40:16 -08:00
Philip Rosedale
1048c9cda3 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-23 16:09:51 -08:00
Philip Rosedale
806c1851be add save/restore of gravity 2015-01-23 16:09:45 -08:00
Atlante45
7a1300d66c Request blocking calls 2015-01-23 16:05:06 -08:00
Thijs Wenker
42cf9e846a Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-23 19:10:08 +01:00
David Rowe
22347dd794 Add AudioDevice.deviceChanged() signal and use to update audio menu 2015-01-22 19:11:55 -08:00
Ryan Huffman
4fd5f74365 Update editEntities.js to load includes in parallel 2015-01-22 14:14:49 -08:00
Philip Rosedale
59f79fd436 Add handedness choice, default to right handed 2015-01-22 13:42:19 -08:00
Philip Rosedale
45a84895e1 Paddle ball game, first version 2015-01-22 12:44:07 -08:00
David Rowe
7d1cc1f20d Make 3D "x" button work 2015-01-21 21:44:55 -08:00
David Rowe
ef7ea0eaa6 Position and angle 3D notifications in lower part of view 2015-01-21 21:34:34 -08:00
Brad Hefta-Gaub
7d7411ceee Merge pull request #4146 from PhilipRosedale/master 
Improved Billiards, Gun
 2015-01-21 19:36:20 -08:00
David Rowe
00de7062cc Longer persist time for 3D notifications 2015-01-21 18:03:00 -08:00
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