Ryan Huffman
|
38df5d3db5
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta
|
2018-06-11 16:17:56 -07:00 |
|
Sam Gondelman
|
e8ec32c7f8
|
Merge pull request #13340 from SamGondelman/modelTextures
Try to fix ModelOverlay texture loading
|
2018-06-11 16:09:10 -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 |
|
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 |
|
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 |
|
Sam Gondelman
|
be28097279
|
Merge pull request #13339 from SamGondelman/avatarHash
Possibly fix avatarHash crash
|
2018-06-11 09:39:40 -07:00 |
|
Brad Davis
|
380137a660
|
Fix particle entity shader
|
2018-06-10 12:15:00 -07:00 |
|
Anthony Thibault
|
044d142635
|
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
|
2018-06-08 17:53:55 -07:00 |
|
Anthony J. Thibault
|
c3da4e74de
|
Code review feedback
|
2018-06-08 16:22:00 -07:00 |
|
Stephen Birarda
|
112abc9d7e
|
Merge pull request #13148 from birarda/feat/new-version-numbers
add SHA to PR/master version, add build_type (stable/master/pr/dev)
|
2018-06-08 14:44:22 -07:00 |
|
Sam Gondelman
|
c7f05d96b4
|
Merge pull request #13309 from Cristo86/android_crashes_domains
Android - Double Click crash and dev-mobile crash with Pixel XL
|
2018-06-08 13:36:53 -07:00 |
|
Ryan Huffman
|
3e65e0b0cd
|
Update processImage to not compress by default
|
2018-06-08 13:21:47 -07:00 |
|
Ryan Huffman
|
24182d3451
|
Remove compression variables & functions in image.cpp
|
2018-06-08 12:14:52 -07:00 |
|
Ryan Huffman
|
faafd26d2a
|
Add uncompressed KTX files to baked texture output
|
2018-06-08 11:39:47 -07:00 |
|
Sam Gondelman
|
4e649d2498
|
Merge pull request #13276 from SamGondelman/resource
Protect against null resource
|
2018-06-08 11:35:04 -07:00 |
|
SamGondelman
|
a7d75b121f
|
fix avatarHash crash
|
2018-06-08 11:20:41 -07:00 |
|
Sam Gateau
|
7f8af47075
|
Merge pull request #13326 from SamGondelman/green
Fix models starting as green boxes
|
2018-06-08 10:09:53 -07:00 |
|
David Back
|
e8aece4c11
|
Merge pull request #13315 from dback2/avatarFeet
Fix default avatar feet
|
2018-06-08 10:00:43 -07:00 |
|
David Rowe
|
8e1e93abb0
|
Don't save user location if not connected to domain
|
2018-06-08 15:04:01 +12:00 |
|
David Back
|
9a7e199528
|
Merge pull request #13270 from dback2/cloneables
Use version from JSON on domain restore
|
2018-06-07 15:15:43 -07:00 |
|
howard-stearns
|
df0ecb44a8
|
fix crash setting model texture
(cherry picked from commit b152bf02af4eb17cf5c169ca9c577154c83901f7)
|
2018-06-07 13:21:45 -07:00 |
|
SamGondelman
|
c18602d22e
|
fix models starting as green boxes
|
2018-06-07 13:03:56 -07:00 |
|
John Conklin II
|
66b66d5248
|
Merge pull request #13311 from ElderOrb/FB14390
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
|
2018-06-07 11:22:57 -07:00 |
|
John Conklin II
|
be9938013f
|
Merge pull request #13271 from Cristo86/android_joystick_jumps_fix
Fix joystick and view control bug that makes it bounce
|
2018-06-07 11:18:26 -07:00 |
|
John Conklin II
|
277758cd03
|
Merge pull request #13275 from luiscuenca/fixNoAvatarMaterials
Check for null material pointer in CauterizedModel
|
2018-06-07 09:41:03 -07:00 |
|
Sam Gateau
|
146732a20f
|
Merge pull request #13317 from jherico/feature/mac_resources
Use binary resources on OSX
|
2018-06-07 09:38:00 -07:00 |
|
John Conklin II
|
2b6fdb6b69
|
Merge pull request #13217 from Atlante45/fix/ds-memory
Fix uploaded content archives taking too much memory
|
2018-06-07 09:37:41 -07:00 |
|
Bradley Austin Davis
|
fa51c15849
|
Use binary resources on OSX
|
2018-06-06 15:10:52 -07:00 |
|
Seth Alves
|
b70ffa5bae
|
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
|
2018-06-06 14:06:34 -07:00 |
|
Sam Gondelman
|
b4afabee68
|
Merge pull request #13294 from SamGondelman/overlays
Add isGroupCulled property to ModelOverlays
|
2018-06-06 13:52:33 -07:00 |
|
David Back
|
afd4b5a8ab
|
update default avatar to fix non-flat feet
|
2018-06-06 11:48:04 -07:00 |
|
Sam Gateau
|
a1899e80c0
|
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
|
2018-06-06 11:46:09 -07:00 |
|
Sam Gateau
|
c145c0c1b8
|
Merge pull request #13186 from SamGondelman/etc2comp
Android: Local texture compression using Etc2Comp
|
2018-06-06 11:13:50 -07:00 |
|
Alexander Ivash
|
5897c9948d
|
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
|
2018-06-06 03:52:22 +03:00 |
|
Cristian Luis Duarte
|
b38eae3731
|
Only add RenderShadowTask if isDeferred
|
2018-06-05 18:54:48 -03:00 |
|
Anthony J. Thibault
|
94c39bc4af
|
Better fix for looking down at your own body.
|
2018-06-05 14:43:33 -07:00 |
|
David Rowe
|
a7a0cfeef2
|
Remove some deprecated functions from the Controller API
|
2018-06-05 10:56:19 +12:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
SamGondelman
|
bde3382657
|
merge with master
|
2018-06-04 12:55:17 -07:00 |
|
SamGondelman
|
8af1beca8d
|
add isGroupCulled for model overlays
|
2018-06-04 12:07:57 -07:00 |
|
John Conklin II
|
08fcad1932
|
Merge pull request #13227 from SamGondelman/entityMirror
Add local-only isVisibleInSecondaryCamera flag to entities
|
2018-06-04 11:06:00 -07:00 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
Andrew Meadows
|
db3520b332
|
also update queryAACube for 'Held' things
|
2018-06-01 16:38:57 -07:00 |
|
Simon Walton
|
2d9a5c62c1
|
Clean-up for compiler warnings
|
2018-06-01 10:02:41 -07:00 |
|
Seth Alves
|
97b3fdfe68
|
make legacy collisionless property work right
|
2018-06-01 09:34:34 -07:00 |
|
Simon Walton
|
c277cc7574
|
Fix minor error
|
2018-05-31 18:39:25 -07:00 |
|
Simon Walton
|
7d1d7f7bcd
|
Closing the open tablet dialog - try harder
|
2018-05-31 18:31:53 -07:00 |
|
SamGondelman
|
86ee5c12d8
|
merge and update based on sam's changes
|
2018-05-31 17:53:36 -07:00 |
|
John Conklin II
|
611159f65f
|
Merge pull request #13188 from SimonWalton-HiFi/placename-crash
Initialize Qt's use of openssl lib before calling RSA code
|
2018-05-31 14:34:24 -07:00 |
|