Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 13:33:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19711 commits 75 branches 59 tags 1.2 GiB
Commit graph

1513 commits

Author SHA1 Message Date
Philip Rosedale
752a255aee Merge branch 'master' of https://github.com/worklist/hifi 2014-11-14 10:57:11 -08:00
Ryan Huffman
28eebd3fa5 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties 2014-11-14 10:53:18 -08:00
David Rowe
20fdd6d811 Disable model overlay properties example 
It causes intermittent crashes in
NetworkGeometry::setTextureWithNameToURL()
 2014-11-14 10:31:30 -08:00
Atlante45
4afcf9b240 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 08:29:22 -08:00
Brad Hefta-Gaub
db2b5fc28d Merge pull request #3791 from ctrlaltdavid/20128 
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
 2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
Ryan Huffman
3658d65028 Remove grid tool from menu 2014-11-13 20:02:19 -08:00
Ryan Huffman
a6f027e33a Fix entity edit grid not hiding when disabling tools 2014-11-13 18:31:32 -08:00
Atlante45
4c35f8e325 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 18:06:30 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
55612cc596 Add title to WebWindowClass 2014-11-13 17:46:20 -08:00
Atlante45
ce73f75e7d Merge branch 'entities_userdata' into chessgame 2014-11-13 17:45:55 -08:00
Ryan Huffman
49563dbff7 Add entityProperties tool window 2014-11-13 17:41:51 -08:00
Ryan Huffman
4254d38cdd Update buttons to grid tool 2014-11-13 17:40:21 -08:00
Philip Rosedale
1ccd47fd1d Fix drumstick script 2014-11-13 17:27:16 -08:00
Chris Collins
c55f76d7ef Apply alpha to text from 0 - .9 
Apply alpha to text from 0 - .9
 2014-11-13 17:27:05 -08:00
Thijs Wenker
e964741e30 added OverlayPreloader and made a bunch of clones 2014-11-14 00:01:51 +01:00
Stephen Birarda
cfa2912877 use new SoundCache across scripts 2014-11-13 15:01:45 -08:00
Stephen Birarda
de5881818b update playSound to new sound interface 2014-11-13 14:54:48 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
AndrewMeadows
b797c7b38c Merge pull request #3782 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-13 13:52:53 -08:00
Thijs Wenker
388332966d Added cloning methods to Grid3DOverlay 
Added example script for cloning overlays (TODO: SpriteBillboard fix cloning of in example)
 2014-11-13 22:22:46 +01:00
Atlante45
a0afcdfe79 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 11:39:15 -08:00
Atlante45
ac34db14aa Send pieces ID 2014-11-13 11:35:14 -08:00
Atlante45
ce0cb9fdc7 Better move / start of auto move dead piece 2014-11-13 11:34:38 -08:00
Philip Rosedale
9cfc95bc6a Merge pull request #3786 from ZappoMan/animationUnification 
Animation unification
 2014-11-13 10:23:36 -08:00
Atlante45
2498fd11a3 Preload sounds / use hash injector options 2014-11-13 10:22:45 -08:00
Atlante45
bc4514649e Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 09:35:39 -08:00
Stephen Birarda
42a73e280e remove the concert camera scripts from examples 2014-11-13 09:29:37 -08:00
ZappoMan
55c177594b only set animationIsPlaying if it changed 2014-11-13 08:37:54 -08:00
ZappoMan
ea0022501b only set animation properties if they actually changed 2014-11-13 08:13:30 -08:00
David Rowe
9e19641a1d Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
ZappoMan
4077f6c2ab Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification 2014-11-12 20:39:39 -08:00
ZappoMan
8a2e3d5045 add animationSettings property to model entities 2014-11-12 17:41:55 -08:00
Atlante45
16e243aec5 typo 2014-11-12 17:19:16 -08:00
Atlante45
bada1d8e38 Cleaner code + metadata 2014-11-12 17:13:29 -08:00
Atlante45
7193fcc89d Metadata for pieces 2014-11-12 17:12:27 -08:00
David Rowe
725d56d41f Add property getting for all 2D overlays 2014-11-12 16:50:13 -08:00
Brad Hefta-Gaub
99dd20f828 Merge pull request #3780 from ctrlaltdavid/20182 
CR for Job #20182 - Add ability to set alpha on text overlays
 2014-11-12 16:26:59 -08:00
