Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75017 commits 25 branches 0 tags 1.1 GiB
Commit graph

75017 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
fc128b49de don't crash when releasing an entity that has expired 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Thijs Wenker
a035a2f639 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-03 11:09:27 +01:00
Thijs Wenker
725a14ce80 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 11:06:19 +01:00
SamGondelman
ea11497a67 Merge remote-tracking branch 'upstream/master' into NOverlays7 2019-01-02 18:09:19 -08:00
Sam Gondelman
aeafb3c9a7
Merge pull request #14569 from SamGondelman/NOverlays6 
Case 20281: Add missing Text Entity properties
 2019-01-02 18:07:37 -08:00
David Back
0e89e37c8e fix thumb rotations, fix text height, adjust readme 2019-01-02 17:40:00 -08:00
Anthony Thibault
006bd8f939 Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation 2019-01-02 16:58:10 -08:00
NissimHadar
65d975fe5b Added detection of Rift and Vive controllers. 2019-01-02 16:53:38 -08:00
Ryan Huffman
61ac9d0050 Update various styling in Avatar Packager 2019-01-02 16:47:09 -08:00
NissimHadar
4918f7d186 Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo 2019-01-02 16:24:52 -08:00
NissimHadar
dc4be42b20 Corrected AWS update for text results. 2019-01-02 16:14:05 -08:00
Thijs Wenker
cb91a4bc6d Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 00:10:22 +01:00
Ryan Huffman
41effbf862 Remove unused variable in MarketplaceItemUploader.cpp 2019-01-02 15:01:00 -08:00
Ryan Huffman
d29233872e Remove avatar packager from Android builds 2019-01-02 14:59:47 -08:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207 
ACs don't need to call into flagtimeForConnecitonStep
 2019-01-02 13:41:30 -08:00
Ryan Huffman
f3d2d7c95b
Merge pull request #14638 from huffman/fix/entity-list-text-mb 
Fix texture MB column not sorting correctly in entity list
 2019-01-02 13:32:05 -08:00
NissimHadar
56ee91dc60 Fixed Ubuntu warnings. 2019-01-02 13:23:20 -08:00
NissimHadar
1e8e633025 Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo 2019-01-02 11:47:34 -08:00
Jeff Clinton
d5ef7ba175
Merge pull request #14610 from roxanneskelly/Case20106 
Case 20106-AC agents spawned with -n don't come back
 2019-01-02 11:07:40 -08:00
Anthony Thibault
71991c2e2f Added max angles and isTalking into the lookAtCostFunction 2019-01-02 11:05:01 -08:00
SamGondelman
32bec57cfe Merge remote-tracking branch 'upstream/master' into NOverlays6 2019-01-02 09:53:29 -08:00
Jeff Clinton
7143689ddf
Merge pull request #14620 from amantley/hmdSmoothFix 
VIVE can now auto-detect hmd and desktop modes
 2019-01-02 09:15:32 -08:00
Jeff Clinton
bb27acf934
Merge pull request #14530 from SamGondelman/NOverlays4 
Case 20134: Grid Entities
 2019-01-02 09:12:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5 
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
 2019-01-02 09:00:56 -08:00
Thijs Wenker
20c169bd39 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-02 14:03:13 +01:00
NissimHadar
c0a784fa94 Get graphics card type works on Mac laptop 2019-01-01 12:44:09 -08:00
Anthony Thibault
d87bc3e898 Update eye look at interest calculation 
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
 2018-12-31 13:37:22 -08:00
NissimHadar
a3dde612d1 Can get total memory on Mac 2018-12-31 11:56:27 -08:00
NissimHadar
9c00bdcddb getCPUBrand works on Mac 2018-12-31 11:00:29 -08:00
Anthony Thibault
95c93e59a7 Make the Out of Range Strategy drop down wider 
So the "DropAfterDelay" item is not cut off on the Settings > Controlls > Calibration screen.
 2018-12-31 09:23:33 -08:00
NissimHadar
bb54353644 Compilation error. 2018-12-30 22:36:15 -08:00
NissimHadar
abe8352230 Merge branch '20466-addPlatformInfo' of https://github.com/NissimHadar/hifi into 20466-addPlatformInfo 2018-12-30 22:19:44 -08:00
NissimHadar
4b4ef4412a Merge branch 'master' of github.com:highfidelity/hifi into 20466-addPlatormInfo 2018-12-30 20:24:16 -08:00
NissimHadar
76ce63da64 Can read graphics card type. 2018-12-30 20:24:00 -08:00
NissimHadar
6debd996c5 Added method to get total system memory in MB. 2018-12-29 21:59:18 -08:00
NissimHadar
3a9214747a Can read number of logical processors 2018-12-29 20:49:54 -08:00
NissimHadar
63ea300921 Can get CPU brand. 2018-12-29 17:24:44 -08:00
Thijs Wenker
cb33a91a34 - rename functionality 
- avatar packager works in tablet now
 2018-12-29 03:31:56 +01:00
Adam Smith
833ad936c0
Merge pull request #14630 from jherico/fix/20284_master 
Fix for Oculus reset view issue
 2018-12-28 16:24:40 -08:00
Adam Smith
52980559b8
Merge pull request #14491 from SamGondelman/v3 
Case 20080: v3 + v4 procedurals and misc shader fixes
 2018-12-28 15:17:50 -08:00
Ryan Huffman
e7f7f295b0
Merge pull request #14583 from dback2/unityAvatarExporter2 
Avatar Exporter - joint rotation offsets and file workflow changes
 2018-12-28 15:14:55 -08:00
NissimHadar
246c4dab94 Created the PlatformInfo scripting object. 2018-12-28 14:41:55 -08:00
NissimHadar
c28167f797 Initial creation of class - has COPY of getOperatingSystemType(). 2018-12-28 14:24:19 -08:00
NissimHadar
04e872769d Merge branch 'master' of https://github.com/highfidelity/hifi into 20339_nitpick_v1.3 2018-12-28 11:41:27 -08:00
John Conklin II
4f3dd390b5
Merge pull request #14625 from SamGondelman/deprecateDashed 
Case 20392: Deprecated 3D Overlay dashed/isDashed
 2018-12-28 10:16:27 -08:00
NissimHadar
493a05f905 Remove bad comment. 2018-12-28 08:45:45 -08:00
Thijs Wenker
1ec8aa8fa5 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-28 17:13:05 +01:00
Ryan Huffman
24aaeee5fd Disable back button on avatar upload page 2018-12-27 22:55:54 -08:00
Ryan Huffman
8f70865cf7 Fix marketplace upload finishing before inventory item is valid 2018-12-27 21:02:56 -08:00