Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 23:37:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65214 commits 69 branches 56 tags 1.2 GiB
Commit graph

65214 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexia Mandeville
61e2814db4 Removing toolbar apps that are no longer necessary 2018-03-12 13:07:21 -07:00
Alexia Mandeville
8c9c7248d4 Reorganize of menu action items as well as QML categories 2018-03-12 12:52:12 -07:00
Alexia Mandeville
748507f1e3 Increasing speed on mousescroll - zooming in/out of avatar 2018-03-10 22:20:00 -08:00
Alexia Mandeville
2598be16f8 Updating default mouse pitch/yaw input to be more stabilized 2018-03-10 21:46:20 -08:00
Alexia Mandeville
5139f3f503 Update repo script with marketplace script 2018-03-05 14:15:50 -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
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
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
Brad Davis
9e8368e50e Disable virtual trackpad rendering on non-Android builds 2018-03-02 11:12:44 -08:00
samcake
b8fb97c824 Resolving conflicts 2018-03-02 10:36:55 -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
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
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
Sam Gondelman
b90af9e3b5
Merge pull request #12523 from samcake/punk 
Adding more detailed stats
 2018-02-28 12:18:07 -08:00
NissimHadar
5d7e6651a7 Use correct pixel shader. 2018-02-28 11:05:02 -08:00
samcake
9e5ed7b905 Add more timing stats in explanded mode 2018-02-28 10:48:35 -08:00
Elisa Lupin-Jimenez
061a189e9f
Merge pull request #12520 from elisa-lj11/selection_tool_log_spam 
Fixed log spam undefined error
 2018-02-28 09:37:17 -08:00
samcake
9580258589 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-02-28 09:00:55 -08:00
NissimHadar
faad930e35 WIP. 2018-02-28 08:44:01 -08:00
NissimHadar
7ae37c21e0 Merge branch 'master' of github.com:highfidelity/hifi into fixDualQuats 2018-02-28 08:13:00 -08:00
NissimHadar
5764a21c4a WIP. 2018-02-28 08:12:48 -08:00
Ken Cooke
328b5a1e8b
Merge pull request #12479 from kencooke/audio-nearfield-hrtf 
Near-field HRTF
 2018-02-28 07:44:24 -08:00
Ken Cooke
bc7b983f48 Fast approximation of the azimuth parallax correction 2018-02-28 04:44:20 -08:00
Seth Alves
31115b3cb6 make sure rezzer doesn't ignore adjustment 2018-02-27 20:14:00 -08:00
Seth Alves
9d131a6547 if a node can't change locks, don't allow them to create an already-locked entity 2018-02-27 19:53:54 -08:00
samcake
a2e9e8295d Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-02-27 17:47:22 -08:00
NissimHadar
7cae04883e WIP. 2018-02-27 17:19:02 -08:00
Thijs Wenker
6bf1c9878f
Merge pull request #12473 from misslivirose/fix-log-spam 
Logspam fix for editing in HMD mode
 2018-02-28 01:59:25 +01:00
Elisa Lupin-Jimenez
b8fd640ddf fixed log spam undefined error 2018-02-27 16:44:45 -08:00
NissimHadar
f52f146db5 WIP. 2018-02-27 16:28:46 -08:00