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

13233 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
f4c274dbe6 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-23 17:41:58 -07:00
Brad Hefta-Gaub
3c05aa74b0 Merge pull request #2921 from ey6es/master 
Support for shadows falling on models (including self-shadowing).
 2014-05-23 17:40:17 -07:00
Philip Rosedale
ad1c205063 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-23 17:17:54 -07:00
Andrzej Kapolka
632f87dc88 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:15:03 -07:00
Andrzej Kapolka
e48f02f2c5 Remove unused variable. 2014-05-23 17:13:27 -07:00
Clément Brisset
965d5778d6 Merge pull request #2917 from stojce/19705 
Code Review for Job #19705
 2014-05-23 17:07:17 -07:00
Andrzej Kapolka
ac2137c3b6 Fixed a couple copy and paste errors. 2014-05-23 16:56:10 -07:00
Clément Brisset
fb7db04573 Merge pull request #2918 from PhilipRosedale/master 
Ability to move both slowly and fast with hand controllers
 2014-05-23 16:55:16 -07:00
Andrzej Kapolka
84b78429f2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 16:37:25 -07:00
Andrzej Kapolka
67e3454a86 Missed a few files. 2014-05-23 16:37:12 -07:00
Philip Rosedale
ef989e7ca9 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-23 16:37:06 -07:00
Philip Rosedale
7c8ece6a5b Merge pull request #2919 from AndrewMeadows/inertia 
turn on gravity when there is a voxel floor to stand on
 2014-05-23 16:36:57 -07:00
AndrewMeadows
4f8b2819d2 Merge pull request #2916 from birarda/master 
make transaction amounts and balances signed 64-bit
 2014-05-23 16:36:34 -07:00
Andrzej Kapolka
0baf757c0d Basic support for shadows on models. 2014-05-23 16:35:51 -07:00
Philip Rosedale
d341e7314d squared force on thrust controller 2014-05-23 16:25:19 -07:00
Stephen Birarda
45ab8145a4 fix another implicit float cast 2014-05-23 16:22:08 -07:00
Stephen Birarda
1e9589c19e fix an implicit cast to float 2014-05-23 16:18:21 -07:00
Stephen Birarda
831b0faa20 fix a mistyped constant 2014-05-23 16:15:11 -07:00
Stephen Birarda
1b00cda068 don't use powf for credit conversions 2014-05-23 16:12:34 -07:00
Andrew Meadows
8d660c76cc merge upstream/master into andrew/inertia 2014-05-23 16:00:55 -07:00
Andrew Meadows
d425b5b322 Enable local gravity when there is a floor nearby. 2014-05-23 15:59:27 -07:00
Stephen Birarda
15a8272286 fix domain-server pending credits to actually be in credits 2014-05-23 15:43:02 -07:00
Stephen Birarda
34eb0f9f43 make transaction amounts and balances signed 64-bit 2014-05-23 15:34:34 -07:00
Brad Hefta-Gaub
50e812a82b Merge pull request #2913 from talentraspel/19680 
locking against crash
 2014-05-23 15:08:20 -07:00
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
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
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
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