Zach Fox
|
7fbc7bf1a5
|
Merge pull request #13347 from zfox23/MS15721_deleteApp
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-11 13:28:05 -07:00 |
|
Zach Fox
|
688d82b286
|
Go back to 60%
|
2018-06-11 13:23:41 -07:00 |
|
Zach Fox
|
dbd10cc2f0
|
Merge branch 'master' of github.com:highfidelity/hifi into MS15673_bubbleResizeExperiment
|
2018-06-11 13:20:34 -07:00 |
|
John Conklin II
|
9db71fb40d
|
Merge pull request #13322 from dback2/fixEquipMessage
Fix Hifi-Grab-Hand message for equipping
|
2018-06-11 13:16:39 -07:00 |
|
Sam Gateau
|
82eec46402
|
Merge pull request #13346 from jherico/fix/particle_shader
Fix particle entity shader
|
2018-06-11 12:10:47 -07:00 |
|
Stephen Birarda
|
b41c80f31e
|
Merge pull request #13221 from huffman/feat/oven-cli-texture-options
Add more texture options to Oven CLI
|
2018-06-11 12:01:56 -07:00 |
|
Zach Fox
|
a5ef3fa729
|
Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state
|
2018-06-11 12:00:51 -07:00 |
|
Ryan Huffman
|
fa22ea7630
|
Update ES to keep the backup that pushes file size over the limit
|
2018-06-11 11:58:50 -07:00 |
|
Zach Fox
|
15129e37db
|
Merge pull request #13341 from zfox23/MS13761_hideOverlayFix
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-11 11:44:26 -07:00 |
|
John Conklin II
|
6794fedf5b
|
Merge pull request #13337 from ctrlaltdavid/21887
Don't save user location if not connected to domain
|
2018-06-11 11:09:57 -07:00 |
|
Anthony J. Thibault
|
f773aef053
|
Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68
|
2018-06-11 11:06:21 -07:00 |
|
sabrina-shanman
|
4c39d08358
|
Remove "Draw Collision Shapes" option from developer physics menu
|
2018-06-11 11:03:57 -07:00 |
|
sabrina-shanman
|
440c77905a
|
Remove functionality for rendering collision meshes directly in the Model class
|
2018-06-11 11:03:57 -07:00 |
|
Clement
|
ffac96d0a0
|
Migrate old logs
|
2018-06-11 11:00:08 -07:00 |
|
Clement
|
75bb6e5211
|
Store sandbox log in appdata local
|
2018-06-11 11:00:08 -07:00 |
|
Zach Fox
|
56bd7e3d37
|
Remove dead function declaration from header
|
2018-06-11 10:58:01 -07:00 |
|
Stephen Birarda
|
0fd0a64e7f
|
Merge pull request #13118 from huffman/feat/010-templates
Add fbx + ktx templates
|
2018-06-11 10:52:32 -07:00 |
|
Stephen Birarda
|
be64f4bcbf
|
Merge pull request #12917 from kitely/cmake-fixes
CMake fixes
|
2018-06-11 10:51:49 -07:00 |
|
Stephen Birarda
|
743cb7c7e8
|
Merge pull request #13241 from Atlante45/fix/corrupted-backup
Don't mark backups from domains with no asset server corrupted
|
2018-06-11 10:50:16 -07:00 |
|
Stephen Birarda
|
10e34000aa
|
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains
Domain-unreachable message remaining on slow connects
|
2018-06-11 10:46:55 -07:00 |
|
Zach Fox
|
c26b03f480
|
Cleanup
|
2018-06-11 10:40:13 -07:00 |
|
John Conklin II
|
d5b8570ef6
|
Merge pull request #13343 from ctrlaltdavid/21888
Fix tablet attaching to hand while far-grabbing an entity
|
2018-06-11 10:26:37 -07:00 |
|
Zach Fox
|
c7c06590ac
|
Merge branch 'master' of github.com:highfidelity/hifi into MS13761_hideOverlayFix
|
2018-06-11 10:16:35 -07:00 |
|
Howard Stearns
|
5ce122f148
|
Merge pull request #13307 from howard-stearns/infinite-scroll
Infinite scroll
|
2018-06-11 10:03:52 -07:00 |
|
Anthony J. Thibault
|
b8379045a8
|
Fix MyAvatar::isReadyForPhysics() in serverless domains.
|
2018-06-11 09:53:34 -07:00 |
|
Ryan Huffman
|
11a48915e2
|
Fix order of variable initialization in OctreePersistThread
|
2018-06-11 09:48:22 -07:00 |
|
Sam Gondelman
|
be28097279
|
Merge pull request #13339 from SamGondelman/avatarHash
Possibly fix avatarHash crash
|
2018-06-11 09:39:40 -07:00 |
|
Sam Gondelman
|
9c66ee412a
|
Merge pull request #13325 from Cristo86/patch-1
Use third person camera mode when switching to My View from Top View mode.
|
2018-06-11 09:36:29 -07:00 |
|
Sam Gondelman
|
535dc92213
|
Merge pull request #13334 from SamGondelman/tablet
Fix tablet not disappearing
|
2018-06-11 09:34:57 -07:00 |
|
Dante Ruiz
|
ba86c9753d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 09:13:14 -07:00 |
|
Ryan Huffman
|
94069c964d
|
Remove unused variable and log message in OctreePersistThread
|
2018-06-11 08:37:19 -07:00 |
|
David Rowe
|
11178d80f7
|
Fix avatar attachment spinbox min/max values
|
2018-06-11 16:24:45 +12:00 |
|
David Rowe
|
0161015746
|
Fix setting avatar attachment joint
|
2018-06-11 15:31:42 +12:00 |
|
Brad Davis
|
380137a660
|
Fix particle entity shader
|
2018-06-10 12:15:00 -07:00 |
|
Ken Cooke
|
16eefe7f14
|
Ensure self-sufficient headers
|
2018-06-09 19:44:12 -07:00 |
|
howard-stearns
|
020d622302
|
don't depend on matching handlers with overlapping requests
|
2018-06-09 17:34:49 -07:00 |
|
howard-stearns
|
421edbfa1e
|
PSFListModel isa ListModel instead of hasa
|
2018-06-09 16:03:45 -07:00 |
|
howard-stearns
|
d2cf042a88
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-09 14:09:42 -07:00 |
|
SamGondelman
|
2dae613612
|
remove conserveResources
|
2018-06-08 17:58:06 -07:00 |
|
Anthony Thibault
|
044d142635
|
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
|
2018-06-08 17:53:55 -07:00 |
|
Stephen Birarda
|
7a9d77d0d9
|
force git abbreviated SHA to have length of 7
|
2018-06-08 17:21:09 -07:00 |
|
Stephen Birarda
|
8dd268addb
|
handle semantic version updates in sandbox
|
2018-06-08 17:21:06 -07:00 |
|
Stephen Birarda
|
9506e7edbe
|
check for update for dev-builds, handle semantic version
|
2018-06-08 17:20:57 -07:00 |
|
Cristian Luis Duarte
|
26a9364efd
|
Android - Clean up enterBackground logs
|
2018-06-08 20:59:38 -03:00 |
|
howard-stearns
|
d68415c47c
|
code feedback
|
2018-06-08 16:47:06 -07:00 |
|
David Rowe
|
54b96cd602
|
Fix incomplete transition from far-grabbing entity to grabbing tablet
|
2018-06-09 11:32:10 +12:00 |
|
Ryan Huffman
|
9afc9d19c5
|
Cleanup comments and process structure in OctreePersistThread
|
2018-06-08 16:22:11 -07:00 |
|
Ryan Huffman
|
d0af06939f
|
Update persistInterval to use std::chrono in OctreePersistThread
|
2018-06-08 16:22:11 -07:00 |
|
Ryan Huffman
|
8f4f3db9ce
|
Add octree backup file cleanup
|
2018-06-08 16:22:11 -07:00 |
|
Ryan Huffman
|
d476146a56
|
Move OctreePersistThread off GenericThread and add octree negotiation
|
2018-06-08 16:22:11 -07:00 |
|