Commit graph

15511 commits

Author SHA1 Message Date
Stephen Birarda
3a9ac7d4ac remove macro to consolidate installer components 2016-01-15 15:41:34 -08:00
Stephen Birarda
6a503f3db0 remove icon as source to interface executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
ae67da4bcb use absolute path to interface icon 2016-01-15 15:41:34 -08:00
Stephen Birarda
301124ba3c fix reference to rc template and icon prefix 2016-01-15 15:41:34 -08:00
Stephen Birarda
f8f0b99a46 add icon to interface exec, icons in start menu 2016-01-15 15:41:34 -08:00
Stephen Birarda
8662fd0afb use correct dde install path for win 2016-01-15 15:41:34 -08:00
Stephen Birarda
fcd9d9b810 setup optional dde archive for windows 2016-01-15 15:41:34 -08:00
Stephen Birarda
8842c66109 include trailing slash in windows file copy 2016-01-15 15:41:34 -08:00
Stephen Birarda
1faa78fe72 install fixed up DS and AC beside console 2016-01-15 15:41:34 -08:00
Stephen Birarda
aa9e9836b4 repair another committed conflict 2016-01-15 15:41:34 -08:00
Stephen Birarda
6db36a3863 remove accidentally committed conflict 2016-01-15 15:41:34 -08:00
Stephen Birarda
3b3140de48 exclude console build from all by default 2016-01-15 15:41:34 -08:00
Stephen Birarda
acdd0bda2e use external project hack on win only 2016-01-15 15:41:34 -08:00
Stephen Birarda
275fa1c5c7 fix for override warnings with clang on OS X 2016-01-15 15:41:34 -08:00
Stephen Birarda
dedb7e2778 bury components in a shell application inside the server-console 2016-01-15 15:41:34 -08:00
Stephen Birarda
55886d43f5 add DDE component as downloadable optional 2016-01-15 15:41:34 -08:00
Stephen Birarda
4f00982724 remove extraneous add dependency for FIXUP_LIB 2016-01-15 15:41:34 -08:00
Stephen Birarda
817d651c47 add initial fixup install commands for interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
e3ef18ae6e customize Interface output name for PR/dev/prod 2016-01-15 15:41:34 -08:00
Stephen Birarda
f87d8885f4 rename interface bundle for production and pr build 2016-01-15 15:41:34 -08:00
Stephen Birarda
d491a7f0e5 work around OS X package installer relocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
92064fe507 generate a componentized server/client installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
0463e008cf base cpack configuaration using install commands 2016-01-15 15:41:34 -08:00
Andrew Meadows
8b420adbc8 namechange MotionType to PhysicsMotionType 2016-01-15 15:21:25 -08:00
samcake
2494623bc7 Cleaning the code for review 2016-01-15 10:55:43 -08:00
Ryan Huffman
0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging 2016-01-15 10:46:22 -08:00
Philip Rosedale
0ec754cf5f Merge pull request #6839 from hyperlogic/tony/squeeze-hands-part-deux
Updated animations for left hand grasp
2016-01-14 16:57:46 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window
Tool window in QML
2016-01-14 16:56:27 -08:00
Brad Davis
98df0d8fcc Merge pull request #6836 from ZappoMan/menuGroups
wire up audio show level meter menu
2016-01-14 19:27:47 -05:00
Anthony J. Thibault
90516d95f2 Updated animations for left hand grasp 2016-01-14 16:22:58 -08:00
Philip Rosedale
a8d13cb947 Merge pull request #6831 from hyperlogic/tony/squeeze-hands-part-deux
Simplify grab animation logic
2016-01-14 15:49:00 -08:00
Brad Davis
e76e13c05c Removing close button on tool window, fixing dragging 2016-01-14 14:20:31 -08:00
Brad Hefta-Gaub
0ad39feeb6 juggle developer menus a bit 2016-01-14 13:31:01 -08:00
Brad Hefta-Gaub
2177765b09 wire up audio show level meter menu 2016-01-14 13:12:16 -08:00
Anthony J. Thibault
51d678670d Updated grab animations for right hand 2016-01-14 12:57:30 -08:00
Ryan Huffman
fe4c161cb6 Fix sending URL to second interface instance 2016-01-14 12:47:36 -08:00
Ryan Huffman
196161fe93 Merge pull request #66 from birarda/console-dev
some initial packaging work and console fixes
2016-01-14 10:17:24 -08:00
Brad Davis
d924e042bc Merge pull request #6834 from ZappoMan/hmdFixes
fix issues with HMD lookout 2D, and cleanup
2016-01-14 12:42:23 -05:00
Anthony J. Thibault
c267d672d2 Updated hand grab animations
Left hand is old squeeze hands poses
Right hand is new hydra grasp poses
2016-01-14 08:57:27 -08:00
Brad Hefta-Gaub
6b76cf484d fix issues with HMD lookout 2D, and cleanup 2016-01-14 08:48:55 -08:00
Andrew Meadows
82e261480f Merge pull request #6827 from howard-stearns/physics-timing
Physics timing
2016-01-14 08:39:29 -08:00
Brad Hefta-Gaub
8f8afabbfe Merge pull request #6811 from Atlante45/master
Fix skybox not always rendering correctly
2016-01-13 21:00:48 -08:00
Anthony J. Thibault
75b3523c33 Simplify grab animation logic
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js

