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

21328 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
5d67b9d384 Request AvatarMixer 2015-01-28 15:20:48 -08:00
Atlante45
8847338297 Added avatars dependency to GVRInterface 2015-01-28 14:59:20 -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
8abbac6bb2 fix system image explanation in build guide 2015-01-28 13:00:05 -08:00
Stephen Birarda
31e46cf70d bullet out android-sdk requirements 2015-01-28 12:57:41 -08:00
Stephen Birarda
dae9246c87 updates to build guide for SDK requirements 2015-01-28 12:56:40 -08:00
Stephen Birarda
f1c6d26ed1 don't explicitly require LibOVR for android build 2015-01-28 11:20:25 -08:00
Stephen Birarda
067ffad122 add instructions for hybrid GVR testing 2015-01-28 11:04:21 -08:00
Stephen Birarda
42d064a613 add a comment to push build count 2015-01-28 10:29:12 -08:00
Andrew Meadows
7a849e97ec Merge pull request #4184 from samcake/temp0 
Fix windows crash on start
 2015-01-28 10:25:20 -08:00
Stephen Birarda
0c1babe6f9 allow APK rename, fix hockey app update 2015-01-28 10:25:11 -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
Stephen Birarda
3a69e394b6 use the git commit count for version code 2015-01-28 10:04:27 -08:00
Atlante45
df96e023e3 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 20:36:48 -08:00
Brad Hefta-Gaub
347c74ebae Merge pull request #4181 from ctrlaltdavid/20276 
CR for Job #20276 - Add Scripting Support for changes in Audio Devices
 2015-01-27 19:36:17 -08:00
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -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
Brad Hefta-Gaub
7f1df726bf Merge pull request #4183 from Atlante45/master 
Revert "Use QDickCache for every QNAM"
 2015-01-27 18:28:35 -08:00
Atlante45
98fc1836d8 Revert "Use QDickCache for every QNAM" 
This reverts commit 2f39b93823.
 2015-01-27 18:09:22 -08:00
Stephen Birarda
161b49a819 don't install the HockeyApp build 2015-01-27 18:03:27 -08:00
Andrew Meadows
58bb137c4d bulletRotationStep --> computeBulletRotationStep 2015-01-27 17:37:12 -08:00
Grayson Stebbins
0bf20a207c Added gverb instructions 2015-01-27 17:35:53 -08:00
Grayson Stebbins
24845b7856 Added gverb 2015-01-27 17:34:00 -08:00
Stephen Birarda
62a8483e3c use an InterfaceActivity subclass to setup HockeyApp 2015-01-27 17:27:16 -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
Grayson Stebbins
14f9d627f6 Note about Qxmpp version and support for Oculus Rift 2015-01-27 17:16:31 -08:00
Grayson Stebbins
dc1051b6a9 Reminder that everything should be 32-bit 2015-01-27 17:10:09 -08:00
Stephen Birarda
4c338a9950 handle possibility of HockeyApp inclusion 2015-01-27 17:08:57 -08:00
David Rowe
2ee1570a40 Merge branch 'master' into 20276 2015-01-27 16:38:41 -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
Brad Hefta-Gaub
1dd037c7cf Merge pull request #4180 from huffman/edit-focus 
Update editEntities to auto-focus on selection
 2015-01-27 16:03:05 -08:00
Stephen Birarda
bf454f3b57 add the oculus mobile sdk as an Android requirement 2015-01-27 16:02:01 -08:00
Stephen Birarda
730be964fe add instructions for Oculus Mobile SDK 2015-01-27 16:00:58 -08:00
Ryan Huffman
1ba398c0e3 Remove blank line 2015-01-27 15:57:27 -08:00
Ryan Huffman
defb796c1e Update editEntities to auto-focus on selection 2015-01-27 15:56:24 -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
Stephen Birarda
346381efc9 Merge pull request #4179 from Atlante45/move_setup_essentials 
Move setApplication/Organisation to setupEssentials
 2015-01-27 15:39:41 -08:00
Grayson Stebbins
baba56a793 Add another link back to BUILD.md 2015-01-27 15:34:54 -08:00
Atlante45
a28195a334 Move setApplication/Organisation to setupEssentials 2015-01-27 15:28:06 -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
d09b8f8c2e remove enter VR mode and leave VR mode 2015-01-27 14:52:28 -08:00