Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 04:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13318 commits 76 branches 59 tags 1.2 GiB
Commit graph

13318 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
3d566bc49f Merge pull request #2915 from birarda/credits 
fix a comment in script handling
 2014-05-23 12:37:51 -07:00
Stephen Birarda
e7e19e8714 fix a comment in script handling 2014-05-23 12:37:27 -07:00
Andrzej Kapolka
aca50aa779 Merge pull request #2914 from birarda/credits 
balances are 64-bit unsigned ints, fix script request
 2014-05-23 12:36:49 -07:00
Stephen Birarda
7e78fc788a fix double return false 2014-05-23 12:35:16 -07:00
Stephen Birarda
f4292fd29c handle serving of scripts at temp unique UUIDs 2014-05-23 12:33:39 -07:00
Brad Hefta-Gaub
43bdc8c156 Merge pull request #2912 from Atlante45/point_and_glow 
Point and glow
 2014-05-23 12:31:41 -07:00
Atlante45
28536eaef2 CR 2014-05-23 11:53:34 -07:00
Stephen Birarda
9acf377573 balances are 64-bit unsigned ints 2014-05-23 11:52:39 -07:00
Stojce Slavkovski
b3b8e2d775 Merge branch 'master' of https://github.com/worklist/hifi into 19705 2014-05-23 20:50:10 +02:00
Stojce Slavkovski
be9aac08ee add disabled state to Share button on click 2014-05-23 20:49:48 +02:00
ZappoMan
7036233a47 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:47:47 -07:00
Atlante45
f0f62ced6b Don't create a glower if no glow 2014-05-23 11:41:42 -07:00
Brad Hefta-Gaub
861a48f6f9 Merge pull request #2911 from ey6es/master 
Use local viewer model for specular.
 2014-05-23 11:35:40 -07:00
Brad Hefta-Gaub
10b0471641 Merge pull request #2906 from Barnold1953/master 
Write thread safety for Overlays QMaps
 2014-05-23 11:34:02 -07:00
Atlante45
7b9f6f8505 Merge branch 'master' of https://github.com/highfidelity/hifi into point_and_glow 2014-05-23 11:32:52 -07:00
Brad Hefta-Gaub
fe79fa3de2 Merge pull request #2910 from wangyix/master 
fix for skipped sequenceNumber bug in OctreeQueryNode
 2014-05-23 11:30:50 -07:00
Atlante45
37a939588f Mode sure the closest model is always selected 2014-05-23 11:28:48 -07:00
Kai Ludwig
7fb9e3a7e6 spaces instead of tabs. 2014-05-23 20:25:20 +02:00
Kai Ludwig
107c142532 _voxelFades needs locking. 2014-05-23 20:21:00 +02:00
ZappoMan
ee523ff373 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:17:59 -07:00
wangyix
fe5fabdd61 removed old code that was commented out 
changed tabs to spaces
 2014-05-23 11:17:59 -07:00
barnold1953
6817c9682e Added a new lock specific to deleting, and improved safety 2014-05-23 11:17:55 -07:00
Atlante45
53141ff1c1 Glow when grabbed with the mouse (for now) 2014-05-23 11:10:56 -07:00
Atlante45
df68082705 Added local glow to models 2014-05-23 11:02:07 -07:00
Andrzej Kapolka
bfd00f1b15 Use local viewer model for specular. 2014-05-23 10:57:14 -07:00
ZappoMan
3a166d2832 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:57:08 -07:00
ZappoMan
33fe339213 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:21 -07:00
ZappoMan
39ed7f7b65 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:04 -07:00
barnold1953
9553271fa1 Added some missing locks to make Overlays thread safe for reading as well. 2014-05-23 10:44:40 -07:00
wangyix
87d927d447 moved _sequenceNumber back to OctreeQueryNode 
instead added incrementSequenceNumber() to OctreeQueryNode for
sendthread to use
 2014-05-23 10:09:46 -07:00
wangyix
a6d0384c3b Merge remote-tracking branch 'upstream/master' 2014-05-23 10:08:46 -07:00
Philip Rosedale
22548b9956 Merge pull request #2909 from PhilipRosedale/master 
add visual indicator of thrust direction
 2014-05-23 09:58:55 -07:00
Philip Rosedale
6998dfae3c add visual indicator of thrust direction 2014-05-23 09:57:47 -07:00
ZappoMan
9188b9ac59 add meshExtents to sub meshes 2014-05-23 09:56:09 -07:00
Andrew Meadows
b875144e2d Don't repeat check for non-zero collision groups 2014-05-23 09:55:45 -07:00
AndrewMeadows
3a638cc447 Merge pull request #2905 from ey6es/animenu 
Added animation controls for start/stop frames, loop/hold flags, "start automatically," roles (with script commands to start/stop by role).
 2014-05-23 09:52:54 -07:00
AndrewMeadows
18046c9e9a Merge pull request #2907 from PhilipRosedale/master 
Velocity damped hand positions
 2014-05-23 09:50:39 -07:00
wangyix
645002493f Merge remote-tracking branch 'upstream/master' 2014-05-23 09:48:05 -07:00
wangyix
2dd78b36db moved _sequenceNumber to OctreeSendThread 2014-05-23 09:47:08 -07:00
Andrzej Kapolka
4d6e8a2c9e Or rather, replaceMatchingPriorities. 2014-05-23 09:42:36 -07:00
Andrzej Kapolka
09ba25bde5 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-23 09:40:35 -07:00
Leonardo Murillo
c4e807d3d9 Merge pull request #2908 from murillodigital/master 
Revert "Initialise lisencing manager after we have enabled Visage."
 2014-05-23 09:44:23 -06:00
Leonardo Murillo
f7f4c48b9b Revert "Initialise lisencing manager after we have enabled Visage." 
This reverts commit 061f182fab.
 2014-05-23 08:40:41 -06:00
Philip Rosedale
2681312b54 Velocity damped hand positions 2014-05-23 00:09:15 -07:00
barnold1953
e33cdedeef Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-22 17:56:01 -07:00
barnold1953
3a45104793 Made overlays thread safe for write operations, which solved a script 
crash.
 2014-05-22 17:55:25 -07:00
Andrew Meadows
08b525ef91 prevent walking avatar from bouncing on floor 2014-05-22 17:54:32 -07:00
Andrzej Kapolka
945112da30 Merge pull request #2904 from birarda/credits 
display user's credit balance in window title
 2014-05-22 17:32:59 -07:00
Stephen Birarda
4f81bac742 add back a missing space in AccountManager 2014-05-22 17:16:42 -07:00
Stephen Birarda
6d500d64d1 fix floats that aren't actually floats 2014-05-22 17:12:22 -07:00