Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 01:29:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
79052 commits 76 branches 59 tags 1.2 GiB
Commit graph

4314 commits

Author SHA1 Message Date
amerhifi
0d97543ece code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform 2019-05-09 12:04:41 -07:00
David Rowe
c3730e41f7 Typos 2019-05-09 08:33:37 +12:00
Andrew Meadows
e770bd6142 build CollisionShapes and load RigidBodies even when not yet stepping 2019-05-06 17:37:35 -07:00
Andrew Meadows
deee159892 unravel physics-vs-entities lib dependencies part 1 2019-05-06 17:35:57 -07:00
Andrew Meadows
7fb7e503f9 reduce footprint of ShapeManager::_shapeMap 2019-05-06 17:35:57 -07:00
David Rowe
9c12a39368 Merge branch 'master' into M22147 2019-05-06 11:28:22 +12:00
jennaingersoll
57b9b18012
Merge pull request #15363 from ctrlaltdavid/M22068 
Case 22068: Clipboard JSDoc
 2019-05-02 11:15:25 -07:00
David Rowe
d8f6e923c7 Paths JSDoc update 2019-05-01 08:18:17 +12: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
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
David Rowe
73fd61dcf0 Picks, PickType, RayPick JSDoc update 2019-04-25 13:19:07 +12: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
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-24 09:52:12 -07:00
Clement
86b6341098 Add error reporting + Make temp dir erase safer 2019-04-23 14:54:12 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations 
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
 2019-04-22 11:02:13 -07:00
sabrina-shanman
05a2b11c54 Fix mat4FromVariant 2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27 Fix baked models not preserving scale in some cases 2019-04-19 11:29:27 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check 
Better head vs camera checks for avatar head cauterization
 2019-04-16 15:07:46 -07:00
r3tk0n
d0abb86366 Reversed costants because no sleep. >_< 2019-04-15 17:26:22 -07:00
r3tk0n
12d7e35722 Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release. 2019-04-15 10:56:07 -07:00
r3tk0n
a40fdf3f77 Merge branch 'master' of https://github.com/highfidelity/hifi into running-fix 2019-04-15 09:47:26 -07:00
r3tk0n
87deb348a8 Adjust run speed constants. 2019-04-12 14:07:06 -07:00
Shannon Romano
a0ddadc0e7
Merge pull request #15320 from ctrlaltdavid/M21989 
Case 21989: AvatarList and AvatarManager JSDoc
 2019-04-12 12:27:29 -07:00
Shannon Romano
11e5f0a101
Merge pull request #15323 from ctrlaltdavid/M22052 
Case 22052: Camera JSDoc
 2019-04-12 12:26:39 -07:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
David Rowe
617617736e Merge branch 'master' into M22052 2019-04-11 10:24:27 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize 
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
 2019-04-10 12:29:40 -07:00
Sam Gateau
89ff63e8bb
Merge pull request #15267 from jherico/fix/tracing 
Case 21930: Don't change OpenGL context state every frame
 2019-04-10 09:42:09 -07:00
David Rowe
d587f1227d Add ResourceRequestObserver JSDoc 2019-04-10 12:09:48 +12:00
Anthony J. Thibault
02d5769991 Better head vs camera checks for avatar head cauterization 
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
 2019-04-09 12:57:03 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Olivier Prat
08aa133472 Fixed other compilation errors / warnings 2019-04-05 11:32:00 +02:00
Olivier Prat
89ca7ac415 Fixed compilation errors 2019-04-05 10:22:57 +02:00
Olivier Prat
a45b91c4be Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-05 09:01:03 +02:00
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco 
Case 21777: Locomotion Project
 2019-04-04 16:18:32 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-04 13:36:25 -07:00
Olivier Prat
b71a8f7902 Switched to split sum model for ambient (as Unreal) 2019-04-04 16:10:33 +02:00
Olivier Prat
acded5488e Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-04 08:58:49 +02:00
David Rowe
1bc38cab28 Camera JSDoc polish 2019-04-04 18:03:14 +13:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Olivier Prat
20f53f5de3 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-01 10:04:41 +02:00
SamGondelman
33b3e2afac try to fix build errors? 2019-03-29 10:57:01 -07:00
Olivier Prat
4a2323f3c2 Just need to write correct textureLod equivalent on CPU cube map 2019-03-27 17:43:26 +01:00
Brad Davis
36cecef166 Support explicit timestamps in tracing, conditional event output based on duration 2019-03-26 13:50:46 -07:00
SamGondelman
4ed7c09016 grab correct stencil masks from display plugins 2019-03-26 13:42:18 -07:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
David Rowe
839a03ebe6 Miscellaneous JSDoc fixes noticed in passing 2019-03-26 09:41:07 +13:00
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
7a8dfe0aaf Fix run speeds. 2019-03-21 15:06:21 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
David Rowe
7445d73857 Merge branch 'master' into M21222 
# Conflicts:
#	libraries/avatars/src/AvatarData.h
 2019-03-13 16:14:14 +13:00
