Shannon Romano
|
caefa3e06a
|
Merge pull request #15362 from ctrlaltdavid/M22075
Case 22075: Controller JSDoc update
|
2019-05-02 11:34:58 -07:00 |
|
jennaingersoll
|
57b9b18012
|
Merge pull request #15363 from ctrlaltdavid/M22068
Case 22068: Clipboard JSDoc
|
2019-05-02 11:15:25 -07:00 |
|
David Rowe
|
e217909f17
|
Merge branch 'master' into M22075
|
2019-05-02 20:19:17 +12:00 |
|
David Rowe
|
e94cafd88e
|
Doc review
|
2019-05-02 20:16:53 +12:00 |
|
Sam Gondelman
|
222d36c7d0
|
Merge pull request #15480 from SamGondelman/tests
Case 22418: Fix model bounds on resize
|
2019-05-01 16:50:07 -07:00 |
|
Anthony Thibault
|
b0af8b1bdc
|
Merge pull request #15489 from luiscuenca/jointIndicesCrashFix
Fix memory corruption in _modelJointIndicesCache QHash
|
2019-05-01 15:17:08 -07:00 |
|
luiscuenca
|
6e2ac14c23
|
Change while loops
|
2019-05-01 12:42:41 -07:00 |
|
luiscuenca
|
73454b06a2
|
Fix crash accessing _modelJointIndicesCache
|
2019-05-01 08:57:09 -07:00 |
|
SamGondelman
|
5a184bd584
|
fix model bounds
|
2019-04-30 13:38:11 -07:00 |
|
amer cerkic
|
49cecdee6e
|
fixing spacing
|
2019-04-30 11:52:37 -07:00 |
|
amer cerkic
|
978108b3ba
|
found a more simplified way to stop rendering the mouse unless its the Reticle cursor
|
2019-04-30 11:34:11 -07:00 |
|
amer cerkic
|
00a153c730
|
moving work location
|
2019-04-29 16:39:34 -07:00 |
|
Shannon Romano
|
69b1b38807
|
Merge pull request #15471 from danteruiz/mac-window-size
Case 22363: Setting mac window size to 1/2 screen resolution on first Run
|
2019-04-29 08:38:41 -07:00 |
|
Shannon Romano
|
e6c7bb56f3
|
Merge pull request #15392 from ctrlaltdavid/M22215
Case 22215: Menu JSDoc update
|
2019-04-29 08:37:37 -07:00 |
|
Simon Walton
|
5ffce7f1a1
|
Merge pull request #15467 from samcake/sol
case 22353: Mac Game loop performances was borked
|
2019-04-26 17:19:16 -07:00 |
|
danteruiz
|
d73f685ef2
|
change mac default window size
|
2019-04-26 16:56:38 -07:00 |
|
David Rowe
|
407ce745d5
|
Merge branch 'master' into M22075
# Conflicts:
# libraries/controllers/src/controllers/Actions.cpp
|
2019-04-27 10:51:13 +12:00 |
|
David Rowe
|
fbe49bbfd4
|
Doc review
|
2019-04-27 10:20:35 +12:00 |
|
David Rowe
|
311826c04d
|
Merge branch 'master' into M22215
|
2019-04-27 10:03:24 +12:00 |
|
Shannon Romano
|
a00545b48d
|
Merge pull request #15361 from SaracenOne/falling_push
Case 22121: Allow players to disable automatic falling to flight threshold.
|
2019-04-26 14:03:52 -07:00 |
|
Sam Gateau
|
d08e2e5ca1
|
Fixing th emerge conflict
|
2019-04-26 13:44:49 -07:00 |
|
Shannon Romano
|
324bbadcfc
|
Merge pull request #15466 from Atlante45/fix/traits-parsing
Case 22255: Add size checks for trait packets parsing
|
2019-04-26 13:29:50 -07:00 |
|
Sam Gateau
|
c647bbcb16
|
Merge pull request #15400 from danteruiz/throttle-refresh-rate
Case 22253: Refresh Rate Controller
|
2019-04-26 12:04:39 -07:00 |
|
Shannon Romano
|
4947f14eb7
|
Merge pull request #15394 from ctrlaltdavid/M22223
Case 22223: Messages JSDoc update
|
2019-04-26 10:40:10 -07:00 |
|
Anthony Thibault
|
2c370d9d74
|
Merge pull request #15460 from hyperlogic/feature/network-opt-faux
Avatar network bandwidth optimization
|
2019-04-26 10:16:30 -07:00 |
|
Anthony Thibault
|
4761a69a4d
|
Merge pull request #15438 from luiscuenca/skeletonTrait
Skeleton Trait Implementation
|
2019-04-26 10:14:47 -07:00 |
|
danteruiz
|
b60e35040e
|
another round of CR
|
2019-04-26 10:08:06 -07:00 |
|
Anthony Thibault
|
93b03a588f
|
Merge pull request #15445 from amantley/AnimRandomSwitchSquash
AnimRandomSwitch class for random idle implementation
|
2019-04-26 10:06:37 -07:00 |
|
jennaingersoll
|
fb1842cbfa
|
Merge pull request #15455 from ctrlaltdavid/M22330
Case 22330: Regularize JSDoc deprecation notices
|
2019-04-26 09:48:45 -07:00 |
|
Sabrina Shanman
|
67e511a6ff
|
Merge pull request #15439 from SamGondelman/textureUsage
Case 22322: Oven handles TextureBakers with same URL but different usage + fix domain baking
|
2019-04-26 09:40:57 -07:00 |
|
Sam Gateau
|
244bf4b15e
|
Merge pull request #15468 from raveenajain/gltf_morphTargets
Case 22012: Morph Targets for glTF Avatars
|
2019-04-26 08:58:11 -07:00 |
|
Angus Antley
|
395a4cc9c4
|
added final animations and json to the resource
|
2019-04-25 19:14:31 -07:00 |
|
raveenajain
|
0be36783bf
|
hfm blendshape name
|
2019-04-26 01:37:26 +01:00 |
|
jennaingersoll
|
24196e2776
|
Merge pull request #15321 from ctrlaltdavid/M21956
Case 21956: Audio JSDoc
|
2019-04-25 17:03:58 -07:00 |
|
raveenajain
|
66ad6451f9
|
morph targets for avatars
|
2019-04-26 00:40:44 +01:00 |
|
Sam Gateau
|
5d87c4caad
|
REintroduce the gl context make current and done for Macos...
|
2019-04-25 16:24:00 -07:00 |
|
Clement
|
d36fd6eaa3
|
Ensure we don't read past the end of packet buffers
|
2019-04-25 16:22:01 -07:00 |
|
danteruiz
|
9e1671a1bf
|
making requested changes
|
2019-04-25 16:02:12 -07:00 |
|
SamGondelman
|
6ce6877dfa
|
Merge remote-tracking branch 'upstream/master' into textureUsage
|
2019-04-25 15:05:27 -07:00 |
|
luiscuenca
|
080f891c9f
|
Fix scale and refactor debug function
|
2019-04-25 14:54:40 -07:00 |
|
Angus Antley
|
27ed468946
|
made changes requested
|
2019-04-25 14:42:41 -07:00 |
|
Angus Antley
|
76164ecee8
|
corrected the case where you have a random switch state trigger and a random transition trigger in the same random state machine
|
2019-04-25 13:57:58 -07:00 |
|
Sam Gondelman
|
ef64de7c04
|
Merge branch 'master' into openurl
|
2019-04-25 13:21:27 -07:00 |
|
SamGondelman
|
0e4ea4aff2
|
fix openDirectory
|
2019-04-25 13:20:18 -07:00 |
|
SamGondelman
|
a66c515c2a
|
fix url issue and always generateIrradiance
|
2019-04-25 11:36:29 -07:00 |
|
David Rowe
|
8e69e0b049
|
Regularize deprecation notices
|
2019-04-25 20:55:30 +12:00 |
|
Angus Antley
|
ea173b8d61
|
more time for talk ease in and updated json random choice times
|
2019-04-24 21:29:55 -07:00 |
|
Howard Stearns
|
da1597c5d1
|
Merge pull request #15327 from Atlante45/fix/warnings
Case 22065: Fix mac warnings
|
2019-04-24 20:32:29 -07:00 |
|
SamGondelman
|
31b3f0e8f1
|
possible fix for openUrl exploit
|
2019-04-24 16:39:31 -07:00 |
|
Shannon Romano
|
70c2b8b8c4
|
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master
Case 22333: Master: Fix asset server auto-baking
|
2019-04-24 16:30:14 -07:00 |
|