Deleted old hydra/squeezeHands.js to avoid confusion.

Added new sqeezeHands.js script to the default scripts.
2016-01-13 17:57:51 -08:00
Zach Pomerantz
2938829167 Add shadow items to stats 2016-01-13 17:49:37 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
howard-stearns
830dcb582a Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing 2016-01-13 13:32:38 -08:00
howard-stearns
8a77e2ee95 Split physics perf timing into three parts: updateStates, stepSimulation,
and harvestChanges.
2016-01-13 13:31:37 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
Atlante45
0008b1a055 Code cleanup 2016-01-12 20:49:25 -08:00
Andrew Meadows
e1ba4ff0a8 add CollisionMask entity property 2016-01-12 15:08:52 -08:00
Brad Hefta-Gaub
cd167e43fb Merge pull request #6812 from jherico/running_scripts
Running scripts in QML
2016-01-12 13:40:47 -08:00
Brad Davis
e7bfcba44f Fix 'load' button 2016-01-12 13:17:06 -08:00
Brad Davis
2ed54d8ea7 Cleanup running scripts 2016-01-12 13:11:03 -08:00
Howard Stearns
d1a72e8d63 Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation
Move hand animation control into grab script
2016-01-12 13:02:59 -08:00
Brad Davis
dcc6739bce Final functionality for running scripts 2016-01-12 12:40:46 -08:00
Brad Davis
a9eb5b8229 Load script from file 2016-01-12 12:40:45 -08:00
Brad Davis
4f975de6a6 Working on crash fixes, file open dialog 2016-01-12 12:40:43 -08:00
Brad Davis
21534cbde0 Layout for running scripts 2016-01-12 12:40:42 -08:00
Anthony J. Thibault
fee6bda721 Updated hand animation references. 2016-01-12 12:18:26 -08:00
Brad Hefta-Gaub
4c98c3a7a5 Merge pull request #6815 from ctrlaltdavid/20773
Resume Interface in 1st person if exit in 1st person
2016-01-12 12:05:12 -08:00
Brad Hefta-Gaub
8619be28ef Merge pull request #6816 from ctrlaltdavid/20772
Don't use cache when use load script "from Disk" button
2016-01-12 11:46:41 -08:00
Brad Hefta-Gaub
5b9607ca29 fix merge 2016-01-12 10:36:59 -08:00
Brad Hefta-Gaub
6ac9b737d2 Merge branch 'master' of https://github.com/highfidelity/hifi into fixCrashRedux
Conflicts:
	interface/src/Application.cpp
2016-01-12 10:35:24 -08:00
Brad Hefta-Gaub
5ec5ff9ad0 temporary fix to crash on startup 2016-01-12 09:11:20 -08:00
David Rowe
71ed8d2a64 Change camera to first person if start up with it in camera entity mode
Same as happens if start up with camera in independent mode.
2016-01-12 17:39:39 +13:00
David Rowe
92d63c48dd Resume Interface in 1st person if exited in 1st person 2016-01-12 17:38:16 +13:00
David Rowe
74515f9089 Don't use cache when user loads script from disk 2016-01-12 16:09:40 +13:00
Anthony J. Thibault
b44ae3a197 avatar-animation.json: Updated right hand grasp animations 2016-01-11 16:55:45 -08:00
Zach Pomerantz
801dde7950 Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-11 16:38:04 -08:00
Brad Davis
d1d178787c PR comments 2016-01-11 12:55:23 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Brad Hefta-Gaub
dfba05ae5f CR feedback 2016-01-11 11:07:07 -08:00
Anthony J. Thibault
8f78a0624c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-11 10:16:51 -08:00
Brad Hefta-Gaub
3e05d95478 Merge branch 'master' of https://github.com/highfidelity/hifi into menuGroups 2016-01-11 09:09:37 -08:00
David Rowe
9068d55998 Fix display of File > About Interface window 2016-01-11 15:58:00 +13:00
Brad Davis
d74686474a Ensure VR menus never render off the overlay 2016-01-10 11:39:47 -08:00
Anthony J. Thibault
8e915733f0 added place holder right hand open/searching animation 2016-01-08 17:15:18 -08:00
Zach Pomerantz
c8d3342aca Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-08 17:04:02 -08:00
Brad Hefta-Gaub
e2a3903def add support for advanced/developer plugins and change diplay modes to match spec 2016-01-08 16:58:25 -08:00
Brad Hefta-Gaub
e70be2d8fe more menu rework 2016-01-08 11:58:13 -08:00
Brad Hefta-Gaub
0f52b82c21 allow scripted addMenu() to specify grouping 2016-01-08 11:21:37 -08:00
Anthony J. Thibault
cac19b8579 grab animation work
Hand animations now have 5 states:

