Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 19:46:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
56191 commits 75 branches 59 tags 1.2 GiB
Commit graph

3232 commits

Author SHA1 Message Date
Zach Fox
0441d8c703 Add placeholder image when previous snapshot can't be loaded 2017-05-31 10:27:17 -07:00
David Rowe
d891c834ba Move record script files to unpublishedScripts directory 2017-05-31 09:06:11 +12:00
Vladyslav Stelmakhovskyi
0f80a8b7af On create button, switch Tablet to landscape mode 2017-05-30 16:51:04 +02:00
David Rowe
f5066aac51 Don't adjust position of imported entities of particular types 2017-05-30 15:53:03 +12:00
David Rowe
1e8698aee1 Snap imported JSON to grid 2017-05-30 15:23:18 +12:00
David Rowe
e02021bddf Tidying 2017-05-30 14:38:59 +12:00
David Rowe
b176dbe544 Refactoring 2017-05-30 14:35:59 +12:00
David Rowe
4c0296daaa Reposition imported JSON entities so that they start at import distance 2017-05-30 14:29:10 +12:00
David Rowe
18558dd795 Make JSON import distance 2m 2017-05-30 13:34:17 +12:00
David Rowe
31df18ff5b Fix snap-to-grid elevation 2017-05-29 18:43:49 +12:00
David Rowe
6c890d90ef Adjust position of model after its been resized 2017-05-29 17:48:01 +12:00
David Rowe
f0785cd39e Adjust creation position so that bounding box is creation distance away 2017-05-29 13:52:36 +12:00
David Rowe
9b679325ff Don't raise creation position if in independent or entity view mode 2017-05-29 13:35:54 +12:00
David Rowe
508dee4580 Increase entity creation distance to 2m 2017-05-29 13:35:18 +12:00
Vladyslav Stelmakhovskyi
bcee25acc7 Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated 2017-05-28 19:54:41 +02:00
Menithal
0e46c11a94 Fixed not being able to override slider sizes 2017-05-28 11:59:30 +03:00
David Rowe
367b3ec603 Handle nonvertical avatar orientation 2017-05-28 09:59:32 +12:00
Menithal
4e97f8ad9c Removed stray print 2017-05-27 16:21:25 +03:00
Menithal
26389be826 Minor tweaks to unselect behavior 2017-05-27 11:18:29 +03:00
Menithal
9201af96bd Added Changes from Alan's Feedback 2017-05-27 11:02:01 +03:00
Menithal
5500f8240d Merge remote-tracking branch 'upstream/master' into 21324 2017-05-27 09:55:56 +03:00
David Rowe
2a88f5cc79 Merge branch 'master' into 21345 2017-05-27 11:51:29 +12:00
samcake
882df7391b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-26 16:47:49 -07:00
Stephen Birarda
6c2758e4ea fix reference to pending transfer count for progress/stats 2017-05-26 14:37:24 -07:00
Liv
06a5467b50 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-05-26 09:10:50 -07:00
David Rowe
de4184e9fa Merge branch 'master' into 21345 2017-05-26 15:49:47 +12:00
Liv
d3e900e42f Adding first pass on cone shape 2017-05-25 12:54:49 -07:00
Liv
417d9ec80b Surface cylinder option for primitive shape to html 2017-05-25 11:04:25 -07:00
Seth Alves
de40604042 whitespace 2017-05-25 09:54:40 -07:00
Seth Alves
80e641b6d4 fix code that was using old raypickInfo.properties field 2017-05-25 09:47:02 -07:00
Sam Cake
3eb95d2d19 cleaning the commented code 2017-05-25 01:16:45 -07:00
David Rowe
f1dca5019a Fix making the tablet horizontal 2017-05-25 11:48:28 +12:00
David Rowe
6452e92ac9 Hand controller data may not be valid 2017-05-25 11:28:26 +12:00
samcake
044110e4f3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-24 15:40:40 -07:00
David Rowe
925cca97db Make the tablet horizontal 2017-05-25 09:16:17 +12:00
Menithal
a3fc87fb23 Removed straggling print 2017-05-24 21:27:47 +03:00
Menithal
3f9b306c7f Finalized UI changes doing final tests 2017-05-24 21:23:30 +03:00
Menithal
255540d0f8 Reverted a few files 2017-05-24 10:16:46 +03:00
Menithal
674f1f5f3a Trying to hunt down a specific issue 2017-05-24 09:53:01 +03:00
David Rowe
39654779fb Position tablet relative to hand 2017-05-24 13:35:00 +12:00
samcake
653abf0ee3 brining the new counters to 4.1 2017-05-22 17:34:06 -07:00
samcake
e0487f7e04 Solving the size evaluation for compressed format 2017-05-22 16:51:54 -07:00
Menithal
9aa7e2e56d Adjusted values 2017-05-23 02:19:52 +03:00
samcake
e4f9f2935e Solving the size evaluation for compressed format 2017-05-22 15:42:18 -07:00
Menithal
46acbe1aba Fixed typo 2017-05-22 11:27:32 +03:00
Sam Cake
1f090d8148 Debugging the size problem and fixing the compression size evaluation 2017-05-22 01:00:34 -07:00
Menithal
d5b7a4e36b Doing some one-way binding for now. 
- Oddly, there is still an issue with the webview occasionally not
appearing when a particle is selected, and appearing inthe wrong time.
Investigate.
 2017-05-22 02:45:24 +03:00
