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

1838 commits

Author SHA1 Message Date
Sam Gateau
ace6dc4faf Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-08 23:23:06 -08:00
Sam Gateau
469ee29f0b Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2015-02-06 16:30:47 -08:00
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Sam Gateau
3c30e70c12 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-04 13:32:02 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Atlante45
e4591e0d03 Work arount for QVariant not converting to QVariant 2015-02-03 17:11:32 -08:00
Atlante45
f0b5cd195d Renaming + end of file spaces 2015-02-02 18:37:49 -08:00
Atlante45
9abdb41764 Rearrange settings classes in correct files 2015-02-02 17:17:19 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Atlante45
633ec9807d New settings api 2015-02-02 15:56:03 -08:00
Sam Gateau
2eb3c92e1d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-02 11:19:08 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Sam Gateau
38129c2988 Merging with latest build 2015-01-30 12:58:50 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/avatar/Hand.cpp
 2015-01-30 12:02:11 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
ZappoMan
6821f31f14 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	libraries/gpu/src/gpu/GLBackend.cpp
 2015-01-28 10:46:30 -08:00
Sam Gateau
3953a4c8c7 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-28 00:10:20 -08:00
Andrew Meadows
58bb137c4d bulletRotationStep --> computeBulletRotationStep 2015-01-27 17:37:12 -08:00
Andrew Meadows
23bd3f90d9 Bullet-style rotation integration for kinematics 
and for dead reckoning after wire-transfer
 2015-01-27 17:27:15 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
 2015-01-27 16:44:11 -08:00
Sam Gateau
ae3233b119 in the middle of something 2015-01-27 15:44:10 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Atlante45
4eac6cd410 Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers 2015-01-23 13:19:03 -08:00
Atlante45
bbf6ae7b01 Move Faceshift constants to their own file in shared 2015-01-23 12:11:08 -08:00
ZappoMan
02a68096c3 add debug for vec4 2015-01-21 16:56:04 -08:00
Atlante45
850f92eae3 Don't call Settings::set when you don't need too. 2015-01-20 17:54:11 -08:00
Stephen Birarda
b4d6a44fc2 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-20 11:15:54 -08:00
Atlante45
d7f6add74c Use QThreadStorage to store QSettings 2015-01-20 10:53:16 -08:00
Atlante45
e4fa9e508e Moved loadSetting to MyAvatar 2015-01-20 00:56:25 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
4f2fa227b2 Got rid of SettingHandle::type 2015-01-19 22:35:38 -08:00
Atlante45
d0d16e088e Introduced SettingsBridge class 
Class use to privatize direct access to settings
 2015-01-19 21:24:57 -08:00
Atlante45
6cf00041f8 Introduced SettingHandle 
New class that serves as an accesor to a single setting
 2015-01-19 20:56:15 -08:00
Atlante45
43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
 2015-01-19 14:18:22 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
Atlante45
33d0e1bad5 Added Settings class 
Just a simple Wrapper for now
 2015-01-18 18:08:20 -08:00
Atlante45
8f5f634308 Took audio settings out of Menu 
Hooked to actual settings in Audio class
 2015-01-17 21:22:02 -08:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Atlante45
786c0a5462 Drop DM ref before creating new object 2015-01-15 14:00:45 -08:00
Brad Hefta-Gaub
89967fbe7a Merge pull request #4104 from AndrewMeadows/inertia 
store density in EntityItem instead of mass
 2015-01-14 17:17:45 -08:00
Andrew Meadows
8236837dd0 add ShapeInfo::computeVolume() 2015-01-14 15:00:31 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
27cc3d297e DependencyManager update 
- Now need a call to DependencyManager::set(...) that support
	  variable arguments number and type
	- Now support destroy operation via DependencyManager::destroy()
	- Now support inheritance. All inheritance relationship need to
	  be specified via DependencyManager::registerInheritance<Base,
Derived>() before any call to the DepedencyManager involving Base.
	- Dependencies should now inherit from the class Dependency as
	  well as using SINGLETON_DEPENDENCY
 2015-01-13 20:27:38 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Atlante45
7d39b45f16 Hopefully fixes the windows compile error 2015-01-12 17:34:07 -08:00
Andrzej Kapolka
cad8313e56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-12 12:00:20 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Atlante45
6d67b8e20c Don't call delete later unless you have to 2015-01-09 15:32:08 -08:00