Andrew Meadows
|
c2f5d19ddb
|
add TODO about optimizing character ray tracing
|
2018-05-31 10:21:14 -07:00 |
|
Sam Gateau
|
0a7870d5f3
|
Merge pull request #13264 from AndrewMeadows/workload
Workload: merge master into workload
|
2018-05-30 16:33:51 -07:00 |
|
Andrew Meadows
|
003e444246
|
Merge branch 'master' into 'workload'
|
2018-05-30 16:04:13 -07:00 |
|
Sam Gateau
|
d87b19522f
|
Merge pull request #13226 from AndrewMeadows/workload-015
workload: disable regulation of workload regions by default
|
2018-05-30 16:02:22 -07:00 |
|
John Conklin II
|
6095a3b319
|
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
|
2018-05-30 13:55:34 -07:00 |
|
Sam Gondelman
|
46a6334c72
|
Merge pull request #13249 from gcalero/android_remove_mic_bar
Android: Update Application.cpp
|
2018-05-30 14:31:31 -04:00 |
|
Sam Gondelman
|
0d6cd8de58
|
Merge pull request #13242 from gcalero/signing_apk
Sign release apk. Remove daydream intent from manifest
|
2018-05-30 13:45:54 -04:00 |
|
Wayne Chen
|
81eea5d8d1
|
Merge pull request #13213 from wayne-chen/filebrowser-case-14515
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
|
2018-05-30 10:43:58 -07:00 |
|
Gabriel Calero
|
a36c41fc13
|
Make APK release signature optional
|
2018-05-30 12:43:44 -03:00 |
|
Gabriel Calero
|
4b9295b9be
|
Merge remote-tracking branch 'upstream/master' into signing_apk
|
2018-05-30 11:16:16 -03:00 |
|
Andrew Meadows
|
57138b5fb7
|
disable workload region regulation by default
also set default region radiuses large
|
2018-05-29 14:21:16 -07:00 |
|
Gabriel Calero
|
b99f901595
|
Merge branch 'android_remove_mic_bar' of https://github.com/gcalero/hifi into android_remove_mic_bar
|
2018-05-29 17:22:04 -03:00 |
|
Gabriel Calero
|
bb73af7230
|
Show stats button only in debug mode. Add isDebugMode to Script public interface
|
2018-05-29 17:21:44 -03:00 |
|
Anthony Thibault
|
aae38165b8
|
Merge pull request #13248 from birarda/tools/wireshark-dissectors
add split wireshark dissectors for avatar/entity protocols
|
2018-05-29 13:08:25 -07:00 |
|
Gabriel
|
cf499ca047
|
Update Application.cpp
Remove the mic bar for android
|
2018-05-29 16:42:09 -03:00 |
|
Stephen Birarda
|
f7710d126f
|
split up wireshark dissectors for sub protocols
|
2018-05-29 11:35:03 -07:00 |
|
John Conklin II
|
38916a3023
|
Merge pull request #12946 from AndrewMeadows/minor-physics-cleanup
minor cleanup in physics simulation
|
2018-05-25 14:56:04 -07:00 |
|
Gabriel Calero
|
8c6166d6e5
|
Change gradle configuration to sign release apk. Remove Daydream intent from AndroidManifest
|
2018-05-25 17:42:41 -03:00 |
|
John Conklin II
|
155d6f87c4
|
Merge pull request #13238 from wayne-chen/toggleAdvancedModeHMD-case-15324
Forward and backward on HMD controllers don't work after restarting interface
|
2018-05-25 12:25:03 -07:00 |
|
John Conklin II
|
eeed3ae82d
|
Merge pull request #13211 from druiz17/login-fix
Fixing Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password"
|
2018-05-25 11:33:29 -07:00 |
|
John Conklin II
|
1d9f33a637
|
Merge pull request #13220 from NissimHadar/fixCameraMode
Correct `Camera.mode` command.
|
2018-05-25 10:47:31 -07:00 |
|
John Conklin II
|
82bb664cb3
|
Merge pull request #13235 from druiz17/fix-qml-crash-v2
Remove offscreenUi desktop qml object from being a contextProperty for Web3DOverlay
|
2018-05-25 10:46:11 -07:00 |
|
Wayne Chen
|
8453c7baba
|
reverting commit 802cedf1bc regarding toggleSpaceMode
|
2018-05-25 09:25:05 -07:00 |
|
Wayne Chen
|
89f7eb0b30
|
Adding fix for enabling saved front/back advanced controls.
|
2018-05-25 09:21:01 -07:00 |
|
Andrew Meadows
|
1612d90cd3
|
minor DynamicsWorld optimizations and track global steps count therein
|
2018-05-25 08:31:09 -07:00 |
|
Andrew Meadows
|
ed62a2fc37
|
_lastKinematicStep now mutable, avoids explicit const_cast
|
2018-05-25 08:31:09 -07:00 |
|
Andrew Meadows
|
cd568867b2
|
disable regulation of workload views by default
|
2018-05-25 08:30:11 -07:00 |
|
Andrew Meadows
|
85beca6b67
|
tweak to dynamic workload regions regulation
|
2018-05-25 08:30:11 -07:00 |
|
John Conklin II
|
286d09939d
|
Merge pull request #13205 from luiscuenca/GLTFfix1
Minor fix allows import glTF from Substance Painter
|
2018-05-25 08:28:29 -07:00 |
|
John Conklin II
|
0d8fb90fa8
|
Merge pull request #13222 from SamGondelman/mirror
Fix image and text overlay drifting
|
2018-05-25 08:26:33 -07:00 |
|
Wayne Chen
|
534341ef62
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-05-24 20:45:06 -07:00 |
|
Andrew Meadows
|
ec352a55af
|
Merge pull request #13234 from samcake/workload
Workload: MErge with upstream master and fix conflicts
|
2018-05-24 18:08:57 -07:00 |
|
Dante Ruiz
|
e34d67fee4
|
fix crash
|
2018-05-24 17:54:53 -07:00 |
|
NissimHadar
|
d01482bf68
|
Now looks for an actual change in the boom length (vs a change has been requested).
|
2018-05-24 17:44:39 -07:00 |
|
NissimHadar
|
9ed8c04097
|
Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode
|
2018-05-24 17:40:21 -07:00 |
|
samcake
|
55ec0d3e84
|
Fixing the merge conflicts and repairing the regulation values
|
2018-05-24 17:25:00 -07:00 |
|
Andrew Meadows
|
cc2d8bebef
|
Merge pull request #13228 from highfidelity/robin-k-wilson-patch-1
Updated Build Guide language
|
2018-05-24 17:13:45 -07:00 |
|
samcake
|
559d436dfa
|
Fixing the merge conflicts
|
2018-05-24 16:57:10 -07:00 |
|
Stephen Birarda
|
c03b9833fd
|
Merge pull request #13233 from highfidelity/RC68
Merge RC68 back to master
|
2018-05-24 16:55:44 -07:00 |
|
Anthony Thibault
|
eae5215d94
|
Merge pull request #13206 from ctrlaltdavid/21872-c
JSDoc fixes
|
2018-05-24 16:44:55 -07:00 |
|
Wayne Chen
|
b86d74b4b7
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-05-24 15:08:23 -07:00 |
|
John Conklin II
|
caee987d96
|
Merge pull request #13210 from SamGondelman/macSkybox
Mac: render unsupported BPTC textures as uncompressed
|
2018-05-24 14:52:11 -07:00 |
|
NissimHadar
|
d81ae26c7e
|
Merge pull request #13232 from NissimHadar/newAvatar
Updates to AutoTester
|
2018-05-24 14:49:50 -07:00 |
|
John Conklin II
|
cacc102fd0
|
Merge pull request #13218 from huffman/feat/rc68-tutorial
Update serverless tutorial for RC68
|
2018-05-24 14:44:18 -07:00 |
|
John Conklin II
|
c89c70fbaa
|
Merge pull request #13216 from birarda/bug/domain-ice-peer-id
never re-use node ID during domain connection
|
2018-05-24 14:09:39 -07:00 |
|
David Rowe
|
bc757ddd41
|
Fix typo
|
2018-05-25 09:04:06 +12:00 |
|
John Conklin II
|
36d2baab60
|
Merge pull request #13214 from SamGondelman/primCrash
Fix crash in GL45Backend::do_drawIndexedInstanced
|
2018-05-24 13:33:06 -07:00 |
|
NissimHadar
|
3dbebe2347
|
Merge branch 'master' of github.com:highfidelity/hifi into newAvatar
|
2018-05-24 13:30:57 -07:00 |
|
John Conklin II
|
04bf8f851f
|
Merge pull request #13219 from samcake/one
Bringing Evolution to the Job Engine Task library developed in the workload project to master
|
2018-05-24 13:30:16 -07:00 |
|
NissimHadar
|
802cedf1bc
|
Removed messages in non-interactive mode.
|
2018-05-24 13:29:02 -07:00 |
|