Menithal
b8695e2509 Returned undescore, is smaller overally actually 2017-05-22 01:14:51 +03:00
Menithal
c6a22bcfa3 Majority of the Bindings complete 2017-05-21 20:49:07 +03:00
Menithal
4269fcf69c Lots of Groundwork for UI Building 
- Changed underscore to lodash for smaller file size / faster loading
- Removed dat.gui dependency, as we now have a completely custom
solution
- Started to use some more modern convensions which Qt Supports
 2017-05-21 19:42:14 +03:00
Menithal
42bb5fa8e9 Part. Tab now only appears if selected 
- Particle Tab now only appears if a Particle Entity is selected
 2017-05-20 13:47:24 +03:00
samcake
c5b5aa93b1 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-19 18:13:42 -07:00
samcake
c449229850 Cleaned up the counters for memory 2017-05-19 17:52:56 -07:00
Sam Gateau
36ac623e66 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-19 13:25:36 -07:00
Zach Fox
6765451cc8 Ensure snapshots without story_ids get uploaded 2017-05-19 10:36:31 -07:00
Zach Fox
8efac1e7f1 Prevent another GIF from being captured while one is processing 2017-05-18 14:30:08 -07:00
Sam Gateau
d9ad45bf4a Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-18 09:37:04 -07:00
samcake
2c6e10fbe1 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-18 09:21:02 -07:00
samcake
80b6fd65ae Cleaning up counters and naming schemes... 2017-05-17 18:31:28 -07:00
samcake
b19b0007c8 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-17 13:02:37 -07:00
Seth Alves
3570bd905e update for spring to tractor name-change 2017-05-17 11:55:23 -07:00
Seth Alves
8a88b30da7 Merge pull request #10468 from AndrewMeadows/cleanup-actions 
cleanup Actions and Constraints part-1
 2017-05-17 11:33:53 -07:00
Sam Gateau
0f250e693d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-17 09:49:20 -07:00
Thijs Wenker
2d6c6af37f Merge pull request #10381 from Triplelexx/21297 
DNM 21297 - Edit.js: Make the default particle system attractive
 2017-05-17 15:55:40 +02:00
Triplelexx
c678fd67ed change default particle texture to production 2017-05-17 14:52:11 +01:00
Brad Hefta-Gaub
b0d2de7bc0 Merge pull request #10427 from ctrlaltdavid/21334 
Fix erroneous "did not start playing recording" messages
 2017-05-16 20:54:27 -07:00
Brad Hefta-Gaub
b759a148f3 Merge pull request #10480 from ctrlaltdavid/21360 
Add domain to record script user activity logging
 2017-05-16 20:48:27 -07:00
Brad Hefta-Gaub
36c7821e1e Merge pull request #10455 from ZappoMan/TriangleSetOptimizations 
TriangleSet optimizations - ~80% improvement in Ray picking against models
 2017-05-16 20:47:50 -07:00
Seth Alves
36f8d08b32 Merge pull request #10450 from hiflex/patch-1 
Fix the Face Camera checkbox on the text entity properties tab.
 2017-05-16 20:31:56 -07:00
