Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 05:36:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36752 commits 74 branches 59 tags 1.2 GiB
Commit graph

36752 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
6fc98bd577 fixed ravestick, merged 2015-12-22 12:03:03 -08:00
James B. Pollack
7bc7bddc3a set defaults 2015-12-22 12:00:45 -08:00
Brad Hefta-Gaub
cc00aa01fb Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-12-22 11:54:34 -08:00
James B. Pollack
80e8fcf502 Merge branch 'master' into particle_grab 2015-12-22 11:49:51 -08:00
ericrius1
bb28369dee Merge branch 'polylineOptimizations' of https://github.com/ericrius1/hifi into polylineOptimizations 2015-12-22 11:49:31 -08:00
James B. Pollack
56d654987c changing branches 2015-12-22 11:48:56 -08:00
Eric Levin
e8803ad9ae Lightsaber looks way better now 2015-12-22 11:35:04 -08:00
Brad Hefta-Gaub
298e4d0f83 Merge pull request #6726 from jherico/legacy_oculus 
Legacy oculus work
 2015-12-22 11:02:37 -08:00
Eric Levin
653e3ecdcc fixed offset issue with lightsaber 2015-12-22 11:02:36 -08:00
Brad Hefta-Gaub
22bc6f861a Merge pull request #6722 from jherico/server_only_build 
Add CMake flag for building only server components
 2015-12-22 10:53:26 -08:00
Bradley Austin Davis
79d8b20637 Simulating Oculus interaction on legacy platforms 2015-12-22 10:09:45 -08:00
Ryan Huffman
00b47cacea Fix crash when getting MyAvatar.sessionUUID from AvatarManager 
The previous code inadvertently added a default constructed shared pointer
to the avatar hash, causing it to crash when dereferencing it in
the update loop.
 2015-12-22 09:59:57 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
Brad Davis
7fdeb66cf4 Merge pull request #6723 from ZappoMan/macHydraCrash 
fix crash on mac when sixense DLL can't be loaded
 2015-12-22 09:32:23 -08:00
Bradley Austin Davis
e0e1ae43f5 Fixing legacy oculus plugin 2015-12-22 09:28:38 -08:00
Brad Davis
243fba461d Add CMake flag for building only server components 2015-12-22 09:19:07 -08:00
Thijs Wenker
6c34059061 (note to self, ctrl-s every 5 seconds in code editor) 2015-12-22 14:24:14 +01:00
Thijs Wenker
c62ff3e5be Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-22 14:14:04 +01:00
Thijs Wenker
b97f7ace66 path fix 2015-12-22 14:09:25 +01:00
Thijs Wenker
aefff1a59b script to trigger recording with an assignment-client using messages-mixer 2015-12-22 14:08:12 +01:00
Thijs Wenker
60e1c74fe9 winter games target Practice scripts 2015-12-22 13:58:18 +01:00
Brad Hefta-Gaub
eff830ad4b fix crash on mac when sixense DLL can't be loaded 2015-12-22 01:03:23 -08:00
ericrius1
1031489ada changed dates 2015-12-21 19:08:34 -08:00
ericrius1
ba993eccd4 cleanup 2015-12-21 18:32:07 -08:00
Anthony J. Thibault
0459479c2b NeuronPlugin: Added external project for Neuron SDK 
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
 2015-12-21 18:30:15 -08:00
ericrius1
8d80c06f02 updated ravestick model 2015-12-21 18:26:28 -08:00
Brad Hefta-Gaub
025e769a9f average both hands, enabled both mouse clicks, and detect base station resting hand 2015-12-21 18:25:30 -08:00
Brad Hefta-Gaub
3dfc48e205 Merge pull request #6687 from jherico/marketplace 
Support the marketplace in QML
 2015-12-21 17:55:55 -08:00
Brad Davis
fc4ece5671 Merge pull request #6719 from ZappoMan/rightClickMenu 
fix reticle drive
 2015-12-21 17:11:48 -08:00
Brad Hefta-Gaub
da86686533 fix reticle drive 2015-12-21 17:10:01 -08:00
samcake
757e94ed98 Merge pull request #6715 from zzmp/refactor/scene-render-js 
Clean up interfaces for JS Scene/Render
 2015-12-21 16:50:41 -08:00
Brad Hefta-Gaub
ce426f0144 Merge pull request #6695 from birarda/qxmpp-deletion 
remove an unused qxmpp external
 2015-12-21 16:49:04 -08:00
Brad Davis
95c524fba1 Fixing authentication token for followed links 2015-12-21 15:44:35 -08:00
Zach Pomerantz
4df8fa4ac3 Create Render/Scene unique_ptr without C++14 make_unique 2015-12-21 15:39:49 -08:00
Zach Pomerantz
f146b207c4 Update JS debug scripts to use nested props 2015-12-21 15:27:37 -08:00
Brad Hefta-Gaub
e527bfd645 Merge pull request #6717 from birarda/collision-verbose-debug 
remove extra audio injector debug
 2015-12-21 15:26:59 -08:00
Stephen Birarda
ba89c8a97a remove some extra debug that isn't needed 2015-12-21 16:23:23 -07:00
Ryan Huffman
f5f0829216 Merge pull request #6716 from birarda/master 
fix for stop of a nullptr QTimer
 2015-12-21 15:21:42 -08:00
ericrius1
f19d1a3067 cleanup 2015-12-21 15:20:36 -08:00
Stephen Birarda
8c6449a886 fix for stopping a nullptr QTimer 2015-12-21 16:20:06 -07:00
Zach Pomerantz
d8022aa5b0 Add back deferred debugging and combine context init 2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d Nest JS props in RenderScriptingInterface 2015-12-21 14:32:06 -08:00
Zach Pomerantz
5a86f0c23f Nest JS props in SceneScriptingInterface 2015-12-21 14:32:06 -08:00
ericrius1
876d8ab6b2 far grabbing arc balls 2015-12-21 13:59:00 -08:00
Brad Hefta-Gaub
111a8caa3c Merge pull request #6701 from highfidelity/graphics 
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
 2015-12-21 13:54:50 -08:00
ericrius1
cabc47e7a9 lightsaber immediately turns off on release 2015-12-21 13:30:52 -08:00
ericrius1
4110630d1f fixed ravestick fargrab 2015-12-21 13:15:37 -08:00
ericrius1
1cdee11784 Merge branch 'master' into polylineOptimizations 2015-12-21 12:49:00 -08:00
Thijs Wenker
5d1e5b054a Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-21 21:48:55 +01:00
ericrius1
4b4fe96b64 tweaks 2015-12-21 12:47:31 -08:00