Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65324 commits 71 branches 56 tags 1.2 GiB
Commit graph

65324 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
79aa450332 some code-review induced changes 2018-03-06 13:11:09 -08:00
Seth Alves
a6c3bcd8d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-05 08:51:12 -08:00
John Conklin II
8cb7e0584f
Merge pull request #12547 from Atlante45/fix/session-uuid-lock 
Protect session UUID from concurrent read/writes
 2018-03-05 08:24:22 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink 
Fix hyperlink when far/near grabbing enitities
 2018-03-05 08:23:51 -08:00
Seth Alves
dabdff9b2b don't add extra entry in history when going 'back' from a serverless domain 2018-03-03 08:33:42 -08:00
Seth Alves
606face7c0 gather together the url scheme constants, name them consistently 2018-03-02 20:39:38 -08:00
Seth Alves
fdb53b6543 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-02 19:27:53 -08:00
Seth Alves
7a61119d11 remove unneeded call to clearDomainOctreeDetails 2018-03-02 19:27:45 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
Sam Gateau
8856d4af4f
Merge pull request #12530 from samcake/punk 
Fixing the graphics bugs introduced since last recent dual quaternion change
 2018-03-02 16:12:23 -08:00
John Conklin II
ed07b3c28b
Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick 
Purge RayPick and LaserPointers from default scripts
 2018-03-02 14:59:32 -08:00
Dante Ruiz
d12a4f0c18 little change 2018-03-02 14:30:02 -08:00
Dante Ruiz
5dc336bfae remove dead code and eslint files 2018-03-02 14:23:35 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
samcake
fc8f1c1e65 Resolving conflicts 2018-03-02 14:20:33 -08:00
Dante Ruiz
05fb3cfd9a fixing hyper link for entities 2018-03-02 14:03:24 -08:00
Seth Alves
746769cbe9 don't crash 2018-03-02 13:52:18 -08:00
Brad Hefta-Gaub
762e36ef19
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii 
fix ASCII art for packet headers in NLPacket
 2018-03-02 13:49:27 -08:00
John Conklin II
7ebe3df2b1
Merge pull request #12537 from zfox23/fixJsRequest 
Fix undefined request from JS
 2018-03-02 13:39:27 -08:00
John Conklin II
ff94587518
Merge pull request #12544 from jherico/fix_android 
Disable virtual trackpad rendering on non-Android builds
 2018-03-02 13:37:08 -08:00
Stephen Birarda
4f151a4237 fix ASCII art for packet headers in NLPacket 2018-03-02 12:41:22 -08:00
Seth Alves
507dfa5ec3 more code review response 2018-03-02 11:35:34 -08:00
Brad Davis
9e8368e50e Disable virtual trackpad rendering on non-Android builds 2018-03-02 11:12:44 -08:00
Seth Alves
bdd926f89e cleanups 2018-03-02 10:38:35 -08:00
samcake
b8fb97c824 Resolving conflicts 2018-03-02 10:36:55 -08:00
Seth Alves
45157a16f2 merge from upstream 2018-03-02 09:57:27 -08:00
Seth Alves
82bfd25d8b fix placename in title-bar, fix domain-spawning-point 2018-03-02 09:54:54 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
Zach Fox
c4e90c24eb Fix undefined request from JS 2018-03-01 16:40:24 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
Brad Hefta-Gaub
d24cea2f07
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers 
if a node can't change locks, don't allow it to create an already-locked entity
 2018-03-01 14:56:29 -08:00
Brad Hefta-Gaub
2bc37d37bd
Merge pull request #12512 from birarda/update-brace-expansion-for-cve 
update fs-extra for dependency update of brace-expansion
 2018-03-01 14:53:02 -08:00
Seth Alves
9ee65ab474 don't use clipboard when loading serverless domains 2018-03-01 13:31:43 -08:00
Seth Alves
b18993e09f put serverless domain into history if going to a different serverless domain 2018-03-01 12:19:42 -08:00
Seth Alves
2d374583b4 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-01 11:07:50 -08:00
Seth Alves
33065fb51c more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port 2018-03-01 11:07:37 -08:00
samcake
a227cf1edb Fixing bad key/pipeline pair 2018-03-01 10:49:58 -08:00
Anthony Thibault
d888e7fd95
Merge pull request #12528 from hyperlogic/bug-fix/fix-anim-tests 
Animation Unit Tests build and pass
 2018-03-01 10:48:15 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00
Andrew Meadows
27c6e7915e purge LaserPointers refs from scripts that don't use it 2018-03-01 08:43:30 -08:00
Andrew Meadows
b4f941af03 finish purge of RayPick from grab.js 2018-03-01 08:42:08 -08:00
Andrew Meadows
181944d5db fix bugs in controllerDispatcher.js 2018-03-01 08:41:13 -08:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
samcake
dc286544c5 Merging with nissim's pr 2018-02-28 17:54:54 -08:00
samcake
a7542d5b90 fixing the shadow 2018-02-28 17:46:22 -08:00
Anthony J. Thibault
cb1d453f10 Removed RigTests 2018-02-28 17:15:24 -08:00
Anthony J. Thibault
470aa53454 AnimTest now passes 2018-02-28 17:12:57 -08:00
Anthony J. Thibault
95dfee25b9 Relaxed tolerance on AnimIK test so it can pass... 2018-02-28 16:43:49 -08:00
Anthony J. Thibault
f291ddae97 Animation unit tests now compile. 
not all of them pass tho...
 2018-02-28 15:55:08 -08:00