Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 03:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22930 commits 71 branches 56 tags 1.2 GiB
Commit graph

22930 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
2f885bb7f2 Move WindowScriptingInterface to DependencyManager 2015-03-11 15:34:29 -07:00
Clément Brisset
885e6206e9 Merge pull request #4420 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-11 11:17:04 -07:00
David Rowe
fd423e5019 Fix units 2015-03-11 11:07:02 -07:00
David Rowe
1a18decc6d Fix typo 2015-03-11 10:49:36 -07:00
Philip Rosedale
aae0ceab48 Merge pull request #4418 from huffman/hide-edit-tools 
Hide edit tools when inactive
 2015-03-11 10:38:21 -07:00
David Rowe
bbffa6474b Add users.js to default scripts 2015-03-11 10:32:14 -07:00
David Rowe
532e4feebb Remove dead code and fix typos 2015-03-11 10:30:09 -07:00
David Rowe
22ff97fd27 Make visible by default 2015-03-11 10:25:24 -07:00
David Rowe
d36399c65d Add heading 2015-03-11 10:21:49 -07:00
David Rowe
c30bf5667f Fix teleporting to user 2015-03-11 10:15:34 -07:00
Ryan Huffman
e4f7e35587 Hide edit tools when inactive 2015-03-11 10:10:11 -07:00
David Rowe
ad08a7dde2 Position window at bottom left of screen 2015-03-11 09:37:18 -07:00
David Rowe
a3c4429e0b Longer wait until requesting status again after request error 2015-03-11 09:36:26 -07:00
Leonardo Murillo
0509270bc6 Merge pull request #4415 from birarda/master 
fix for SVG issues on Windows
 2015-03-10 19:28:21 -06:00
Stephen Birarda
931a234ba7 fix reset for close button SVG in LoginDialog 2015-03-10 18:08:19 -07:00
Stephen Birarda
76f3378223 don't pass no-libraries option to windeployqt 2015-03-10 18:05:10 -07:00
David Rowe
d071bc50a4 Change from paragraph of usernames to single column of usernames 2015-03-10 17:20:08 -07:00
Brad Hefta-Gaub
6f24a62758 Merge pull request #4414 from birarda/master 
workaround for missing touch begin event in 5.4.x
 2015-03-10 17:09:33 -07:00
Stephen Birarda
3579bb46ab handle touch update without a touch begin event 2015-03-10 17:04:30 -07:00
Brad Hefta-Gaub
5cced9fc66 Merge pull request #4400 from samcake/temp0 
Introduce gpu::Shader, Pipeline and State
 2015-03-10 16:51:40 -07:00
Brad Hefta-Gaub
77eae204cf Merge pull request #4411 from AndrewMeadows/thermonuclear 
fix for crash when deleting physical entity that departs the domain
 2015-03-10 16:43:17 -07:00
Brad Hefta-Gaub
04837d5302 Merge pull request #4390 from ctrlaltdavid/20287 
CR for 20287 - Don't show the application menu bar when in full screen
 2015-03-10 16:36:11 -07:00
Andrew Meadows
dd9ae49e49 Merge pull request #4392 from virneo/20304 
worklist 20304: calculate mass properties of a mesh
 2015-03-10 16:18:14 -07:00
Philip Rosedale
2e85cf7459 Merge pull request #4413 from birarda/master 
fix stereo to stereo resampling via soxr
 2015-03-10 16:09:31 -07:00
Stephen Birarda
8ede9fb39b fix stereo to stereo resampling 2015-03-10 15:50:30 -07:00
Andrew Meadows
9736ee1c28 Merge pull request #4410 from ZappoMan/crashonexit 
make sure UserActivityLogger::close() waits for the pending log message to complete
 2015-03-10 15:47:18 -07:00
Seth Alves
cf20596d6d Merge pull request #4406 from ZappoMan/svoFromURL 
Support for importing from a network URL
 2015-03-10 15:41:41 -07:00
ZappoMan
b9671f3f9b CR feedback 2015-03-10 15:27:44 -07:00
Virendra Singh
7954dd4d67 anticlockwise triangle order 2015-03-11 03:27:26 +05:30
Andrew Meadows
50ba8ecc9d Merge pull request #4409 from PhilipRosedale/master 
Only catch moving objects with ToyBall.js
 2015-03-10 14:56:04 -07:00
Virendra Singh
a0e7125e11 code revamp and correction in parallel axis theorem 2015-03-11 03:11:17 +05:30
Andrew Meadows
f82f9cc2f4 merge upstream/master into andrew/thermonuclear 2015-03-10 14:28:02 -07:00
Andrew Meadows
503afc8c73 erase deleted entities from pending sort list 2015-03-10 14:26:19 -07:00
Andrew Meadows
3d531e8304 add f at end of float literal 2015-03-10 14:24:49 -07:00
ZappoMan
3bd3f5a6d2 make sure UserActivityLogger::close() waits for the pending log message to complete 2015-03-10 14:23:23 -07:00
David Rowe
4e8fcd47c0 Show/hide users window with menu item 2015-03-10 13:51:25 -07:00
Brad Hefta-Gaub
d59f9c85a3 Merge pull request #4408 from birarda/master 
let QMainWindow delete GLCanvas, just stop the QTimer instead
 2015-03-10 13:41:36 -07:00
Philip Rosedale
4b53cfb950 Merge pull request #4407 from birarda/windows-fixes 
fix for out of bounds sound resampling
 2015-03-10 13:35:22 -07:00
Philip Rosedale
182a1a726d remove debug 2015-03-10 13:34:16 -07:00
Philip Rosedale
2d6c51ac77 Detect moving objects before catching them 2015-03-10 13:32:56 -07:00
Stephen Birarda
6afdb26042 let QMainWindow delete GLCanvas, just stop the QTimer instead 2015-03-10 13:19:32 -07:00
Stephen Birarda
c660b771db Merge branch 'master' of https://github.com/highfidelity/hifi into windows-fixes 2015-03-10 13:05:09 -07:00
Stephen Birarda
271a4e2cae cleanup some divides for manual sound resampling 2015-03-10 13:04:35 -07:00
Stephen Birarda
dc0ad09953 fix for check of num source samples 2015-03-10 13:04:34 -07:00
Stephen Birarda
7ecde7be30 add fix for out of bounds Sound resampling 2015-03-10 13:04:34 -07:00
Stephen Birarda
6ec5c387e2 default to All discoverability until UI is present 2015-03-10 13:04:34 -07:00
Stephen Birarda
f8fe8393dd store discoverability mode as an int 2015-03-10 13:04:34 -07:00
Stephen Birarda
5feb6be221 expose discoverability changes to js 2015-03-10 13:04:34 -07:00
Stephen Birarda
d96691f2d0 handle discoverability change in DiscoverabilityManager 2015-03-10 13:04:34 -07:00
Stephen Birarda
91b473f035 move location update to DiscoverabilityManager 2015-03-10 13:04:34 -07:00