Anthony J. Thibault
d4f9d21ce8
Pass tablet QQuickItem to TabletScriptingInterface
...
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
2016-12-14 14:04:48 -08:00
David Rowe
17c54a5fae
Log requested ATP mapping of model upload
2016-12-15 10:01:19 +13:00
David Rowe
5af57d7bbc
Don't make downloaded Clara.io models dynamic
2016-12-15 09:38:06 +13:00
Anthony J. Thibault
db0b2ba7d3
Fleshing out TabletScriptingInterface.
...
Added TabletProxy and TabletButtonProxy
2016-12-14 12:08:41 -08:00
David Rowe
934f48362a
Rework Clara.io download user messaging to have no user interaction
2016-12-14 22:23:25 +13:00
Brad Hefta-Gaub
a7750501c6
first cut at adding view frustum support to avatar mixer
2016-12-13 18:58:11 -08:00
David Rowe
2b0529bcea
Inform user if can't do Clara.io download because can't write to ATP
2016-12-14 14:45:33 +13:00
Zach Pomerantz
bc59be12ef
create flagged forward render task
2016-12-13 19:19:30 -05:00
howard-stearns
6fc27ac8d6
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 09:39:51 -08:00
David Rowe
2df7c189a2
Auto-close Clara model download progress box when model added to world
2016-12-14 01:22:47 +13:00
David Rowe
5344cc6155
Make Clara.io models grabbable and dynamic by default
2016-12-14 01:15:12 +13:00
David Rowe
c9a00e86d1
Fix model being left invisible if not auto-resized
2016-12-13 18:31:24 +13:00
David Rowe
ea7d84ec7d
Increase auto-resize timeout for Clara.io asset download from ATP
2016-12-13 17:55:44 +13:00
David Rowe
aefa116207
Add extra logging for Clara.io asset resizing
2016-12-13 17:55:22 +13:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
Stephen Birarda
b4f43e01b1
Merge pull request #9189 from huffman/feat/help-touch
...
Add support for oculus touch in help menu
2016-12-12 16:48:00 -08:00
howard-stearns
712543a39a
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55
pal prototype
2016-12-12 16:37:16 -08:00
Seth Alves
d97be52542
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2016-12-12 16:24:17 -08:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00
samcake
9155f11b3d
Merge pull request #9190 from jherico/test_mode
...
Add test mode to interface
2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef
Add test mode to interface
2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Ryan Huffman
9f166d82ce
Add support for oculus touch in help menu
2016-12-12 13:44:09 -08:00
Clément Brisset
84bf93b0fc
Merge pull request #9154 from highfidelity/revert-9144-revert-9129-audio-dll
...
Restores "Select Audio DLL at runtime"
2016-12-12 13:38:34 -08:00
David Rowe
8a399c7cc0
Fix model auto-scaling to 1% not being seen by observers take 2
2016-12-12 17:01:02 +13:00
David Rowe
4f0c429e7f
Fix model auto-scaling to 1% not being seen by observers
2016-12-11 17:08:36 +13:00
Chris Collins
c912d77a95
Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit
...
Honor reorient and quit request from OVR
2016-12-09 16:03:41 -08:00
David Rowe
a52d8d1982
Merge branch 'master' into 21089
2016-12-10 11:47:43 +13:00
David Rowe
e956608fa4
Fix keyboard focus when switch highlight between overlays and entities
2016-12-09 18:31:52 +13:00
David Rowe
bad8d20dd9
Rescale large Clara.io models to 1% instead of 10%
2016-12-09 17:02:06 +13:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
Atlante45
aa1d90108c
No updater command line argument
2016-12-08 16:35:30 -08:00
Clément Brisset
06331494af
Revert "Revert "Select Audio DLL at runtime""
2016-12-08 14:14:03 -08:00
David Rowe
4c236b293e
First pass at controller interaction with 3D Web overlay
2016-12-09 01:47:40 +13:00
David Rowe
5313a682ad
Fix compiler warning
2016-12-08 19:48:51 +13:00
David Rowe
7eacdb69b5
Auto-resize Clara.io models if larger than 10m as likely in cm or mm
2016-12-08 19:17:26 +13:00
David Rowe
639d7a5d97
Add further user feedback on Clara download progress
2016-12-08 18:36:50 +13:00
Atlante45
7b0b777051
Honor reorient and quit request from OVR
2016-12-07 17:29:54 -08:00
Howard Stearns
2eb8d9d0c4
Merge pull request #9153 from davidkelly/dk/machineFingerprint
...
Machine fingerprint
2016-12-06 16:34:45 -08:00
David Kelly
562cd12bca
More CR feedback
...
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things. So, no more namespace, back to a class with
2 static functions, one public one private
2016-12-06 15:17:47 -08:00
David Rowe
186d3f18ef
Improve temporary download directory robustness
2016-12-07 11:55:17 +13:00
David Rowe
eafd51ba9e
Merge branch 'master' into 21089
2016-12-07 11:27:15 +13:00
David Rowe
8e30674069
Tidying
2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8
Handle Clara marketplace downloads
2016-12-07 09:16:59 +13:00
David Kelly
dc47c5fc0c
CR feedback
...
lame mistake - it is always the error branches that get you.
2016-12-06 11:12:50 -08:00
David Kelly
c40aadfea4
whitespace
2016-12-05 17:13:12 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
Anthony J. Thibault
e8b5b56df7
Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode"
...
This reverts commit 119653bceba69d77ffbe
2016-12-05 15:16:49 -08:00
Andrew Meadows
119653bceb
Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode
...
Fix for reset sensors while in desktop mode.
2016-12-05 13:46:53 -08:00
Anthony J. Thibault
349f0355ae
Fix for reset sensors while in desktop mode.
...
Previously hitting ' a.k.a. reset sensors, would teleport you to the last
position you were in before you switched into desktop mode, or the spawn location.
This fixes that behavior but not re-centering the avatar while in desktop mode.
2016-12-05 10:42:20 -08:00
David Rowe
2f42f4cfa5
Merge branch 'master' into 21089
2016-12-05 18:33:38 +13:00
David Rowe
71de106594
Tidying
2016-12-04 15:14:47 +13:00
David Rowe
b84bcaf629
Highlight Web overlay with focus
2016-12-04 13:42:12 +13:00
David Rowe
38e6c8075c
Direct keyboard input to Web overlay when has focus
2016-12-04 12:28:44 +13:00
David Rowe
6dbb7129e6
Add mouse press, move, and release handling to Web overlay
2016-12-03 17:09:09 +13:00
David Kelly
643353a31e
Initial push
...
Works on windows, have not tried it on mac. Lots more to do, but
need to get it pushed to remote just in case.
2016-12-02 15:46:20 -08:00
Clément Brisset
3659e8e585
Revert "Select Audio DLL at runtime"
2016-12-02 14:15:11 -08:00
Seth Alves
efe9571ab8
Merge pull request #8691 from highfidelity/out-of-body-experience
...
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Atlante45
e6b9d3604d
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-12-01 09:45:50 -08:00
Brad Hefta-Gaub
c9545ca920
Merge pull request #9129 from Atlante45/audio-dll
...
Select Audio DLL at runtime
2016-11-30 15:42:21 -08:00
Atlante45
1d8c97b337
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-30 10:22:16 -08:00
Atlante45
db263df03e
Select Audio DLL at runtime
2016-11-29 19:42:59 -08:00
David Rowe
a75d0b3fe8
Merge branch 'master' into 21089
2016-11-30 14:50:51 +13:00
Brad Davis
3b07e31eab
Working on OpenGL debuggability
2016-11-29 13:15:56 -08:00
howard-stearns
5188de924f
allow for SnapshotReview dialog to be up during a change of href for all
...
media capture
2016-11-22 11:09:43 -08:00
Atlante45
3035d43772
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-21 13:05:08 -08:00
Zach Fox
7f4613f136
Add checkbox for GIF and length selector
2016-11-18 14:39:30 -08:00
Zach Fox
20a2d1275a
Bugfixes and GIF uploads workinggit add -A!
2016-11-18 14:39:30 -08:00
Zach Fox
a81289a0d7
Huge progress today. Buggy behavior with multiple snapshots remains
2016-11-18 14:39:29 -08:00
Zach Fox
8f9ffd2bc5
Framerate is stable, and GIF duration is correctgit add -A!
2016-11-18 14:39:29 -08:00
Zach Fox
25471d9fae
Still unstable, but maybe better?
2016-11-18 14:39:29 -08:00
Zach Fox
fc21cae904
More stable than ever! Uses external GifCreator lib. Still frame timing issues.
2016-11-18 14:39:29 -08:00
Zach Fox
f726ea546f
code cleanup; simultaneous gif and still capture
2016-11-18 14:39:29 -08:00
Zach Fox
1158ae8b3d
Much more stability.
2016-11-18 14:39:29 -08:00
Zach Fox
d91158f07c
Small changes, still trying to figure out judder
2016-11-18 14:39:29 -08:00
Zach Fox
0c4c97d3f9
GIF speed is wrong. Need to save both still and animated.
2016-11-18 14:39:29 -08:00
Zach Fox
152e0aee17
I think I'm very close to a PR...
2016-11-18 14:39:29 -08:00
Zach Fox
045dfff158
It's workinggit add -A! Stack corruption errors? Must fix.
2016-11-18 14:39:29 -08:00
Zach Fox
c39a8da3b8
Getting theregit add -A!
2016-11-18 14:39:29 -08:00
Zach Fox
e656a4413f
Comments - still crashing...
2016-11-18 14:39:28 -08:00
Zach Fox
1912ab1467
still crashing, feeling closer
2016-11-18 14:39:28 -08:00
Zach Fox
b6dd795b00
It crashes, but it's the start of a new architecture
2016-11-18 14:39:28 -08:00
Zach Fox
ed1d087a68
Starting cleanup procedure...
2016-11-18 14:39:28 -08:00
Zach Fox
ee21d1ccc7
IT WORKSgit add -A! Mega amounts of cleanup to do now.
2016-11-18 14:39:28 -08:00
Zach Fox
21d4590075
Just using usleep won't work
2016-11-18 14:39:28 -08:00
Zach Fox
76121a2bcd
Getting somewheregit add -A!
2016-11-18 14:39:28 -08:00
Zach Fox
912c9db1c1
More progress. Corrupted output GIF.
2016-11-18 14:39:28 -08:00
Zach Fox
704476c197
Initial progressgit add -A!
2016-11-18 14:39:28 -08:00
David Rowe
9b270834dd
Merge branch 'master' into 21089
2016-11-16 08:51:48 +13:00
Andrew Meadows
6bb3dd6830
Merge hifi/master into hifi/out-of-body-experience
2016-11-14 15:08:04 -08:00
Brad Davis
c7d68aa9cf
Add stutter stat logging
2016-11-10 13:15:35 -08:00
David Rowe
84795439ea
Display Clara.io download information
2016-11-10 16:29:48 +13:00
David Rowe
5eff7c9e15
Merge branch 'master' into 21089
2016-11-10 14:42:21 +13:00
Brad Hefta-Gaub
5454dca82e
Merge pull request #9030 from highfidelity/stable
...
Update master with Stable hotfix
2016-11-07 18:48:54 -08:00
David Rowe
8cceda1cfe
Tidy UI text
2016-11-08 13:23:44 +13:00
David Rowe
afd2a900a3
Improve error handling for case that don't have permissions
2016-11-08 13:22:50 +13:00
Chris Collins
eec8e2f19b
Merge pull request #9000 from samcake/punk
...
Add Frame Timing and GPU memory to the Stats and user activity log
2016-11-07 16:17:20 -08:00
Atlante45
f34cf64f3e
Disable updater on Steam
2016-11-07 16:09:56 -08:00
David Rowe
090065ee34
Add user feedback on download process
2016-11-08 13:05:35 +13:00
Seth Alves
24556fc70d
Merge pull request #8980 from huffman/feat/default-to-hmd
...
Update interface to default to HMD display plugin
2016-11-07 13:36:39 -08:00
David Rowe
d33ac21aaa
Merge branch 'master' into 21089
2016-11-08 08:23:10 +13:00
Andrew Meadows
ccdf383151
Merge hifi/master into hifi/out-of-body-experience
2016-11-07 08:24:26 -08:00
Atlante45
ae29fe8ab2
Logging improvements
2016-11-04 14:26:19 -07:00
Ryan Huffman
0cec62b3a3
Revert "Update interface to default to HMD display plugin"
...
This reverts commit bbef071723
2016-11-04 12:27:15 -07:00
Ryan Huffman
0dac2c999e
Revert "Remove unused 'first' variable"
...
This reverts commit 26e0d02d60
2016-11-04 12:27:04 -07:00
Ryan Huffman
3ad9c1a797
Add check to go into HMD on first run if available
2016-11-04 12:26:20 -07:00
samcake
76aa541d4a
Adding the frame gpu and batch timer
2016-11-04 11:49:52 -07:00
samcake
7655f906f1
Starting adding a timer for the frame
2016-11-03 19:26:30 -07:00
Clément Brisset
00a94bdd6d
Merge pull request #8974 from huffman/feat/help-select-xbox-tab
...
Update help window to auto select xbox or vive controller tab on availability of device
2016-11-03 14:42:23 -07:00
howard-stearns
3a072b5bf9
tell desktop about preference changes
2016-11-03 12:17:28 -07:00
Zach Fox
9a22c29788
Get ready for merge
2016-11-03 11:20:08 -07:00
Zach Fox
b74c1d3476
tabs to spaces
2016-11-03 10:42:15 -07:00
Zach Fox
a12e0325bf
Making progress...
2016-11-03 10:39:55 -07:00
David Rowe
427c8008c6
Merge branch 'master' into 21089
2016-11-03 09:18:25 +13:00
Ryan Huffman
26e0d02d60
Remove unused 'first' variable
2016-11-01 16:40:41 -07:00
Ryan Huffman
bbef071723
Update interface to default to HMD display plugin
2016-11-01 16:23:53 -07:00
David Rowe
10490a9fad
Default collision shap to hull per submesh instead of static
2016-11-02 10:45:00 +13:00
Ryan Huffman
3147ea9e33
Update help window to auto select xbox or vive controller tab on availability of device
2016-11-01 13:43:55 -07:00
David Rowe
93beaa81c0
Code tidying
2016-11-01 13:27:05 +13:00
David Rowe
cee8b66ce9
Handle duplicate Clara download asset names
2016-11-01 13:26:05 +13:00
David Rowe
3ca2c19075
Delete temporary directory after content has been used
2016-11-01 12:31:35 +13:00
David Rowe
8ab56fe871
Automatically download Clara model to ATP and add to world
2016-10-31 16:02:20 +13:00
David Rowe
12747d26e0
Add parameter that enables automatically adding download model to world
2016-10-30 13:58:17 +13:00
Seth Alves
e15043754c
Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068
2016-10-28 11:36:09 -07:00
Brad Davis
012e215f62
Merge pull request #8922 from ZappoMan/report45hzTarget
...
when vive is on i5 report a correct target frame rate so we can see that in metaverse stats
2016-10-27 14:03:07 -07:00
Brad Hefta-Gaub
bfe6ebb44f
some tweaks
2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub
510786bc0f
Merge pull request #8923 from Atlante45/steamvr
...
Add getter for SteamVR's buildID to SteamClient
2016-10-27 11:38:35 -07:00
Seth Alves
f47aeae2a7
stop passing bare pointers to EntityTreeRenderer all around
2016-10-27 10:10:22 -07:00
Brad Hefta-Gaub
c6d89f181a
CR feedback
2016-10-27 10:08:16 -07:00
Brad Hefta-Gaub
d778b3b4ce
fix the timing of the launchedFromSteam property
2016-10-27 10:00:48 -07:00
Andrew Meadows
38e4ac0ae9
Merge master into out-of-body-experience
2016-10-26 16:59:31 -07:00
Atlante45
f26ddc6f8b
Add getter for SteamVR's buildID to SteamClient
2016-10-26 14:51:48 -07:00
Zach Pomerantz
4913654f44
Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-audio-shutdown-order
2016-10-25 17:49:30 -07:00
Brad Hefta-Gaub
56b0995047
Merge pull request #8909 from hyperlogic/bug-fix/crash-on-exit-fix
...
Crash on exit fix for render items
2016-10-25 17:34:46 -07:00
Chris Collins
3b31b28622
Merge pull request #8904 from sethalves/fix-a-couple-crash-on-exits
...
fix a couple of crash-on-exits
2016-10-25 17:03:21 -07:00
Zach Pomerantz
78a04255ab
amend qml/audio ordering comment
2016-10-25 16:35:56 -07:00
Zach Pomerantz
5413d97089
cleanup qml before audio
2016-10-25 15:54:08 -07:00
Anthony Thibault
23aa626755
Destroy render scene & engine before Application is destroyed
...
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.
There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal. Also, we guard against null
scene pointer dereferences. Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
2016-10-25 15:28:37 -07:00
Brad Hefta-Gaub
822e088240
tweak format of gl_info
2016-10-25 15:20:10 -07:00
Brad Hefta-Gaub
e22a2e9e2f
add gl info and gpu free memory to user stats
2016-10-25 14:56:54 -07:00
Brad Hefta-Gaub
272055b6ee
add location and build info to user activity stats
2016-10-25 14:19:44 -07:00
Seth Alves
3903a51062
fix a couple of crash-on-exits
2016-10-25 13:58:48 -07:00
Chris Collins
9846614468
Merge pull request #8879 from AndrewMeadows/show-physics-stats
...
add Bullet profile info to PerformanceTimer stats
2016-10-25 06:29:27 -07:00
Clément Brisset
dd45500313
Merge pull request #8891 from huffman/fix/disconnected-dialog-updates
...
Fix several aspects of the "disconnected" dialog
2016-10-24 15:39:16 -07:00
Brad Davis
da9eb0433c
Remove workaround for QML HDPI offscreen rendering bug
2016-10-24 11:51:40 -07:00
Ryan Huffman
32b5c84bec
Update ConnectionMonitor to init at end of startup
2016-10-24 10:27:27 -07:00
Andrew Meadows
51a9a99381
Merge hifi/master into hifi/out-of-body-experience
2016-10-24 08:13:42 -07:00
David Kelly
aa31d3d8cc
Heartbeats need to happen while waiting for sandbox
...
We can only know if sandbox is up by waiting for the http request to
succeed or fail. In the common case (fail since it isn't up yet), we
have to wait until a connect timeout in http. Seems that is a couple
seconds, and in that time we really upset the deadlock watchdog thread
since it keeps a moving average of heartbeat times.
Simple solution, updateHeartbeat while waiting, and right before we
start.
2016-10-21 14:43:39 -07:00
Brad Hefta-Gaub
ba9d9f6ab7
Merge pull request #8860 from davidkelly/dk/2004
...
Fix for sandbox startup issue
2016-10-21 14:24:08 -07:00
Andrew Meadows
e44672180a
add Bullet profile info to PerformanceTimer stats
2016-10-21 13:22:22 -07:00
David Kelly
20b140317c
PR feedback
...
bool to indicate sandbox is actually running.
2016-10-20 17:01:09 -07:00
Clément Brisset
b63eb6ba9f
Merge pull request #8665 from zzmp/feat/audio-stats
...
move audio stats to QML/JS, with graphs
2016-10-20 16:43:49 -07:00
David Kelly
ab02fd79a0
since we know the state, use that boolean
2016-10-20 10:12:26 -07:00
howard-stearns
6f283a4893
fix resize on plugin switch
2016-10-20 09:39:02 -07:00
David Kelly
5b7f0cb358
Fix for sandbox startup issue
...
Move determinedSandboxState=true until after we spawn it.
2016-10-19 13:51:20 -07:00
Stephen Birarda
18523558f7
move HFWebEngineProfile back to interface/networking
2016-10-18 20:04:11 -07:00
Stephen Birarda
9f2627d31d
Merge pull request #8828 from birarda/web-engine-interceptor
...
move HF access token to authorization header
2016-10-18 17:24:58 -07:00
Stephen Birarda
f8e0d7ad88
move QWebEngine classes to ui library
2016-10-18 12:53:32 -07:00
Stephen Birarda
c4cec8eb1e
use desktop profile again, move classes to networking subdir
2016-10-18 10:22:31 -07:00
Brad Hefta-Gaub
0d48eb55b9
Merge pull request #8835 from zzmp/fix/entity-del-deadlock
...
fix deadlock when removing tablet
2016-10-18 01:21:55 -07:00
Zach Pomerantz
95eb52ad17
bail early when removing entity focus
2016-10-17 14:02:22 -07:00
Brad Hefta-Gaub
dcab5a5dbc
fix unix warning
2016-10-17 13:12:24 -07:00
Brad Hefta-Gaub
c575e19b81
more CR feedback
2016-10-17 13:09:10 -07:00
Brad Hefta-Gaub
d5c87a0db6
CR feedback
2016-10-17 12:02:23 -07:00
Stephen Birarda
b4b5c648c2
use a QWebEngineProfile request interceptor for auth in HTTP header
2016-10-17 11:34:37 -07:00
Stephen Birarda
89a4bc8434
add custom QWebEngine request interceptor
2016-10-17 11:34:10 -07:00
Brad Hefta-Gaub
d46170bec0
auto shutdown of sandbox when interface quits
2016-10-17 07:55:24 -07:00
Anthony J. Thibault
81db8f7e08
Merge branch 'master' into out-of-body-experience
2016-10-13 17:27:15 -07:00
Chris Collins
90b283f83b
Merge pull request #8806 from huffman/fix/atp-script-cache
...
Update ScriptCache to clear ATP assets when disconnected from a domain
2016-10-13 16:30:29 -07:00
Ryan Huffman
decb94b719
Update ScriptCache to clear ATP assets when disconnected from a domain
2016-10-13 14:05:53 -07:00
Andrew Meadows
d54c07ed14
Merge 'master' into 'out-of-body-experience'
2016-10-12 13:35:27 -07:00
Atlante45
eaca3b672f
Switch to JSON for application settings
2016-10-12 10:20:19 -07:00
Brad Davis
28771cbda9
Additional plugin debugging, better plugin resource cleanup
2016-10-11 19:40:02 -07:00
Andrew Meadows
abb05bc686
Merge pull request #8753 from ctrlaltdavid/21068
...
Improve indication of user not being logged in
2016-10-11 10:40:37 -07:00
Andrew Meadows
55c90e7bca
Merge branch 'master' into out-of-body-experience
2016-10-07 15:18:08 -07:00
Ryan Huffman
c995e51128
Fix compilation bugs in Application
2016-10-07 10:30:18 -07:00
Ryan Huffman
b839926396
Remove unnecessary lambda for location initialization on startup
2016-10-07 10:30:18 -07:00
Ryan Huffman
9ddeda389e
Update initial run logic
2016-10-07 10:30:18 -07:00
Ryan Huffman
20b93a7afa
Add redirection to entry on first turn if you don't have Vive
2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc
Update tutorial to work with HMD + Hand Controllers only
2016-10-07 10:30:18 -07:00
Ryan Huffman
1699299de9
Fix location that server content version is looked for
2016-10-07 10:30:18 -07:00
Ryan Huffman
37096910fc
Fix tutorial begin location
2016-10-07 10:30:18 -07:00
Ryan Huffman
9c7ea6ac7c
Update logic for going to tutorial on launch
2016-10-07 10:30:18 -07:00
Ryan Huffman
1e0772d613
Remove unused variable
2016-10-07 10:30:18 -07:00
Ryan Huffman
4c3cb83d47
Set default preferred device to vive and rift
2016-10-07 10:30:18 -07:00
Ryan Huffman
9f53652dfb
Add routing of new users to tutorial
2016-10-07 10:30:18 -07:00
Howard Stearns
3a294e77d4
Merge pull request #8745 from huffman/feat/new-help-window
...
Update the help window
2016-10-07 10:01:47 -07:00
David Rowe
c76bb01359
Make Interface title say if user not logged in
2016-10-07 15:39:46 +13:00
Anthony J. Thibault
cc7a6ada38
Merge branch 'master' into out-of-body-experience
2016-10-05 17:16:39 -07:00
David Rowe
1a745094e2
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
Clément Brisset
d18394f249
Merge pull request #8596 from huffman/feat/my-avatar-self-id
...
Add ability to parent overlays to MyAvatar for use across servers
2016-10-05 12:03:01 -07:00
Anthony J. Thibault
aab974e6ae
Merge branch 'master' into out-of-body-experience
2016-10-04 11:17:52 -07:00
Ryan Huffman
b5eb943c1d
Add hmd stats to stats event
2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab
Add processor information to launch user activity event
2016-10-03 15:11:56 -07:00
David Rowe
caf1a93354
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-10-04 10:51:14 +13:00
David Rowe
4818ad2615
Merge branch 'master' into 21055
2016-10-04 08:46:30 +13:00
samcake
0189e3aea7
Github is borked ?
2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b
replace the simple log by a unique log
2016-10-03 11:27:15 -07:00
samcake
0df69b8e15
Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug
2016-10-03 10:06:58 -07:00
Anthony J. Thibault
eccd01e88f
Merge remote-tracking branch 'upstream/master' into out-of-body-experience
2016-09-29 16:36:25 -07:00
Thijs Wenker
3d14a32d17
fix controller::ScriptingInterface not found warning in AC
2016-09-29 22:11:12 +02:00
David Rowe
f8572096b1
Merge branch 'master' into 21055
2016-09-28 20:00:04 +13:00
Anthony J. Thibault
961d262df1
Improved body follow behavior
...
* follow helper lean re-centering / reconciliation now modifies bodySensorMatrix, NOT the character controller.
* The character controller now always follows the bodySensorMatrix (in world space).
This decouples the lean re-centering velocity from the velocity used to move the character controller.
We can now independently tune these things separately.
2016-09-27 16:38:48 -07:00
Zach Pomerantz
b9c4018b8e
expose AudioStats to qml/js
2016-09-26 15:35:29 -07:00
Zach Pomerantz
277eefafd7
remove the audio stats dialog
2016-09-23 14:39:07 -07:00
Zach Pomerantz
d0f4a29031
Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection
2016-09-23 13:12:39 -07:00
Anthony J. Thibault
98ffea2fb9
Merge branch 'master' into out-of-body-experience
2016-09-22 18:08:23 -07:00
Brad Hefta-Gaub
5d3d4bdbd9
add support for redirection on domain at max capacity
2016-09-21 18:12:38 -07:00
Zach Pomerantz
9e2ec27b29
always play audio injectors locally
2016-09-21 17:20:51 -07:00
Seth Alves
2468b56079
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-20 13:28:20 -07:00
Brad Hefta-Gaub
fd474f6319
add basic support for master vs stable builds
2016-09-19 14:14:32 -07:00
Seth Alves
d67701f7bb
new logging category for deadlock debug prints
2016-09-15 13:02:18 -07:00
Seth Alves
4470338663
catagorize some qDebugs
2016-09-14 21:39:45 -07:00
Ryan Huffman
23450e929b
Add special avatar id for attaching overlays
2016-09-13 16:33:58 -07:00
Andrew Meadows
954d690b8a
expose setting avatar collisionless
2016-09-12 16:24:08 -07:00
Seth Alves
e020351c93
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-12 11:22:12 -07:00
Howard Stearns
b949c83a05
remove jpg error popup behavior
2016-09-10 11:18:14 -07:00
Seth Alves
8899c0b790
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-10 10:43:07 -07:00
Brad Hefta-Gaub
258c83f864
Merge pull request #8551 from jherico/texture_load_test_pbo
...
Stuttering: Sparse Textures
2016-09-09 13:47:27 -07:00
Seth Alves
f6398315b1
avoid a crash-on-exit
2016-09-09 11:48:14 -07:00
Brad Davis
ecfe56085d
GLM update and GLI integration
2016-09-09 10:18:15 -07:00
Brad Davis
bc6b43b7be
Add debug option to lower texture resolution
2016-09-08 22:19:17 -07:00
Brad Hefta-Gaub
3d54600843
Merge pull request #8513 from Atlante45/feat/network-port
...
Add settings to change local port
2016-09-08 18:10:32 -07:00
SamGondelman
99176588cc
remove old webwindowclass that relied on qwebkit
2016-09-06 17:36:59 -07:00
SamGondelman
9d447d4dcc
enabled qnetworkrequest redirects everywhere I could find them
2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd
Use invalid port to signal no value passed
2016-09-06 11:59:07 -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
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
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
Brad Davis
587d015c57
Give names to offscreen contexts for easier debugging
2016-08-26 19:09:26 -07:00
Zach Pomerantz
24162f0f3d
set skybox default color to empty color
2016-08-25 12:37:23 -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
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -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
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
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
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
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
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
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
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
Ryan Huffman
b5e2913eb9
Move node received bandwidth tracking to LimitedNodeList
2016-08-15 09:23:02 -07:00
Brad Davis
5b09748c00
Merge pull request #8431 from imgntn/assetbutton
...
Open Asset Browser with Button from Edit.js Toolbar
2016-08-13 12:04:21 -07:00
Brad Davis
cac529a1b1
Display plugins now use gpu::Context API
2016-08-12 22:29:00 -07:00
Brad Davis
d548da02d9
Expose whether nsight is running to the app, disable some stuff under nsight
2016-08-12 22:28:50 -07:00
Brad Davis
adcfd55cc0
Batch replay reprojection
2016-08-12 22:28:23 -07:00
Bradley Austin Davis
274321de8a
First pass at threaded rendering
2016-08-12 22:18:36 -07:00
Anthony J. Thibault
1be434342b
Work In Progress snapshot
...
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
2016-08-12 17:11:59 -07:00
Clément Brisset
5a1c7bd4e6
Merge pull request #8407 from highfidelity/steam
...
Steam integration
2016-08-12 16:55:48 -07:00
Zander Otavka
62f4e3536b
Expose showing asset server to script interface
2016-08-12 15:18:30 -07:00
SamGondelman
ccca6d935f
don't fade after physics kick in
2016-08-12 14:35:22 -07:00
howard-stearns
df3769166e
Merge branch 'master' of https://github.com/highfidelity/hifi into pull-from-master
2016-08-12 14:16:16 -07:00
Atlante45
e4dd4c1a41
Merge branch 'master' of https://github.com/highfidelity/hifi into steam
2016-08-12 10:38:05 -07:00
Ryan Huffman
211da3c428
Add more user activity tracking data
2016-08-11 16:49:29 -07:00
howard-stearns
e6746acf4c
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-11 15:40:26 -07:00
Anthony J. Thibault
8dac45c99e
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-10 11:27:21 -07:00
Zander Otavka
4e16998b45
Disable loading client scripts over ATP
2016-08-09 17:36:59 -07:00
Brad Hefta-Gaub
d8f1847fde
Merge pull request #8365 from huffman/feat/default-skybox
...
Default skybox change
2016-08-09 11:17:36 -07:00
Brad Hefta-Gaub
d8edf5c85a
Merge pull request #8357 from sethalves/fsm-arrows-dont-walk
...
FSM arrow keys don't make the avatar walk
2016-08-09 11:17:00 -07:00
Ryan Huffman
8ee3f680c9
Change default skybox ambient intensity from 3.5 to 2.0
2016-08-08 16:03:03 -07:00
Ryan Huffman
eaa77edc25
Replace 'Stars' menu option with 'Default Skybox'
2016-08-08 16:03:03 -07:00
Ryan Huffman
9cbfe195cd
Adjust commenting out of old stars rendering code
2016-08-08 16:03:03 -07:00
Ryan Huffman
4c662b0d60
Add static consts for default skybox values
2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0
Move default skybox out of global and make irradiance gen optional
2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd
Add default skybox
2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub
55c690d016
Merge pull request #8368 from huffman/feat/domain-connection-display
...
Automatically show address bar after disconnected for X seconds
2016-08-08 15:56:29 -07:00
Atlante45
f08b2f9257
Remove temporary override to reload QML
2016-08-08 15:39:44 -07:00
Atlante45
7ec2f98cf2
Join lobby on startup
2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff
Invite friends in HMD
2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51
login UI first draft
2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0
Interface login through steam
2016-08-08 15:39:25 -07:00
David Kelly
c8f3a898d2
First cut of a snapshot uploader
...
Will need to test end-to-end shortly, etc...
2016-08-08 15:27:27 -07:00
Ryan Huffman
fb14628a7e
Handle case in entity loading priority function where max dim size is <= 0
2016-08-08 10:39:27 -07:00
Ryan Huffman
d367583426
Clean up priority loading implementation
2016-08-08 08:53:06 -07:00
Ryan Huffman
d48bc96cf9
Add ability to set number of concurrent downloads
2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72
Fix camera position not being set for angular loading
2016-08-08 08:53:06 -07:00
elisa-lj11
b1b2ea48b2
Made code more QA; extra browser and download widget close upon download
2016-08-04 17:01:19 -07:00
elisa-lj11
a94a304700
Downloads from Clara.io and uploads to asset server
2016-08-04 16:59:38 -07:00
elisa-lj11
6152fa28b7
Download through QML
...
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70
working within webview to access url
2016-08-04 16:57:19 -07:00
elisa-lj11
76a847d34f
testing for URL bug
2016-08-04 16:53:09 -07:00
elisa-lj11
212e4f9cca
making quazip work
2016-08-04 16:48:14 -07:00
elisa-lj11
4f33e1502f
starting the zip project
2016-08-04 16:46:56 -07:00
Ryan Huffman
8044910bf2
Add show-address-bar when disconnected from domain
2016-08-04 14:39:53 -07:00
Seth Alves
40a5e4abc8
in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk
2016-08-03 13:54:25 -07:00
Anthony J. Thibault
0ab15f0dcd
fixed one frame lag on webEntity keyboard highlight overlay.
...
Also, made overlay not draw in front.
2016-08-02 15:35:59 -07:00
Howard Stearns
c2d1f08551
Merge pull request #8342 from highfidelity/dk/snapshot
...
Snapshot button
2016-08-02 15:31:50 -07:00
Anthony J. Thibault
6d768d8327
hand controllers send touch events instead of mouse events to web entities
...
This gives a much better experience when scrolling web content.
2016-08-02 15:23:46 -07:00
David Kelly
1d7cdff2bc
Snapshot button plus script
...
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does). Added button to do it, saves them to disk.
The plan is for us to add UI to share (or not) the snapshot. That's
why we are not going through the notifications. Also, the
script makes sure to hide/unhide hud and overlays. Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
2016-08-01 18:21:01 -07:00
Anthony Thibault
cf7450beb7
handControllerGrab and web entity input integration
2016-07-29 17:50:45 -07:00
Brad Hefta-Gaub
e879f22c95
fix behavior with no entity server
2016-07-28 15:15:52 -07:00
Bradley Austin Davis
a9740b803f
Defer batch execution to the end of the frame generation
2016-07-26 16:13:48 -07:00
Brad Hefta-Gaub
2d199fe3d0
rename function for better clarity
2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
83dc9ea6bb
punish slow scripts and don't send updates while physics is still loading
2016-07-25 21:46:30 -07:00
Ryan Downe Karpf
91714aaca6
Merge pull request #8258 from AlexanderOtavka/edit-model-ui
...
Edit model dialog improvements
2016-07-22 17:11:52 -07:00
James B. Pollack
5202038210
Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor
...
Vive HMD fixes to prevent user from becoming embedded in the floor.
2016-07-22 09:04:40 -07:00
samcake
853f31f6ea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-20 10:49:27 -07:00
Anthony J. Thibault
837b19ed1b
fix for pushing avatar into floor when exiting away mode.
...
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
are facing the same direction as the current HMD orientation.
away.js now uses the above new API's instead of MyAvatar.reset()
2016-07-19 14:42:24 -07:00
samcake
ff132fa712
Gathering the diffusion passes in the SUrfaceGEometryPAss job
2016-07-19 02:11:22 -07:00
Anthony J. Thibault
7fd40a5d10
MacOS: fix crash when touchscreen device is nullptr.
2016-07-18 17:08:17 -07:00
samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
Zander Otavka
71f62c02fc
Add basic implementation of customPrompt
...
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
2016-07-15 17:35:55 -07:00
samcake
a3f6ed6a89
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-15 09:22:34 -07:00
Brad Davis
882139ebcf
Allow scripts to override the navigation focus state set by QML dialogs
2016-07-14 12:10:46 -07:00
samcake
3ab56062d4
Address some warnings and syntax issues
2016-07-14 12:06:02 -07:00
Stephen Birarda
6b6513d5f9
immediately fade out ignored avatars
2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6
add a scripting interface to ignore users
2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
487aacde3c
Merge pull request #8216 from huffman/feat/improved-domain-loading
...
Update max request limit and number of processing threads
2016-07-13 14:47:24 -07:00
Brad Hefta-Gaub
f8910d475e
Merge pull request #8225 from ZappoMan/codecPlugins
...
Audio codec plugins
2016-07-13 14:47:03 -07:00
samcake
8acc18ae8b
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-13 11:42:07 -07:00
Ryan Huffman
fcd59ea94f
Update target number of processing threads to be based on system
2016-07-12 17:44:23 -07:00
Brad Hefta-Gaub
b8d79ec263
Merge pull request #8179 from SamGondelman/snapshotFix3
...
Various snapshot improvements
2016-07-12 15:28:51 -07:00
samcake
5d4b55eeea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-12 09:19:28 -07:00
samcake
ba7590712a
BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore
2016-07-11 18:33:57 -07:00
Brad Hefta-Gaub
bcee128de0
Merge pull request #6959 from Triplelexx/20769
...
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
Brad Hefta-Gaub
f3f72f3c93
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-11 13:15:27 -07:00
Ryan Huffman
26545b2b99
Add new help.html info window
2016-07-09 04:22:42 -07:00
Stephen Birarda
11aafc0f48
use endsWith for scriptURL check
2016-07-08 16:00:06 -07:00
Stephen Birarda
43967dc9a6
handle running of non .svo.json JSON files from mp CDN
2016-07-08 15:47:56 -07:00
Ryan Huffman
489d2e4ca5
Update max request limit and number of processing threads
2016-07-08 15:33:11 -07:00
Stephen Birarda
5bce924eda
keep signature for askToLoadScript
2016-07-08 14:34:42 -07:00
Stephen Birarda
216e47b29a
hide the long URL prefix of scripts from marketplace
2016-07-08 09:43:11 -07:00
Brad Hefta-Gaub
9333c7dcca
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-06 13:26:19 -07:00
SamGondelman
04184ee1fb
added snapshot notification in desktop mode
2016-07-05 17:21:57 -07:00
Brad Davis
d6250d4c5a
Fix export entities by region
2016-07-05 10:37:53 -07:00
SamGondelman
218b26b521
removed snapshot share dialog, ctrl s shouldn't leave you moving
2016-07-01 10:58:55 -07:00
SamGondelman
69ffd63ba7
fix snapshot sharing window
2016-06-30 15:42:48 -07:00
Brad Hefta-Gaub
ec0ca1d173
Merge pull request #8146 from huffman/fix/launch-version
...
Add version to launch user activity
2016-06-28 17:13:10 -07:00
Howard Stearns
da61100b6d
Merge pull request #8150 from highfidelity/vive-ui
...
merge vive-ui to master
2016-06-28 13:31:55 -07:00
Ryan Huffman
b36a39b2bc
Add version to launch user activity
2016-06-28 09:59:59 -07:00
Andrew Meadows
58e05b2e90
Merge pull request #8143 from AlexanderOtavka/remove-cam-slots
...
namechange Camera::_rotation --> Camera::_orientation
2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2
Merge pull request #8121 from SamGondelman/miniMirrorFix
...
Mini mirror/multi-monitor bug fixes
2016-06-27 22:04:39 -07:00
Zander Otavka
235ee4bd46
Refactor Camera scripting interface a little
...
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used. get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
2016-06-27 13:06:12 -07:00
Triplelexx
aae3555b63
update TouchscreenDevice
...
* fix threading issue with zoom gesture
* KeyboardMouseDevice touchpad disabled to prevent interference
* device supported based on QTouchDevice::devices().count()
2016-06-27 21:01:06 +01:00
Brad Davis
f90a351400
Don't reposition windows prior to selecting the initial display plugin
2016-06-24 16:31:24 -07:00
Triplelexx
6542604d13
resolve conflicts with TouchscreenDevice
...
updated to master
2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce
merge master and resolve conflicts
...
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
d7bffc3eab
first cut at negotiating codecs
2016-06-23 17:14:41 -07:00
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51:15 -07:00
Brad Hefta-Gaub
be37921845
first cut at codec plugins
2016-06-23 10:42:02 -07:00
howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
Ryan Huffman
2621add8e3
Fix nearby_avatars not tracking
2016-06-22 09:17:28 -07:00
SamGondelman
78a1845afe
fixed resizing of qml overlays when device pixel ratio changes
2016-06-21 18:13:11 -07:00
Ryan Huffman
70be7b3273
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub
160a5de271
CR feedback
2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
Ryan Huffman
6d753e317b
Fix more osx warning
2016-06-21 10:51:31 -07:00
Ryan Huffman
a77dea9048
Fix osx warning
2016-06-21 10:30:05 -07:00
Ryan Huffman
cee897d6d3
Fix osx warning
2016-06-20 16:44:07 -07:00
Ryan Huffman
ab057010d6
Add changed display mode tracking
2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd
Cleanup nearby avatar tracking
2016-06-20 16:09:17 -07:00
Ryan Huffman
3aac0cc4fb
Update fps useractivity with more general stats
2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a
Add more values to launch UserActivity
2016-06-20 16:02:14 -07:00
Bradley Austin Davis
ec615caa80
Support toolbar API
2016-06-17 13:06:42 -07:00
Bradley Austin Davis
5bc8b53d1b
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub
d8d4eb65ec
Merge pull request #8059 from Atlante45/feat/steamworks
...
Initial Steamworks integration
2016-06-16 18:49:51 -07:00
Ryan Huffman
c7955900ab
Add new user activity events
2016-06-16 13:17:18 -07:00
Ryan Huffman
8b3b62aad7
Add UserActivityLogger scripting interface
2016-06-16 10:25:38 -07:00
Bradley Austin Davis
33e9caa636
Simplify overlay conductor, menu interation
2016-06-15 17:24:39 -07:00
David Rowe
657f8fdad5
Fix reporting of JSON export failure
2016-06-15 14:12:49 +12:00
Atlante45
1403fad04e
Add cmd line opt to disable settings reset popup
2016-06-14 16:34:46 -07:00
Atlante45
5560ba9a4c
Quit application when SteamVR requests it
2016-06-14 16:29:50 -07:00
Howard Stearns
213479c530
Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements
...
HMD UI re-centering while driving improvements.
2016-06-13 14:28:50 -07:00
Brad Davis
0ddee876c3
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-13 13:03:46 -07:00
Anthony J. Thibault
ab4bef7d55
Fixes based on PR feedback
...
* The "Clear Overlay When Driving" avatar preference is obeyed.
* sensor reset will also center the ui.
2016-06-13 11:19:47 -07:00
Seth Alves
4c45d081cd
merge from upstream
2016-06-10 19:57:46 -07:00
Stephen Birarda
3c4f336e72
re-instate NodeList reset on limit of check ins reached
2016-06-10 09:11:25 -07:00
Stephen Birarda
12e5851ba4
fix connection denial message, put version back
2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122
remove check in version downgrading from NodeList
2016-06-09 15:53:19 -07:00
Seth Alves
1977efae4f
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-08 10:36:52 -07:00
Howard Stearns
bf48099286
Merge pull request #8032 from jherico/pin-button
...
Add a constant hud toggle button to the UI
2016-06-08 10:33:11 -07:00
Brad Davis
ca6e86e767
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-06-07 21:51:47 -07:00
Brad Davis
29d9f51b58
Adding missed file
2016-06-07 16:46:17 -07:00
Seth Alves
b2f63a2132
hook up can-rez-tmp and can-write-to-asset-server
2016-06-07 16:17:58 -07:00
Atlante45
399517fcbd
Activate Inputs after menus are setup
2016-06-06 13:28:36 -07:00
Atlante45
26acc6fd8b
Typo
2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f
Remove input plugin menu dependency
2016-06-06 13:28:36 -07:00
Atlante45
ee62a211ac
Remove "Input Devices" menu
2016-06-06 13:28:36 -07:00
Atlante45
992fa63932
Allow ordered list of preferred plugins
2016-06-06 13:28:36 -07:00
Atlante45
932838b1e3
Setup preferred display plugin
2016-06-06 13:28:36 -07:00
Atlante45
d8493f960a
Add command line option to enable/disable plugins
2016-06-06 13:28:36 -07:00
Brad Davis
b7d1659852
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-06 09:32:33 -07:00
Brad Hefta-Gaub
c85923c69b
Merge pull request #7956 from jherico/web_entity_crash
...
fix crash on click on non-visible web-entity
2016-06-03 10:29:55 -07:00
Brad Davis
8c13ff4ee1
Pinned UI support
2016-06-02 17:24:25 -07:00
Brad Davis
bf734395e5
More invisible web entity fixes
2016-06-02 16:37:45 -07:00
Brad Davis
ac5912df01
Fix crash on shutdown of SteamVR
2016-05-27 13:40:47 -07:00
Brad Hefta-Gaub
fb9f6185db
CR feedback
2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub
183f38e4f0
pop up warning if domain over capacity
2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub
2eef07e414
cleanup and dead code removal
2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280
check point with protocol refusal working
2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624
first cut at support for verifying all protocol version compatibility
2016-05-24 13:31:19 -07:00
Zach Pomerantz
7dabce9cff
Check throttle before idling/painting
2016-05-23 19:04:35 -07:00
Brad Hefta-Gaub
ac49feda22
Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
...
Conflicts:
libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
Seth Alves
f91a2403be
merge from upstream
2016-05-20 17:07:34 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Seth Alves
ff36b39067
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub
770fab956f
remove dead code
2016-05-20 12:23:06 -07:00
Zach Pomerantz
2026226fe2
Handle vsync without halving fps
2016-05-20 09:04:39 -07:00
Seth Alves
1de9598243
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 16:37:40 -07:00
Zach Pomerantz
9a4b30a50b
Fix AvatarInputs phantom movement
2016-05-19 13:19:15 -07:00
Brad Hefta-Gaub
cef4a49c35
Merge pull request #7867 from huffman/fix/query-octree-crash
...
Fix crash in JurisdictionMap
2016-05-19 11:53:54 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -07:00
Ryan Huffman
ce6ae40432
Replace foreach use with for()
2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd
Make AccountManager a DependencyManager singleton
2016-05-18 15:38:54 -07:00
Ryan Huffman
cf49c8e2bf
Add getUserAgent function that includes plugin information
2016-05-18 15:35:29 -07:00
Brad Hefta-Gaub
4df4829280
Merge pull request #7902 from jherico/gpu_breakup
...
moving GL backend out of GPU
2016-05-18 11:35:35 -07:00
Seth Alves
3380b2a668
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-17 19:10:33 -07:00
Ryan Huffman
47d897f669
Fix processOctreeStats recreating JurisdictionMap for every stat packet
2016-05-17 15:12:14 -07:00
Ryan Huffman
ef6d758e7f
Fix JurisdictionMap multithreading issues
...
Make octal code pointers use shared_ptr, add locks around access.
2016-05-17 10:59:51 -07:00
Brad Davis
34e574c148
Merge pull request #7816 from zzmp/perf/idle-event
...
Drive render loop from DisplayPlugin instead of busy wait
2016-05-17 09:36:09 -07:00
Brad Davis
5ba8372c21
Moving GL backend out of GPU
2016-05-16 12:54:17 -07:00
Brad Hefta-Gaub
166fbdece5
Merge pull request #7853 from zzmp/fix/shutdown
...
Fix hang on exit from dying scripts
2016-05-16 10:17:34 -07:00
Seth Alves
3876a8037c
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-16 09:51:20 -07:00
Brad Hefta-Gaub
0d5fdbdb6e
Merge pull request #7879 from howard-stearns/fix-reticle-offset
...
fix reticle position offset
2016-05-13 17:17:23 -07:00
Zach Pomerantz
65e81077cb
Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event
2016-05-13 16:24:42 -07:00
Zach Pomerantz
59e4b9c356
Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown
2016-05-13 15:28:12 -07:00
Brad Hefta-Gaub
65aae42714
move firstRun.set() to correct place
2016-05-13 13:28:02 -07:00
howard-stearns
40f7212b1e
Make uses of getReticlePosition consistent with respect to window offset.
2016-05-12 16:37:03 -07:00
Seth Alves
fcd2e45d67
merge from upstream
2016-05-11 18:45:32 -07:00
Zach Pomerantz
25deaf5bda
Repost missed Presents with low priority
2016-05-11 18:27:48 -07:00
Anthony Thibault
8fecb51dde
Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw
...
Eye tracking bug fix and debug rendering improvements
2016-05-11 17:41:49 -07:00
Brad Hefta-Gaub
d656f61c64
Merge pull request #7759 from jherico/app_plugin_type
...
Don't expose raw pointer to the display plugin
2016-05-11 14:49:22 -07:00
Brad Hefta-Gaub
e01681eb52
Merge pull request #7856 from ZappoMan/NUEtweaks
...
don't show help or login on first run
2016-05-11 10:53:09 -07:00
Zach Pomerantz
2d4fd783bd
Rename Paint/Idle events to Present
2016-05-10 16:09:04 -07:00
Brad Hefta-Gaub
a17acc6f6b
rename functions
2016-05-10 15:52:07 -07:00
Anthony J. Thibault
80a349c65b
Merge branch 'master' into tony/improved-avatar-debug-draw
2016-05-10 14:50:13 -07:00
Zach Pomerantz
4711c23d9d
Delay AvatarInputs instantiation to first paint
2016-05-10 14:39:23 -07:00
Zach Pomerantz
783be53125
Trigger Idle from present Paint
2016-05-10 14:39:23 -07:00
Zach Pomerantz
c3f41cdd89
Add PAINT_DELAY_DEBUG log
2016-05-10 14:39:23 -07:00
Seth Alves
f90b9ec65d
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
350743454b
Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1
...
use smart pointers for entity simulations
2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
33c5cb519a
cleanup firstRun with a common setting
2016-05-10 11:32:29 -07:00
Clément Brisset
c3ce463b6c
Merge pull request #7854 from zzmp/refactor/delayLoad
...
Clean up resource cache's encapsulation of asynchronous loading
2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub
22f4beab1a
on first run, go to home or entry
2016-05-10 10:45:57 -07:00
Seth Alves
4c1f815870
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub
d7eee98acc
Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
...
resurrection of threadsafe ViewFrustum
2016-05-10 09:06:38 -07:00
Brad Hefta-Gaub
e478b72e67
Merge branch 'master' of https://github.com/highfidelity/hifi into NUEtweaks
2016-05-10 08:36:32 -07:00
Seth Alves
b761ecf44f
merge from upstream
2016-05-10 08:18:45 -07:00
Brad Hefta-Gaub
8b51746788
don't show help or login on first run
2016-05-09 18:49:29 -07:00
Zach Pomerantz
9ac783a88d
Black box asynch resource retrieval
2016-05-09 18:03:19 -07:00
Zach Pomerantz
2d820221dc
Clear queued processing on quit
2016-05-09 17:32:25 -07:00
Zach Pomerantz
694dc1bbf6
Delay Overlays cleanup for scripting
2016-05-09 17:32:25 -07:00
Atlante45
5c196f3df5
Remove Deadlock status
2016-05-09 15:53:45 -07:00
Brad Hefta-Gaub
2c0204b0d6
Merge pull request #7821 from Atlante45/fix/collision-sound
...
Fix avatar/entity collision sound
2016-05-09 14:24:19 -07:00
Anthony J. Thibault
641e152699
Eye tracking bug fix and debug rendering improvement
...
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
2016-05-08 16:20:32 -07:00
Brad Davis
c54d0bc993
Don't expose raw pointer to the display plugin
2016-05-08 10:35:31 -07:00
Seth Alves
0e6d9a1eec
avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.
2016-05-07 14:48:31 -07:00
Seth Alves
a0771f8ee5
use smart pointers for entity simulations
2016-05-07 09:14:33 -07:00
Stephen Birarda
fb09efc0c9
send location updates immediately on mode change and startup
2016-05-06 12:01:03 -07:00
Stephen Birarda
ed1ddc2a8b
remove code to update/store wallet balance
2016-05-06 11:54:49 -07:00
Andrew Meadows
778820edb4
fix broken dupe method implementation
2016-05-06 09:07:03 -07:00
Andrew Meadows
635e2e78e3
minor cleanup
2016-05-05 18:43:08 -07:00
Andrew Meadows
71b2d647e8
add locks and explicitly copy ViewFrustums
2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660
getViewFrustum() provides const pointer
2016-05-05 18:28:27 -07:00
Atlante45
07adef9465
Fix entities collision sounds
2016-05-05 14:55:28 -07:00
Brad Hefta-Gaub
4ab7b660d4
fix a bunch of bugs in qml window placement
2016-04-25 20:19:54 -07:00
Anthony Thibault
d8a32c8329
Avatar eye gaze fix for HMDs
...
When no avatars are chosen for more detailed eye gaze tracking the eyes should look straight ahead.
Before this fix, if you were in room scale or not aligned with the camera sensor your gaze could drift to the left or to the right of your head's forward direction.
Now it should follow your head more closely.
2016-04-24 17:59:51 -07:00
Brad Hefta-Gaub
d87d631871
Merge pull request #7708 from zzmp/feat/render-rates
...
Add renderRates.js to visualize rates over time
2016-04-21 15:59:58 -07:00
Zach Pomerantz
1fe12e7029
Mv Rates to RatesScriptingInterface.h
2016-04-20 13:26:23 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
Brad Hefta-Gaub
0ac9601ea7
Merge pull request #7690 from ZappoMan/improveHMD
...
Introduce "recommended overlay rectangle" to display plugins
2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69
Merge pull request #7707 from huffman/fix/osx-default-script-dir
...
Remove fix for old QT file path bug in OSX
2016-04-18 18:01:47 -07:00
Zach Pomerantz
f48541961d
Expose Rates to JS/QML
2016-04-18 17:43:34 -07:00
Ryan Huffman
4e0ac2a4be
Remove fix for old QT file path bug in OSX
2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub
01907f181f
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-18 16:01:42 -07:00
Seth Alves
3298883774
Merge pull request #7702 from zzmp/fix/clear-octree-on-exit
...
Clear entities and avatars on exit
2016-04-18 15:48:35 -07:00
samcake
dccf549118
Merge pull request #7676 from jherico/perf_testing
...
Manually generate mipmaps for textures while loading
2016-04-18 15:09:12 -07:00
Zach Pomerantz
790e325248
Clear entities and avatars on exit
2016-04-18 14:31:16 -07:00
Brad Hefta-Gaub
374ba10524
more CR feedback
2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e
CR feedback
2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
0520363da8
cleanup
2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9
cleanup
2016-04-18 10:27:12 -07:00
Brad Davis
f3e5306f90
Working on an automated performance test
2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a
switch to QRect instead of vec4
2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807
code review feedback
2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
87078b1ea2
first cut at resetting entities script engine on domain change
2016-04-16 11:09:23 -07:00
David Rowe
8f6cfb72ea
Fix QML warnings at shutdown
2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
04df84974c
handle repositioning of qml windows
2016-04-15 19:50:12 -07:00
Brad Hefta-Gaub
c7f58dc17c
first cut at exposing recommend overlay rectangle
2016-04-14 20:47:31 -07:00
Brad Hefta-Gaub
ea4da05cba
Merge pull request #7643 from AndrewMeadows/faster-bullet
...
faster Bullet kinematics
2016-04-14 12:16:54 -07:00
Andrew Meadows
dcf28937cf
cleanup cached Physics::sessionUUID
2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095
Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache
2016-04-14 10:12:16 -07:00
Brad Hefta-Gaub
7b5075cce5
Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
...
add a heuristic for deciding when it's safe to enable bullet
2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
37dcfdad8a
Merge pull request #7652 from huffman/feat/crash-menu
...
Move crash menu items to submenu and add new crash types
2016-04-14 09:32:36 -07:00
Seth Alves
ba0549dddd
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-14 09:18:58 -07:00
Chris Collins
47522e1774
Merge pull request #7659 from ZappoMan/newLODSettings
...
improve reset settings
2016-04-13 16:49:22 -07:00
Zach Pomerantz
7a15339631
Use AnimationCache for models
2016-04-13 15:44:47 -07:00
Ryan Huffman
47c2a1722b
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu
2016-04-13 14:40:46 -07:00
Ryan Huffman
bc247ec058
Remove unused Application::crashApplication()
2016-04-13 14:01:41 -07:00
Brad Hefta-Gaub
67af3917bc
improve reset settings
2016-04-13 13:18:23 -07:00
Brad Hefta-Gaub
4b3b917af6
add support for avatar licenses in FST files
2016-04-13 12:26:09 -07:00
Seth Alves
688de6f100
quiet warning
2016-04-12 14:10:14 -07:00
Seth Alves
e4c91e5064
add a heuristic for deciding when it's safe to enable bullet
2016-04-12 11:46:00 -07:00
Brad Hefta-Gaub
3f05ded932
Merge pull request #7611 from zzmp/guard/amd
...
Disable gradient QML items on AMD
2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
a1fe6aee6d
Merge pull request #7625 from hyperlogic/tony/third-person-hmd-camera-improvements
...
Improve comfort of third-person HMD camera.
2016-04-12 08:32:23 -07:00
Zach Pomerantz
ab72d8d8fb
Init QML GL from share context
2016-04-11 13:47:45 -07:00
Brad Davis
df8ad57185
Fix FPS counter
2016-04-11 00:25:16 -07:00
Anthony J. Thibault
93a5bdd79a
Prevent avatar rotation due to HMD head turning in third-person camera.
...
Also, fix one frame glitch during snap turning, by updating the sensorToWorld matrix
after the MyAvatar::updateOrientation rotates the avatar, but before we perform IK.
2016-04-08 15:27:43 -07:00
Zach Pomerantz
e08c9db469
Expose GL property to QML
2016-04-07 18:27:07 -07:00
Brad Hefta-Gaub
5287c174b4
Merge pull request #7605 from jherico/route_log_errors
...
Fixing logging errors on initial load of controller routes
2016-04-07 17:13:13 -07:00
Brad Hefta-Gaub
3d94558d6b
Merge pull request #7589 from jherico/oculus_input
...
Support oculus remote input
2016-04-07 15:05:45 -07:00
Brad Hefta-Gaub
157dd96303
Merge pull request #7612 from ZappoMan/mirrorReturnsToLastView
...
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
2016-04-07 14:56:53 -07:00
Brad Davis
72d8990fed
Fix menu launch from Oculus remote
2016-04-07 14:13:02 -07:00
Brad Hefta-Gaub
d1a2a30c02
fix build buster
2016-04-07 13:41:05 -07:00
Brad Hefta-Gaub
09004680d0
handle a couple edge cases
2016-04-07 13:32:26 -07:00
Brad Hefta-Gaub
81bb5ff07d
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
2016-04-07 13:13:19 -07:00
Brad Hefta-Gaub
bd1eb5842a
fix crash related to menu vs watchdog create order
2016-04-07 12:45:24 -07:00
Brad Davis
85019b2b5e
Fixing logging errors on initial load of controller routes
2016-04-07 10:41:54 -07:00
Brad Hefta-Gaub
2c3aeddbe4
reduce log spam for the deadlock watchdog
2016-04-07 10:25:08 -07:00
Brad Hefta-Gaub
5f4d6ca1d3
CR feedback
2016-04-06 19:07:26 -07:00
Brad Hefta-Gaub
47aed9c8bd
fix redraw issue when logging in to or out of a domain
2016-04-06 14:56:20 -07:00
Brad Hefta-Gaub
51660ab3a8
Merge pull request #7579 from sethalves/log-about-webengine-remote-debugging
...
Log about webengine remote debugging
2016-04-06 08:28:37 -07:00
Brad Hefta-Gaub
699c717828
Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix
...
Application: focusOut keyboard device when clicking on web entity.
2016-04-05 18:44:30 -07:00
Brad Hefta-Gaub
70f3a39463
Merge pull request #7593 from hyperlogic/tony/keyboard-focus-improvements
...
Application: change keyboard input focus when using ui overlay.
2016-04-05 18:44:16 -07:00
Anthony J. Thibault
07ff687bfe
Application: change keyboard input focus when using ui overlay.
...
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
2016-04-05 18:12:02 -07:00
Brad Hefta-Gaub
891cc12d3f
Merge pull request #7549 from zzmp/feat/resource-vis
...
Add a visualization of cacheable resource usage
2016-04-05 15:43:27 -07:00
Seth Alves
bda8761e00
fix how env variable is accessed
2016-04-05 14:30:41 -07:00
Seth Alves
f42e968dda
commit to repush to see if github is working yet
2016-04-05 14:12:46 -07:00
Anthony J. Thibault
4c632cb4c4
Application: focusOut keyboard device when clicking on web entity.
2016-04-05 14:00:43 -07:00
Seth Alves
d8282ae799
log value of QTWEBENGINE_REMOTE_DEBUGGING before exit
2016-04-05 13:56:39 -07:00
Brad Hefta-Gaub
08a19c0471
Merge pull request #7554 from jherico/load_stutter2
...
Addressing stuttering in the frame while loading content - Part 2
2016-04-05 09:45:31 -07:00
Brad Davis
e86066c1ce
Merge pull request #7563 from hyperlogic/tony/jittery-hands-fix
...
Application: fix for jittery hands when moving.
2016-04-04 15:58:22 -07:00
Brad Hefta-Gaub
04471f1c88
Merge branch 'master' of https://github.com/highfidelity/hifi into simpleTestPR
...
Conflicts:
interface/src/Application.cpp
2016-04-04 13:16:39 -07:00
Brad Hefta-Gaub
b3b5c5d1ea
small change to trigger a build
2016-04-04 13:14:52 -07:00
Anthony J. Thibault
d7b13d226f
Application: fix for jittery hands when moving.
...
The issue was that the hands are sampled in sensor coordinates.
But when the avatar is moved via physics, the sensor to world matrix
must be updated to move the hands in the world by the correct amount.
These new hand positions are then computed before IK is performed.
2016-04-04 12:36:18 -07:00
Triplelexx
a4775983a2
Merge branch 'master' into 20769
...
# Conflicts:
# interface/src/Application.cpp
conflicting line 2528 wheelEvent is now const
2016-04-04 19:19:55 +01:00
Brad Davis
d98abbc7df
First pass at threaded texture transfers
2016-04-04 10:23:01 -07:00
Thijs Wenker
2be4097bc5
another 3.1.2.1 rollback
2016-04-04 17:36:43 +02:00
Thijs Wenker
142f37da1c
fix accidentally violated style rule 3.1.2.1
2016-04-04 17:33:47 +02:00
Thijs Wenker
b2058376ba
used "ReSharper C++" to fix some style and spelling in Application.(h|cpp)
2016-04-04 17:03:05 +02:00
Triplelexx
11af0a421b
Merge branch 'master' into 20769
2016-04-03 22:57:55 +01:00
Brad Hefta-Gaub
ecaaa34576
Merge pull request #7547 from howard-stearns/lock-trees-on-import-export
...
Lock trees on import export
2016-04-03 14:23:54 -07:00
Zach Pomerantz
5b9198ed3d
Expose tex/model cache to js/qml
2016-04-01 19:52:43 -07:00
Seth Alves
5fa9f662fc
Merge pull request #7542 from birarda/refresh-on-asset-connect
...
refresh/close the asset browser dialog on domain switch
2016-04-01 18:08:59 -07:00
Zach Pomerantz
d72c695417
Sanitize ResourceCache to expose to JS/QML
...
fix sanitize
2016-04-01 17:42:36 -07:00
howard-stearns
b5cbd7720e
Lock entity tree on export, and clipboard on import.
2016-04-01 14:56:56 -07:00
Stephen Birarda
ee7bee95f8
use nodeActivated to trigger refresh of Asset Browser
2016-04-01 11:35:33 -07:00
Stephen Birarda
194226103c
refresh the Asset Browser when switching domains
2016-04-01 11:13:59 -07:00
Anthony J. Thibault
3d43f73a88
Application: don't call Model::simulate on network thread.
...
This can cause a crash.
On startup the Application::processOctreeStats method on the network thread will call into entities entity->isReadyToComputeShape() (without a tree lock) and trigger Model::simulate. Model is NOT thread safe. This was leading to a single model to be initialized on two threads simultaneously.
This might be somewhat rare, I only caught it because I was running a debug build.
2016-03-31 17:57:20 -07:00
Brad Hefta-Gaub
b76f8509aa
Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones
2016-03-30 19:29:28 -07:00
Brad Hefta-Gaub
28978c8adb
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
2016-03-30 17:49:30 -07:00
Brad Hefta-Gaub
f0cc8c0dd3
Merge pull request #7491 from jherico/oculus_release
...
Update to latest Oculus SDK, add input device support
2016-03-30 17:42:32 -07:00
Seth Alves
bb43347599
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-30 13:33:59 -07:00
Brad Davis
f569cbf70e
Add debugging output, fix timewarp
2016-03-30 10:40:32 -07:00
Brad Hefta-Gaub
d99dcf5450
Merge pull request #7487 from hyperlogic/tony/animated-culling
...
Improved render bounding boxes for animated models
2016-03-30 09:27:43 -07:00
Brad Hefta-Gaub
6fdedb8f34
Merge pull request #7508 from howard-stearns/import-export-parents
...
Make export/import and copy/paste be parent/child-clean.
2016-03-30 09:06:33 -07:00
Brad Hefta-Gaub
c64b2bb236
Merge pull request #7495 from Atlante45/fix/audio-client
...
Fix crash in Audio Client
2016-03-30 09:00:07 -07:00
howard-stearns
5381be6902
Whitespace
2016-03-29 17:06:19 -07:00
howard-stearns
4ebf816166
cleanup
2016-03-29 16:17:19 -07:00
howard-stearns
bcb729eac2
Abstract out globalizeProperties.
2016-03-29 15:21:06 -07:00
howard-stearns
4a28dadae5
Working, but not cleaned up.
2016-03-29 13:26:50 -07:00
Seth Alves
b88770228e
convert running-scripts window to use local script files
2016-03-29 10:40:56 -07:00
howard-stearns
3f18e0cd09
Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents
2016-03-29 09:20:07 -07:00
Howard Stearns
5db1c33e4d
kill offsets
2016-03-29 09:18:29 -07:00
Anthony J. Thibault
940f3e636d
Merge branch 'master' into tony/animated-culling
2016-03-28 19:58:38 -07:00
Anthony J. Thibault
115fd607a0
Address performance issues introduced with this PR.
...
* Prevent clusterMatrices from being invalidated and re-computed in each updateItem lambda.
We do this by not setting _model->_needsUpdateClusterMatrices = true;
* Prevent redundant work if Model::enqueueLocationChange is called multiple times per frame.
We do this by introducing a preRenderLambdas map in the Application class.
Instead of adding work directly to the scene PendingChanges queue Model::enqueueLocationChange
adds a lambda to the Application preRenderLambdas map. The Application ensures that only one lambda will
be invoked for each model per frame.
2016-03-28 19:47:30 -07:00
Atlante45
807698f0bb
Make svo loading use ResourceManager
2016-03-28 18:07:48 -07:00
Atlante45
238131014b
Fix avatar manager naming
2016-03-28 15:00:36 -07:00
Atlante45
92ef8cafb1
Make sure pos/rot getters don't crash
2016-03-28 14:37:06 -07:00
howard-stearns
d07967d6d8
Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents
2016-03-28 14:02:20 -07:00
howard-stearns
c6347eb92a
checkpoint for debugging/comparing edit.js
2016-03-28 13:39:43 -07:00
Zach Pomerantz
7bcef1d319
Fallback display to last, then desktop
2016-03-28 12:54:38 -07:00
Zach Pomerantz
37a725b06d
Fallback to desktop if display plugin fails
2016-03-28 12:12:52 -07:00
Brad Hefta-Gaub
f7e6f60e87
one more crack at fixing false deadlock
2016-03-25 19:04:01 -07:00
Brad Hefta-Gaub
fe31be71eb
protect against unexpected rollover
2016-03-25 14:59:43 -07:00
Brad Hefta-Gaub
541c1e5c6f
Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks
2016-03-25 13:03:31 -07:00
Brad Hefta-Gaub
941821e2c7
add some extra debugging at deadlock detection to explain unreasonable numbers
2016-03-25 12:17:24 -07:00
Brad Hefta-Gaub
fb09ad51b3
CR feedback
2016-03-24 21:14:07 -07:00
Brad Hefta-Gaub
7de8a2267f
one more try
2016-03-24 18:09:14 -07:00
Brad Davis
0ac70049c7
Merge pull request #7431 from hyperlogic/tony/vive-rendering-work
...
OpenVR rendering & Nsight instrumentation improvements
2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub
cfaa97d8f3
one more try
2016-03-24 17:39:23 -07:00
Brad Hefta-Gaub
5b13ebf72b
more mac build busters
2016-03-24 17:19:11 -07:00
Brad Hefta-Gaub
2b595fb329
break out thread safe moving average to get around unix build hell
2016-03-24 16:26:28 -07:00
Brad Hefta-Gaub
8691aa6905
fix unix build and CR feedback
2016-03-24 15:45:44 -07:00
Brad Davis
520cccb219
Make display plugin switching atomic from other threads
2016-03-24 15:19:46 -07:00
Brad Hefta-Gaub
deed643ca7
add additional tracking of max elapsed
2016-03-24 13:30:39 -07:00
Brad Hefta-Gaub
208b594ef8
make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines
2016-03-24 12:37:07 -07:00
Brad Hefta-Gaub
2b0670718f
Merge pull request #7449 from howard-stearns/report-previous-session-data
...
Report previous session data
2016-03-23 20:58:51 -07:00
Anthony J. Thibault
de3144cde5
Merge branch 'master' into tony/vive-rendering-work
2016-03-23 18:13:59 -07:00
Anthony J. Thibault
0ef5c45815
DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
...
This will, hopefully, prevent false positives from people loading content on slow PCs.
2016-03-23 17:59:54 -07:00
Howard Stearns
a393f36978
Forgot important comment.
2016-03-23 17:31:21 -07:00
Howard Stearns
c09c1438f8
ivar init order.
2016-03-23 17:28:54 -07:00
Philip Rosedale
e1f3665185
Merge pull request #7435 from hyperlogic/tony/all-jitter-must-die
...
MyAvatar: fix jitter in hands when moving
2016-03-23 17:28:47 -07:00
Anthony J. Thibault
cec6e7dd8d
Application: reduced idle PROFILE_RANGE spam
2016-03-23 17:12:48 -07:00
howard-stearns
dbdf79f96f
Restore whitespace so there aren't superfluous diffs.
2016-03-23 17:01:50 -07:00
howard-stearns
c435ca212a
Report previous session time.
2016-03-23 16:59:17 -07:00
Anthony J. Thibault
0d37515784
Merge branch 'master' into tony/vive-rendering-work
2016-03-23 15:59:59 -07:00
howard-stearns
550738776c
Pass whether or not previous session crashed to the UserActivityLogger.
2016-03-23 15:56:29 -07:00
Anthony J. Thibault
df187499ff
MyAvatar: fix jitter in hands when moving
...
Store hand controller positions within the avatar in sensor space, not world space.
Before IK the sensorToWorld matrix is updated to reflect the world space motion of the
character controller during physics. This ensures the IK hand targets move properly with the character.
2016-03-22 19:19:52 -07:00
Zach Pomerantz
9c11474dd7
Expose qApp->updateHeartbeat
2016-03-22 17:17:36 -07:00
Anthony Thibault
50ac101d56
Avatar and Rig NSIGHT instrumentation
2016-03-22 10:36:32 -07:00
Anthony Thibault
9faccabf0d
Merge branch 'master' of https://github.com/highfidelity/hifi into tony/vive-rendering-work
2016-03-21 21:55:53 -07:00
Anthony Thibault
225c462685
Improved NSIGHT instrumentation
...
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
2016-03-21 21:47:59 -07:00
Anthony J. Thibault
7cab8f63fb
Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem
2016-03-21 16:03:33 -07:00
Anthony J. Thibault
0f31c3da10
Application: guard idle from being called within paintGL()
2016-03-21 15:21:16 -07:00
Anthony J. Thibault
ce47f83288
Prevent deadlock if idle is called during rendering
...
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.
* removed AvatarData::avatarLock
* removed AvatarUpdate
This code was left over from an earlier avatar threading experiment.
Removed AvatarData avatarLock and AvatarUpdate class
2016-03-21 15:11:15 -07:00
Andrew Meadows
0a00436700
Merge pull request #7411 from ZappoMan/fixBlenderCrashRedux
...
Fix blender crash redux
2016-03-21 15:04:22 -07:00
Andrew Meadows
47c4b226ea
Merge pull request #7395 from hyperlogic/tony/openvr-crash-on-exit
...
openvr crash on exit fix
2016-03-21 13:04:45 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Andrew Meadows
d7d428d1b2
Merge pull request #7387 from ZappoMan/fixBlenderCrash
...
Fix ModelBlender crash
2016-03-21 09:14:11 -07:00
Anthony Thibault
5b2a050df7
display-plugins: Pulled getHeadPose into common base class.
...
* Moved getHeadPose and _headPoseCache out of each derived class and into HmdDisplayPlugin.
* updated comment in application.
2016-03-20 14:08:35 -07:00
Anthony Thibault
b71a56de38
Application: disable deadlock watchdog for debug builds
...
Cause it will cause a crash if you sit on a breakpoint for too long.
2016-03-20 12:18:33 -07:00
Anthony J. Thibault
960ffd9c9e
DisplayPlugins: updateHeadPose() no longer returns a value.
...
Also, moved updateHeadPose so that the overlay and the main rendering use the same headPose.
Which should also be the same place the latencyMarker for the ovr_GetTrackingState is set.
2016-03-18 15:16:58 -07:00
Brad Hefta-Gaub
2ef5b3727e
Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash
2016-03-18 14:04:45 -07:00
Anthony J. Thibault
d218ca4960
openvr: fix for crash on exit
...
Before this fix, a script could call into HMD.getHUDLookAtPosition2D() while the app was shutting down, which in turn would call
getHeadPose() on the currently active display plugin. This call could cause a crash within the openvr plugin, because the SDK was either shutdown, or in the process of shutting down on the main thread.
This fixes this by spliting the previous DisplayPlugin::getHeadPose(int) into two parts:
* updateHeadPose(int) which is only called once a frame and only by the main thread.
* getHeadPose() which is thread-safe and will return a cached copy of the hmd pose sampled by the last updateHeadPose.
2016-03-18 12:26:11 -07:00
Brad Hefta-Gaub
917c4644a5
make SkeletonModel be shared_ptr friendly as well
2016-03-17 18:03:49 -07:00
Brad Hefta-Gaub
edcf642410
Merge pull request #7374 from jherico/plugin_switch_crash
...
Reduce crashes on switching display plugins
2016-03-17 15:51:39 -07:00
Brad Hefta-Gaub
6f8f5ed15c
Merge pull request #7382 from hyperlogic/tony/crash-fix-focus-out-event
...
Application: prevent crash on startup when "Crashed" dialog is shown
2016-03-17 15:51:15 -07:00
Bradley Austin Davis
d6d7e67ca3
Fix OpenVR shutdown crash
2016-03-17 14:37:43 -07:00
Anthony J. Thibault
a8bc8a7843
Application: prevent crash on startup when "Interface Crashed" dialog is shown.
...
If the application "Interface Crashed" dialog is shown at startup, it can cause Application to receive events before it has been fully constructed.
In this case the QMainWindow _window pointer is uninitialized, causing Menu::getInstance() to de-reference an invalid pointer.
The fix for this is three fold.
1. Construct the QMainWindow before calling setupEssentials (which in turn spawns the "Interface Crashed" dialog).
2. Change Menu::getInstance() from a static_cast to a dynamic_cast. This will cause it to return a nullptr if [QMainWindow::menuBar()](http://doc.qt.io/qt-4.8/qmainwindow.html#menuBar ) returns an instance of QMenuBar and not a ui::Menu instance.
3. In Application::event return false if Menu::getInstance() returns a nullptr. This should prevent any code that relies on having a valid ui::Menu instance from running.
2016-03-17 12:13:01 -07:00
Bradley Austin Davis
1cf89f046c
Fix off by one error
2016-03-17 10:13:52 -07:00
Bradley Austin Davis
7045680bc7
Reduce crashes on switching display plugins
2016-03-17 10:13:52 -07:00
Bradley Austin Davis
80e2025ebf
Allow display plugin switching by keyboard
2016-03-16 18:28:48 -07:00
Andrew Meadows
6028c3e841
Merge pull request #7318 from birarda/atp
...
Asset Transfer Protocol Mappings
2016-03-15 16:52:36 -07:00
Stephen Birarda
0012967734
use curly braced initialization for consts
2016-03-15 14:38:41 -07:00
Atlante45
03efde5b3c
Change text in case of drag and drop.
2016-03-15 13:53:13 -07:00
Atlante45
4265ddbd0e
Can't drop fbx if you can't rez
2016-03-15 11:42:48 -07:00
Atlante45
4a90ec303c
Fix drag&drop
2016-03-15 11:22:42 -07:00
Anthony J. Thibault
7539eec134
Application: fix third-person and fullscreen-mirror toggle
2016-03-15 10:11:56 -07:00
Stephen Birarda
72c64532f5
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-15 09:12:49 -07:00
Anthony Thibault
9fb897476e
Application: fix for mouse control in third-person camera
...
Process the keyboard & mouse input plugin after the userInputMapper()->update().
2016-03-11 17:29:18 -08:00
Stephen Birarda
66e572f226
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-11 14:44:49 -08:00
Anthony Thibault
ab390f7d2e
Merge branch 'master' into tony/smooth-hands
2016-03-11 10:06:31 -08:00
Anthony J. Thibault
5eeb4ca594
Fix one frame lag controller lag/jitter
...
Move userInputMapper->update() after inputPlugin->pluginUpdate().
2016-03-11 09:28:25 -08:00
Zach Pomerantz
40378920b1
Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex
2016-03-10 21:44:31 -08:00
Anthony J. Thibault
ab19d3e5a2
Moved animation after physics, hand poses are in world frame.
...
There are still some debug hacks enabled so I can test in the vive room.
2016-03-10 20:44:35 -08:00
Anthony J. Thibault
807d31743c
Removed Hand, HandData & PalmData
...
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.
The hand controller debug drawing is slightly different, but still works.
2016-03-10 19:33:31 -08:00
Philip Rosedale
e87ef52a4c
Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay
...
More reliable and usable UI sphere overlay location
2016-03-10 17:43:50 -08:00
Atlante45
548d826a4e
Couple bug fixes
2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18
Add uploadFile method that prompts the user
2016-03-10 14:59:20 -08:00
Stephen Birarda
5ad4645b47
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-10 13:28:59 -08:00
Anthony J. Thibault
6d11dd465c
Application: reset avatar on displayMode change
...
but not HMD sensor.
2016-03-10 13:12:09 -08:00
Zach Pomerantz
b627a17ce9
Allow px/color skybox without tex
2016-03-10 12:58:49 -08:00
Anthony J. Thibault
5f1b8805cf
Removed unnecessary include
2016-03-09 17:37:51 -08:00
Brad Davis
9645ed9120
Update the watchdog heartbeat manually during startup
2016-03-09 17:00:45 -08:00
Anthony J. Thibault
886457939d
Merge branch 'master' into tony/wrong-way-overlay
2016-03-09 16:50:18 -08:00
Howard Stearns
2b576e86f0
Merge pull request #7259 from jherico/crashes
...
Crash fixes
2016-03-09 16:42:36 -08:00
Ryan Huffman
0d2ae4f3a4
Merge branch 'atp' of github.com:birarda/hifi into atp-model
2016-03-09 16:33:53 -08:00
Anthony Thibault
5df616be37
OpenVR: More usable UI Sphere overlay location
...
Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.
2016-03-09 16:24:08 -08:00
Ryan Huffman
f5497aa1e7
Add new AssetMappingsScriptingInterface and add mappings model
2016-03-09 14:53:04 -08:00
Brad Davis
23a89a63d8
Set deadlock thread name
2016-03-09 14:51:19 -08:00
Anthony J. Thibault
4af3766804
Don't reset sensors when initializing or changing display plugins.
...
This should fix the issue with the Oculus starting up with the UI aligned
to the HMD on your desk, rather then the configured default sitting pose.
2016-03-09 14:28:26 -08:00
Stephen Birarda
57ea51d244
Merge pull request #84 from Atlante45/feat/atp
...
Replace old drag&drop with new UI
2016-03-09 14:26:49 -08:00
Zach Pomerantz
21719b3980
Wait 10m for DEBUG deadlocks
2016-03-09 14:07:36 -08:00
Ryan Huffman
fd5a5dd8f4
Add QJSEngine compatible AssetMappingScriptInterface
2016-03-09 14:03:25 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Brad Davis
cac31761c0
Safer shutdown code in deadlock thread
2016-03-09 13:45:01 -08:00
Stephen Birarda
9a2b2b4c16
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-09 12:16:46 -08:00
Atlante45
5a0beec1f5
Replace old drag&drop with new UI
2016-03-09 11:47:31 -08:00
Brad Davis
80fdef4348
Ensure the heartbeat has a valid value before the thread starts
2016-03-09 10:53:01 -08:00
Brad Davis
95f5d82d37
Add a watchdog thread to trigger a crash on detecting a deadlock
2016-03-09 00:32:46 -08:00
Atlante45
ded449072f
Rename window
2016-03-08 13:13:45 -08:00
Atlante45
784f669998
First draft Assets Manager
2016-03-08 13:13:45 -08:00
Stephen Birarda
969244927b
use extension for entity add for drag and drop upload
2016-03-08 13:09:20 -08:00
Stephen Birarda
28af9c51e6
add a missing parenthesis
2016-03-08 12:22:13 -08:00
Stephen Birarda
8fa32e75b2
client side fixes for upload with no extension
2016-03-08 12:19:15 -08:00
Brad Davis
8988dd9771
Fix mouse drag turning
2016-03-07 17:14:44 -08:00
Brad Davis
28103cf5ef
Migrate composition of the overlay and pointer to the present thread
2016-03-07 17:14:41 -08:00
Chris Collins
7850ca3576
Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes
...
Avatar eye look at fixes for HMD and desktop
2016-03-07 11:50:16 -08:00
Brad Hefta-Gaub
cfce5af8d4
Merge pull request #7191 from samcake/orange
...
Better Shading Model and support fr Stingray material
2016-03-01 18:24:09 -08:00
samcake
16ac69315f
Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture
2016-03-01 16:38:02 -08:00
Zach Pomerantz
5c64115b26
Use keyLight in DLE instead of _skyboxTexture
2016-03-01 14:44:34 -08:00
Stephen Birarda
f44cf3903c
re-instate verified domain ownership for full automatic networking
...
This reverts commit 34408c8144
2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562
Merge pull request #7217 from huffman/udt-random-seq
...
Randomize initial send sequence number in UDT
2016-03-01 12:59:10 -08:00
Atlante45
4944d0a8d0
Handle threading inside AssetServer
2016-03-01 12:00:43 -08:00
Atlante45
6a4b93a4e7
Proper fix for DiskCacheInfo
2016-03-01 12:00:43 -08:00
Atlante45
40d307a37b
Temporary fix to disk cache editor crash
2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d
Move all resource requests to the same thread
2016-03-01 12:00:43 -08:00
Ryan Huffman
cc9c87d281
Fix packet version mismatch not showing for domain packets
2016-03-01 11:36:49 -08:00
Brad Hefta-Gaub
2c3fdc995f
Away improvements
2016-02-29 20:23:06 -08:00
Anthony J. Thibault
460582239a
Avatar eye look at fixes for HMDs
...
There were three things that were causing issues with eye look at vectors while wearing an HMD.
1) The matrix returned by AvatarUpdate->getHeadPose() was in the wrong space, it should be in avatar space.
it was actually returning a matrix in sensor/room space.
2) The lookAtPosition was incorrect while wearing an HMD and with no avatars to look at.
3) The eye rotation limits in Rig::updateEyeJoint were relative to the model's zero orientation, NOT relative to the head.
this was causing the eyes to hit limits when the avatar head turned.
2016-02-29 18:02:50 -08:00
Zach Pomerantz
3c53078178
Merge pull request #7194 from ZappoMan/toggleOverlay
...
add toggleOverlays menu item and action
2016-02-26 10:17:24 -08:00
Philip Rosedale
783892ac2e
Merge pull request #7206 from hyperlogic/tony/simrate-fix
...
Application: don't simulate until we are ready to render
2016-02-26 07:27:35 -08:00
Brad Hefta-Gaub
bf0fb7258a
CR feedback
2016-02-25 22:01:10 -08:00
Anthony J. Thibault
e5c81f66a5
Application: removed threadID and milliseconds from logging.
2016-02-25 18:20:43 -08:00
Anthony J. Thibault
08c16beff2
Application: re-worded presentCount comments
2016-02-25 18:17:42 -08:00
Andrew Meadows
5d1e283508
namechange TouchesKeyhole to IntersectsKeyhole
2016-02-25 18:09:35 -08:00
Andrew Meadows
2591c5ee3e
cleanup names that use "keyhole"
2016-02-25 18:09:35 -08:00
Andrew Meadows
9558258f64
use cubeInKeyhole() where appropriate
2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853
use shapeInFrustum() names again
...
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
2016-02-25 18:09:35 -08:00
Anthony J. Thibault
11cd8e03b9
Merge branch 'master' into tony/simrate-fix
2016-02-25 17:50:23 -08:00
Anthony J. Thibault
1fdae13de1
Application: don't simulate until we are ready to render.
2016-02-25 17:48:55 -08:00
Stephen Birarda
34408c8144
Revert "verified domain ownership for full automatic networking"
2016-02-25 17:02:08 -08:00
Brad Hefta-Gaub
b0c286bc3b
Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay
...
Conflicts:
interface/src/Application.cpp
2016-02-25 16:21:38 -08:00
Brad Hefta-Gaub
202a456e1a
Merge pull request #7126 from AndrewMeadows/cleanup
...
cleanup ViewFrustum method names
2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub
519a90f2bd
fix the overlays visible on startup case
2016-02-25 16:02:05 -08:00
Clément Brisset
2e7c7eace5
Merge pull request #7179 from birarda/domain-security
...
verified domain ownership for full automatic networking
2016-02-25 15:24:09 -08:00
Brad Hefta-Gaub
366aa39be8
handle startup overlay visibility correctly
2016-02-25 14:46:08 -08:00
Andrew Meadows
9c927ea36b
ViewFrustum method renames and whitespace cleanup
...
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
2016-02-25 09:11:28 -08:00
Brad Hefta-Gaub
91f6b7e80d
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
...
Wire up zone ambientURL
2016-02-25 09:05:25 -08:00
Brad Hefta-Gaub
5828c32041
add toggleOverlays menu item and action
2016-02-25 08:31:11 -08:00
Zach Pomerantz
1817b8ef2f
Use only skyboxTexture in DeferredLightingEffect
2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7
Wire up zone ambientURL
2016-02-24 16:07:04 -08:00
Brad Hefta-Gaub
568fd3e77f
Merge pull request #7164 from ctrlaltdavid/20809
...
Restyle message box modal dialogs
2016-02-24 13:47:00 -08:00
Chris Collins
7f679af186
Merge pull request #7176 from zzmp/menu/graphics
...
Update graphics menus
2016-02-24 08:18:58 -08:00
Clément Brisset
8e8e23452f
Merge pull request #7156 from ZappoMan/depthReticleWork
...
Depth reticle work
2016-02-23 17:54:35 -08:00
Andrew Meadows
8d91912d4b
Merge pull request #7162 from hyperlogic/tony/controller-velocity
...
Improve hand controller move and throw velocity
2016-02-23 17:13:13 -08:00
Zach Pomerantz
7ae9752272
Remove Render > Ambient Light menu
2016-02-23 16:24:43 -08:00
David Rowe
7ee1edac3a
Merge branch '20805' into 20809
2016-02-24 13:08:28 +13:00
Stephen Birarda
42582e5d0f
remove old voxel cost model from application
2016-02-23 14:53:35 -08:00
Stephen Birarda
6cab831ea0
re-gen the interface keypair while being denied from domain
2016-02-23 14:52:12 -08:00
samcake
7e39cc7753
clean up a bit the 2 globals RenderItem in APplication.cpp
2016-02-23 10:53:33 -08:00
Brad Hefta-Gaub
8117d51324
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-23 10:21:10 -08:00
Brad Hefta-Gaub
2db25690f1
detect when mouse is over QML overlays or 2D JS Overlays
2016-02-23 10:14:44 -08:00
David Rowe
fdb7a9cf75
Merge branch '20805' into 20809
2016-02-23 20:29:18 +13:00
David Rowe
49c229897f
Give the "change avatar?" confirmation dialog a default action
2016-02-23 17:55:36 +13:00
Anthony J. Thibault
0fd260076b
SixenseManager: fix velocity and angularVelocity computation
...
Copied the delta based computation of velocity and angularVelocity that was in
Application::setPalmData() and moved it into SixenseManager. This will guarantee
that the velocity computation is the same as it was previously. The goal here is
to NOT change the behavior of the hydra.
The moving average style calculation of velocities has been removed.
Removed dead code.
2016-02-22 20:05:41 -08:00
Brad Davis
160a107bbd
Auto-unhide the desktop when showing or raising a window
2016-02-22 19:36:00 -08:00
Anthony Thibault
3b87cd0ea8
Improve hold action by using controller velocity
...
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released.
OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
Triplelexx
949eab62ec
Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 20769
...
# Conflicts:
# libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
removed deviceID
2016-02-21 22:04:14 +00:00
Brad Hefta-Gaub
9f602a938d
don't move mouse on reset sensors
2016-02-21 12:42:02 -08:00
Brad Hefta-Gaub
3e6cddede3
CR feedback
2016-02-21 10:03:51 -08:00
Brad Hefta-Gaub
32a7179c62
CR feedback
2016-02-21 09:59:19 -08:00
Brad Hefta-Gaub
1a4591db58
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
2016-02-21 09:30:41 -08:00
Brad Hefta-Gaub
9066fb0622
Merge pull request #7145 from howard-stearns/lod-pid-removal
...
Lod pid removal
2016-02-20 10:29:42 -08:00
Stephen Birarda
f553becabe
data-server name tweak and isAgent behaviour change
2016-02-19 16:04:45 -08:00
Anthony Thibault
942f2c13ab
Vive: smoother updates for IK driven by vive controllers
...
Before this PR the simulation rate was clamped to never exceed 60htz.
This had problems when waving the vive hand controllers in the world,
they would jitter. The simulation rate is now clamped to never exceed
120 htz. This has the effect of synchronizing the display and the
update rates to 90htz.
Also there are improvements to vive support if threaded present is
disabled.
2016-02-19 15:58:13 -08:00
Howard Stearns
13c602e2a3
Remove mumbleUnsynchronizedFPS, which is obsolete now that the update/render rate is not in power-of-two lockstep with present rate, and which had users other than the LOD PID.
2016-02-19 15:12:44 -08:00
Brad Hefta-Gaub
7219a925d2
remove getTrueMouse()
2016-02-19 14:17:28 -08:00
Brad Hefta-Gaub
7be5811f34
tweak to UI size, clean up screen to overlay
2016-02-19 13:22:37 -08:00
Howard Stearns
30b4eace95
Remove LOD PID-related preferences and the related toggling of preferences.
2016-02-19 11:52:07 -08:00
Triplelexx
087e2e7f66
revise touchscreen camera control manipulation
...
Touchscreen camera control is now via a touchscreen device. Input must
be enabled with the menu option. Currently supports dragging and
gesturing to control avatar camera. Gesturing is handled by integration
of the Qt implementation.
2016-02-19 13:47:28 +00:00
Triplelexx
9d03f0eb66
Revert "integrate touch screen camera manipulation controls"
...
This reverts commit 4855511512d6df09691d7d54d48a341512d92392.
2016-02-19 13:38:34 +00:00
Triplelexx
fde01e094e
integrate touch screen camera manipulation controls
...
Set Avatar _driveKeys via touch manipulation
2016-02-19 13:38:19 +00:00
Brad Hefta-Gaub
adcadedc65
slight rework of handleRealMouseMoveEvent
2016-02-18 14:40:55 -08:00
Brad Hefta-Gaub
935af6d2cc
clean up debug logs
2016-02-18 12:01:03 -08:00
Brad Hefta-Gaub
0467930c57
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
examples/controllers/handControllerGrab.js
2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
c4fc3e4057
more work on dragging in hmd
2016-02-18 10:07:37 -08:00
Brad Hefta-Gaub
279519b6d5
hmd mouse check point
2016-02-18 08:44:22 -08:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -08:00
Anthony Thibault
e863da5a68
Merge pull request #7118 from jherico/hmd_mono
...
Remove distortion on HMD previews, both mono and stereo
2016-02-17 15:39:48 -08:00
Brad Hefta-Gaub
38430d8d2c
Merge pull request #7112 from howard-stearns/snap-turn-preference
...
Snap turn preference
2016-02-17 09:19:38 -08:00
Brad Hefta-Gaub
a25581c656
clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor)
2016-02-16 12:11:58 -08:00
Brad Davis
56fc9ea301
Remove distortion on HMD previews, both mono and stereo
2016-02-15 21:46:29 -08:00
Brad Hefta-Gaub
0d873c7732
consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface
2016-02-15 16:11:25 -08:00
howard-stearns
4150d318d3
"Leave it on by default" (and change name of route variable to SnapTurn).
2016-02-15 13:39:53 -08:00
howard-stearns
20406a5a14
Remove comfortMode menu item, but add a Settings for snapTurn within MyAvatar.
2016-02-15 13:26:40 -08:00
samcake
545f276fdf
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-15 09:29:00 -08:00
Andrew Meadows
6baf181453
Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space
...
Controller Pose values are relative to Avatar.
2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9
Merge pull request #7103 from jherico/render-rate
...
Don't drop to half the vsync rate when we can't keep up
2016-02-12 17:11:03 -08:00
Brad Davis
df225afd05
PR feedback
2016-02-12 16:25:46 -08:00
Brad Davis
908e153c36
Don't drop to half the vsync rate when we can't keep up
2016-02-12 15:57:27 -08:00
samcake
9bfeb4a1d5
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-12 11:31:47 -08:00
samcake
ef92a52777
Merge pull request #7051 from zzmp/feat/graphics-dialog
...
Move graphics settings to a new dialog
2016-02-12 10:46:00 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
Anthony J. Thibault
8bde897cee
Application: removed unused myAvatar local variable.
2016-02-11 18:14:42 -08:00
Anthony J. Thibault
111ed65bf8
Controller Pose values are relative to Avatar.
...
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.
This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
2016-02-11 17:18:01 -08:00
Zach Pomerantz
a7778daed2
Change graphics dialog to persisted dropdowns
2016-02-11 10:15:13 -08:00
samcake
31230e81bb
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 10:05:58 -08:00
samcake
355b8ee40d
THursday morning the frustum culling seems broken in one particular angle
2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2
Add persistent render engine configuration file
2016-02-11 10:00:44 -08:00
Atlante45
913172b490
Fix extension checking
2016-02-10 18:17:13 -08:00
Chris Collins
b1c6d1d256
Merge pull request #7070 from sethalves/no-sink-upon-server-restart
...
don't sink through floor when server restarts
2016-02-10 14:42:28 -08:00
Seth Alves
11d296a477
if we are told to clear the octree, disable physics until we have (re)loaded entities
2016-02-10 14:08:35 -08:00
Andrew Meadows
132169395c
use const reference for std:vector
2016-02-10 10:36:34 -08:00
Brad Davis
6a66d74e19
Limit the number of concurrent file parsing threads
2016-02-08 23:55:03 -08:00
samcake
07759bb5db
Merge pull request #7034 from zzmp/feat/render-to-json
...
Add toJson methods to render config objects in JS
2016-02-08 18:00:25 -08:00
Zach Pomerantz
8bf6c66327
Add (de)serializer for QObject->JSON
2016-02-05 13:03:46 -08:00
Bradley Austin Davis
ebf0bf394a
Fix native text rendering by forcing positions to integer values
2016-02-05 11:43:31 -08:00
Andrew Meadows
63df34541d
Merge pull request #6802 from huffman/agent-simulation
...
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
Bradley Austin Davis
f24f2749e1
Make users.js show QML window for edit friends
2016-02-02 15:19:12 -08:00
Bradley Austin Davis
5adf9adb0e
Make mirror rectaqngle move with mirror controls
2016-02-02 12:00:17 -08:00
Ryan Huffman
eff02d3e3a
Fix Agents bidding on simulation ownership
2016-02-02 10:47:51 -08:00
samcake
e645f8a1f1
FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore
2016-02-01 16:25:55 -08:00
Brad Hefta-Gaub
6779bc4073
Merge pull request #7000 from jherico/qml
...
Snapshot UI in QML
2016-02-01 14:00:25 -08:00
Brad Hefta-Gaub
711787a997
Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal
...
Animate iff visible with step2 billboard removal
2016-02-01 13:54:25 -08:00
Brad Davis
27c38599a9
Snapshot dialogs
2016-02-01 11:07:48 -08:00
Brad Davis
eb7988e4ef
Cleaning up unused code
2016-02-01 11:07:46 -08:00
Seth Alves
753fc44c12
Merge pull request #6996 from thoys/hydra-scaling-fix
...
Fix for controller palm movement for scaled avatars
2016-02-01 09:17:22 -08:00
Seth Alves
b553c8400d
Merge pull request #6988 from huffman/market-import-fail
...
Fix marketplace imports failing silently if edit.js not running
2016-02-01 07:06:34 -08:00
Thijs Wenker
8f6e7018bd
Fix for Hydra scaling
...
This PR fixes the hydra (and probably other hand controllers) while scaling.
Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
2016-01-31 23:39:43 +01:00
Ryan Huffman
acf96a401f
Fix marketplace imports failing silently if edit.js not running
2016-01-29 15:48:08 -08:00
David Rowe
a5bc1cfd19
Periodically store avatar location
2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94
Store avatar location after a teleport
2016-01-30 12:26:50 +13:00
David Rowe
be4022983b
Don't store avatar location immediately after a host change
...
Because the avatar location is 0,0,0 rather than the end target.
2016-01-30 12:25:56 +13:00
howard-stearns
9601b65269
Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible
2016-01-29 11:40:13 -08:00
Brad Davis
5b2e739ef3
Fixing warning
2016-01-28 16:39:40 -08:00
Brad Davis
aa03241dd9
Make all load script dialogs QML and respect previous script location
2016-01-28 15:53:04 -08:00
howard-stearns
1225e50581
One round of billboard shredding. Server/wire/AvatarData have not been
...
touched.
2016-01-27 16:15:43 -08:00
samcake
f4e0352f61
Merge pull request #6930 from zzmp/feat/bubble-render-settings
...
Bubble up render settings from CPP to JS/QML
2016-01-27 14:20:51 -08:00
Brad Davis
f53aaa1d64
Removing old attachment dialog, updating menu code
2016-01-26 21:55:42 -08:00
Brad Davis
664100b9b1
Attachment dialog
2016-01-26 21:55:40 -08:00
Zach Pomerantz
e770d7b679
Add PhysicsShowOwned back to Menu
2016-01-26 18:56:52 -08:00
Zach Pomerantz
2da2bc60db
Tie shadow frustum to boom offset
2016-01-26 12:26:16 -08:00
howard-stearns
6928984448
remaining Application message boxes, EXCEPT asset upload, which has a
...
checkbox.
2016-01-25 14:45:26 -08:00
howard-stearns
eb19f293c4
Fix askToSetAvatarUrl dialogs to use new style.
2016-01-25 14:04:06 -08:00
Zach Pomerantz
f3265db298
Gut RenderContext
2016-01-25 12:14:58 -08:00
Zach Pomerantz
f5a408d82a
Notes for later
2016-01-25 12:14:58 -08:00
Zach Pomerantz
9064438bf0
Replace RenderScriptingInterface with dynamic Task::Config
2016-01-25 12:13:55 -08:00
Zach Pomerantz
2e1fbf66ad
Refine Configuration for render::Job
...
wip
wip
wip
wip
2016-01-25 12:13:55 -08:00
Zach Pomerantz
8b68d5922c
Make Engine a Task
2016-01-25 12:13:55 -08:00
Brad Davis
208d7c3cfc
Killing the old preferences dialog
2016-01-22 19:24:38 -08:00
Brad Davis
858bbbf987
Adding OffscreenUI API for QInputDialog functionality
2016-01-22 17:31:03 -08:00
Brad Davis
2026821d9e
Moving preferences to dependency mananger
2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506
First pass on preferences dialog
...
Conflicts:
tests/ui/qmlscratch.pro
2016-01-22 17:30:07 -08:00
samcake
338342cdec
Merge pull request #6859 from zzmp/flag/shadows
...
Add shadows behind a render-menu flag
2016-01-22 16:28:17 -08:00
Andrew Meadows
200676ac68
Merge pull request #6896 from AndrewMeadows/another-crash-fix
...
fix crash when deleting entities quickly
2016-01-22 14:04:46 -08:00
Seth Alves
7a3401a8d7
Merge pull request #6867 from AndrewMeadows/collision-group-prep
...
cleanup in preparation for smarter collision grouping
2016-01-22 11:45:42 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Zach Pomerantz
dee8e0ba9d
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:03:06 -08:00
Brad Hefta-Gaub
e1c369dc10
Merge pull request #6766 from samcake/hdr
...
Ambient Occlusion
2016-01-21 18:10:52 -08:00
Brad Hefta-Gaub
7bfe2730e8
Merge pull request #6849 from jherico/atmosphere
...
Remove old atmosphere rendering
2016-01-21 17:58:59 -08:00
samcake
2471a88e85
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-21 15:53:25 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8
Fix wifi ping spikes
...
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
2016-01-21 15:05:32 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Brad Hefta-Gaub
7919d7bc17
Merge pull request #6866 from jherico/menufix
...
Fixing overlay menu popup & some more QML cleanup
2016-01-20 16:58:21 -08:00
samcake
4e5869b247
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-20 16:30:24 -08:00
Zach Pomerantz
0c798c06a9
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-20 14:51:42 -08:00
samcake
0da4df93b8
Merge pull request #6860 from zzmp/refactor/cull-functor
...
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
2016-01-20 14:25:42 -08:00
Brad Davis
d2900200a1
More cleanup & menu fixing
2016-01-20 11:23:56 -08:00
samcake
320c799379
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-20 10:14:02 -08:00
Andrew Meadows
a92c512c17
move collision group/mask calculus into EntityItem
2016-01-19 19:52:08 -08:00
Stephen Birarda
8bc063e758
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2016-01-19 16:21:19 -08:00
Brad Hefta-Gaub
bcdff7ba4a
fix premature octree query before preferences are loaded
2016-01-19 13:11:11 -08:00
Zach Pomerantz
568ae2e7bc
Move ShoudRenderFunctor to render::CullFunctor
2016-01-19 11:24:11 -08:00
Zach Pomerantz
1b36d56b7a
Add shadowmap as a debug feature
2016-01-18 17:12:42 -08:00
samcake
df496b065c
Merging with master
2016-01-18 16:40:34 -08:00
Howard Stearns
6f84a67453
Merge pull request #6840 from jherico/qml_cleanup
...
File dialogs and modal message boxes in QML
2016-01-18 15:04:37 -08:00
samcake
93c7c182b3
Exposing the gpu RangeTimer counter for the AO effect
2016-01-18 14:10:59 -08:00
Brad Hefta-Gaub
d10e1cc39d
CR feedback, dead code cleanup
2016-01-18 12:09:21 -08:00
Brad Davis
5aa8398adb
Working on keyboard focus issues
2016-01-17 20:56:07 -08:00
Brad Davis
746c388f7a
Cleanup of QML windowing and message boxes
2016-01-15 23:14:49 -08:00
Stephen Birarda
0b118a8e98
replace ApplicationVersion with BuildInfo
2016-01-15 15:41:34 -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
d924e042bc
Merge pull request #6834 from ZappoMan/hmdFixes
...
fix issues with HMD lookout 2D, and cleanup
2016-01-14 12:42:23 -05: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
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
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
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
dcc6739bce
Final functionality for running scripts
2016-01-12 12:40:46 -08:00
Brad Davis
21534cbde0
Layout for running scripts
2016-01-12 12:40:42 -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
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
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
Stephen Birarda
404fb2f781
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2016-01-07 16:02:32 -08:00
Brad Davis
3a7ec33d38
Merge pull request #6790 from ZappoMan/menuGroups
...
Menu restructuring
2016-01-07 17:48:20 -05: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
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
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
Atlante45
e59397a97a
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/skybox
2016-01-06 18:56:58 -08:00
Atlante45
3effa9d5e1
Fix skybox rendering
2016-01-06 17:03:29 -08:00
Brad Hefta-Gaub
335ab3c501
fix warnings
2016-01-06 15:24:52 -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
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
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
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
Brad Hefta-Gaub
d98c2d1413
migrate callers of QMessageBox::question() to OffscreenUi::question()
2016-01-05 09:39:39 -08:00
Brad Davis
4b6f58dcab
Restoring code commented out for debugging
2016-01-04 20:51:52 -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
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
Stephen Birarda
7304e695b3
resolve conflicts on merge with upstream/master
2016-01-04 15:40:16 -08:00
Stephen Birarda
02069bfcd2
Merge remote-tracking branch 'leo/master' into console
2016-01-04 09:57:55 -08:00
Howard Stearns
9c8a04ce1e
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2016-01-04 09:26:14 -08:00
Brad Hefta-Gaub
5b177404d5
Merge pull request #6749 from jherico/resource_override
...
Allow a script to set a resource override.
2016-01-04 09:17:38 -08:00
Brad Hefta-Gaub
ec8a2ae093
Merge pull request #6739 from jherico/qml_window
...
Support QML and Web content in overlay windows
2016-01-03 10:18:26 -10:00
Brad Hefta-Gaub
02835fc960
Merge pull request #6702 from hyperlogic/tony/soft-attachments
...
Soft Attachment Support
2016-01-03 08:46:16 -10:00
Brad Davis
462cc325e5
Cleanup, moving some QML objects to OffscreenUI
2015-12-31 12:39:56 -08:00
Brad Davis
c77b66f88c
Make navigation directions into axes
2015-12-30 22:28:08 -08:00
Brad Davis
4c26627622
Add navigation actions and wire them up in the standard controller
2015-12-30 17:14:40 -08:00
Brad Davis
bfe7ab4d94
Allow QML windows to quit the application
2015-12-30 11:39:34 -08:00
Brad Davis
d6f5296c3b
Working on event bridge and scripting interfaces
2015-12-30 09:14:50 -08:00
Brad Davis
0901e3aae1
Support QML and Web content in overlay windows
2015-12-30 09:14:49 -08:00
Brad Davis
07531353e4
Allow a script to set a resource override.
2015-12-30 09:06:04 -08:00
Stephen Birarda
6b4db2707e
Merge branch 'console' into console-dev
2015-12-29 17:55:22 -08:00
Anthony J. Thibault
c2dd00375d
Merge branch 'master' into tony/soft-attachments
2015-12-29 13:21:37 -08:00
Stephen Birarda
e399a3709e
remove debug for bytes read from message
2015-12-29 11:44:06 -08:00
Stephen Birarda
5887867ccf
use a QLocalServer to handle multiple instance launches
2015-12-29 11:10:40 -08:00
Zach Pomerantz
12fa223004
Render SKY_DOME when SKY_MAP tex is loading
2015-12-29 10:58:23 -08:00
Zach Pomerantz
687eef37da
Move final blit into RenderDeferredTask
...
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0 to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
2015-12-23 18:21:08 -08:00
Brad Hefta-Gaub
3dfc48e205
Merge pull request #6687 from jherico/marketplace
...
Support the marketplace in QML
2015-12-21 17:55:55 -08:00
Zach Pomerantz
d8022aa5b0
Add back deferred debugging and combine context init
2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d
Nest JS props in RenderScriptingInterface
2015-12-21 14:32:06 -08:00
Brad Hefta-Gaub
111a8caa3c
Merge pull request #6701 from highfidelity/graphics
...
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
2015-12-21 13:54:50 -08:00
Brad Davis
6ef77bc46a
Support the marketplace in QML
2015-12-21 11:34:03 -08:00
Brad Davis
05b7fcc957
Remove script -> qt::webchannel dependency
2015-12-21 11:19:05 -08:00
samcake
6bbc94badc
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-21 10:48:55 -08:00
Brad Davis
46a4a469e9
Merge pull request #6689 from ZappoMan/rightClickMenu
...
Some early work to support hand driven reticle
2015-12-20 17:49:50 -08:00
samcake
1e8e3fec87
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-19 11:38:20 -08:00
Brad Davis
6098c4a1d6
Revert "Revert "Migrate QML based web views to Qt WebEngine""
...
This reverts commit 1f3adeb666
2015-12-18 17:18:46 -08:00
samcake
7e66515beb
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:38 -08:00
samcake
41525a7c4d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 16:20:41 -08:00
Brad Hefta-Gaub
4075f355a3
more work on hand movement
2015-12-18 15:44:01 -08:00
Brad Hefta-Gaub
868d10651a
Merge pull request #6651 from jherico/webengine
...
Migrate QML based web views to Qt WebEngine
2015-12-18 14:56:35 -08:00
samcake
19769ddd8f
Merge pull request #6691 from zzmp/refactor/scene-render
...
Split JS global Scene into Scene and Render
2015-12-18 13:57:25 -08:00
Anthony J. Thibault
1618e0a92f
Network, Preferences and UI support for soft attachments
...
Added an isSoft field to the AttachmentData which is edited
by the Attachment Dialog Menu, sent over the network via
AvatarData identity packets and saved in the Interface.ini preferences.
AvatarData and AvatarBulkData version number has been bumped.
Changed Avatar attachment collections to use smart pointers to models
instead of raw ones. Removed _unusedAttachmentModels.
I don't think the caching was worth the added code complexity.
2015-12-18 13:32:09 -08:00
samcake
dff4327f7d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 13:18:30 -08:00
Zach Pomerantz
d057239023
Rename RenderContext::ItemsMeta to ItemsConfig
2015-12-18 11:48:40 -08:00
Zach Pomerantz
919a4b6728
Split global JS Scene into Render
2015-12-18 10:33:41 -08:00
Howard Stearns
d6612d20ff
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-17 16:51:04 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
samcake
d8a71db929
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-17 10:11:03 -08:00
Howard Stearns
da27cacdec
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-16 20:56:33 -08:00
samcake
1b1365fd40
Exposing the tone curve in the js api
2015-12-16 16:32:53 -08:00
Brad Davis
fa5bab08b1
Support web content inside QML
2015-12-16 16:25:38 -08:00
Seth Alves
ea202c5271
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-16 15:44:44 -08:00
Seth Alves
d3c57821c0
call a method on actions before each physics simulation step. use this to attempt to dejitter held objects
2015-12-16 14:00:04 -08:00
Anthony Thibault
0c1ae5bb61
Merge pull request #6657 from AndrewMeadows/avatar-capsule-2
...
Correct collision capsule for scaled avatars
2015-12-16 11:36:08 -08:00
howard-stearns
d15da79d90
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-16 10:14:33 -08:00
samcake
7c8f12b9c4
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-16 09:55:37 -08:00
samcake
b4b541178d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-16 09:42:06 -08:00
Brad Davis
1e5793893b
Merge pull request #6665 from ZappoMan/rightClickMenu
...
fix bug in simulated left click - make qml menus work
2015-12-15 21:40:00 -08:00
samcake
d2ebaef69e
Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template
2015-12-15 18:18:42 -08:00
Andrew Meadows
e9f52b1211
properly scale avatar collision shape
2015-12-15 18:18:08 -08:00
Brad Hefta-Gaub
76da3a14ac
fix bug in simulated left click - make qml menus work
2015-12-15 17:58:07 -08:00
Brad Davis
29516619ee
Merge pull request #6661 from ZappoMan/rightClickMenu
...
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 16:08:59 -08:00
howard-stearns
a2c2ab6c94
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-15 16:07:57 -08:00
howard-stearns
069199554c
checkpoint
2015-12-15 16:07:37 -08:00
Brad Hefta-Gaub
aa53900fa3
CR feedback
2015-12-15 15:40:50 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
David Rowe
541af36794
Fix signal connection to ScriptEngine::finished
2015-12-16 09:12:07 +13:00
samcake
e70ab472af
Merging with upstream master/graphics
2015-12-14 18:38:29 -08:00
samcake
84d1e3b123
Merged with upstream master
2015-12-14 18:30:24 -08:00
samcake
a50b14dfae
Merging with upstream graphics
2015-12-14 18:18:39 -08:00
samcake
3554f54e17
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-14 17:38:56 -08:00
samcake
9f1f0798cb
cleaning up the code
2015-12-14 17:04:26 -08:00
samcake
ed2d45d0b6
HMD Mirror looks correct
2015-12-14 16:18:44 -08:00
samcake
1597d3d466
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2015-12-14 10:25:22 -08:00
samcake
2aad26154e
THis should fix the mirror and the skybox issue
2015-12-14 10:24:51 -08:00
samcake
e005bb7b5a
MAybe a mirror solution ?
2015-12-14 09:25:32 -08:00
Sam Cake
6288e99798
Playing with mirror
2015-12-11 23:28:04 -08:00
Atlante45
b8495a6912
Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win
2015-12-11 18:05:47 -08:00
samcake
b3acde4462
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-11 17:49:00 -08:00
samcake
1ddbc15df4
Exploring how to solve the mirror fullscreen bug
2015-12-11 17:47:33 -08:00
Clément Brisset
c160a98c5c
Merge pull request #6636 from samcake/controllers
...
Fix the broken skybox and simplify a bit the vertex shader used
2015-12-11 17:06:33 -08:00
samcake
7ee066b9ed
Merge branch 'controllers' of https://github.com/samcake/hifi into red
2015-12-11 16:35:18 -08:00
Atlante45
c782b01fde
More warning fixes
2015-12-11 16:31:27 -08:00
Atlante45
79fdb2e882
Fix warnings on windows 64bit
2015-12-11 16:31:27 -08:00
samcake
68134aafe5
Fix the broken skybox and simplify a bit the vertex shader used
2015-12-11 16:14:55 -08:00
Brad Davis
1bcf42a799
Merge pull request #6629 from ZappoMan/resetSkyBoxOnDomainChange
...
reset skybox on changing domains
2015-12-11 15:48:20 -08:00
Brad Hefta-Gaub
d918eca030
reset skybox on changing domains
2015-12-11 11:36:02 -08:00
Brad Hefta-Gaub
a1a3c4470c
reload own avatar on Content Reload
2015-12-11 11:02:16 -08:00
Brad Hefta-Gaub
a7a924153a
Merge pull request #6617 from huffman/entity-query-keyhole
...
Add keyhole radius to OctreeQuery
2015-12-11 09:35:46 -08:00
samcake
5d395ae54f
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-10 18:06:43 -08:00
Brad Hefta-Gaub
a472d293bb
Merge pull request #6599 from jherico/aeryn-sdl2
...
Moving SDL2 to external plugin
2015-12-10 18:02:15 -08:00
Brad Davis
98263f0c0d
Moving sdl2 to external plugin
2015-12-10 14:56:41 -08:00
Ryan Huffman
b6ecd539df
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole
2015-12-10 14:36:03 -08:00
Ryan Huffman
b5e3dce376
Add keyhole radius to OctreeQuery
2015-12-10 14:34:28 -08:00
Seth Alves
8ca6c7acc3
Merge pull request #6611 from Atlante45/attachments
...
Fix Attachments jitter
2015-12-10 11:46:19 -08:00
Seth Alves
dbde0b641e
Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready
2015-12-10 11:38:08 -08:00
Seth Alves
d10221f53a
merge from upstream
2015-12-10 11:21:36 -08:00
Atlante45
739e184b52
Fix attachments jitter
2015-12-10 11:19:11 -08:00
Brad Hefta-Gaub
589adde41e
Merge pull request #6541 from howard-stearns/correct-target-frame-rate
...
Don't limit avatar rendering when not vsync'd
2015-12-10 11:17:23 -08:00
James B. Pollack
d21e4ff5e1
Merge pull request #6592 from huffman/script-engine-fixes
...
Fix concurrency issues for bools in ScriptEngine
2015-12-10 10:48:54 -08:00
Seth Alves
a59af2c1b2
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c
make entity-tree a global. change how network-requests to load model geometry are triggered
2015-12-10 09:03:53 -08:00
Ryan Huffman
ad0865171b
Fix unused variable in scriptFinished
2015-12-09 15:52:30 -08:00
Howard Stearns
dd2d040253
Merge branch 'fix-sync-period-calc' into correct-target-frame-rate
2015-12-09 15:43:43 -08:00
Howard Stearns
d964032572
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-09 15:23:00 -08:00
Howard Stearns
270cfe8af7
coding standards
2015-12-09 15:22:44 -08:00
Ryan Huffman
fc6a78d9ef
Update scriptFinished signal to be a DirectConnection
2015-12-09 14:49:05 -08:00
Ryan Huffman
4bfce768ca
Add locks around read/writes of _scriptEnginesHash
2015-12-09 14:48:33 -08:00
Seth Alves
446ca8236f
disable physics disabler
2015-12-09 11:25:44 -08:00
howard-stearns
1d65cbce88
Remove unneeded getTargetFramePeriod and isVSynchronized.
2015-12-08 18:08:57 -08:00
howard-stearns
9ae22800fe
Merge branch 'fix-sync-period-calc' into correct-target-frame-rate
2015-12-08 17:32:53 -08:00
howard-stearns
32e4967ee0
cleanup
2015-12-08 16:38:05 -08:00
howard-stearns
7afc803fb5
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-08 15:30:48 -08:00
howard-stearns
5b41d4da1c
Snapshot of "working" version.
2015-12-08 15:30:23 -08:00
Seth Alves
c462bda86c
disable physics when moving to a new domain
2015-12-08 14:01:18 -08:00
Seth Alves
164439b303
don't enable physics until an entire scene has been received from the entity server and until nearby (to MyAvatar) entities are ready
2015-12-08 13:53:39 -08:00
samcake
ede375a889
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-08 12:28:16 -08:00
samcake
83279489f3
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-08 09:46:29 -08:00
Howard Stearns
481fe5a7d0
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 18:52:29 -08:00
Seth Alves
5bf0ddfc2e
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 18:05:03 -08:00
Brad Hefta-Gaub
4cbbd252d5
Merge pull request #6587 from jherico/rigel
...
Fix crashes on exit due to poor cleanup
2015-12-07 18:04:52 -08:00
Bradley Austin Davis
b7aeb34a8c
Fix crashes on exit due to poor cleanup
2015-12-07 17:50:08 -08:00
Seth Alves
bee423718a
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 17:48:05 -08:00
James B. Pollack
6cf1ad464f
Merge pull request #6583 from birarda/extension-ci
...
use a case insensitive check for extensions in Application
2015-12-07 17:33:03 -08:00
howard-stearns
9512c3f73d
Debugging.
...
Please enter the commit message for your changes. Lines starting
2015-12-07 16:58:59 -08:00
Stephen Birarda
7beaf5e235
force asset upload to use a lowercase extension
2015-12-07 15:18:32 -08:00
Stephen Birarda
0fee004bdd
use case insensitive check for extensions
2015-12-07 15:13:14 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
samcake
9ddc3c27bf
compilation errors fixed
2015-12-07 13:25:55 -08:00
Howard Stearns
289c8d6137
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 11:54:33 -08:00
Clément Brisset
42365acef5
Merge pull request #6561 from ZappoMan/cruftRemovalRedux
...
More Cruft Removal
2015-12-07 11:39:54 -08:00
Howard Stearns
8303b63491
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 10:11:12 -08:00
Howard Stearns
1d4cc7c984
Checkpoint exploring use of getLastSynchronizedElapsed and fixing paintWait (which may go away).
2015-12-07 10:01:46 -08:00
Clément Brisset
390836b64e
Merge pull request #6431 from huffman/proto-received-message
...
Combine Packet and PacketList into ReceivedMessage on receiving end
2015-12-07 09:58:52 -08:00
Ryan Huffman
34138f07bd
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-07 08:58:47 -08:00
Atlante45
f8ee377f01
Fix QOpenGL warning
2015-12-07 08:37:07 -08:00
Seth Alves
f6b1ef85b3
remap entity IDs on export also
2015-12-07 06:03:47 -08:00
Seth Alves
f53571ac81
remap IDs on export, also
2015-12-07 05:41:34 -08:00
Seth Alves
3cc423ca03
remap IDs when importing entities
2015-12-06 17:55:48 -08:00
Atlante45
acb9e2774e
Basic implementation of debug zone resizing
2015-12-04 21:01:53 -08:00
samcake
119cc733b5
Merging with master
2015-12-04 17:17:33 -08:00
Howard Stearns
fa0ad1fe4d
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-04 16:12:22 -08:00
Brad Hefta-Gaub
2a243ccd17
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemovalRedux
2015-12-04 14:58:38 -08:00
Brad Hefta-Gaub
46946212cf
remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true
2015-12-04 14:24:31 -08:00
Brad Hefta-Gaub
f44a9daa21
remove WANT_DELTA from OctreeQuery
2015-12-04 14:04:57 -08:00
Brad Davis
11917ca501
Fixing preview / vsync functionality
2015-12-04 12:46:19 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Atlante45
c27944ae28
Simple normal map debug
2015-12-04 10:44:23 -08:00
Brad Davis
60aa93c38c
Fixing menu items in display plugins
2015-12-04 10:28:19 -08:00
Brad Davis
d8bb9f8d18
Fixing screenshot functionality
2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1
Prototyping threaded present
2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
8b58aa706a
Merge pull request #6534 from jherico/homer
...
Windows 64 bit updates
2015-12-04 10:05:45 -08:00
Clément Brisset
19a503a99f
Merge pull request #6549 from samcake/hdr
...
Graphics: Introducing a deferred Color buffer different from the Primary one used for final composition
2015-12-04 09:53:15 -08:00
Brad Hefta-Gaub
f472b515c3
remove wantsColor support since its always true and required for entities
2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 20:29:23 -08:00
