Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
58920 commits 2 branches 0 tags 1.1 GiB
Commit graph

58920 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thijs Wenker
ddb4b2d2be Merge pull request #11354 from hyperlogic/bug-fix/good-riddance 
Remove handControllerGrab.js, see controllerDispatcher.js instead.
 2017-09-14 15:42:30 +02:00
Anthony J. Thibault
745d2ff395 Remove handControllerGrab.js, see controllerDispatcher.js instead. 2017-09-13 17:36:56 -07:00
anshuman64
d3dbd431d6 Merge pull request #11279 from druiz17/controller-dispatcher-1 
handControllerGrab Refactor -> controllerDispatcher
 2017-09-13 16:56:57 -07:00
druiz17
1b288ef860 make garbbing radius the same as master 2017-09-13 16:15:36 -07:00
druiz17
310dbce65d fixed merge conflict 2017-09-13 15:55:04 -07:00
Chris Collins
84998a3360 Merge pull request #11351 from Atlante45/new-master 
Update master from stable
 2017-09-13 14:28:44 -07:00
Atlante45
d3966ce8c2 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-09-13 13:14:25 -07:00
Melissa Brown
49ab8af428 Merge pull request #11344 from Menithal/21536 
21536: Clap App!
 2017-09-13 12:54:31 -07:00
Menithal
59746c564b 21536: Applied forgotten beutify to file 2017-09-13 21:24:24 +03:00
David Kelly
030b39050a Merge pull request #11343 from davidkelly/dk/oneFileWallet 
Wallet updates
 2017-09-13 11:15:03 -07:00
Chris Collins
1b608a7d35 Merge pull request #11315 from highfidelity/RC-54 
Beta Release 54 - Includes up to Developer Release 7078
 2017-09-13 10:36:28 -07:00
David Kelly
bce92a622e cr feedback 2017-09-13 09:45:02 -07:00
Andrew Meadows
50b94887fa Merge pull request #11339 from ElderOrb/case7469 
7469 Mouse Pointer Depth is Incorrect in HMD Mode
 2017-09-13 08:33:09 -07:00
Andrew Meadows
5741699bab Merge pull request #11301 from Menithal/21484-Fix 
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
 2017-09-13 08:05:53 -07:00
David Kelly
7550374f8f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet 2017-09-13 04:49:13 -07:00
druiz17
b3ff5c86f7 fixed secondary triggers and chest lid 2017-09-12 14:43:06 -07:00
druiz17
0b360f455c Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-12 14:38:07 -07:00
Dante Ruiz
bf32f65efe Merge pull request #11341 from vladest/flickable_off 
Flickable off
 2017-09-12 13:09:06 -07:00
Menithal
40beb4bca8 Some minor tweaks 2017-09-12 22:12:30 +03:00
Chris Collins
bb26cf2179 Merge pull request #11342 from Atlante45/RC-54 
Fix RC-54 conflict with stable
 2017-09-12 11:48:13 -07:00
Menithal
79603765c4 Removed unused check 2017-09-12 21:40:15 +03:00
Menithal
5aab3f3cf3 Switched from marketplace links to local 2017-09-12 21:24:14 +03:00
Menithal
ca2d22a192 Updated Scripts 2017-09-12 21:22:40 +03:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
Dante Ruiz
d90f6320a9 Merge pull request #8 from sethalves/controller-dispatcher-1 
Controller dispatcher 1
 2017-09-12 10:54:10 -07:00
Atlante45
c170cc2eb1 Merge branch 'stable' of https://github.com/highfidelity/hifi into RC-54 2017-09-12 10:53:04 -07:00
druiz17
b634292261 fixing some small issues 2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599 add profiling to controller-dispatcher 2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-12 10:44:29 -07:00
Seth Alves
315f874824 add profiling to controller-dispatcher 2017-09-12 10:44:09 -07:00
vladest
92a83328c0 Follow naming convention 2017-09-12 19:17:49 +02:00
Seth Alves
2850029f26 add profiling to controller-dispatcher 2017-09-12 10:00:32 -07:00
Seth Alves
14965da1b2 Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-12 09:23:39 -07:00
David Kelly
61e8458d13 some cleanup 2017-09-12 08:08:41 -07:00
vladest
08deba35ae Take in account current WebEngine profile to make sure all features are in place, like download 2017-09-12 16:22:53 +02:00
vladest
17a923b9de Temporarily disable WebView flickable until new solution will be investigated 2017-09-12 15:48:47 +02:00
beholder
deee6aab1a 7469 Mouse Pointer Depth is Incorrect in HMD Mode 2017-09-12 04:24:18 +03:00
Bradley Austin Davis
45a2c3d5d9 Modifying SDL initialization due to crash on OSX 2017-09-11 17:17:16 -07:00
Bradley Austin Davis
0f465da92f Various Mac fixes 2017-09-11 17:17:07 -07:00
Bradley Austin Davis
3a75dcf84d Fix crashes in entity rendering on OSX 2017-09-11 17:17:00 -07:00
David Kelly
5c12403b7c first working pass at single file. Cleanup needed 2017-09-11 16:40:21 -07:00
druiz17
684aef23dc Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-11 15:08:37 -07:00
druiz17
d78262f2f5 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-11 15:07:39 -07:00
druiz17
a46e41607c fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown 2017-09-11 15:07:14 -07:00
Menithal
30c979bd31 Added Clap App to Repository 
Addede Clap App Icons to tablet icons (there needs to be another way to
do this than link directly to link or use this method!)
Added module as valid global to eslintrc
 2017-09-11 23:48:30 +03:00
David Kelly
4acbc2bfba Just write the image file in the format we will use later 2017-09-11 13:03:21 -07:00
anshuman64
996277b34c Merge pull request #11335 from vladest/menu_fix 
Make sure root item is created before lambda gets called for desktop …
 2017-09-11 12:47:40 -07:00
vladest
34c1cb6579 Typos and naming fixes 2017-09-11 19:42:05 +02:00
Menithal
40d339a831 21484: Updated code to go with PR feedback 2017-09-11 20:36:29 +03:00
Howard Stearns
54deef8f32 Merge pull request #11329 from davidkelly/dk/walletSSLFix 
fix wallet for new openssl
 2017-09-11 10:07:12 -07:00