Brad Hefta-Gaub
70c463695a Merge pull request #3779 from PhilipRosedale/master 
Remove buckyBalls and faceshift lean-to-drive
 2014-11-12 16:26:50 -08:00
Atlante45
6f8b702334 New grid 2014-11-12 15:34:39 -08:00
Atlante45
76d45953fd switch to mesh board 2014-11-12 15:34:14 -08:00
David Rowe
8c3bedae9d Add position vector and color object script value examples 
OverlayPropertyResult type is needed to successfully move QScriptValue
objects from QScriptEngine in Overlays to QScriptEngine in script.
 2014-11-12 14:33:52 -08:00
Atlante45
d25af3b4c9 Actual piece meshes 2014-11-12 14:15:18 -08:00
Atlante45
b4585163db Global board position / piece boundaries 2014-11-12 14:14:37 -08:00
David Rowe
4fa5447c85 Add overlay getProperty() for text overlay "text" property 2014-11-12 12:13:57 -08:00
Atlante45
685734bdcc Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-12 09:04:48 -08:00
Philip Rosedale
6af2b7aadf remove buckyballs and face shift lean driving (should be a script if desired) 2014-11-12 07:33:59 -08:00
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
David Rowe
8ac3aba2bd Make text overlays apply alpha to text as well as background 2014-11-11 17:54:02 -08:00
Stephen Birarda
9aa950e657 fix audio injector cleanup for local only injectors 2014-11-11 17:34:03 -08:00
David Rowe
f0f12b0479 Auto-size load URL and file menu items in editModels and newEditEntities 
And fix a couple of typos
 2014-11-11 17:32:37 -08:00
Stephen Birarda
7f79f0946d play a random musak song in lobby when it is shown 2014-11-11 17:10:25 -08:00
Atlante45
f80068798f playChess script with autonomous pieces 2014-11-11 17:09:08 -08:00
Atlante45
e4975c0e2b chessPiece script with sound 2014-11-11 17:08:35 -08:00
Stephen Birarda
0433586293 switch lobby noise back to drone 2014-11-11 16:59:15 -08:00
Stephen Birarda
cb5d5dd3a8 handle looping via AudioInjectorLocalBuffer 2014-11-11 16:57:25 -08:00
Stephen Birarda
a5a02b5f8a add AudioInjectorLocalBuffer for more control 2014-11-11 16:34:00 -08:00
Stephen Birarda
0e30c65e60 handle cleanup of local injection, volume 2014-11-11 15:12:11 -08:00
Philip Rosedale
e6bbb53483 Merge pull request #3774 from ZappoMan/newEntityNotification 
implement "preload" method for entity Scripts
 2014-11-11 14:46:23 -08:00