* idle
* open
* grasp
* point
* farGrasp

The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.

Also, removed hand trigger AnimVar setting from C++ Rig class.
2016-01-07 19:36:57 -08:00
Anthony J. Thibault
c2736cb68c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-07 16:58:10 -08:00
Seth Alves
8e199e0457 Merge pull request #6794 from hyperlogic/tony/soft-avatar-attachment-script
Added avatarAttachmentTest.js script
2016-01-07 16:41:41 -08:00
Anthony J. Thibault
7bef1ebdac Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script 2016-01-07 16:14:52 -08:00
Anthony J. Thibault
031f59b7b5 Support for adding soft attachments from script.
Also, bug fixes for setting MyAvatar.attachmentData property.
2016-01-07 16:12:36 -08:00
Stephen Birarda
404fb2f781 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-07 16:02:32 -08:00
Brad Davis
35e17b7604 movable audio bar 2016-01-07 15:43:51 -08:00
Brad Davis
3a7ec33d38 Merge pull request #6790 from ZappoMan/menuGroups
Menu restructuring
2016-01-07 17:48:20 -05:00
Brad Hefta-Gaub
45b85735d3 disable the not yet implemented menu items 2016-01-07 14:37:42 -08:00
Brad Hefta-Gaub
e9ec561a55 add separator in View menu 2016-01-07 14:28:44 -08:00
Brad Hefta-Gaub
cdc982c6e5 mini mirror off by default 2016-01-07 14:22:20 -08:00
Brad Hefta-Gaub
a8383238e4 make mini mirror a standard option 2016-01-07 13:46:55 -08:00
Philip Rosedale
c5ab29071e Merge pull request #6791 from jherico/qml_hang
Stop QML hanging the app on shutdown
2016-01-07 13:29:47 -08:00
Brad Hefta-Gaub
04a5f5ce1b remove dead code for friends, since its handled by users.js 2016-01-07 13:26:03 -08:00
Philip Rosedale
3e8f26d591 Merge pull request #6789 from jherico/url_loop
Stop looping on URL fixing
2016-01-07 13:10:54 -08:00
Brad Hefta-Gaub
d51f514281 reworking of view/camera mode to match spec 2016-01-07 12:42:18 -08:00
Brad Davis
660304a0a3 Stop QML hanging the app on shutdown 2016-01-07 12:25:25 -08:00
Brad Hefta-Gaub
1508a637ab Menu restructuring 2016-01-07 12:09:02 -08:00
AlessandroSigna
eaa67a41dd Following coding standard 2016-01-07 11:09:27 -08:00
AlessandroSigna
18390c87da handling NULL pointer 2016-01-07 11:09:26 -08:00
AlessandroSigna
7b74f7407a Threadsafe access to EntityTree in OverlayPanel 2016-01-07 11:09:25 -08:00
Seth Alves
bc538a0f7d Merge pull request #6756 from AndrewMeadows/physics-cleanup-003
more correct management of MotionState pointers
2016-01-07 11:04:28 -08:00
Andrew Meadows
8ae1e750ab Merge pull request #6783 from sethalves/fix-h0ld-action
try harder to ensure that a held object is active in bullet
2016-01-07 10:53:55 -08:00
Brad Davis
144af19ebd Stop looping on URL fixing 2016-01-07 10:52:28 -08:00
Andrew Meadows
36e19b43c9 add some comments; specify const and overrides 2016-01-07 10:19:46 -08:00
Andrew Meadows
c1206ca73d fix bad merge 2016-01-07 10:19:46 -08:00
Andrew Meadows
e0ec941476 fix typo 2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8 fix misusage of smart-pointers 2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b overhaul of MotionState cleanup
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Andrew Meadows
534bfa5983 remove dangling whitespace 2016-01-07 10:19:46 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order
Address some z-ordering issues in overlay windows
2016-01-06 20:08:52 -08:00
Atlante45
e59397a97a Merge branch 'master' of https://github.com/highfidelity/hifi into fix/skybox 2016-01-06 18:56:58 -08:00
Clément Brisset
447f2f6361 Merge pull request #6785 from ZappoMan/fixWarnings
fix warnings
2016-01-06 18:56:26 -08:00
Anthony J. Thibault
dfc3f02db3 avatar-animation.json: Removed point outro state.
Also replaced right hand point with force grab animation.
2016-01-06 18:15:32 -08:00
Atlante45
3effa9d5e1 Fix skybox rendering 2016-01-06 17:03:29 -08:00
Anthony J. Thibault
1251be1b2b Merge branch 'master' into tony/grab-script-hand-animation 2016-01-06 16:26:56 -08:00
Brad Hefta-Gaub
335ab3c501 fix warnings 2016-01-06 15:24:52 -08:00
Seth Alves
b873d92469 try harder to ensure that a held object is active in bullet 2016-01-06 14:12:58 -08:00
Andrew Meadows
b8b113844f reduced avatar max fly speed from 300 to 30 2016-01-06 11:22:58 -08:00
Brad Davis
44b9bc7115 Force active focus on the address bar line while address bar is visible 2016-01-06 11:10:05 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Zach Pomerantz
444a014252 Delay renderEngine init for GLBackend init 2016-01-05 17:20:08 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
Seth Alves
b59934573a Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 13:50:12 -08:00
Brad Hefta-Gaub
c2f2f950fb Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe
Make Avatar palm position/rotation accessors thread safe
2016-01-05 13:07:47 -08:00
Brad Davis
908c1072ce Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen
move alert and confirm to use offscreen ui
2016-01-05 15:26:48 -05:00
Seth Alves
b222c12857 unmangle merge 2016-01-05 12:21:50 -08:00
Seth Alves
cd82383d33 Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability 2016-01-05 11:13:38 -08:00
Anthony J. Thibault
a21b604746 Simplified implementation of ThreadSafeValueCache 2016-01-05 11:08:08 -08:00
Andrew Meadows
0473891e86 Merge pull request #6671 from sethalves/near-grab-via-parenting
queryAACube plumbing
2016-01-05 11:01:28 -08:00
Andrew Meadows
62688d5c07 Merge pull request #6768 from jherico/vr_keys
Tweaks for supporting the new QML UI
2016-01-05 10:31:57 -08:00
Seth Alves
212d2d9e8f merge from upstream 2016-01-05 10:27:45 -08:00
Howard Stearns
5f85e0a4c0 Merge pull request #6769 from hyperlogic/tony/marketplace-avatar-attachment-support
Interface support for avatar attachments from Marketplace
2016-01-05 10:17:33 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Andrew Meadows
43d8c14c16 Merge pull request #6767 from howard-stearns/pid-render-limits
render limits fixes
2016-01-05 10:17:04 -08:00
Anthony J. Thibault
9ea6079c64 Merge branch 'master' into tony/get-palm-thread-safe 2016-01-05 10:16:52 -08:00
Brad Hefta-Gaub
d98c2d1413 migrate callers of QMessageBox::question() to OffscreenUi::question() 2016-01-05 09:39:39 -08:00
Brad Davis
900a0f7f08 Trigger selection is too twitchy 2016-01-05 09:16:44 -08:00
Brad Davis
4b6f58dcab Restoring code commented out for debugging 2016-01-04 20:51:52 -08:00
Brad Davis
8485c89a0e More work on exposing tools to QML overlay windows 2016-01-04 20:51:52 -08:00
Brad Davis
56ee48a084 Working on focus problems 2016-01-04 20:51:51 -08:00
Brad Davis
e6b59cb0a1 Make it easier for QML dialogs to access the global menu, manipulate the overlay desktop 2016-01-04 20:51:50 -08:00
Brad Davis
41dcc3d52b QML dialogs should not consume key events when disabled 2016-01-04 20:51:49 -08:00
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Anthony J. Thibault
bac6570655 Interface support for avatar attachments from Marketplace
Drag and drop support of ava.json files is also supported and
at the moment the only way to test.

To test:

1. Create a cowboyhat.ava.json file on your hard-drive, with the following contents:
    {
        "version": "0.1",
        "name": "Cowboy Hat",
        "modelUrl": "https://s3.amazonaws.com/hifi-public/tony/cowboy-hat.fbx",
        "jointName": "Head",
        "transform": {
            "rotation": {"x": 0, "y": 0, "z": 0, "w": 1},
            "translation": {"x": 0, "y": 0, "z": 0},
            "scale": {"x": 1, "y": 1, "z": 1}
        },
        "isSoft": false
    }
2. Create a leatherjacket.ava.json file, with the following contents:
    {
        "version": "0.1",
        "name": "Leather Jacket",
        "modelUrl": "https://hifi-content.s3.amazonaws.com/ozan/dev/clothes/coat/coat_rig.fbx",
        "isSoft": true
    }
3. Run interface
4. Drag-and-Drop cowboyhat.ava.json onto the main Interface window.
5. You should be prompted wear the 'Cowboy Hat' attachment.
6. If you select 'Yes', the cowboy hat should appear on the avatar.
7. Do the same with leatherjacket.ava.json file.
2016-01-04 17:50:45 -08:00