samcake
b466964817 REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior 2017-05-16 18:21:24 -07:00
David Rowe
04fcdfc4a2 Add domain to record script user activity logging 2017-05-17 12:23:53 +12:00
Triplelexx
5a742002e2 change default particle values 2017-05-16 23:39:38 +01:00
Zach Fox
aa0394c2ef Fix case when user stories would be incorrectly deleted 2017-05-16 11:07:03 -07:00
Andrew Meadows
d705f529a0 use 'tractor' instead of 'spring' in JS files 2017-05-16 08:35:54 -07:00
David Rowe
0cd5fe35da Lint 2017-05-16 15:54:55 +12:00
David Rowe
8ab261d1b0 Work around Script.clearTimeout() occasionally failing 2017-05-16 15:52:34 +12:00
David Rowe
4b175e98e9 Delete persistence entity if recording fails to load for manual playback 2017-05-16 15:30:30 +12:00
David Rowe
6d9bf2b33e Typos 2017-05-16 13:58:42 +12:00
David Rowe
6bdd498ecf Cancel autoplay when manually playing 2017-05-16 10:47:52 +12:00
David Rowe
5c5eb298f5 Better error message 2017-05-16 09:20:58 +12:00
David Rowe
8480a8e7d5 Merge branch 'master' into 21334 2017-05-16 08:52:31 +12:00
samcake
2df6d0df48 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-15 13:40:56 -07:00
ZappoMan
9c81a89ac3 add test script 2017-05-14 08:37:26 -07:00
Philip Rosedale
6e82343b29 Merge pull request #10406 from amvmoody/21289 
21289 - Edit: Add the ability to duplicate an object with hand controller
 2017-05-13 20:43:52 -07:00
Brad Hefta-Gaub
bffa3185d0 Merge pull request #10402 from MrRoboman/W-21305-floating-lanterns 
added floating lantern box that spawns floating lanterns
 2017-05-12 15:57:03 -07:00
Rob Kayson
9fc0ad0d28 fix indent floatingLanternBox 2017-05-12 15:12:43 -07:00
Rob Kayson
f3d8d1641f fix indent createFloatingLanternBox.js 2017-05-12 15:10:40 -07:00
Rob Kayson
a12e8e34db coding standard 2017-05-12 15:06:22 -07:00
Zach Fox
d189f3f110 Fix the twitter mention 2017-05-12 12:39:10 -07:00
samcake
3393456d91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-12 10:15:13 -07:00
David Rowe
2bed69cfea Display playback errors only for user that initiated playback 2017-05-12 15:18:25 +12:00
David Rowe
acd71caae2 Inform user when an AC error prevents a recording from playing 2017-05-12 14:53:38 +12:00
David Rowe
42aacb07ff Remove check that recording has started playing 2017-05-12 14:14:24 +12:00
David Rowe
26672b475f Clear timer value when timer stopped 2017-05-12 14:13:32 +12:00
hiflex
a4406906f3 Fix the Face Camera checkbox on the text entity properties tab. 
The checkbox appeared unchecked even if the underlying property was true.
 2017-05-11 20:12:10 -05:00
David Rowe
d7a4396daa Improve log messages 2017-05-12 11:45:11 +12:00
David Rowe
f74e29e4b0 Code review 2017-05-12 11:43:12 +12:00
David Rowe
021c3dff32 Merge branch 'master' into 21334 2017-05-12 10:34:16 +12:00
David Kelly
52c288bfed Desktop users of different height can shake hands 2017-05-11 14:20:42 -07:00
Seth Alves
9d63113e62 Merge pull request #10337 from vladest/audio-source-sync 
Audio source sync
 2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e Code style fixes 2017-05-11 20:38:09 +02:00
samcake
6b32219f5f Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-11 10:07:27 -07:00
David Kelly
0ea5bf7834 Merge pull request #10440 from davidkelly/dk/fixSettingsDialog 
Fix for multiple settings dialogs
 2017-05-11 08:11:16 -07:00
Vladyslav Stelmakhovskyi
f963233a7b Merge branch 'master' into audio-source-sync 2017-05-11 15:25:24 +02:00
Thijs Wenker
0a3a2705af Merge pull request #10426 from huffman/fix/tablet-invisible-by-default 
Fix tablet showing up for a short period of time on launch
 2017-05-11 15:03:52 +02:00
Mike Moody
89d93ee56d Updated HMD grab Clone to work with all entity types. 2017-05-11 04:16:22 -07:00
Philip Rosedale
f9567d0330 Merge pull request #10182 from CraftsmanMG/master 
hifi: #21216 - Resize entities with hand controllers while editing
 2017-05-10 22:03:35 -07:00
David Kelly
4cc0aaf102 Fix for multiple settings dialogs 2017-05-10 18:31:57 -07:00
samcake
737fdf9dd8 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-10 17:28:07 -07:00
Triplelexx
7edda87330 change default particle to wispy smoke 2017-05-11 01:21:42 +01:00
Howard Stearns
3c652a52d8 Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus 
minor handshake script update
 2017-05-10 13:54:21 -07:00