ZappoMan
8ec3f8ce99 implement support for calling preload when the script changes 2014-11-11 14:21:06 -08:00
Stephen Birarda
cd3877b584 handle local audio output via AudioInjector directly for control 2014-11-11 14:14:43 -08:00
ZappoMan
2bc7896dee first cut at preload script behavior 2014-11-11 13:46:48 -08:00
Ryan Huffman
db9a5f2282 Add back XZ constraining to entity edit tools 2014-11-11 11:43:27 -08:00
Stephen Birarda
1f452c8baa replace AudioInjectionOptions with hash in playSoundOnEnterOrLeave 2014-11-11 11:17:45 -08:00
Stephen Birarda
d81609f045 use hash in place of AudioInjectionOptions in other js files 2014-11-11 11:16:45 -08:00
Stephen Birarda
89ae8f53ba use new AudioInjectionOptions format in botProceduralWayPoints 2014-11-11 11:05:35 -08:00
Stephen Birarda
bfc25767ed repairs to bot_procedrual for hash injector options format 2014-11-11 10:57:07 -08:00
Stephen Birarda
853c0197a1 repairs to birdSongs for new hash injector format 2014-11-11 10:55:45 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Stephen Birarda
d4b74e6ecf update birdSongs to new injector hash format 2014-11-11 10:30:16 -08:00
Stephen Birarda
12e15eab6a update avatarCollision to new hash injector format 2014-11-11 10:29:29 -08:00
Stephen Birarda
c684a1cf00 update audioBall to new hash injector format 2014-11-11 10:28:33 -08:00
Stephen Birarda
05174ffdf3 update airGuitar.js to new AudioInjectionOptions format 2014-11-11 10:26:53 -08:00
Atlante45
e58664d418 Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-11 10:20:12 -08:00
Ryan Huffman
d537c5efdb Add grid tool menu option 2014-11-11 09:56:02 -08:00
Ryan Huffman
b04fd89e4f Update grid tool html location 2014-11-11 09:55:30 -08:00
AndrewMeadows
22dbebbe09 Merge pull request #3760 from DaveDubUK/20142 
CR for Job #20142 - Walk Cycle Polish Description
 2014-11-11 09:10:32 -08:00
DaveDubUK
3f1897d6b2 Minor formatting change 2014-11-11 13:21:37 +00:00
DaveDubUK
05b361affc Formatting changes 2014-11-11 07:34:18 +00:00
Atlante45
450e89df21 playChess script 2014-11-10 08:23:42 -08:00
DaveDubUK
ef325db052 Formatting changes to walk.js 1.1 
Minor formatting changes for HiFi coding standard compliance
 2014-11-08 11:47:57 +00:00
Brad Hefta-Gaub
3a90e869d4 Revert "CR for Job #20140 - Add Overlays.getTextWidth" 2014-11-07 21:50:19 -08:00
Brad Hefta-Gaub
8e17bc74bf Merge pull request #3759 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-07 20:14:18 -08:00
David Rowe
5f259791a3 Control "hand" joint with wrist position estimate if no "wrist" joint 2014-11-07 12:07:04 -08:00
David Rowe
a50c3c1696 Fix order of wrist and hand joints in Leapmotion controller 2014-11-07 12:04:03 -08:00
ZappoMan
742e6487c7 rename textureNames to originalTextures 2014-11-07 10:05:43 -08:00
ZappoMan
fdc5aa1da5 include urls with texture names, make sure to wait till default textures loaded before setting new textures 2014-11-07 09:54:13 -08:00
ZappoMan
c48d79ad8b add gettable feature which lists texture names 2014-11-07 09:05:47 -08:00
David Rowe
8c3360d0a9 Auto-size load URL and file menu items in editModels and newEditEntities 
And fix a couple of typos.
 2014-11-07 08:59:37 -08:00
Ryan Huffman
feaf5678bb Add grid tools to entity edit tools 2014-11-06 15:00:39 -08:00
Stojce Slavkovski
06da1bd566 add checkbox support in scripting interface 2014-11-06 20:41:08 +01:00
Philip Rosedale
b103c62df9 add new birdSongs.js 2014-11-06 08:30:33 -08:00
Philip Rosedale
54957a2fa1 merge fix 2014-11-05 21:08:24 -08:00
Philip Rosedale
291767fd9e updated header 2014-11-05 17:09:26 -08:00
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
DaveDubUK
7a1f7bd418 Update to walk.js v 1.1 
Revised code structure (see /libraries for new files), walk animation
completely overhauled (now using geometric wave generators, Fourier
synthesis and Butterworth LP filtering for selected motion curve
construction), redesigned sidestepping animations, tweaked flying
animations, decreased maximum walk speed in Interface to more natural
human value, improved Hydra support, added support for Leap motion,
animation file sizes optimised, cleared out code used to work around now
fixed bugs, lots of minor tweaks and improvements. walk.js is now under
100,000 characters, but I had to use tabs instead of 4 spaces to get it
below the threshold.
 2014-11-05 20:11:11 +00:00
