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

6910 commits

Author SHA1 Message Date
Stephen Birarda
d3828c7d89 remove gverb from externals 2015-01-29 11:05:16 -08:00
Atlante45
ff88b7d4e6 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-29 10:59:54 -08:00
Stephen Birarda
fa166f012f set size of GVRMainWindow to note 4 size 2015-01-29 10:11:46 -08:00
Atlante45
5bc98f5258 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-28 13:14:08 -08:00
Atlante45
d68b59d4c7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-28 13:13:58 -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
Stephen Birarda
f1c6d26ed1 don't explicitly require LibOVR for android build 2015-01-28 11:20:25 -08:00
Sam Gateau
dc01611f26 Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded 2015-01-28 10:22:37 -08:00
Brad Hefta-Gaub
8994b9f51c Merge pull request #4182 from AndrewMeadows/isentropic 
fix bad integration of rapidly spinning objects
 2015-01-27 18:33:31 -08:00
Brad Hefta-Gaub
aa2011a543 Merge pull request #4160 from samcake/temp0 
Introducing the gpu::Texture class and using it for model rendering
 2015-01-27 18:30:06 -08:00
Atlante45
98fc1836d8 Revert "Use QDickCache for every QNAM" 
This reverts commit 2f39b93823.
 2015-01-27 18:09:22 -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
Andrew Meadows
b9ac5bb915 merge upstream/master into andrew/isentropic 2015-01-27 16:24:45 -08:00
Andrew Meadows
d1cf6559c5 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/ObjectMotionState.cpp
 2015-01-27 16:24:11 -08:00
Andrew Meadows
026c39e010 Merge pull request #4131 from Atlante45/pull_out_menu_mess 
Settings - Part I
 2015-01-27 16:23:23 -08:00
Atlante45
505f3f143b Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 16:13:35 -08:00
Andrew Meadows
d5c0c200de optimization for when physics engine doesn't step 2015-01-27 15:54:32 -08:00
Andrew Meadows
aebdd3b335 fix bad extrapolation of rapidly spinning objects 2015-01-27 15:53:37 -08:00
Sam Gateau
f619acc3b5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-27 15:43:27 -08:00
Sam Gateau
4592bdcb4f fixes after review by Brad 2015-01-27 15:42:56 -08:00
Atlante45
c25ae9d506 Merge branch 'android' of git://github.com/birarda/hifi into android 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityCollisionSystem.cpp
	libraries/entities/src/EntityCollisionSystem.h
 2015-01-27 15:04:17 -08:00
Stephen Birarda
d420674edd apply orientation change to listening position for audio 2015-01-27 14:50:02 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
Ryan Huffman
7ececd793a Fix failing QMetaObject::invokeMethod call 2015-01-27 13:59:46 -08:00
Andrew Meadows
e2ffe00c38 Merge pull request #4172 from huffman/fix-image-overlay-rescale 
Fix image overlay rescale
 2015-01-27 13:07:15 -08:00
Brad Hefta-Gaub
a46fda3749 Merge pull request #4174 from huffman/delete-entity 
Update deleteEntity to obey entity locked property
 2015-01-27 13:05:05 -08:00
Andrew Meadows
6b6e846378 Merge pull request #4177 from ZappoMan/fixGlitches 
Some physics improvements
 2015-01-27 13:02:11 -08:00
Andrew Meadows
f2f054f689 Merge pull request #4161 from ey6es/master 
Partial implementation of "granularity" setting for metavoxel tools.
 2015-01-27 12:52:32 -08:00
ZappoMan
23892ab1e7 fixed comments 2015-01-27 11:38:14 -08:00
ZappoMan
94e04e2d7d removed extra whitespace 2015-01-27 11:34:46 -08:00
ZappoMan
b1586d4f90 move debug into ifdef 2015-01-27 11:29:17 -08:00
ZappoMan
45dbff67f8 more hacking 2015-01-27 11:15:33 -08:00
Atlante45
0f8e10b275 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 11:14:36 -08:00
Ryan Huffman
9fd352e1dc Break long lines in TextureCache.h/cpp 2015-01-27 10:27:05 -08:00
Ryan Huffman
f65640a593 Update EntityTree.cpp to not delete entity when locked 2015-01-27 10:24:54 -08:00
Ryan Huffman
86f7c28ee9 Update EntityScriptingInterface::deleteEntity to not delete when known entity is locked 2015-01-27 10:24:28 -08:00
Ryan Huffman
1f6932bdcb Update TextureCache to store original image dimensions (pre-scale) 2015-01-27 08:09:20 -08:00
Atlante45
71b565c33c Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
 2015-01-27 01:21:33 -08:00
ZappoMan
83d1cc911a hacking 2015-01-26 19:38:24 -08:00
Atlante45
f84f6e9b66 Restore joints state on stopAnimation 2015-01-26 19:12:18 -08:00
ZappoMan
02c0700db3 support for skipping forward on new edit packets from server 2015-01-26 17:25:06 -08:00
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
ZappoMan
81185cfe56 removed some debugging 2015-01-26 12:46:22 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
ZappoMan
73b9c06ec0 added some debugging 2015-01-26 11:13:30 -08:00
Stephen Birarda
4198d1d5ca disable output starve detection on android 2015-01-26 10:07:24 -08:00
ZappoMan
f85774c687 adding some debugging 2015-01-26 09:45:33 -08:00
Sam Gateau
1a044b4ea6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-23 23:31:24 -08:00