Vladyslav Stelmakhovskyi
2328da3c48 Merge branch 'master' into audio-source-sync 2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi
2d46f9d30e Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum 2017-05-10 21:21:39 +02:00
Chris Collins
3b5b567578 Merge pull request #10409 from hyperlogic/bugfix/hand-lasers-in-third-person-view 
Hand controller lasers work better in thirdPerson camera mode.
 2017-05-10 10:35:35 -07:00
David Kelly
4536d3c484 cr feedback 2017-05-10 10:09:45 -07:00
samcake
39f6e22da3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-10 09:48:26 -07:00
David Kelly
a45dc673be minor handshake script update 2017-05-09 17:33:33 -07:00
Zach Fox
8c2851b996 Merge pull request #10425 from zfox23/PAL_FixConnectionsDrift 
Enable the PAL to update data about a single connection
 2017-05-09 16:01:45 -07:00
David Rowe
c2d22a1246 Log stopping playing recording 2017-05-10 10:57:53 +12:00
David Rowe
771b76690c Clear timeout that checks recording started when stop recording 2017-05-10 10:56:23 +12:00
David Rowe
a7cc582459 Don't multiply heartbeats 2017-05-10 10:32:43 +12:00
Ryan Huffman
51db0cef98 Fix tablet showing up for a short time on launch 2017-05-09 15:12:12 -07:00
Zach Fox
cf3c10c5b1 Fix the bugs, add the feature 2017-05-09 14:40:41 -07:00
David Kelly
5b33e0233c fix typo in handshake script 2017-05-09 13:27:42 -07:00
Howard Stearns
713ddd5cef Merge pull request #10408 from davidkelly/dk/updatePalForProfileUrl 
Use new images in api/v1/users response json
 2017-05-09 12:01:47 -07:00
samcake
c36035d3eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-09 10:46:38 -07:00
David Kelly
d40984b475 Merge pull request #10384 from davidkelly/dk/minorHandshakeImprovement 
Some minor handshake improvements
 2017-05-09 09:14:31 -07:00
Anthony J. Thibault
b276970258 Hand controller lasers work better in thirdPerson camera mode. 2017-05-08 14:32:50 -07:00
David Kelly
7d0494dd56 use new images in api/v1/users response json 2017-05-08 12:15:03 -07:00
Mike Moody
dae652d3db v1 HMD duplication overlay. 2017-05-08 11:25:24 -07:00
Vladyslav Stelmakhovskyi
d0111ac0bb Merge branch 'master' into audio-source-sync 2017-05-08 20:09:34 +02:00
Chris Collins
4bfb23b5d2 Merge pull request #10388 from humbletim/21308 
CR #21308 Fix Script.print
 2017-05-08 10:46:49 -07:00
Chris Collins
d88d52cd2e Merge pull request #9735 from humbletim/21190-fix-unit-tests 
CR 21190 unit_tests: add support for jasmine.done() and pending
 2017-05-08 09:19:01 -07:00
Rob Kayson
1873558df1 added floating lantern box that spawns floating lanterns 2017-05-06 18:41:57 -07:00
Mike Moody
03490c81da v1 with bug, looking into. 2017-05-06 15:36:18 -07:00
Triplelexx
fae51c5c46 change default particle texture to production 2017-05-06 20:12:09 +01:00
Seth Alves
9e0845f17e Merge pull request #10387 from vladest/tablet-performance 
Decrease CPU usage in tabletUI periodical updates
 2017-05-06 07:07:29 -07:00
Vladyslav Stelmakhovskyi
b2be22f0e0 Maerge broke the logic. Fixed now 2017-05-06 10:28:57 +02:00
samcake
327dac8a19 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-05 09:31:03 -07:00
Vladyslav Stelmakhovskyi
e395a51c60 Merge with master 2017-05-05 07:05:16 +02:00
Seth Alves
9ee6badc86 Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:06:13 -07:00
Seth Alves
92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:05:57 -07:00
Seth Alves
900fae30fd avoid calling editEntity on overlays 2017-05-04 19:05:52 -07:00
Seth Alves
70efe4aa4f avoid calling editEntity on overlays 2017-05-04 18:52:17 -07:00
samcake
df2c5b8c23 adding the notification for keyLight changes modifying the KeyLIghtPayoad 2017-05-04 18:28:12 -07:00
Howard Stearns
d9540d7ece Merge pull request #10390 from zfox23/newSnapshotReview_Improvements3 
Lots of Snapshot app improvements, Round Three
 2017-05-04 17:05:37 -07:00
samcake
855d35eb1b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-04 16:47:15 -07:00
samcake
64317f5fd0 Adding a light item per zone 2017-05-04 16:47:03 -07:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
David Kelly
a4125c1507 logic tweak 2017-05-04 16:33:50 -07:00