Stephen Birarda
f8874daab6 remove the voxel drumming script 2014-11-05 10:10:22 -08:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Philip Rosedale
6b8476a87f Merge pull request #3734 from birarda/lobby 
bubble up a PickRay with action event, camera cleanup
 2014-11-04 12:03:29 -08:00
Stephen Birarda
b968f05123 use a new cursor for selection in lobby 2014-11-04 11:54:14 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
AndrewMeadows
d7234d5995 Merge pull request #3731 from ctrlaltdavid/20138 
CR for Job #20138 - Repopulate example default models for "Upload URL" to better sized models
 2014-11-04 11:08:47 -08:00
Stephen Birarda
8452182b45 replace position and orientation calls in lobby 2014-11-04 10:43:09 -08:00
Stephen Birarda
303e8f6da9 more js changes for changes to camera interface 2014-11-04 10:41:36 -08:00
Stephen Birarda
fe0d593ac4 expose camera mode as property and leverage in scripts 2014-11-04 10:41:13 -08:00
Stephen Birarda
81ef722ef8 update camera calls in JS to use new mode methods 2014-11-04 10:35:41 -08:00
Stephen Birarda
99219a1758 use actionRay in lobby script 2014-11-04 10:17:00 -08:00
Ryan Huffman
2e8e31fce9 Update inspect tool behavior to pan correctly 2014-11-04 10:06:45 -08:00
Ryan Huffman
573e6f119f Add entity camera options to settings 2014-11-04 10:06:17 -08:00
David Rowe
4fdc00948f Repopulate example models in newEditEnties.js too 2014-11-04 09:39:37 -08:00
David Rowe
fd8fb32190 Repopulate example models for "Upload URL" to better sized models 2014-11-04 09:33:39 -08:00
Ryan Huffman
fc977e21e6 Remove print statements 2014-11-04 09:14:14 -08:00
Ryan Huffman
a3fa1e4ce8 Merge branch 'master' of github.com:highfidelity/hifi into inspect-tool 2014-11-04 08:32:58 -08:00
Ryan Huffman
185b9ac545 Add Inspect tool to newEditEntities 2014-11-04 08:32:21 -08:00
Ryan Huffman
640c2c5fbf Add optional orientation easing to entity camera 2014-11-04 08:30:10 -08:00
Stephen Birarda
a86ccfd603 Merge pull request #3725 from ZappoMan/entityScriptsAndEvents 
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
 2014-11-03 15:51:33 -08:00
ZappoMan
60182a78cb CR feedback 2014-11-03 15:42:40 -08:00
ZappoMan
e12e3b05e1 add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity 2014-11-03 15:33:01 -08:00
Stephen Birarda
d3372537c5 Merge pull request #3715 from ZappoMan/entityScriptsAndEvents 
Entity Scripts
 2014-11-03 15:02:52 -08:00
ZappoMan
252d05282b added example entity script that teleports your avatar to the entity when you click on it 2014-11-03 12:03:08 -08:00
ZappoMan
30c5451b87 added example of playing a sound on click 2014-11-03 11:52:16 -08:00
ZappoMan
f9bd954fbe typo 2014-11-03 11:43:30 -08:00
ZappoMan
948f3a4c1f added an example entity script that makes the avatar do crazy legs when you click on an entity 2014-11-03 11:38:49 -08:00
David Rowe
d085be6c47 Better estimate of HMD offset 2014-11-03 11:14:04 -08:00
ZappoMan
49a389618e Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-11-03 10:54:19 -08:00
AndrewMeadows
8d02e64804 Merge pull request #3711 from ctrlaltdavid/20130 
CR for Job #20130 - Repeated inspect.js errors
 2014-11-03 08:43:53 -08:00
