Saracen
|
43ddf7ca23
|
Unify cube and sphere edit menu entries into one.
|
2019-05-02 22:40:11 +01:00 |
|
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 |
|
amerhifi
|
a878232c6d
|
setting default cursor after display initialization for systems that do not call checkcursor on startup
|
2019-05-01 14:31:40 -07:00 |
|
Sam Gateau
|
c1ee4deb12
|
Merge pull request #15478 from amerhifi/feature/systemMouse
Case 22378: System cursor in desktop mode instead of rendering texture from Displayplugin
|
2019-04-30 20:17:18 -07:00 |
|
amer cerkic
|
df3049cb44
|
simplified way to switch to system cursor if non hmd mode
|
2019-04-30 11:49:33 -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
|
7d2b75673c
|
fixed syntax for cursor
|
2019-04-29 16:42:49 -07:00 |
|
David Rowe
|
3032b58abc
|
Revise formatting of Facilities and Entity Methods sections
|
2019-04-30 10:10:46 +12:00 |
|
Shannon Romano
|
9261df5c24
|
Merge pull request #15383 from ctrlaltdavid/M22196
Case 22196: HMD JSDoc update
|
2019-04-29 13:05:32 -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 |
|
Shannon Romano
|
5bf872b1b8
|
Merge pull request #15470 from parkerchard/master
- updated desktop icons and installer graphics
|
2019-04-26 21:16:04 -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
|
eff97d48d3
|
Doc review
|
2019-04-27 10:34:06 +12:00 |
|
David Rowe
|
72ef36db02
|
Merge branch 'master' into M22196
|
2019-04-27 10:26:10 +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 |
|
Parker Richard
|
4df3a29b00
|
- updated console+server icons, installer+uninstaller graphics, and console notification icon
|
2019-04-26 14:50:18 -07: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
|
c647bbcb16
|
Merge pull request #15400 from danteruiz/throttle-refresh-rate
Case 22253: Refresh Rate Controller
|
2019-04-26 12:04:39 -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 |
|
Sam Gateau
|
dc7abe1aff
|
Merge pull request #15450 from amerhifi/feature/macScreenScale
Case 22350: Setting mac default for resolution render scale
|
2019-04-25 19:33:54 -07:00 |
|
Angus Antley
|
395a4cc9c4
|
added final animations and json to the resource
|
2019-04-25 19:14:31 -07:00 |
|
Shannon Romano
|
d0108301a0
|
Merge pull request #15410 from wayne-chen/fixMuteWarningSwitchText
Case 22297: Fix Mute Warning Switch Text
|
2019-04-25 17:11:45 -07:00 |
|
jennaingersoll
|
24196e2776
|
Merge pull request #15321 from ctrlaltdavid/M21956
Case 21956: Audio JSDoc
|
2019-04-25 17:03:58 -07:00 |
|
danteruiz
|
9e1671a1bf
|
making requested changes
|
2019-04-25 16:02:12 -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 |
|
NissimHadar
|
2685550cc1
|
Merge branch 'master' of github.com:highfidelity/hifi into 21976-implementScriptAPIFor_gpuTextureMemSizeStable
|
2019-04-25 14:18:43 -07:00 |
|
Shannon Romano
|
766854081a
|
Merge pull request #15457 from davidkelly/dk/22291
Tiny logical error in wallet creation
|
2019-04-25 14:10:00 -07:00 |
|
NissimHadar
|
261277e4c1
|
Wrong method call fixed.
|
2019-04-25 13:49:56 -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 |
|
Shannon Romano
|
164984b15d
|
Merge pull request #15459 from luiscuenca/sentHandsCrashFix
Fix crash sending other avatars hands to flow
|
2019-04-25 12:32:06 -07:00 |
|
Thijs Wenker
|
cdcdae2fda
|
Merge pull request #15393 from ctrlaltdavid/M22188
Update Record app per Marketplace certification requirements
|
2019-04-25 20:00:13 +02:00 |
|
Shannon Romano
|
392b372815
|
Merge pull request #15452 from AndrewMeadows/send-after-applying-bookmark
Case 21884: send update after changing AvatarEntity via AvatarBookmarks.updateAvatarEntities()
|
2019-04-25 10:31:25 -07:00 |
|
luiscuenca
|
6b33f4e027
|
Don't call function if flow is not active and made it thread safe
|
2019-04-25 10:31:05 -07:00 |
|
Angus Antley
|
baca58360e
|
updated json and talk_righthand anim
|
2019-04-25 09:50:12 -07:00 |
|
David Kelly
|
c63ee8d4f6
|
Tiny logical error in wallet creation
|
2019-04-25 09:21:06 -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
|
404be42bfb
|
Merge pull request #15409 from wayne-chen/fixShieldIconBehavior
Case 22290: Fixing Shield Icon Behavior in Desktop Mode
|
2019-04-24 16:35:02 -07:00 |
|
Shannon Romano
|
0051693da8
|
Merge pull request #15414 from wayne-chen/fixRelaunchMuteSettings
Case 22298: Persist Mute Settings Between Sessions
|
2019-04-24 16:34:34 -07:00 |
|