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
51390 commits 2 branches 0 tags 1.1 GiB
Commit graph

51390 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
d6428ee98c Merge pull request #6 from fayeli/tablet-edit-layout-fix 
fix overlapping issue with the delete button
 2017-02-23 17:40:15 -08:00
Seth Alves
a6b4f07674 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 12:07:31 -08:00
Seth Alves
5bff2034c3 cleanups, attempt to get particle explorer to work right 2017-02-22 12:07:18 -08:00
Chris Collins
c967f9383a Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements 
Multi-core Avatar Mixer
 2017-02-22 11:20:28 -08:00
Seth Alves
84b93826d0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 09:30:16 -08:00
Seth Alves
a8de6c8c93 Merge pull request #9723 from hyperlogic/bug-fix/tablet-ui-reload-script-bug 
Fix for system toolbar hiding when scripts are reloaded
 2017-02-22 07:34:20 -08:00
Chris Collins
04d8c78089 Merge pull request #9707 from hyperlogic/bug-fix/mac-os-deadlock 
MacOS: Fix for audio, toolbar and tablet.
 2017-02-21 17:39:07 -08:00
Anthony J. Thibault
379b7bc56d Fix for system toolbar hiding when scripts are reloaded 2017-02-21 17:24:22 -08:00
Brad Hefta-Gaub
97fc88491f Merge pull request #9718 from AndrewMeadows/sort-avatars-correctly 
fix sorting algorithm for avatar render updates
 2017-02-21 16:14:12 -08:00
Chris Collins
c0f893fe82 Merge pull request #9699 from sethalves/overlays-uuid 
Overlays uuid
 2017-02-21 15:28:28 -08:00
Andrew Meadows
dd447689e0 expose avatar sort coefficients for fine tuning 2017-02-21 15:09:44 -08:00
Brad Hefta-Gaub
a526db1779 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-21 14:18:36 -08:00
Seth Alves
3b181eb803 code review 2017-02-21 13:56:28 -08:00
Seth Alves
8cf71ebc65 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-21 13:54:21 -08:00
Andrew Meadows
27dd82b517 fix sorting algorithm for avatar render updates 2017-02-21 13:34:07 -08:00
Stephen Birarda
10828d7534 Merge pull request #9692 from birarda/feat/es-get-children-parents 
Give implicit access to family tree of server scripted entities in ESS
 2017-02-21 13:17:46 -08:00
Stephen Birarda
3b996f2b7f bump packet version for new JSON query options 2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub
ec8a95037d Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-20 17:01:29 -08:00
Seth Alves
92580a977b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-20 13:54:12 -08:00
Philip Rosedale
5c782deb4d Merge pull request #9701 from ctrlaltdavid/21175 
Fix laser beam jumping upon grabbing entity
 2017-02-20 13:37:11 -08:00
Seth Alves
43f47c1106 merge from upstream 2017-02-20 12:45:39 -08:00
Seth Alves
a7e002f046 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-20 12:43:13 -08:00
Seth Alves
2db8517303 remove ctrl-M from file 2017-02-20 12:42:57 -08:00
Seth Alves
70c9853189 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-20 12:38:13 -08:00
Seth Alves
4a650ff2bb Overlays::getOverlayAtPoint was depending on the order in which the overlays were added 2017-02-19 18:37:35 -08:00
Brad Hefta-Gaub
fa0749b494 Merge pull request #9696 from ctrlaltdavid/21168 
Add finger painting script
 2017-02-19 11:37:25 -08:00
Brad Hefta-Gaub
942c5689fc more comment cleanup 2017-02-18 14:09:47 -08:00
Brad Hefta-Gaub
73d64120df removed dead comment 2017-02-18 14:08:03 -08:00
Brad Hefta-Gaub
bc858f82fc fixed a FIXME comment 2017-02-18 14:07:20 -08:00
Brad Hefta-Gaub
2b79602220 debug cleanup 2017-02-18 13:14:14 -08:00
Brad Hefta-Gaub
e95e7f663c more cleanup 2017-02-18 13:04:00 -08:00
Brad Hefta-Gaub
66a6666b52 more cleanup, improved stats, port throttling 2017-02-18 12:29:01 -08:00
Seth Alves
ea03f41b57 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-18 10:32:11 -08:00
David Rowe
71ba38afb0 Process controller and script updates only when finger painting is on 2017-02-18 21:28:30 +13:00
David Rowe
05c63e16ca Send messages local only 2017-02-18 20:40:27 +13:00
Brad Hefta-Gaub
71af81851e migrate to new style throttling 2017-02-17 22:20:32 -08:00
Brad Hefta-Gaub
42d916a719 fix warnings 2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub
d233430809 fix warnings 2017-02-17 21:58:35 -08:00
Brad Hefta-Gaub
4570b3439d some cleanup 2017-02-17 21:38:30 -08:00
Brad Hefta-Gaub
c2c843d841 fix mac warnings 2017-02-17 21:05:02 -08:00
David Rowe
6827a28807 Fix grab position 2017-02-18 16:36:14 +13:00
Brad Hefta-Gaub
291b823cfa const cleanup and fix crash 2017-02-17 18:28:07 -08:00
David Rowe
692fa52aca Disable drawing pointer lasers while painting 2017-02-18 15:21:48 +13:00
David Rowe
2c02b42c96 Finger paint button icon files 2017-02-18 14:21:54 +13:00
Anthony J. Thibault
856a38af0c Fix for audio, toolbar and tablet on macos. 2017-02-17 17:08:23 -08:00
Chris Collins
ec07969c0b Merge pull request #9703 from kunalgosar/logDisplayMode 
Logging HMD/Desktop Transitions
 2017-02-17 17:07:02 -08:00
David Rowe
0689557ba5 Draw smoother lines 2017-02-18 13:39:59 +13:00
David Rowe
777a0b51c1 Ignore spurious finger tip position values 2017-02-18 13:35:16 +13:00
David Rowe
784009a9fa Merge branch 'master' into 21168 2017-02-18 13:20:39 +13:00
Seth Alves
def669364b Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-17 15:45:19 -08:00