AndrewMeadows
80a385b23a Merge pull request #3710 from ZappoMan/lockAndMaterialProperties 
Improvements to Entities
 2014-11-03 08:41:55 -08:00
AndrewMeadows
61d12ba0a9 Merge pull request #3709 from huffman/entity-tool-updates 
Entity tool cleanup and fixes
 2014-11-03 08:37:01 -08:00
AndrewMeadows
aa726bdb56 Merge pull request #3708 from DaveDubUK/19996 
CR for Job #19996 - Applying the principles of animation to a procedural animation script
 2014-11-03 08:25:43 -08:00
ZappoMan
2ffe15c833 add example entity script for change color on hover 2014-11-01 11:43:40 -07:00
Thijs Wenker
af74fc09b9 Adds AudioDevice mute functionality to ScriptEngine 2014-11-01 02:42:22 +01:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
David Rowe
f84030ce3f Fix pan and orbit camera controls in inspect.js after API change 2014-10-30 19:16:29 -07:00
ZappoMan
fecea5fe3c fixes to the Model List feature in editModels.js and added it to new edit 2014-10-30 15:27:05 -07:00
Ryan Huffman
7ccacbd8ac Remove old entity selection code and fix rotation bug 2014-10-30 14:57:23 -07:00
ZappoMan
81cc15495f rename Models to Entities, and add menu option to disable Light entities 2014-10-30 14:43:43 -07:00
Ryan Huffman
55fdbfec1f Disable edit camera tools 2014-10-30 14:43:35 -07:00
Brad Hefta-Gaub
12fbc9a039 Merge pull request #3705 from birarda/lobby 
lobby easter egg for status
 2014-10-30 11:40:24 -07:00
Stephen Birarda
bc24fa7de0 lobby easter egg for status 2014-10-30 11:39:37 -07:00
AndrewMeadows
4cf77d1c6c Merge pull request #3702 from ZappoMan/lockAndMaterialProperties 
Lock and textures properties
 2014-10-30 11:35:38 -07:00
Brad Hefta-Gaub
cdca6588e2 Merge pull request #3704 from huffman/orbit-camera 
Update edit camera controls to hide cursor when orbiting
 2014-10-30 11:28:27 -07:00
Ryan Huffman
87a17f869f Update edit camera controls to hide cursor 2014-10-30 11:25:39 -07:00
Stephen Birarda
409a01c498 show the reticle sphere in lobby interface 2014-10-30 11:16:52 -07:00
ZappoMan
95c5b417c9 texture support in model entities 2014-10-30 11:04:19 -07:00
Stephen Birarda
35dc72521b only show sphere if user is wearing the oculus 2014-10-30 10:44:55 -07:00
Stephen Birarda
ec126f16d5 make the oculus reticle a sphere overlay 2014-10-30 10:43:10 -07:00
Stephen Birarda
ae4233c680 add a missing semicolon for @zappoman 2014-10-30 10:22:30 -07:00
Stephen Birarda
2aebfc968a don't render Avatars when in lobby 2014-10-30 10:21:52 -07:00
Stephen Birarda
183d080b1e use new lobby panel wall to avoid shimmer on frame edge 2014-10-30 10:11:05 -07:00
ZappoMan
c650cabb5d support for locked property, some plumbing for textures property 2014-10-30 10:05:20 -07:00
Brad Hefta-Gaub
12c79b2be8 Merge pull request #3696 from birarda/lobby 
tweaks to lobby to add the orb shell
 2014-10-30 09:20:21 -07:00
Stephen Birarda
136aba450b add semicolons back to all of lobby, fix long line 2014-10-30 09:18:46 -07:00
ZappoMan
83706cfc4e Revert "remove sample code" 
This reverts commit bde221c0c3.
 2014-10-29 21:22:06 -07:00