danteruiz
6303f61cc3 fix lasers scale issue 2019-03-12 14:26:59 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
r3tk0n
cbd841a14d Update gearing system. 2019-03-11 16:22:48 -07:00
David Rowe
24286273b4 Miscellaneous JSDoc fixes 2019-03-09 19:22:07 +13:00
Shannon Romano
a8f6e74ca4
Merge pull request #15135 from SamGondelman/text81 
Case 21628: Fix text rendering on AMD/Mac
 2019-03-08 14:59:37 -08:00
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13:00
David Rowe
0b7cddb886 Fill in and tidy MyAvatar JSDoc 2019-03-08 13:49:10 +13:00
SamGondelman
af03fb5f85 try to fix text rendering on amd with transparency 2019-03-07 16:23:12 -08:00
Shannon Romano
8be93fd16c
Merge pull request #14891 from kencooke/glm-pack-normals-speedup 
Case 21114: SIMD optimized blendshape packing
 2019-03-07 15:28:40 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
Dante Ruiz
d33400f6ad fix GCC compiler warning 2019-02-28 15:25:15 -08:00
David Rowe
aa53ab7492 Distinguish between Mat4 type and Mat4 API in JSDoc 2019-02-27 09:54:11 +13:00
David Rowe
e79594ef53 Fill in and tidy Avatar JSDoc 2019-02-27 09:53:11 +13:00
r3tk0n
5d3a778b0b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation 2019-02-25 13:10:47 -08:00
Roxanne Skelly
2dffd14fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-25 10:20:52 -08:00
Shannon Romano
dc6bdfae8a
Merge pull request #14995 from SamGondelman/parentCrash 
Case 21391: Fix parent loop crash
 2019-02-25 10:01:37 -08:00
Shannon Romano
5f99158c25
Merge pull request #14977 from SamGondelman/rot 
Case 21354: Add "modelScale" property to fix pal
 2019-02-22 16:36:17 -08:00
Sam Gondelman
30b6b7f21b
let's try that again 2019-02-22 16:30:36 -08:00
Roxanne Skelly
0636579822 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-22 15:43:42 -08:00
SamGondelman
081e62a647 fix parent loop crash 2019-02-22 14:26:15 -08:00
amantley
c9db426ce4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-21 14:36:13 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
amantley
50bc8d3646 added protected function to cubic hermite spline 2019-02-21 13:32:28 -08:00
amantley
de10aebbb5 removed white space 2019-02-21 11:44:18 -08:00
amantley
64ec28ef44 added back missing unity meta files 2019-02-21 11:37:14 -08:00
Roxanne Skelly
8c058f147e Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-20 14:24:47 -08:00
Shannon Romano
0b7bdb185e
Merge pull request #14949 from SamGondelman/wearables 
Case 21300, Case 21301: Group cull all entity descendants of avatars
 2019-02-20 10:29:40 -08:00
r3tk0n
7092513b7d Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 17:42:58 -08:00
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00
Shannon Romano
07d084d086
Merge pull request #14937 from SamGondelman/pal 
Case 21259: Pal textures don't change
 2019-02-19 17:14:15 -08:00
SamGondelman
6765268998 Merge remote-tracking branch 'upstream/master' into wearables 2019-02-19 16:52:00 -08:00
SamGondelman
44e70db4cd WE DID IT FOLKS 2019-02-19 15:02:36 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf 
Case 21271: Remove unnessary picks for quest
 2019-02-19 14:20:56 -08:00
Roxanne Skelly
d957b38f10 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-19 12:34:10 -08:00
r3tk0n
ebbf48a11b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 12:02:50 -08:00
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
Roxanne Skelly
be98fb1ac7 Standalone Tags - checkpoint 2019-02-15 11:21:40 -08:00