Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:12:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14750 commits 75 branches 59 tags 1.2 GiB
Commit graph

14750 commits

This branch
This branch
All branches
Author SHA1 Message Date
barnold1953
44cf662904 Use deltaTIme to ensure sand updates are somewhat uniform 2014-07-16 12:06:48 -07:00
barnold1953
77b2dd695d fixed header 2014-07-16 11:34:31 -07:00
barnold1953
4483c7dc6b Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-16 11:24:32 -07:00
barnold1953
8b911c3e2c Finished up basic falling sand example script 2014-07-16 11:21:58 -07:00
barnold1953
f6a184fc2b Bug fixes in fallingSand 2014-07-16 11:10:59 -07:00
AndrewMeadows
e7bc2a37e8 Merge pull request #3173 from ey6es/metavoxels 
More metavoxel progress: basic scriptability, fix for subdivisions, threading fixes.
 2014-07-16 09:22:13 -07:00
Andrzej Kapolka
3be00b972d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-15 18:11:54 -07:00
Andrzej Kapolka
2d4134afaf Provide basic conversions to/from SharedObjectPointer (still have to work out 
how to handle reference counting correctly).
 2014-07-15 17:58:31 -07:00
Andrzej Kapolka
a13d8559e6 Better scoping. 2014-07-15 16:55:52 -07:00
Andrzej Kapolka
ce0210bf04 The weak shared object hash can be accessed by multiple threads, so it must 
be locked.
 2014-07-15 16:52:17 -07:00
Andrzej Kapolka
469e31cc05 Script bindings for QColor. 2014-07-15 16:44:02 -07:00
Andrzej Kapolka
ebcb8d00d6 Unfortunately, the early test for subdivision doesn't work, which means that, 
for now, we need to traverse the entire tree to find subdivided nodes.  To be
revisited.
 2014-07-15 15:47:31 -07:00
Brad Hefta-Gaub
8128214144 Merge pull request #3172 from wangyix/quick_audio_PR 
removed SIMD instructions in AudioMixer; removed IsNaN check for _nextOutputTrailingLoudness
 2014-07-15 15:20:13 -07:00
wangyix
abca4661f4 removed space 2014-07-15 14:48:26 -07:00
wangyix
d5a30ff6ee removed SIMD stuff from AudioMixer for all builds 2014-07-15 14:43:08 -07:00
Brad Hefta-Gaub
fc28279afe Merge pull request #3170 from wdings23/master 
Allow script to set light properties for all the avatars
 2014-07-15 14:07:26 -07:00
Andrzej Kapolka
e2c8bdbdbe Create new nodes on subdivision. 2014-07-15 13:22:50 -07:00
wangyix
871aa2790a forgot unused variable 2014-07-15 12:24:28 -07:00
wangyix
828410b7d6 removed isNan check for _nextOutputTrailingLoudness 2014-07-15 12:23:54 -07:00
wangyix
a1b2bf59e9 disabled SIMD adds in AudioMixer for windows 2014-07-15 12:23:02 -07:00
Andrzej Kapolka
1f5922fa67 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-15 11:55:47 -07:00
barnold1953
b339e9c2af Added getVoxelEnclosingPointBlocking and improved sand script 2014-07-15 11:44:59 -07:00
Clément Brisset
fe7c949c53 Merge pull request #3171 from ZappoMan/fixeParticleServerCrash 
fixed some warnings - fix potential crash in particle server
 2014-07-15 10:51:08 -07:00
ZappoMan
0068428c7c fixed some warnings 2014-07-15 10:41:29 -07:00
TonyPeng
4cea4d2838 Resolve upstrem conflict 2014-07-15 10:33:22 -07:00
Andrzej Kapolka
9d55100087 Merge (but don't clear redundant nodes) after reading subdivisions. 2014-07-15 09:31:23 -07:00
Andrzej Kapolka
60e8c12d4b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-15 09:25:36 -07:00
TonyPeng
28854363d4 Coding standard 2014-07-15 09:20:33 -07:00
Brad Hefta-Gaub
12f8cfbb67 Merge pull request #3167 from Atlante45/typed_arrays 
Typed arrays
 2014-07-15 08:31:02 -07:00
Brad Hefta-Gaub
dcd3110266 Merge pull request #3166 from wangyix/quick_audio_PR 
Made audio timegap stats more readable with varying units; Fixed AudioMixer NaN error on WIndows;
 2014-07-15 08:28:48 -07:00
barnold1953
4991bf37a2 Added a brush for the voxel sand script 2014-07-14 17:54:34 -07:00
Clément Brisset
529fa50025 Merge pull request #3169 from murillodigital/master 
Adding place/user go to logging
 2014-07-14 16:41:44 -07:00
wangyix
1047ec7c87 merge with upstream 2014-07-14 16:25:26 -07:00
barnold1953
13960cd645 Basic falling sand script 2014-07-14 16:16:07 -07:00
TonyPeng
afc573b248 Took out debug print 2014-07-14 15:08:29 -07:00
Andrzej Kapolka
e32bab5b04 Beginnings of some metavoxel scriptability, to create some test landscapes. 2014-07-14 14:32:55 -07:00
Leonardo Murillo
6bf06989db Adding place/user go to logging 2014-07-14 15:24:47 -06:00
TonyPeng
1aa20dff60 Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager. 2014-07-14 13:59:57 -07:00
AndrewMeadows
4e6b194444 Merge pull request #3168 from AlericInglewood/master 
Type fix. That that even compiled :/
 2014-07-14 13:26:00 -07:00
Aleric Inglewood
935f28aa35 Type fix. That that even compiled :/ 2014-07-14 21:18:37 +02:00
AndrewMeadows
64ff5f6ecf Merge pull request #3165 from AlericInglewood/master 
Compiler warnings fixes.
 2014-07-14 11:10:48 -07:00
AndrewMeadows
8ff5c0757a Merge pull request #3164 from PhilipRosedale/master 
Moved Hair object to separate class
 2014-07-14 11:08:03 -07:00
wangyix
a37e24aeb4 updated domain page stats to use formated usec time strings 2014-07-14 11:08:00 -07:00
Atlante45
afa43a9d7e Fix win build fail 2014-07-14 11:06:10 -07:00
Andrzej Kapolka
eab0fa4c27 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-14 10:58:01 -07:00
wangyix
cb5a9bf668 moved some const defs to avoid redefinition 2014-07-14 10:43:02 -07:00
Atlante45
30fd4e27d0 pre-CR cleanup 2014-07-14 10:43:01 -07:00
wangyix
a59cef3197 removed debug code in AudioMixer 2014-07-14 10:05:37 -07:00
Atlante45
8b50fbad92 Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-14 09:57:17 -07:00
Philip Rosedale
4b7ba08932 code review fix 2014-07-14 08:53:10 -07:00