ZappoMan
bde221c0c3 remove sample code 2014-10-29 21:09:31 -07:00
Brad Hefta-Gaub
6b4b0bc8a4 Merge pull request #3693 from Adrianl3d/20016 
CR for Job #20016 - Input box overlay in Javascript
 2014-10-29 20:45:57 -07:00
Adrianl3d
2532a54a2d code tidy up 
Fixed indentation, fixed text overflow.
 2014-10-30 13:28:50 +10:00
Stephen Birarda
4a32b5acf3 add a reticle so oculus selection is more obvious 2014-10-29 16:19:44 -07:00
Stephen Birarda
64c5405a36 use an ORB_SHIFT variable to easily shift the orb position 2014-10-29 16:01:33 -07:00
Stephen Birarda
88475f6154 fix positioning of lobby panel wall inside orb sphere 2014-10-29 15:47:23 -07:00
Stephen Birarda
26f71de65f Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-29 14:50:47 -07:00
Stephen Birarda
a333325a92 when user drops into lobby hide everything else 2014-10-29 14:29:28 -07:00
Brad Hefta-Gaub
d49b617a4a Merge pull request #3695 from RyanDowne/master 
Philip's head move script changes
 2014-10-29 13:59:26 -07:00
Brad Hefta-Gaub
daf867f3ee Merge pull request #3694 from birarda/lobby 
initial version of the lobby panel wall to jump to locations
 2014-10-29 13:59:02 -07:00
Ryan
d8ce5d530f Philip's head move script changes 2014-10-29 13:50:49 -07:00
Stephen Birarda
ed098be2bc don't remove testModelOverlaySubMeshes 2014-10-29 13:49:12 -07:00
Stephen Birarda
cb4ae5f1bb initial version of the lobby script to jump to locations 2014-10-29 13:43:59 -07:00
Brad Hefta-Gaub
51531e1fb5 Merge pull request #3689 from huffman/fix-edit-entities-arrow 
Fix issue with arrow keys moving objects when edit mode off
 2014-10-29 12:11:06 -07:00
ZappoMan
c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes 2014-10-29 11:56:27 -07:00
ZappoMan
0696bd39f5 added example script for lobby model overlays 2014-10-29 11:39:23 -07:00
Ryan Huffman
e8f7c2c2ae Fix issue with arrow keys moving objects when edit mode off 2014-10-29 11:20:19 -07:00
Adrianl3d
1d335c1218 Added textInputOverlayExample.js 
Displays a text overlay and captures keystrokes which appear on the
overlay. Demonstrates keystroke events, mouse click events, clickable
text overlay and image overlay buttons
 2014-10-29 23:39:44 +10:00
Brad Hefta-Gaub
caecf473ff Merge pull request #3678 from huffman/entity-tool-fixes 
Entity tool updates and fixes
 2014-10-28 15:24:21 -07:00
Ryan Huffman
bdfdeecc46 Fix bug with entity selection shadow 2014-10-28 13:45:31 -07:00
Ryan Huffman
af103b22ff Remove extra print statements and whitespace 2014-10-28 13:42:40 -07:00
Ryan Huffman
76c3e9f483 Add support for undoing duplication and deletion commands 2014-10-28 13:42:02 -07:00
Ryan Huffman
68f51d2484 Add entity tool support for unkown entity ids 2014-10-28 13:39:41 -07:00
ZappoMan
8debb33c6a default light properties 2014-10-28 12:44:57 -07:00
Ryan Huffman
8f53e1731b Add selectionManager.setSelections and hasSelection 2014-10-28 12:40:44 -07:00
ZappoMan
c3cd733c2f tweaks to edits for lights 2014-10-28 12:40:17 -07:00
ZappoMan
8570088f9d added light exampple 2014-10-28 12:26:45 -07:00
Ryan Huffman
e21bf78d04 Remove cancel tool functionality 2014-10-28 11:21:26 -07:00
ZappoMan
7d2ef7923b Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 10:50:02 -07:00
Ryan Huffman
21b6a93fef Add entity tool for movement using arrow keys 2014-10-28 10:12:17 -07:00
Ryan Huffman
48eaa7ce12 Cleanup entity tools 2014-10-28 10:11:18 -07:00
Ryan Huffman
97ede6c75a Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-fixes 2014-10-28 10:00:49 -07:00
Ryan Huffman
e7d67ee3ba Move rotation handle update to a separate function 2014-10-28 10:00:34 -07:00
DaveDubUK
d1404aa7d3 Minor code edits 2014-10-28 16:57:53 +00:00
ZappoMan
5d7a0c2934 added light properties to edit tools 2014-10-27 14:34:43 -07:00
AndrewMeadows
fecf7ba5ed Merge pull request #3667 from PhilipRosedale/master 
HeadMove:  Double click on spacebar turns around
 2014-10-27 11:00:34 -07:00
