Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 18:45:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14349 commits 25 branches 0 tags 1.1 GiB
Commit graph

14349 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
6e02561d96 Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 14:08:57 -07:00
Atlante45
bf520d0eff Added thread safe implementation of NetworkAccessManager main methods 2014-07-02 14:05:46 -07:00
Atlante45
598c1cb516 Switched Sound to NetworkAccessManager 2014-07-02 11:27:55 -07:00
Atlante45
74e7e0a7bf Switched XMLHttpRequestClass to NetworkAccessManager 2014-07-02 11:27:32 -07:00
Atlante45
2549b0d946 Switched ScriptEngine to NetworkAccessManager 2014-07-02 11:22:44 -07:00
Atlante45
14a2bbb454 Switched SnapshotShareDialog to NetworkAccessManager 2014-07-02 11:22:29 -07:00
Atlante45
9bcd4e7ac8 Switched ScriptEditorWidget to NetworkAccessManager 2014-07-02 11:21:54 -07:00
Atlante45
602015be66 Switched ScriptModel to NetworkAccessManager 2014-07-02 11:21:26 -07:00
Atlante45
15b37ec3d1 Switched ResourceCache to NetworkAccessManager 2014-07-02 11:21:07 -07:00
Clément Brisset
3acbaa7ab6 Merge pull request #3110 from AndrewMeadows/say-no-to-warnings 
remove warnings
 2014-07-02 11:10:36 -07:00
Atlante45
da0021cc8e Switch ModelsBrowser to NetworkAccessManager 2014-07-02 10:53:30 -07:00
Atlante45
f6221abb71 Switch ModelUploader to NetworkAccessManager 2014-07-02 10:52:08 -07:00
Andrew Meadows
ed78855eb6 remove warnings about signed/unsigned comparisons 2014-07-02 10:49:37 -07:00
Andrew Meadows
ec80ccdb9c remove warning about signed/unsigned comparison 2014-07-02 10:49:05 -07:00
Andrew Meadows
8b3af0b9cb merge upstream/master into andrew/say-no-to-warnings 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	libraries/audio/src/AudioRingBuffer.cpp
 2014-07-02 10:37:30 -07:00
Atlante45
6489151578 Switch ImageOverlay to NetworkAccessManager 2014-07-02 10:28:26 -07:00
Atlante45
36fb530594 Switched DomainServer to NetworkAccessManager 2014-07-02 10:26:38 -07:00
Brad Hefta-Gaub
2df851dcfc Merge pull request #3106 from ctrlaltdavid/19823 
Code Review for Job #19823
 2014-07-02 09:06:01 -07:00
Atlante45
7c3292a41b Switched AccountManager to NetworkAccessManager 2014-07-01 17:47:31 -07:00
Atlante45
30644c750d Switched AvatarData to NetworkAccessManager 2014-07-01 17:46:23 -07:00
Atlante45
ab15a1487e Switched BillboardOverlay to NetworkAccessManaqer 2014-07-01 17:44:38 -07:00
Atlante45
c5a997a567 Switched Application to NetworkAccessManager 2014-07-01 17:43:25 -07:00
Atlante45
d6a2cea756 Switched AudioMixer to NetworkAccessManager 2014-07-01 17:39:45 -07:00
Atlante45
231557a12c Switched Agent to NetworkAccessManager 2014-07-01 17:35:34 -07:00
Atlante45
29976d7861 Created base for wrapper singleton class NetworkAccessManager 2014-07-01 17:17:34 -07:00
Brad Hefta-Gaub
d8a5f59511 Merge pull request #3104 from Atlante45/model_and_billboard_overlays 
Model and billboard overlays
 2014-07-01 15:52:25 -07:00
Atlante45
d63ad86db0 Removed unnecessary function 2014-07-01 15:37:52 -07:00
Atlante45
12ebfd92d1 Memory leak 2014-07-01 15:12:31 -07:00
Atlante45
19be406b1a Added billboards overlays 2014-07-01 15:09:30 -07:00
Brad Hefta-Gaub
5d789ec108 Merge pull request #3101 from Atlante45/add_interface_to_log_user_activity 
Add interface to log user activity
 2014-07-01 13:42:09 -07:00
Atlante45
e9826250cb CR 2014-07-01 12:57:39 -07:00
Atlante45
958367f579 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 
Conflicts:
	interface/src/devices/OculusManager.cpp
 2014-07-01 12:45:42 -07:00
Atlante45
547431d52e Coding Standard -- static_cast 2014-07-01 12:43:28 -07:00
Atlante45
09cf01e097 ModelOverlay functionnal + bounding box 2014-07-01 12:42:56 -07:00
Brad Hefta-Gaub
df51d26625 Merge pull request #3094 from wangyix/seqNumberStats 
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
 2014-07-01 10:54:35 -07:00
wangyix
99fd1c7106 changed numSamplesNeedToStartPlayback calculation in Audio.cpp 2014-07-01 10:44:07 -07:00
Brad Hefta-Gaub
a88c92ea17 Merge pull request #3099 from Barnold1953/OculusSDK 
Oculus SDK Upgrade
 2014-07-01 10:43:39 -07:00
barnold1953
80bfb0766b Fixed warnings 2014-07-01 10:28:40 -07:00
Atlante45
2015861e13 Fixed spelling mistake 2014-06-30 20:10:53 -07:00
Atlante45
7c797449ab Comments + connectedDevice 2014-06-30 19:02:43 -07:00
Clément Brisset
daef739dee Merge pull request #3093 from ey6es/metavoxels 
Factored out the common endpoint/metavoxel client code from the metavoxel client, server, and tests.
 2014-06-30 18:13:25 -07:00
Andrzej Kapolka
0075bb89c4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 18:02:56 -07:00
wangyix
f51a77ce45 reset the incoming audio seq stats in Application::nodeKilled when audiomixer is killed 2014-06-30 18:00:29 -07:00
Atlante45
1a2fd4483b Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 2014-06-30 17:54:34 -07:00
Atlante45
d4ed9d4573 Removed preprocessor statements 2014-06-30 17:52:05 -07:00
Atlante45
780e669fbb fix for jenkins failure 2014-06-30 17:46:19 -07:00
Atlante45
d102795314 Added application version to logger 2014-06-30 17:18:49 -07:00
wangyix
4abfd2b6b7 removed forgotten semicolon in stats string 2014-06-30 17:16:28 -07:00
barnold1953
1cd2066e79 Added option to disable glow effect for 10fps boost for oculus 2014-06-30 17:13:47 -07:00
Atlante45
f33ad8a100 Adding logger calls 2014-06-30 17:10:17 -07:00