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

18272 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
4a32b5acf3 add a reticle so oculus selection is more obvious 2014-10-29 16:19:44 -07:00
Stephen Birarda
64c5405a36 use an ORB_SHIFT variable to easily shift the orb position 2014-10-29 16:01:33 -07:00
Stephen Birarda
88475f6154 fix positioning of lobby panel wall inside orb sphere 2014-10-29 15:47:23 -07:00
Stephen Birarda
26f71de65f Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-29 14:50:47 -07:00
Stephen Birarda
a333325a92 when user drops into lobby hide everything else 2014-10-29 14:29:28 -07:00
Brad Hefta-Gaub
d49b617a4a Merge pull request #3695 from RyanDowne/master 
Philip's head move script changes
 2014-10-29 13:59:26 -07:00
Brad Hefta-Gaub
daf867f3ee Merge pull request #3694 from birarda/lobby 
initial version of the lobby panel wall to jump to locations
 2014-10-29 13:59:02 -07:00
Brad Hefta-Gaub
615664c8b3 Merge pull request #3692 from AndrewMeadows/inertia 
use Qt::AutoConnection for Avatar::setFoo() methods
 2014-10-29 13:52:02 -07:00
Ryan
d8ce5d530f Philip's head move script changes 2014-10-29 13:50:49 -07:00
Stephen Birarda
ed098be2bc don't remove testModelOverlaySubMeshes 2014-10-29 13:49:12 -07:00
Stephen Birarda
cb4ae5f1bb initial version of the lobby script to jump to locations 2014-10-29 13:43:59 -07:00
Stephen Birarda
7ad590c578 don't replace url query in XMLHttpRequest class 2014-10-29 13:20:21 -07:00
Andrew Meadows
e631ab8d38 use Qt::AutoConnection for Avatar::setFoo() methods 
This prevents a JS script from blocking when setting C++ values.
 2014-10-29 13:01:47 -07:00
Brad Hefta-Gaub
333375ccae Merge pull request #3691 from AndrewMeadows/inertia 
smoother avatar motion at low velocities
 2014-10-29 12:54:58 -07:00
Andrew Meadows
9ddd05ca72 smoother avatar motion at low velocities 2014-10-29 12:13:07 -07:00
Brad Hefta-Gaub
51531e1fb5 Merge pull request #3689 from huffman/fix-edit-entities-arrow 
Fix issue with arrow keys moving objects when edit mode off
 2014-10-29 12:11:06 -07:00
Stephen Birarda
5b3897f1cf Merge pull request #3690 from ZappoMan/rayPickSubMeshes 
Ray pick sub meshes
 2014-10-29 12:10:29 -07:00
ZappoMan
ac3a963eca fix build buster 2014-10-29 12:01:43 -07:00
AndrewMeadows
7ea4c760e7 Merge pull request #3684 from samcake/temp0 
Introduction of the Context and Backend class and the OpenGL version: the GLBackend
 2014-10-29 12:00:18 -07:00
ZappoMan
c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes 2014-10-29 11:56:27 -07:00
ZappoMan
0696bd39f5 added example script for lobby model overlays 2014-10-29 11:39:23 -07:00
Ryan Huffman
e8f7c2c2ae Fix issue with arrow keys moving objects when edit mode off 2014-10-29 11:20:19 -07:00
Stephen Birarda
e3dafe65d0 Merge pull request #3688 from birarda/verbose-log-silencer 
include unistd only on Q_OS_LINUX
 2014-10-29 11:18:17 -07:00
ZappoMan
f1326e91b9 move the _model.setScaleToFit( largest dimension) to the setProperties not update 2014-10-29 11:10:52 -07:00
Sam Gateau
33b302ff6f removing inline keyword and typo 2014-10-29 11:08:01 -07:00
Sam Gateau
6cb1cbdee9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-29 11:06:37 -07:00
Sam Gateau
a67b3778c3 fixing name for GLBuffer (instead of the BufferObject) and removing uneeded code 2014-10-29 10:53:50 -07:00
Stephen Birarda
7f3482bbdd swithc from elif to elsif 2014-10-29 10:53:34 -07:00
ZappoMan
17a20ceb16 pass the submesh name as extraInfo in the ray pick result 2014-10-29 10:49:24 -07:00
Stephen Birarda
03e1da0ba9 include unistd only on Q_OS_LINUX 2014-10-29 10:37:39 -07:00
Stephen Birarda
200f5e38b6 Merge pull request #3686 from AndrewMeadows/inertia 
fix linux build for missing getpid()
 2014-10-29 10:34:48 -07:00
AndrewMeadows
26d338f910 Merge pull request #3687 from ZappoMan/fixSittingPointsCrash 
move sitting points back to a contained element to fix the crash Ryan was seeing
 2014-10-29 10:31:36 -07:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
Sam Gateau
22e0e4643c Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-29 10:17:42 -07:00
ZappoMan
1dd4c4c674 move sitting points back to a contained element to fix the crash Ryan was seeing 2014-10-29 10:13:48 -07:00
Andrew Meadows
c39b239f99 fix linux build for missing getpid() 2014-10-29 09:30:51 -07:00
ZappoMan
6b1dc67883 some cleanup 2014-10-29 08:17:30 -07:00
ZappoMan
a73cad91bc first cut at reading and mapping submeshes to named models 2014-10-29 08:09:10 -07:00
Brad Hefta-Gaub
b1bf83e0a4 Merge pull request #3685 from samcake/temp1 
Fix yosemite rendering bug
 2014-10-28 22:09:07 -07:00
Sam Gateau
dbdd5293fa Merged with master 2014-10-28 18:31:02 -07:00
Sam Gateau
7aaac69d35 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-28 18:22:42 -07:00
Sam Gateau
da70ec4c89 Fix the rendering bug on yosemite: due to the attribute channel number assigned by the compiler which colllides with the fixed pipeline vertex attrib channels, forced the attribute bind location after 3 2014-10-28 18:22:06 -07:00
Philip Rosedale
e5c9ad4525 Merge pull request #3661 from Atlante45/reverb_fixed 
Audio Environment packets
 2014-10-28 18:11:14 -07:00
Brad Hefta-Gaub
7ecc0ccb30 Merge pull request #3683 from birarda/lobby 
fix for location naming break after AddressManager changes
 2014-10-28 17:58:34 -07:00
Brad Hefta-Gaub
be65a798db Merge pull request #3681 from birarda/verbose-log-silencer 
logging tweaks to reduce spam from repeated log messages
 2014-10-28 17:58:17 -07:00
Sam Gateau
639497003d Trying to fix the type unkwon issues and other #include problems on linux vs windows 2014-10-28 16:57:47 -07:00
Stephen Birarda
9af097967d remove ctime since windows build did not fail without it 2014-10-28 15:56:30 -07:00
Stephen Birarda
992396ba63 add ctime for strftime call 2014-10-28 15:48:06 -07:00
Stephen Birarda
01de6305e9 add time header for date in log entry 2014-10-28 15:42:03 -07:00
Stephen Birarda
6ba0845767 fix warnings that were bugging Xcode 2014-10-28 15:39:28 -07:00