SamGondelman
4bef033d6f
cleanup, don't compress rcc file to fix corruption
2018-03-12 13:05:03 -07:00
samcake
9bec8cdd0b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-12 12:01:00 -07:00
Olivier Prat
aad571f6bd
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-03-12 14:22:57 -04:00
Seth Alves
621e6a62d6
merge from upstream
2018-03-09 12:07:24 -08:00
Seth Alves
58bc42990c
merge from upstream
2018-03-09 12:03:26 -08:00
Olivier Prat
da6bd92ff6
Merged with master
2018-03-09 10:07:25 +01:00
Atlante45
69fb830480
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
2018-03-08 17:23:17 -08:00
samcake
a0db5c6135
Merge with master
2018-03-08 15:35:58 -08:00
David Rowe
b1bda281ee
Merge branch 'master' into 21776
2018-03-08 15:36:10 +13:00
Elisa Lupin-Jimenez
c6e5f4c9c8
zip file drags don't auto add model textures
2018-03-06 19:24:09 -08:00
Elisa Lupin-Jimenez
251e4a3127
Fixed blocks importer textures being interpreted as image entities
2018-03-06 16:44:23 -08:00
Brad Davis
8bfc610cfb
Merge remote-tracking branch 'upstream/master' into android
2018-03-05 11:48:58 -08:00
Seth Alves
746769cbe9
don't crash
2018-03-02 13:52:18 -08:00
Seth Alves
507dfa5ec3
more code review response
2018-03-02 11:35:34 -08:00
Seth Alves
bdd926f89e
cleanups
2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2
merge from upstream
2018-03-02 09:57:27 -08:00
samcake
d4d5f3a7f0
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-02 08:50:47 -08:00
David Rowe
287ea8eff2
Fix Window.setFocus() unsetting focus if Interface has focus
2018-03-02 15:40:49 +13:00
Seth Alves
33065fb51c
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
2018-03-01 11:07:37 -08:00
Andrew Meadows
3ca21dda67
Merge hifi/master of into hifi/workload
2018-02-28 10:28:31 -08:00
Olivier Prat
2d71d7da9f
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-27 09:11:43 +01:00
Seth Alves
666fa77be2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 13:53:20 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
NissimHadar
c0f20900a0
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix
...
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-26 09:39:16 -08:00
Seth Alves
f08864f17b
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 09:01:41 -08:00
Brad Hefta-Gaub
3d54f4d246
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog
...
Relax deadlock watchdog
2018-02-23 17:09:30 -08:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
Seth Alves
99893d81e2
merge from upstream
2018-02-23 09:14:48 -08:00
Olivier Prat
ee253143ff
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-23 14:53:14 +01:00
Olivier Prat
4636f43728
Simplified camera view history and TAA is now working in all circumstances.
2018-02-23 10:19:05 +01:00
ZappoMan
9f68accb30
add menu for testing unresponsive interface
2018-02-22 17:34:00 -08:00
Olivier Prat
ae63610582
Added history of view to try to adjust for GPU slower than game
2018-02-22 23:03:33 +01:00
Nissim Hadar
049beba157
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-21 14:15:41 -08:00
samcake
33b47f9ae2
Merging with the actual worloadspace managed from the EntityTreeRenderer
2018-02-21 10:34:58 -08:00
samcake
34db56c50c
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-02-21 08:58:01 -08:00
samcake
f1dcfeb25e
Adding shaders and means to render the proxies contained in the workload SPace
2018-02-20 18:20:12 -08:00
Andrew Meadows
e7495d830b
maintain Space proxies for entities
2018-02-20 17:39:05 -08:00
Olivier Prat
4edfe6c9ab
Trying to keep track of a better previous correction
2018-02-20 14:48:21 +01:00
samcake
9441bb477d
Working on adding rendering from the workload
2018-02-16 17:21:07 -08:00
Andrew Meadows
6d347cf44f
revert deadlock, remove Space stubbery in EntityTree
2018-02-15 17:40:15 -08:00
Seth Alves
abc467b919
load json from indicated file to populate serverless domain
2018-02-15 16:09:03 -08:00
Seth Alves
17e2db96c6
make domain-manager and pals be still when interface is in serverless mode
2018-02-15 15:19:50 -08:00
Andrew Meadows
ba888a14ca
give Application a 'workload' engine
2018-02-14 13:26:42 -08:00
Zach Fox
ae8a8a48eb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-13 13:55:32 -08:00
Seth Alves
764447fa24
merge from upstream
2018-02-13 13:01:45 -08:00
Seth Alves
bf9496b46b
start on support for models.json serverless domains
2018-02-13 13:00:27 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
Zach Fox
95e9eb8e4a
Lots of progress
2018-02-12 17:06:57 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
...
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
Cristian Luis Duarte
bb4f57f982
Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.
2018-02-09 17:32:12 -03:00
Brad Davis
7d5502eb92
Migrating QML rendering off the main thread
2018-02-06 11:53:09 -08:00
NissimHadar
faec9a62b6
Changed "" to QString()
2018-02-06 11:01:50 -08:00
NissimHadar
cf87052b7f
Added option to select snapshot filename in scripts.
2018-02-05 17:29:00 -08:00
Elisa Lupin-Jimenez
2ff47fa454
images auto-add to asset server, started asset browser add link
2018-02-02 10:27:42 -08:00
Gabriel Calero
970ca5e08f
Add virtual pad for android
2018-01-17 15:00:43 -03:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Zach Fox
6920e57613
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 13:31:58 -08:00
Anthony J. Thibault
61edd83987
Improve stability for HMD third person avatars
...
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.
To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
2018-01-08 11:26:29 -08:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661
...
Laser auto-on with tablet and Web overlays
2018-01-05 14:08:01 -08:00
David Rowe
138092ac37
Remove "Prefer Avatar Finger Over Stylus" setting
2018-01-04 15:12:34 +13:00
David Rowe
901af8896f
Add "Prefer Stylus Over Laser" setting
2018-01-03 17:54:43 +13:00
Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
Andrew Meadows
2538204b1e
expose physics simulation stats to Test JS API
2017-12-11 11:31:00 -08:00
SamGondelman
c5ebb8a279
expose Window.getDeviceSize()
2017-11-28 16:16:30 -08:00
SamGondelman
033f658fff
Merge remote-tracking branch 'upstream/master' into pointers
2017-11-17 16:10:20 -08:00
Stephen Birarda
eedb77dae9
add clearing of known state if client resets ES connection
2017-11-16 11:40:35 -08:00
Brad Davis
7bbc719d79
Fix for black screen on HMD derived display plugins
2017-11-16 08:53:12 -08:00
Brad Davis
23653f08ca
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-30 09:20:58 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
SamGondelman
a44e8efb99
merge from master
2017-10-26 12:14:53 -07:00
Bradley Austin Davis
becd99a964
Merge pull request #11584 from SamGondelman/pointerEvents
...
First step of cleaning up PointerEvents
2017-10-26 12:01:03 -07:00
luiscuenca
3d3077978e
Simplyfied and fixed null pointer
2017-10-25 18:47:10 -07:00
Sam Gondelman
863a2041a6
Merge branch 'master' into pointerEvents
2017-10-25 17:22:19 -07:00
luiscuenca
a1c9285c90
Fixed bug on case 6443
2017-10-25 13:13:50 -07:00
SamGondelman
9bbb2eb692
austin's comments, send events directly to selected web entity
2017-10-23 10:17:45 -07:00
SamGondelman
7686948daf
resolve conflicts and cleanup
2017-10-20 15:23:17 -07:00
SamGondelman
24ce09f914
generalized pointer, laserpointermanager -> pointermanager
2017-10-20 11:28:48 -07:00
SamGondelman
d7745efc8e
one global pickmanager
2017-10-19 16:55:24 -07:00
Zach Fox
3f0b08aea8
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-18 10:37:47 -07:00
Anthony J. Thibault
67d43b4fac
Use atomic<bool> and compare_exchange_strong
2017-10-13 16:03:56 -07:00
SamGondelman
5bfb0baf09
const references
2017-10-13 14:38:46 -07:00
Anthony J. Thibault
a2a6cd0c7a
Reduce present traffic on main thread event queue.
...
In an effort to diagnose the root cause of several deadlocks,
it seems possible that the main thread event queue can grow
to a size where it can take many seconds to drain.
This PR attempts to address this in two ways:
* Change the connection between the DisplayPlugin::presented signal and
the Application::onPresent slot to be a DirectConnection. This should
prevent the main thread from filling up with signal events.
* Within Applicaiton::onPresent use an atomic counter to prevent the main
thread from filling up with repeated Idle events.
2017-10-13 14:28:23 -07:00
SamGondelman
0d164363af
cleanup mousePressOffEntity signal
2017-10-12 15:29:29 -07:00
SamGondelman
53fde83922
cleaning up pointerevents, wip
2017-10-12 11:21:50 -07:00
Zach Fox
5efa920712
Getting closer
2017-10-12 11:13:23 -07:00
Zach Fox
f037eab26c
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-11 11:07:32 -07:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
Zach Fox
1fa9bd8fc6
Better implementation of location change and bugfixes
2017-10-06 12:22:29 -07:00
samcake
d7333d3fa3
Merging with master
2017-10-04 10:55:38 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
Sam Gateau
316156db46
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-02 21:31:59 -07:00
samcake
bb99f68d40
Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead
2017-10-02 17:04:00 -07:00
Andrew Meadows
8d2153d2f3
cleanup debug stats, use more correct names
2017-10-02 13:08:17 -07:00
Sam Gateau
68046ae4e3
Merge pull request #11491 from jherico/dev/disable_watchdog
...
Disable watchdog with environment variable
2017-10-02 10:19:32 -07:00
samcake
225d2bbbb4
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 13:47:37 -07:00
SamGondelman
3ae41b9b75
cleanup client and stats string
2017-09-29 11:34:35 -07:00
SamGondelman
cbf82a6f2c
fix timeout for physics check
2017-09-29 11:34:34 -07:00
Brad Davis
a7d507e9fd
Disable watchdog with environment variable
2017-09-29 10:44:04 -07:00
SamGondelman
b59ec07171
move hud rendering to render thread, still need to separate out hud overlays
2017-09-29 09:49:08 -07:00
samcake
c112a3baf1
Seting up of camera and avatar correctly in game loop, not in render loop
2017-09-28 15:09:49 -07:00
samcake
b1daae0150
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-28 09:16:02 -07:00
samcake
40ca98214b
Moving all of the camera and avatar eval to game loop
2017-09-27 17:58:43 -07:00
Sam Gateau
88097bb39f
Merge pull request #11447 from AndrewMeadows/lod-auto-adjust
...
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
2017-09-27 10:51:46 -07:00
samcake
328dd9c108
Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue
2017-09-26 16:12:27 -07:00
samcake
669af73a96
Bringing as much as possible out from render to game
2017-09-26 10:47:24 -07:00
Sam Gateau
953614fe65
More stuff out of render to the gameloop
2017-09-25 23:43:32 -07:00
samcake
157b4f2e13
Moving some of the updates on the camera and the avatar out from render to game loop
2017-09-25 18:28:33 -07:00
samcake
11c55755d5
Removing unused call
2017-09-25 15:10:40 -07:00
Andrew Meadows
37c501b131
LODManager uses renderTime instead of main loop fps
2017-09-25 13:17:21 -07:00
samcake
510ecbb137
Merging with upstream
2017-09-21 16:59:15 -07:00
vladest
5b033e021a
Merge branch 'master' into modal_dialogs_async
2017-09-16 12:30:07 +02:00
Seth Alves
8a49edbecb
code review
2017-09-15 10:08:35 -07:00
Seth Alves
d89f2b77da
rework ScriptEngine lifetimes using 'smart' pointers
2017-09-14 10:42:21 -07:00
Sam Gateau
a70f7dfc87
put updateCamera in its function
2017-09-13 22:05:20 -07:00
vladest
38295ab73f
Merge conflicts
2017-08-28 16:58:30 +02:00
Andrew Meadows
4d7700b774
Merge pull request #11243 from SamGondelman/sharks
...
Fix ray pick crash on shutdown
2017-08-25 09:01:14 -07:00
SamGondelman
abaccf9edd
crash on shutdown
2017-08-24 16:00:36 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Elisa Lupin-Jimenez
44f1f340e1
Merge pull request #11147 from elisa-lj11/blocks
...
Adding Blocks Tablet App to Marketplace
2017-08-18 15:06:18 -07:00
Sam Gondelman
cbf2bb3a61
Merge pull request #10980 from SamGondelman/sharks
...
Reduce laser pointer lag
2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez
2b44608ece
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-17 10:18:40 -07:00
Zach Fox
ecd1f13197
Allow users to take a snapshot from the secondary camera
2017-08-16 15:34:06 -07:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
vladest
8326600274
Merge branch 'master' into modal_dialogs_async
2017-08-16 13:48:47 +02:00
Liv
aea5f170f2
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-08-15 13:58:22 -07:00
SamGondelman
9bb7e66859
separate raypickscriptinginterface, cleanup
2017-08-15 13:36:41 -07:00
Elisa Lupin-Jimenez
3d7995da34
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-15 10:01:24 -07:00
vladest
63e907e7b6
Merge branch 'master' into modal_dialogs_async
2017-08-12 13:04:52 +02:00
SamGondelman
4c55849290
merge from master
2017-08-10 15:43:23 -07:00
Seth Alves
ff83a8158b
cancel effects of --replaceAvatarURL when avatar is changed with preference dialog
2017-08-10 13:49:48 -07:00
Elisa Lupin-Jimenez
1ac9536f95
Downloading blocks from marketplace in own asset folder
2017-08-09 15:56:07 -07:00
vladest
556569819d
1st stage of moving to async dialogs
2017-08-09 14:00:19 +02:00
SamGondelman
42147640e2
remove LaserPointerManager as a dependency
2017-08-07 14:18:56 -07:00
Liv Erickson
da70071b5a
Merge branch 'master' into feat/domain-setup
2017-08-07 10:04:54 -07:00
Elisa Lupin-Jimenez
ebc28a6557
Renamed isBlocks to isZip, added debug print for non-entity files
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952
Drag zip cleaned up, marketplaces stylized, back button fixed
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0
Blocks drag does not work yet
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54
Can drag blocks zip folder into hifi and upload the .obj
2017-08-04 16:57:48 -07:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
9b3be6d164
Merge pull request #10808 from humbletim/21400
...
WL 21400 -- Setting that lets you switch from cursor to reticle
2017-07-27 13:16:58 -07:00
Liv
57b27a7bb7
change packet type to be sourced, change from packet list to single packet
2017-07-25 20:17:20 -07:00
Liv
32ddffd9c8
Move logic for confirmation into Application.cpp for handling files directly
2017-07-24 18:09:32 -07:00
Seth Alves
3670a04d8e
switch bare pointers to AudioInjector objects to be QSharedPointers
2017-07-11 14:24:58 -07:00
David Kelly
936c21e849
remove unnecessary cacheDir member
2017-07-06 07:24:58 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
David Kelly
48de8011b2
cr feedback
2017-06-28 14:15:29 -07:00
David Kelly
01155ba4e3
this handles redirecting ktx_cache, data8, prepared
2017-06-27 08:47:54 -07:00
humbletim
c10475186c
add support for switching cursor from arrow to reticle
2017-06-23 18:48:29 -04:00
David Kelly
94a33fea94
new switches to override avatarURL
2017-06-21 16:03:05 -07:00
