Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 14:59:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33079 commits 25 branches 0 tags 1.1 GiB
Commit graph

33079 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
593153deec add receive rate and inbound kbps to av stats 2015-10-06 14:58:51 -07:00
Stephen Birarda
fbf6d166b7 add wire size to BasePacket 2015-10-06 14:48:28 -07:00
Atlante45
8a7871e15b rebase fix 2015-10-06 14:13:28 -07:00
Stephen Birarda
9079f891e9 repair broken node bandwidth stats 2015-10-06 14:09:21 -07:00
Atlante45
ed13c02075 Fix rebase 2015-10-06 13:57:51 -07:00
Atlante45
c745050dea Fix QObject::connect warning 2015-10-06 13:57:51 -07:00
Atlante45
7b25c9d417 More header cleanup 2015-10-06 13:57:50 -07:00
Atlante45
775994f9d0 Fix for 3DConnection 2015-10-06 13:57:49 -07:00
Atlante45
b63df98b8b More unused 2015-10-06 13:57:49 -07:00
Atlante45
17edd38cb9 Remove unused variables 2015-10-06 13:57:48 -07:00
Atlante45
39e0d0e1dc Put timers on the stack 2015-10-06 13:56:26 -07:00
Atlante45
e9b7125894 Misc cleanup 2015-10-06 13:56:26 -07:00
Atlante45
5e9425d9eb Fix view frustum preference 2015-10-06 13:56:25 -07:00
Atlante45
60ebd3a544 Remove unused members (Mostly mouse stuff) 2015-10-06 13:56:25 -07:00
Atlante45
35e2f8cd89 Removed _myAvatar from Application 2015-10-06 13:56:25 -07:00
Atlante45
2fc80e58b6 Fix warning 2015-10-06 13:56:24 -07:00
Atlante45
9827c90851 Rebase fixes 2015-10-06 13:56:24 -07:00
Atlante45
ba5c20b7a6 Header cleanup 2015-10-06 13:56:24 -07:00
Atlante45
9c7a480fda Remove shadowMatrices/Distances 2015-10-06 13:56:23 -07:00
Atlante45
8c653c70fb Remove fps throttle from Application 2015-10-06 13:56:23 -07:00
Atlante45
4ccc2bbcd0 Enclose entire functions in ifdef 2015-10-06 13:56:23 -07:00
Atlante45
dde11c5cd1 More unused 2015-10-06 13:56:23 -07:00
Atlante45
34bba28775 More header cleanup 2015-10-06 13:56:22 -07:00
Atlante45
f55f146d1b More code cleanup 2015-10-06 13:56:22 -07:00
Atlante45
38f23ef79e Remove Application friend 2015-10-06 13:56:22 -07:00
Atlante45
311edabe51 More header cleanup 2015-10-06 13:56:21 -07:00
Atlante45
765608d0ff More unused 2015-10-06 13:56:21 -07:00
Atlante45
7da55747f5 Simplify friends window 2015-10-06 13:56:21 -07:00
Atlante45
77a7814854 Move sendPingPackets 2015-10-06 13:56:20 -07:00
Atlante45
e74df484cc Remove unused methods 2015-10-06 13:56:20 -07:00
Atlante45
a5f31dba5f Fix startup timer 2015-10-06 13:56:20 -07:00
Atlante45
0aab013a0e Remove unused members 2015-10-06 13:56:20 -07:00
Atlante45
92e974929c Move tray icon to MainWindow 2015-10-06 13:56:19 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
James B. Pollack
a37da41253 spell basketball rack correctly 2015-10-06 13:15:35 -07:00
Thijs Wenker
4e8fc08458 made the changes as suggested by @hyperlogic 2015-10-06 20:48:51 +02:00
James B. Pollack
cda1b418ae cleanup 2015-10-06 11:29:41 -07:00
James B. Pollack
5f2112b8a5 finish rack and add to master script, reorganize all bball related scripts 2015-10-06 11:28:36 -07:00
Thijs Wenker
3c6e9378c3 fixes merge issues 2015-10-06 20:20:37 +02:00
samcake
2b5742b277 Some code got overwritten when merging to my office mahcine this morning, that i know got back... 2015-10-06 11:13:35 -07:00
Thijs Wenker
953ff6caa7 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/Application.cpp
	interface/src/scripting/HMDScriptingInterface.h
	libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h
 2015-10-06 20:06:29 +02:00
samcake
cf3828629e Fix build on mac and linux 2015-10-06 11:00:21 -07:00
Thijs Wenker
f6afb4cb02 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:56:22 +02:00
samcake
1788b7b019 Fix the bug created by the previous fix 2015-10-06 10:53:38 -07:00
Andrew Meadows
2c276bb13e Merge pull request #5986 from sethalves/kinematic-grab 
Kinematic grab
 2015-10-06 10:30:06 -07:00
Brad Davis
ee40859c85 Merge pull request #6001 from highfidelity/revert-5989-homer 
Revert "Enabling programmatic access to the IPD scale"
 2015-10-06 10:16:53 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
samcake
978434f15c Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-06 09:54:59 -07:00
samcake
429d82e650 Fixing review comments 2015-10-06 09:54:37 -07:00