AndrewMeadows
9d93ec5a5a Merge pull request #3656 from huffman/separate-camera-tool 
Add camera move tool for editing
 2014-10-27 10:54:02 -07:00
Philip Rosedale
4b7eb682b3 Easier to get out of body and move from there with target 2014-10-27 08:44:45 -07:00
Philip Rosedale
fde85bb4d2 don't spam 2014-10-26 21:18:54 -07:00
Philip Rosedale
8158733a27 double click to turn around 2014-10-24 20:21:57 -07:00
Stephen Birarda
57e7fa233f Merge pull request #3664 from PhilipRosedale/master 
Tour Guide script to let you follow people, better hair
 2014-10-24 17:10:57 -07:00
Philip Rosedale
54197b2c23 fix for spacing 2014-10-24 17:10:46 -07:00
Philip Rosedale
1e832e7bbb Tour guide script 2014-10-24 16:38:24 -07:00
Stephen Birarda
8ae1f980f5 don't make headMove changes if key is auto repeating 2014-10-24 16:13:01 -07:00
Ryan Huffman
e556886c72 Add entity copying and axis constraining to entity tools 2014-10-23 15:28:16 -07:00
Ryan Huffman
fde7b30501 Add Camera::modeUpdated() 2014-10-23 14:47:41 -07:00
Ryan Huffman
28095e9972 Remove print statements in edit entities 2014-10-23 14:47:07 -07:00
Ryan Huffman
5b5a1745fd Add camera move tool 2014-10-23 14:46:39 -07:00
Leonardo Murillo
a4965e7f60 No need for https when downloading assets 2014-10-23 13:59:08 -06:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb 
Reverb
 2014-10-22 21:51:57 -07:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Philip Rosedale
d3fa3fbbac Merge pull request #3640 from PhilipRosedale/master 
can warp at any yaw angle
 2014-10-22 15:43:12 -07:00
Philip Rosedale
70f72f9404 can warp at any yaw angle 2014-10-22 15:09:43 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00
Ryan Huffman
0bda7699a6 Disable properties menu with multi-selection 2014-10-22 10:38:24 -07:00
Ryan Huffman
5b9806dc0d Fix deletion with multi-selection 2014-10-22 10:37:17 -07:00
Ryan Huffman
078d14ae58 Fix rotation overlay size with multi-selection 2014-10-22 10:36:58 -07:00
Ryan Huffman
52dacaab02 Update entity editing to force SPACE_LOCAL for single-selection 2014-10-22 10:36:44 -07:00
ZappoMan
2f9766e051 first cut at light entity 2014-10-22 08:41:31 -07:00
Ryan Huffman
d9029beaa4 Merge remote-tracking branch 'upstream/master' into entity-tools-multi-selection 2014-10-21 15:17:07 -07:00
Ryan Huffman
d5c7c60553 Update entity edit tools 
Move editing functions into "tool" objects which contain onBegin,
onMove, and onEnd functions.
Add multi-selection
Add local and world editing modes
Fix XZ tool
 2014-10-21 15:15:26 -07:00
