Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18327 commits 29 branches 0 tags 1.1 GiB
Commit graph

18327 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
1c4e71ebc1 Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
Brad Hefta-Gaub
7b5d2ef9f8 Merge pull request #3706 from huffman/entity-tool-help 
Add edit entities help window
 2014-10-30 12:53:17 -07:00
Ryan Huffman
4f2fef0428 Add edit entities help window 2014-10-30 12:02:30 -07:00
Brad Hefta-Gaub
12fbc9a039 Merge pull request #3705 from birarda/lobby 
lobby easter egg for status
 2014-10-30 11:40:24 -07:00
Stephen Birarda
bc24fa7de0 lobby easter egg for status 2014-10-30 11:39:37 -07:00
AndrewMeadows
4cf77d1c6c Merge pull request #3702 from ZappoMan/lockAndMaterialProperties 
Lock and textures properties
 2014-10-30 11:35:38 -07:00
Brad Hefta-Gaub
cdca6588e2 Merge pull request #3704 from huffman/orbit-camera 
Update edit camera controls to hide cursor when orbiting
 2014-10-30 11:28:27 -07:00
ZappoMan
6d613fba3c removed debug 2014-10-30 11:26:48 -07:00
Ryan Huffman
87a17f869f Update edit camera controls to hide cursor 2014-10-30 11:25:39 -07:00
Brad Hefta-Gaub
467f2d6df4 Merge pull request #3703 from birarda/lobby 
show a reticle sphere in lobby interface
 2014-10-30 11:22:26 -07:00
Stephen Birarda
409a01c498 show the reticle sphere in lobby interface 2014-10-30 11:16:52 -07:00
ZappoMan
95c5b417c9 texture support in model entities 2014-10-30 11:04:19 -07:00
Stephen Birarda
35dc72521b only show sphere if user is wearing the oculus 2014-10-30 10:44:55 -07:00
Stephen Birarda
ec126f16d5 make the oculus reticle a sphere overlay 2014-10-30 10:43:10 -07:00
Stephen Birarda
a37fcbeb3b Merge pull request #3701 from birarda/lobby 
add a missing semicolon to lobby
 2014-10-30 10:22:44 -07:00
Stephen Birarda
ae4233c680 add a missing semicolon for @zappoman 2014-10-30 10:22:30 -07:00
Stephen Birarda
608c85d183 Merge pull request #3700 from birarda/lobby 
don't render Avatars when in lobby
 2014-10-30 10:22:16 -07:00
Stephen Birarda
f0d6dafcd4 Merge pull request #3698 from birarda/master 
final tweak for linux unistd include
 2014-10-30 10:22:11 -07:00
Stephen Birarda
2aebfc968a don't render Avatars when in lobby 2014-10-30 10:21:52 -07:00
Philip Rosedale
45725db78e Merge pull request #3699 from birarda/lobby 
use new lobby panel wall to avoid shimmer on frame edge
 2014-10-30 10:20:18 -07:00
Stephen Birarda
183d080b1e use new lobby panel wall to avoid shimmer on frame edge 2014-10-30 10:11:05 -07:00
Stephen Birarda
14f216e9c7 set imageURL in ImageOverlay when imageURL is changed 2014-10-30 10:05:31 -07:00
ZappoMan
c650cabb5d support for locked property, some plumbing for textures property 2014-10-30 10:05:20 -07:00
Stephen Birarda
6b922fc3e7 final tweak for linux unistd include 2014-10-30 10:03:36 -07:00
Stephen Birarda
45763a96d7 Merge pull request #3697 from ZappoMan/shadowsTo3DOverlays 
Shadows to3 d overlays
 2014-10-30 09:21:25 -07:00
Brad Hefta-Gaub
12c79b2be8 Merge pull request #3696 from birarda/lobby 
tweaks to lobby to add the orb shell
 2014-10-30 09:20:21 -07:00
Stephen Birarda
136aba450b add semicolons back to all of lobby, fix long line 2014-10-30 09:18:46 -07:00
ZappoMan
ac115086cc move float bool bugs 2014-10-30 00:26:06 -07:00
ZappoMan
1d9c4a6454 fix bug in light properties 2014-10-29 23:18:20 -07:00
ZappoMan
83706cfc4e Revert "remove sample code" 
This reverts commit bde221c0c3.
 2014-10-29 21:22:06 -07:00
ZappoMan
bde221c0c3 remove sample code 2014-10-29 21:09:31 -07:00
ZappoMan
2570caca40 move 3D overlay rendering into the render portion that supports lighting and shadows 2014-10-29 21:08:37 -07:00
Brad Hefta-Gaub
e314fa1fc3 Merge pull request #3652 from ctrlaltdavid/19976 
CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice
 2014-10-29 20:46:12 -07:00
Brad Hefta-Gaub
6b4b0bc8a4 Merge pull request #3693 from Adrianl3d/20016 
CR for Job #20016 - Input box overlay in Javascript
 2014-10-29 20:45:57 -07:00
Adrianl3d
2532a54a2d code tidy up 
Fixed indentation, fixed text overflow.
 2014-10-30 13:28:50 +10:00
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