Atlante45
eb007b24cd
Use invalid port to signal no value passed
2016-09-06 11:59:07 -07:00
Atlante45
9f07511fd8
Move setter to LimitedNodeList
2016-09-06 10:18:42 -07:00
Atlante45
fcf44911a3
Fix Windows warning
2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57
Add settings to change local port
2016-09-06 10:18:42 -07:00
Seth Alves
37db1cba26
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-09-06 09:38:44 -07:00
Anthony J. Thibault
9122a33fff
only raise the webEntity virtual keyboard in HMD mode
2016-09-02 16:53:40 -07:00
Seth Alves
342f7edff3
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-09-02 16:12:41 -07:00
Brad Davis
94210d2e69
Use dynamic count for global thread pool
2016-09-02 15:23:35 -07:00
Brad Davis
91bfa7677c
Updating stats display for threaded rendering
2016-09-02 14:41:49 -07:00
Seth Alves
25f6e1d79d
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-09-01 15:06:52 -07:00
Brad Hefta-Gaub
b3e5e21f40
Merge pull request #8559 from birarda/android-interface
...
create a foundation for interface target compile on android
2016-09-01 13:10:45 -07:00
Seth Alves
1a9f43cb67
fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled
2016-09-01 12:17:34 -07:00
Seth Alves
dc31525794
remove some left-over code
2016-08-31 16:39:57 -07:00
Seth Alves
280b603747
remove some leftover code
2016-08-31 16:30:51 -07:00
Seth Alves
74dc2ce493
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-31 16:26:21 -07:00
Chris Collins
02afa460ff
Merge pull request #8557 from jherico/location_bar
...
Don't show address bar when starting up in a connected state
2016-08-31 16:03:37 -07:00
Brad Davis
b9a97712d5
Don't show address bar when starting up in a connected state
2016-08-31 15:17:57 -07:00
Stephen Birarda
feef76cbab
add tools, no plugins, add InterfaceActivity
2016-08-31 11:31:07 -07:00
Zach Pomerantz
441005bba0
use existing defaults for zoneless keylight
2016-08-31 09:47:53 -07:00
Zach Pomerantz
372c52fea5
restore default ambient skybox
2016-08-30 17:07:34 -07:00
Seth Alves
cdd08bd38e
more anti-jitter changes
2016-08-30 14:59:30 -07:00
Seth Alves
78f54a7f33
get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away
2016-08-30 14:39:11 -07:00
Seth Alves
5bda94b2ba
use same data as used for drawing show-hand-targets for controller joints in MyAvatar
2016-08-30 12:39:30 -07:00
Seth Alves
2a9ffc1529
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 10:26:14 -07:00
Stephen Birarda
74fac8c7c9
Merge pull request #8512 from birarda/shareable-address
...
add shareable address from default name, leverage for steam join/invite
2016-08-30 09:35:24 -07:00
Seth Alves
87fbbd68ae
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 17:37:58 -07:00
Brad Hefta-Gaub
f3d157c396
Merge pull request #8500 from jherico/gl_context
...
Custom OpenGL context creation
2016-08-29 16:22:21 -07:00
Howard Stearns
a1ae9eebf2
Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning
...
Silence address bar log warning
2016-08-29 11:48:43 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
howard-stearns
01af8899bf
silence address bar dialog qml warning
2016-08-29 10:47:22 -07:00
Seth Alves
178a68c967
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 10:21:07 -07:00
Seth Alves
3fb10d0eea
action for arrow flight, etc
2016-08-28 19:08:13 -07:00
Seth Alves
76b72e32f0
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-27 09:06:45 -07:00
Brad Davis
587d015c57
Give names to offscreen contexts for easier debugging
2016-08-26 19:09:26 -07:00
Brad Hefta-Gaub
3d6691f3d1
Merge pull request #8527 from zzmp/fix/skybox-default-color
...
fix skybox default
2016-08-26 15:14:44 -07:00
Seth Alves
9394a25a1c
remove some anti-jitter code that was doing more harm than good
2016-08-26 12:47:19 -07:00
Seth Alves
9884426ad8
replace debugging aborts with asserts
2016-08-26 06:13:33 -07:00
Seth Alves
174a95a005
do some hokey pokey to avoid jitter of held entities while walking
2016-08-25 18:49:47 -07:00
Seth Alves
3b278adba3
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-25 17:28:18 -07:00
Brad Hefta-Gaub
10c465f591
Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering
...
Improved web entity rendering
2016-08-25 16:49:00 -07:00
Seth Alves
dfae5b64bd
attempt to avoid jitter of held entity while walking
2016-08-25 16:42:40 -07:00
Seth Alves
232917fcf8
when processing AvatarActionHold for another's avatar, use their hand-controller joint information
2016-08-25 16:02:58 -07:00
Seth Alves
7c5b8cb75d
send faux joints to the avatar-mixer
2016-08-25 15:21:29 -07:00
Zach Pomerantz
24162f0f3d
set skybox default color to empty color
2016-08-25 12:37:23 -07:00
Anthony J. Thibault
e82f6a90af
Improved web entity rendering
...
* fading now works properly
* web browsers are now fully opaque.
2016-08-25 11:04:23 -07:00
Seth Alves
39f52b3682
start on faux avatar joint that represent hand controllers
2016-08-25 10:58:23 -07:00
Andrew Meadows
d7bb555987
make menu wording more correct
2016-08-25 08:53:08 -07:00
Andrew Meadows
25fb7aacad
ShapeManager hands out const shape pointers
2016-08-24 22:26:56 -07:00
Anthony J. Thibault
c2af948e25
Merge branch 'master' into feature/handheld-marketplace
2016-08-24 16:07:04 -07:00
James B. Pollack
d9ebad7976
Merge pull request #8372 from elisa-lj11/zip_project
...
Added Clara.io to the marketplace
2016-08-24 15:53:58 -07:00
Zach Pomerantz
c740b263a8
detect unset skybox
2016-08-23 15:16:26 -07:00
Howard Stearns
89b00883dd
Merge pull request #8428 from highfidelity/discovery
...
Snapshot of Snapshot-Discovery to master
2016-08-23 14:32:10 -07:00
Howard Stearns
3f30b23b78
Merge pull request #8496 from huffman/fix/address-bar-popup
...
Fix address bar being opened when moving between places on same domain
2016-08-23 13:08:31 -07:00
Stephen Birarda
9461ca0cfc
use the facing shareable address for steam location
2016-08-23 11:56:18 -07:00
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -07:00
Stephen Birarda
fbe784155e
add a shareable address return to address manager
2016-08-23 11:19:14 -07:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
Brad Hefta-Gaub
21bc06f154
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
...
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
Zach Pomerantz
cbb115bbcc
fix typo argee->agree
2016-08-22 16:34:23 -07:00
elisa-lj11
2d2cb45c5d
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-22 16:05:16 -07:00
howard-stearns
056b90c662
separate into four files
2016-08-22 15:01:55 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
howard-stearns
d0b58d8f8e
move thread safety into Application from caller
2016-08-22 12:49:51 -07:00
howard-stearns
80afc6a3b4
pr review comments
2016-08-22 10:59:21 -07:00
Anthony J. Thibault
b6a4904068
remove explicit check for WebEntity from setKeyboardFocus
...
Also, don't get entityTree from entityScriptInterface instead go thru EntityTreeRenderer
2016-08-22 10:56:35 -07:00
Ryan Huffman
bd86318611
Fix address bar being opened when moving between places on same domain
2016-08-22 10:36:56 -07:00
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
howard-stearns
a3d64dbd9c
code cleanup
2016-08-19 14:14:31 -07:00
howard-stearns
b8b345fb43
Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2
2016-08-19 13:04:39 -07:00
elisa-lj11
4aab389305
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-19 11:32:37 -07:00
Anthony J. Thibault
8bb6bb7c6f
generalized keyboard focus interface
...
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.
* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
2016-08-19 10:56:52 -07:00
James B. Pollack
98f0290565
Merge pull request #8436 from huffman/feat/more-user-activity-data
...
Add more user activity data
2016-08-19 10:48:28 -07:00
elisa-lj11
4c434e875e
fixed merge conflicts in Application.cpp
2016-08-19 09:46:22 -07:00
howard-stearns
f6670a6374
new optional aspect-ratio argument to snapshot chain (javascript through
...
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio. Snapshot button uses 1.91.
2016-08-18 16:29:42 -07:00
howard-stearns
4492c4e64e
Allow javascript to safely open the correct login window (or answer that
...
it is unneded).
2016-08-18 14:19:36 -07:00
Brad Hefta-Gaub
1cec7b2db0
Merge pull request #8429 from SamGondelman/loadingFade2
...
Don't do fade effect once physics kick in
2016-08-18 12:46:24 -07:00
Chris Collins
140b0c4d02
Merge pull request #8462 from jherico/openvr_random_position_fix
...
Address issues with random camera locations
2016-08-18 11:51:47 -07:00
Seth Alves
15ce40ecf4
merge from upstream
2016-08-18 11:46:02 -07:00
Clément Brisset
d1fb723b01
Merge pull request #8444 from zzmp/fix/skybox
...
fix flashing in default skybox, and allow skybox lighting without textures
2016-08-18 11:07:09 -07:00
Seth Alves
ccaf7379fc
missed some more due to conditional compilation
2016-08-18 10:31:53 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Seth Alves
8487f825a0
don't return reference to local variables
2016-08-18 08:01:42 -07:00
Seth Alves
2ff35768aa
make 3d-line overlays work again
2016-08-17 18:45:09 -07:00
Ryan Huffman
25b9d756ca
Update entity edit tracking to track count rather than bool
2016-08-17 16:54:04 -07:00
howard-stearns
e75f950ac7
Signal receivedHifiSchemeURL
2016-08-17 16:34:59 -07:00
Brad Davis
a32ab77b7d
Address issues with random camera locations caused by bad HMD sensor poses
2016-08-17 15:22:30 -07:00
howard-stearns
347b20e506
expose to scripts the ability to show dedicated qml windows such as
...
preferences
2016-08-17 09:54:15 -07:00
howard-stearns
2a099d5577
expose to scripts the ability to open the feed
2016-08-17 09:53:26 -07:00
howard-stearns
48ff26eeb7
provide a way to programmatically show the feed (showing address bar in
...
feed mode).
2016-08-17 09:50:38 -07:00
Ryan Huffman
fbe971e730
Fix hand_pose_changed event
2016-08-16 17:46:21 -07:00
Anthony J. Thibault
03322a9c49
Fix for using hardware mouse in HMD mode
2016-08-16 17:09:59 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
Stephen Birarda
3355a90e7d
Merge pull request #8413 from huffman/feat/atp-bandwidth
...
Add asset server bandwidth to stats
2016-08-16 15:54:11 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
Zach Pomerantz
8c559bc65d
use lights from nontextured skyboxes
2016-08-16 13:27:22 -07:00
Zach Pomerantz
4d0c819173
remove peaking irradiance from default background
2016-08-16 13:26:33 -07:00
howard-stearns
2b75240771
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-16 11:14:36 -07:00
Ryan Huffman
2598d27cf3
Add hand_pose_changed implementation for stats
2016-08-15 10:29:19 -07:00
samcake
8d12a23efb
Merge pull request #8325 from jherico/deferred_batches_threaded
...
Threaded rendering
2016-08-15 09:59:44 -07:00