Philip Rosedale
2a5b2d8686 Improved version of headMove with timed target reveal 2014-10-21 11:40:16 -07:00
Philip Rosedale
4e605f5f67 First headMove "no-barf" version with lean/nod to walk, turn 2014-10-21 00:20:08 -07:00
Atlante45
5a11104bdf Updated script 2014-10-20 13:45:16 -07:00
Atlante45
86b87770c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 16:50:19 -07:00
Ryan Huffman
2a4092f287 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-new 2014-10-17 12:44:11 -07:00
ZappoMan
6fdd489715 more Particles to Entities migration 2014-10-17 10:25:52 -07:00
ZappoMan
a1ecad683a more Particles to Entities migration 2014-10-17 10:17:18 -07:00
ZappoMan
0ff6c491d4 more Particles to Entities migration 2014-10-17 10:11:47 -07:00
ZappoMan
25270efa42 more Particles to Entities migration 2014-10-17 10:01:08 -07:00
ZappoMan
aaa76f6071 more Particles to Entities migration 2014-10-17 09:59:03 -07:00
ZappoMan
597bfa33b9 more Particles to Entities migration 2014-10-17 09:53:53 -07:00
ZappoMan
e5b665cc30 more Particles to Entities migration 2014-10-17 09:50:15 -07:00
ZappoMan
c5c44e7cec more Particles to Entities migration 2014-10-16 21:13:34 -07:00
ZappoMan
7ca4c95d4a more Particles to Entities migration 2014-10-16 21:03:40 -07:00
ZappoMan
ce638dd14d more Particles to Entities migration 2014-10-16 20:52:38 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Atlante45
5d146a00e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 
Conflicts:
	interface/CMakeLists.txt
 2014-10-16 15:21:34 -07:00
Ryan Huffman
5139914ba9 Fix entity tools focus not always using latest entity position 2014-10-16 10:50:42 -07:00
Ryan Huffman
0326ec2aa9 Fix right/left stretch entity tool 2014-10-16 10:44:26 -07:00
Ryan Huffman
fdc231424b Update entitySelectionTools to use camera position/orientation instead of avatar 2014-10-16 09:50:06 -07:00
Brad Hefta-Gaub
ec647ca488 Merge pull request #3603 from huffman/entity-tools 
Camera easing for entity edit tools
 2014-10-16 09:23:15 -07:00
Ryan Huffman
643f28eb3f Add rotation and upDown handle resizing to entity edit tools 2014-10-15 09:29:30 -07:00
Ryan Huffman
17209ae0d1 Add easing to edit camera 2014-10-15 09:28:42 -07:00
Brad Hefta-Gaub
102d02d396 Merge pull request #3596 from huffman/entity-tools 
Camera functionality for entity edit tools
 2014-10-14 16:28:17 -07:00
Atlante45
4a3f72ab0b Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-14 15:13:50 -07:00
Ryan Huffman
a05e2ea168 Add entityCameraTools.js 2014-10-14 13:15:28 -07:00
Ryan Huffman
c332d94ae3 Add handle size based on distance in edit tools 2014-10-14 13:04:15 -07:00
Ryan Huffman
f178de3b2e Merge branch 'master' of github.com:highfidelity/hifi into entity-tools 2014-10-13 21:25:47 -07:00
NextPrior
a0a5530641 Initial reverb implementation 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
 2014-10-13 18:13:51 -07:00
Andrzej Kapolka
00490af837 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-13 17:59:35 -07:00
Clément Brisset
200c0e080e Merge pull request #3589 from ZappoMan/editToolsImprovements 
highlight grabber handles on hover
 2014-10-13 16:19:57 -07:00
Clément Brisset
f6f187e7f0 Merge pull request #3587 from ctrlaltdavid/20101 
CR for Job #20101 - Upload model file function is broken
 2014-10-13 16:16:49 -07:00
Andrzej Kapolka
84022fd19d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-13 15:35:07 -07:00