Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 07:50:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58584 commits 25 branches 0 tags 1.1 GiB
Commit graph

58584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
751440388a Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix 
Bug fix for deadlock between EntitySimulation and EntityItem locks.
 2017-08-23 20:50:41 -07:00
David Kelly
c77dafdf12 fix warnings, prepare a bit for hooking up the passphrase 2017-08-23 17:43:37 -07:00
Zach Fox
657beef70f I understand again...getting started again 2017-08-23 17:42:02 -07:00
Liv
1050141b11 Create home path for new content sets loaded in 2017-08-23 17:38:24 -07:00
Stephen Birarda
133b7e66b7 adjust a comment and remove some debug 2017-08-23 16:38:23 -07:00
Zach Fox
52ef0f2037 More progress 2017-08-23 16:37:13 -07:00
Elisa Lupin-Jimenez
20b6cddc56 attempt to add active tablet button 2017-08-23 15:38:11 -07:00
Stephen Birarda
c122b22dfc add additional IP check to DS packet filter operator 2017-08-23 15:32:25 -07:00
David Kelly
57d973851e accidentally left in I guess 2017-08-23 15:11:17 -07:00
Brad Hefta-Gaub
afce8b547a Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda 
Rig: Use a registry to prevent use after free crashes/corruption
 2017-08-23 15:09:28 -07:00
Zach Fox
88c24c16d7 I finally understand - initial progress 2017-08-23 15:02:07 -07:00
David Kelly
138534c3ff encrypt security image 2017-08-23 15:01:09 -07:00
David Kelly
f655bf2713 Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-23 14:53:05 -07:00
Zach Fox
e815946744 Merge pull request #11231 from ElderOrb/Case5830 
5830: Go-To menu shows up blank except for address bar
 2017-08-23 14:33:04 -07:00
beholder
9cd784990c 5830: Go-To menu shows up blank except for address bar 2017-08-23 23:27:02 +03:00
SamGondelman
206862a90f fix flag bits 2017-08-23 12:20:30 -07:00
Zach Fox
f01d9ddbe7 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-23 11:22:28 -07:00
Zach Fox
a489267cec Hide behind switch and remove dead code 2017-08-23 10:48:47 -07:00
druiz17
80eac56c4d Merge pull request #11233 from jherico/threaded_overlay_edits 
Allow asynchronous editing of non-QML overlays
 2017-08-23 09:45:01 -07:00
SamGondelman
d7b3686364 include noncollidable entities 2017-08-22 17:37:51 -07:00
Brad Davis
0a5bef22fc Allow asynchronous editing of non-QML overlays 2017-08-22 17:12:18 -07:00
Zach Fox
69364f2ecd Initial progress 2017-08-22 17:10:57 -07:00
Anthony Thibault
bb49bcdcfd Merge pull request #11223 from ElderOrb/bigobj 
fix for 'C1128: number of sections exceeded object file format limit'
 2017-08-22 16:36:49 -07:00
David Kelly
591c031e7b first pass still broken... 2017-08-22 16:24:25 -07:00
David Kelly
8bb7ea900a Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-22 16:23:23 -07:00
Zach Fox
edb64b047f It compiles! 2017-08-22 16:00:44 -07:00
Zach Fox
ec2a27e68c Progress 2017-08-22 15:02:06 -07:00
beholder
a18410ef07 make building tests optional 2017-08-23 00:40:14 +03:00
David Kelly
0bd3f1728d Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile 2017-08-22 14:40:10 -07:00
beholder
a1e0f31cd8 fix for 'C1128: number of sections exceeded object file format limit' 2017-08-23 00:24:09 +03:00
Chris Collins
06641ade94 Merge pull request #11228 from Atlante45/new-master 
Update master from stable
 2017-08-22 13:29:51 -07:00
Atlante45
697aed2fa2 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-08-22 12:58:38 -07:00
Chris Collins
8474bfb550 Merge pull request #11227 from highfidelity/RC-52 
Beta Release 52 - Includes up to Developer Release 7030
 2017-08-22 12:57:17 -07:00
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07:00
Zach Fox
4d8980b538 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-22 12:30:24 -07:00
Zach Fox
763ce73306 Taking a break now 2017-08-22 12:26:46 -07:00
Zach Fox
a31088b60f More progress 2017-08-22 12:16:17 -07:00
SamGondelman
b8a7fce201 boop 2017-08-22 11:54:55 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
Anthony J. Thibault
d62a0ea8ff Correct controller offsets with sensor scaling 2017-08-22 11:43:39 -07:00
SamGondelman
a904ae1a8a can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API 2017-08-22 11:41:20 -07:00
Stephen Birarda
9dfc74de57 always write rank ID to variant when present 2017-08-22 11:24:32 -07:00
vladest
b7a048c6ea Adopt clonable settings to new styling 2017-08-22 11:23:55 -07:00
Anthony J. Thibault
ffdb10681e Fix for laser rendering and positioning with sensor scale 2017-08-22 11:07:04 -07:00
Anthony J. Thibault
de2262968e Fix for CAMERA_RELATIVE controllers with sensor scale 2017-08-22 09:44:32 -07:00
Chris Collins
8cab4435c9 Merge pull request #11224 from birarda/bug/group-clear 
always write rank ID to variant when present
 2017-08-22 09:08:59 -07:00
Anthony J. Thibault
cd6d2173cc Bug fix for follow rotation of CharacterController 2017-08-21 18:09:58 -07:00
SamGondelman
3a80c6cbe2 fix alpha issues, pipeline issue, clamping issue 2017-08-21 18:09:25 -07:00
Anthony J. Thibault
8e56404c40 Fixes for flying and rotation re-centering in wikiplanet 2017-08-21 17:42:25 -07:00
Anthony J. Thibault
963ddce7bc Use eye-height to match user and avatar scales, follow fixes 
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
 2017-08-21 17:42:24 -07:00