Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 17:32:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79828 commits 75 branches 59 tags 1.2 GiB
Commit graph

24187 commits

Author SHA1 Message Date
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api 
Initial version of Avatar Reaction API
 2019-07-23 13:13:31 -07:00
jennaingersoll
1e84b3f4a2
Merge pull request #15951 from ctrlaltdavid/DOC-122 
DOC-122: LocationBookmarks JSDoc
 2019-07-23 12:00:03 -07:00
Shannon Romano
4f922e350e
Merge pull request #15913 from ctrlaltdavid/DOC-102 
DOC-102: Overlays JSDoc Update
 2019-07-22 16:24:53 -07:00
Shannon Romano
1594e25c4e
Merge pull request #15950 from ctrlaltdavid/DOC-121 
DOC-121: AvatarBookmarks JSDoc
 2019-07-22 15:43:57 -07:00
David Rowe
1e8a205275 Fix typo 2019-07-23 10:30:10 +12:00
Shannon Romano
6d0ba98bfc
Merge pull request #15953 from ctrlaltdavid/DOC-123 
DOC-123: AvatarInputs JSDoc
 2019-07-22 15:21:50 -07:00
Shannon Romano
d719952022
Merge pull request #15946 from AndrewMeadows/avoid-nan-scriptedMotor 
BUGZ-870: MyAvatar's scripted motor needs to filter against NaN input
 2019-07-22 15:06:35 -07:00
David Rowe
a36bcbb2ed Doc review 2019-07-23 07:36:11 +12:00
David Rowe
ddffb8ab9a Doc review 2019-07-23 07:25:34 +12:00
jennaingersoll
abe1ce288c
Merge pull request #15926 from ctrlaltdavid/DOC-115 
DOC-115: Comfort mode JSDoc
 2019-07-22 10:46:11 -07:00
David Rowe
6d7b6f3e0a AvatarInputs JSDoc 2019-07-20 10:19:22 +12:00
David Rowe
3a3bfd1463 Doc review 2019-07-20 09:39:34 +12:00
David Rowe
0a32386f45 Merge branch 'master' into DOC-102 2019-07-20 09:13:52 +12:00
Zach Fox
d62dde1ab8
Merge pull request #15952 from zfox23/setShowBubbleToolsCorrection 
Fix BUGZ-1062: Set the correct Settings value for bubble tools
 2019-07-19 11:51:59 -07:00
Zach Fox
510c922912 Fix BUGZ-1062: Set the correct Settings value for bubble tools 2019-07-19 11:34:14 -07:00
David Rowe
9165a04641 Typo and improvement 2019-07-19 11:41:12 +12:00
David Rowe
c2b67f28d0 LocationBookmarks JSDoc 2019-07-19 11:35:06 +12:00
David Rowe
cf9e563458 Miscellaneous JSDoc fixes noticed in passing 2019-07-19 08:37:10 +12:00
David Rowe
a04da70f16 AvatarBookmarks JSDoc 2019-07-19 08:36:45 +12:00
Andrew Meadows
dcf3df68f2 avoid NaN input for MyAvatar's scripted motor 2019-07-18 10:58:41 -07:00
Andrew Meadows
7b7414dead revert optimization that would skip read from packet 2019-07-17 17:04:12 -07:00
Anthony Thibault
ecae92724e Added reaction api 2019-07-17 14:28:39 -07:00
Andrew Meadows
63b3d666f9 simplify rollover logic for SafeLanding sequence size calculation 2019-07-17 13:57:08 -07:00
Andrew Meadows
b0f297e696 wait for SafeLanding to start before starting octreeQuery 2019-07-17 11:22:01 -07:00
Andrew Meadows
05d896f3de fix SafeLanding failure mode when first sequence number not 0 2019-07-17 11:22:01 -07:00
Shannon Romano
d49fabf370
Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill 
BUGZ-781: Remove loading-orb upon killing of avatar
 2019-07-16 15:31:37 -07:00
dante ruiz
e896a53113 fix interactive crash 2019-07-15 17:18:38 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving 
Case 21663: comfort mode
 2019-07-15 14:54:31 -07:00
Simon Walton
e259aa55c2 Remove loading-orb upon killing avatar, in case destructor isn't called 2019-07-15 14:14:24 -07:00
Shannon Romano
a64bc7f638
Merge pull request #15761 from danteruiz/fix-interactive-window-crash 
BUGZ-400: Crash in Application::notify
 2019-07-15 11:35:15 -07:00
Shannon Romano
7ea8675e83
Merge pull request #15919 from howard-stearns/mac-sleep-monitor 
Mac sleep monitor
 2019-07-15 08:39:19 -07:00
Shannon Romano
09729fb430
Merge pull request #15918 from zfox23/newGraphicsSettings 
New Settings -> Graphics... dialog for Classic UI users
 2019-07-15 08:38:01 -07:00
Shannon Romano
1bc72a86da
Merge pull request #15911 from amerhifi/bugz-968 
case Bugz-968 adding a null check to the display plugin. Possible that display plug…
 2019-07-15 08:35:29 -07:00
Shannon Romano
8ce64d95ab
Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux 
BUGZ-863: wait for objects to be added to physics before completing SafeLanding
 2019-07-15 08:34:17 -07:00
David Rowe
8a82ea55c7 HMD API vision squeeze properties JSDoc 2019-07-13 10:39:40 +12:00
dante ruiz
d78661a47f redo requested work 2019-07-12 13:34:08 -07:00
amerhifi
ba6307e8e4 revert of extra space 2019-07-12 10:55:44 -07:00
amerhifi
f78c1cb5d0 reverting display plugin reset change 2019-07-12 10:54:08 -07:00
Howard Stearns
7ce6dd71d5 fix comment 2019-07-12 10:48:05 -07:00
Shannon Romano
74b830dd12
Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen 
BUGZ-918: Generate RSA key-pair early in start-up
 2019-07-12 09:42:11 -07:00
Shannon Romano
3e70f4f51c
Merge pull request #15671 from SamGondelman/uber 
DEV-203, BUGZ-978: Condense all redundant shader variants using new slp defines feature and add Haze to Forward renderer
 2019-07-12 09:39:33 -07:00
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -07:00
howard-stearns
cc7214fca3 cleanup 2019-07-11 16:56:35 -07:00
Dante Ruiz
2f74f8253f finishing requested changes 2019-07-11 15:39:59 -07:00
howard-stearns
2eb3fdb1ec Merge branch 'master' of https://github.com/highfidelity/hifi into mac-sleep-monitor 2019-07-11 14:35:00 -07:00
amer cerkic
15e7663ed5 removing the destroy call since its not necessary 2019-07-11 14:27:41 -07:00
SamGondelman
22a7a97a9a fix forward web + parabola blending 2019-07-11 12:23:04 -07:00
amer cerkic
efccd10a65 adding a destroy call to hmd scripting interface to ensure that it does not call isHmd mode on already dead display plugin. Also moved displayplugin reset below ui destroy calls to make sure it does not get called after its been destroyed 2019-07-11 12:15:15 -07:00
PrestonB1123
07c71cbadb disabled P shortcut and re-enabled in metaverse 2019-07-11 12:05:15 -07:00
Zach Fox
ce2b7e5baa Finish all of the logic and most of the layout 2019-07-11 12:05:13 -07:00