Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23059 commits 71 branches 56 tags 1.2 GiB
Commit graph

23059 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ryan Huffman
36c14de250 Add rotation to facingAvatar billboard overlays 2015-03-10 13:11:39 -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
Stephen Birarda
6e84e94b86 remove discoverability setter until API ready 2015-03-10 13:04:33 -07:00
Stephen Birarda
dde84ac2b8 fix getUsername for AccountManager include in implementation 2015-03-10 13:04:33 -07:00
Stephen Birarda
c9982e765e cleanup username API from GlobalServicesScriptingInterface 2015-03-10 13:04:33 -07:00
Brad Hefta-Gaub
7b6dfc93d6 Merge pull request #4405 from birarda/master 
manually call delete on GLCanvas in Application dtor
 2015-03-10 13:04:16 -07:00
David Rowe
59762175e4 Grow/shrink window as size of users list changes 2015-03-10 12:44:34 -07:00
ZappoMan
e16961c958 removed dead code 2015-03-10 12:36:31 -07:00
ZappoMan
feddea821a cleanup import from file vs url 2015-03-10 12:35:12 -07:00
David Rowe
a4fe9c1a12 Click on username to TP to them 2015-03-10 12:32:48 -07:00
ZappoMan
5facb39aa7 support for import entities from network URL 2015-03-10 12:21:37 -07:00
Stephen Birarda
a8046b8316 fix a typo in comment, NULL glWidget pointer 2015-03-10 11:47:35 -07:00
Stephen Birarda
292354e180 manually call delete on GLCanvas in Application dtor 2015-03-10 11:33:49 -07:00
David Rowe
abb62fd8f9 Fix typo found in passing 2015-03-10 10:57:48 -07:00
David Rowe
63d8da0233 Display user names in 2D window 2015-03-10 10:57:47 -07:00
David Rowe
d25d3bc6ab Get users online from Web API 2015-03-10 10:57:46 -07:00
ZappoMan
c8298ca617 migrate SVO reading to use QDataStream in step toward reading from HTTP url 2015-03-10 10:49:53 -07:00
Sam Gateau
da16baf0ca removing the atmosphere effect from the directional lighting 2015-03-10 10:24:16 -07:00
Virendra Singh
ce4226d6b9 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-10 22:36:18 +05:30
Sam Gateau
c1a0d767c9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-10 09:37:40 -07:00
Sam Gateau
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -07:00
David Rowe
2df3eed31e Merge branch 'master' into 20287 
Conflicts:
	interface/src/Application.h
 2015-03-10 09:31:15 -07:00
ZappoMan
89f3a091f1 remove debugging 2015-03-10 09:02:35 -07:00
Andrew Meadows
a758ccd75a Merge pull request #4402 from birarda/master 
add underlying controls for user discoverability
 2015-03-10 08:30:46 -07:00
Atlante45
8bb974f01b Move ModelPropertiesDialog to own file 2015-03-10 14:50:38 +01:00
Atlante45
f1460e5c5b Fixed missing forward declaration 2015-03-10 11:50:49 +01:00
Atlante45
d0d9d4bbac Introduced ModelPackager 2015-03-10 11:50:13 +01:00
Atlante45
f55e9b6c1c ModelSelector implementation 2015-03-10 11:49:07 +01:00
Atlante45
60867cc931 Added ModelSelector class 2015-03-10 11:48:31 +01:00
Sam Gateau
d9c071a2a9 trying to put the atmospheric effect in a shader header and use it on the directional lighting pass 2015-03-10 00:47:27 -07:00