Wayne Chen
|
d5b7fe62db
|
modularizing qml font in login
|
2018-10-23 11:00:42 -07:00 |
|
Wayne Chen
|
56656a9079
|
adding button font modularity/using cairo
|
2018-10-23 10:46:19 -07:00 |
|
Wayne Chen
|
2a0a099397
|
adding steam svg
|
2018-10-23 10:04:21 -07:00 |
|
Wayne Chen
|
162502923a
|
image for steam login button
|
2018-10-23 10:00:35 -07:00 |
|
Wayne Chen
|
c087b0f196
|
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
|
2018-10-23 08:51:45 -07:00 |
|
Wayne Chen
|
137b240a47
|
more changes to functions
|
2018-10-22 20:03:12 -07:00 |
|
Wayne Chen
|
73359e4cca
|
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
|
2018-10-22 19:03:31 -07:00 |
|
Wayne Chen
|
84001ae208
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-10-22 17:59:33 -07:00 |
|
Wayne Chen
|
1e418e9976
|
some cleanup in LinkAccountBody
|
2018-10-22 17:52:03 -07:00 |
|
Wayne Chen
|
736a78061d
|
button style change/cant access text
|
2018-10-22 17:44:03 -07:00 |
|
Wayne Chen
|
b33267a63a
|
more wip
|
2018-10-22 17:38:12 -07:00 |
|
Brad Hefta-Gaub
|
e125107a9f
|
Merge pull request #14248 from FlameSoulis/fix/eslint
Update eslint - add HifiAbout [bug 19479]
|
2018-10-22 17:24:22 -07:00 |
|
Sam Gateau
|
40b77c338c
|
Merge pull request #14176 from jherico/fix/fb19156
Add additional safety checks to gl::Uniform::load
|
2018-10-22 14:12:36 -07:00 |
|
John Conklin II
|
e40a021339
|
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
Better imports for controls and styles
|
2018-10-22 11:50:09 -07:00 |
|
John Conklin II
|
bd480bab80
|
Merge pull request #14226 from Atlante45/fix/octree-scene-stats
Only track stats for compatible packets
|
2018-10-22 11:45:16 -07:00 |
|
John Conklin II
|
b3698388ea
|
Merge pull request #14245 from huffman/feat/default-grabbable-setting
Add a 'grabbable' option to the new-model dialog
|
2018-10-22 11:42:40 -07:00 |
|
Stephen Birarda
|
3c79a79487
|
Merge pull request #14163 from Atlante45/fix/bw-recorder
Fix crash with BandwidthRecorder
|
2018-10-22 10:11:26 -07:00 |
|
Clément Brisset
|
bca3a3c1b6
|
Merge pull request #14217 from hyperlogic/bug-fix/cmake-cmp0074-warning-fix
Squelch cmake warning CMP0074 without requiring an update to cmake 3.12.
|
2018-10-22 10:01:35 -07:00 |
|
Wayne Chen
|
9af164cb94
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-10-22 09:58:03 -07:00 |
|
Seth Alves
|
a2d4c236c1
|
Merge pull request #14220 from SamGondelman/pickFree
Fix PickManager::removePick heap use after free
|
2018-10-22 09:48:22 -07:00 |
|
Stephen Birarda
|
ea3bdeb26e
|
Merge pull request #14181 from Atlante45/feat/timebox-packet-processing
Timebox packet processing
|
2018-10-22 09:43:30 -07:00 |
|
Stephen Birarda
|
154414e42e
|
Merge pull request #14189 from Atlante45/fix/archive-timeout
Increase content archive upload timeout
|
2018-10-22 09:40:57 -07:00 |
|
Wayne Chen
|
d7a4531d00
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-10-22 09:27:23 -07:00 |
|
Seth Alves
|
2ce8ed25f8
|
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
|
2018-10-20 13:40:53 -07:00 |
|
Brad Hefta-Gaub
|
508e75edeb
|
Merge pull request #14178 from roxanneskelly/sysTrayIcons
Sys tray icons
|
2018-10-20 12:27:04 -07:00 |
|
Brad Hefta-Gaub
|
23ddb7dea6
|
Merge pull request #14207 from Atlante45/fix/white-spheres
Remove pending avatars data structure
|
2018-10-20 12:09:51 -07:00 |
|
Ryan Huffman
|
9d13902cd3
|
Improve paramater names in model dialog window
|
2018-10-20 11:26:12 -07:00 |
|
Ken Cooke
|
f68a8d7379
|
Merge pull request #14037 from birarda/bug/agent-flush-encoder
fix agent audio packet send when encoder is flushed
|
2018-10-19 20:53:52 -07:00 |
|
Sam Gateau
|
6005b934ad
|
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001
minor bug fix and optimization in ModelEntity animation
|
2018-10-19 17:02:48 -07:00 |
|
Brad Hefta-Gaub
|
e6ec32e515
|
Merge pull request #14222 from SamGondelman/material
Fix material entity opacity maps
|
2018-10-19 16:45:31 -07:00 |
|
Ryan Huffman
|
f1258e4445
|
Add a 'grabbable' option to the new-model dialog
|
2018-10-19 16:42:45 -07:00 |
|
Brad Hefta-Gaub
|
219302a9b6
|
Merge pull request #14157 from SimonWalton-HiFi/domain-checkin-limit
Cap the number of domain-server duplicate check-ins sent upon retransmission
|
2018-10-19 16:41:09 -07:00 |
|
Brad Hefta-Gaub
|
cd4e9a3e08
|
Merge pull request #13889 from alexiamandeville/controllerModelUpdates
Updating highlight textures on Rift Controller
|
2018-10-19 16:39:17 -07:00 |
|
Brad Hefta-Gaub
|
3fab542009
|
Merge pull request #14170 from Atlante45/fix/invisible-agents
Fix non-avatar agents appearing as avatars
|
2018-10-19 16:36:51 -07:00 |
|
Brad Hefta-Gaub
|
e276698f21
|
Merge pull request #14234 from r3tk0n/18518-record-unsub
18518 - Make record.js unsubscribe from messaging channel
|
2018-10-19 16:36:09 -07:00 |
|
Brad Hefta-Gaub
|
1ff69844f2
|
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
hide progress overlays if interstitial mode
|
2018-10-19 16:35:42 -07:00 |
|
Brad Davis
|
a93aa68901
|
Add additional safety checks to gl::Uniform::load
|
2018-10-19 16:20:09 -07:00 |
|
Brad Hefta-Gaub
|
881f7f0142
|
Merge pull request #14242 from jherico/fix/light_channels
Fix light color serialization
|
2018-10-19 16:17:21 -07:00 |
|
Brad Hefta-Gaub
|
c6fff83805
|
Merge pull request #14145 from ctrlaltdavid/M17223
JSDoc fixes
|
2018-10-19 16:16:19 -07:00 |
|
Wayne Chen
|
3bd10716b2
|
wip
|
2018-10-19 16:06:28 -07:00 |
|
Brad Hefta-Gaub
|
acc6d3e45c
|
Merge pull request #14144 from ctrlaltdavid/M17222
Fix and fill in JSDoc for MyAvatar flying-related functions
|
2018-10-19 15:57:04 -07:00 |
|
Anthony Thibault
|
2bc99d3894
|
CMP0074 Warning: Proper check for cmake versions 4.x and higher
|
2018-10-19 15:17:29 -07:00 |
|
Sam Gateau
|
1c8ce3da9d
|
Merge pull request #14015 from NissimHadar/addDailyTests
Add automated daily tests
|
2018-10-19 15:07:00 -07:00 |
|
Brad Davis
|
2687c024eb
|
Fix light color / serialization
|
2018-10-19 14:47:02 -07:00 |
|
Anthony Thibault
|
6cc7c861d1
|
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest
Disable user hand controllers if they are too far away or not moving.
|
2018-10-19 14:02:32 -07:00 |
|
Sam Gateau
|
388b31acf7
|
Merge pull request #14169 from SamGondelman/highlight
Fix highlight not working after HMD switch
|
2018-10-19 11:58:25 -07:00 |
|
John Conklin II
|
9c841db9fb
|
Merge pull request #14184 from SamGondelman/blendshape
Move blendshape buffers to render thread
|
2018-10-19 11:55:44 -07:00 |
|
Wayne Chen
|
8c7a5e98f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-10-19 11:31:43 -07:00 |
|
Brad Hefta-Gaub
|
7d69951a83
|
Merge pull request #14241 from gcalero/gradle_memory_properties
Setup a higher memory limit for android build
|
2018-10-19 11:19:05 -07:00 |
|
Brad Hefta-Gaub
|
b281c090e3
|
Merge pull request #14012 from alexiamandeville/controlImageUpdate
Adding handshake control to image in Controls Reference
|
2018-10-19 11:15:11 -07:00 |
|