Seth Alves
|
cdef502e2e
|
expose setVoxelSphere to js
|
2015-05-26 14:26:05 -07:00 |
|
Seth Alves
|
1ec384ab4d
|
allow QByteArray data to be sent with a length. Use appendRawData in places that used to append raw byte-arrays
|
2015-05-26 13:43:22 -07:00 |
|
Seth Alves
|
988ecf9d55
|
send PolyVox voxel dimensions and compressed data over the wire
|
2015-05-26 13:18:52 -07:00 |
|
Seth Alves
|
ed6fdcfb31
|
add QByteArray data uppacking
|
2015-05-26 13:18:25 -07:00 |
|
Seth Alves
|
d71921fd03
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-26 10:46:02 -07:00 |
|
Seth Alves
|
92c55d69ba
|
Merge pull request #4944 from AndrewMeadows/bispinor
avatar-avatar collisions work again
|
2015-05-26 10:36:54 -07:00 |
|
Seth Alves
|
59f68f5625
|
added voxel-data compression code to see what the sizes are like
|
2015-05-26 09:52:18 -07:00 |
|
Seth Alves
|
a251ae7f50
|
far is a reserved word
|
2015-05-26 09:06:51 -07:00 |
|
Seth Alves
|
f38bc469e4
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-26 07:28:49 -07:00 |
|
Seth Alves
|
727f457f91
|
hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version
|
2015-05-25 21:01:20 -07:00 |
|
samcake
|
ffca6a6502
|
Merge pull request #4935 from sethalves/sam-model-fixes
fixes Sam made in my branch while trying to get a mesh to render
|
2015-05-25 16:39:25 -07:00 |
|
Seth Alves
|
9735174036
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-25 15:37:23 -07:00 |
|
Brad Hefta-Gaub
|
c141f41cee
|
Merge pull request #4960 from Atlante45/undef_ref
Fix entityProperties.html undefined ref
|
2015-05-24 12:41:11 -07:00 |
|
Atlante45
|
18812ab25f
|
Fix entityProperties.html undefined ref
|
2015-05-24 19:21:04 +02:00 |
|
Brad Hefta-Gaub
|
8c0bf19536
|
Merge pull request #4956 from Triplelexx/particle-entityProperties
expose particle properties for editing
|
2015-05-23 12:02:16 -07:00 |
|
Brad Hefta-Gaub
|
4ffe573d0d
|
Merge pull request #4957 from Atlante45/master
Fix incorrect scale constants
|
2015-05-23 11:47:43 -07:00 |
|
Atlante45
|
9e121aa387
|
Fix incorrect scale constants
|
2015-05-23 20:13:14 +02:00 |
|
Triplelexx
|
9a29489784
|
expose particle properties for editing
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
|
2015-05-23 17:57:25 +01:00 |
|
Brad Hefta-Gaub
|
225021671a
|
Merge pull request #4950 from ericrius1/particleScriptName
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
|
2015-05-22 22:17:39 -07:00 |
|
Brad Hefta-Gaub
|
d7b2ca64cd
|
Merge pull request #4949 from sethalves/octree-send-thread-adjustments
entity-server sends initial planky more reliably
|
2015-05-22 22:17:17 -07:00 |
|
Seth Alves
|
6c67d14fbc
|
experimenting with physics
|
2015-05-22 16:21:09 -07:00 |
|
Seth Alves
|
e702518041
|
adjust logic around timestamps used by entity-server to know if something was sent. adjust which physics variables are adjusted by a non-sim-owner packet
|
2015-05-22 16:11:29 -07:00 |
|
Eric Levin
|
71c0aa4913
|
renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does
|
2015-05-22 15:33:38 -07:00 |
|
Seth Alves
|
32cc0eacfc
|
improve a debug print
|
2015-05-22 15:21:26 -07:00 |
|
Seth Alves
|
53fe41ef4d
|
improve a debug print
|
2015-05-22 15:11:56 -07:00 |
|
Seth Alves
|
945a84d24f
|
adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum
|
2015-05-22 15:01:43 -07:00 |
|
Andrew Meadows
|
603528eede
|
Merge pull request #4945 from ctrlaltdavid/fix-float-warnings
Fix some double to float conversion warnings in Windows builds
|
2015-05-22 13:09:21 -07:00 |
|
David Rowe
|
a01830f8f8
|
Fix some double to float conversion warnings in Windows builds
|
2015-05-22 12:32:02 -07:00 |
|
Andrew Meadows
|
461d08c0a9
|
merge upstream/master into andrew/bispinor
|
2015-05-22 11:35:02 -07:00 |
|
Andrew Meadows
|
bf225e4886
|
fix bug masking physics shape changes
|
2015-05-22 11:33:45 -07:00 |
|
Andrew Meadows
|
0431e8da36
|
put avatar body in right spot, and give it mass
|
2015-05-22 11:08:56 -07:00 |
|
Brad Hefta-Gaub
|
da8f99508c
|
Merge pull request #4871 from huffman/console-error
Add error handling to JSConsole
|
2015-05-22 10:57:18 -07:00 |
|
Brad Hefta-Gaub
|
0315bb5e28
|
Merge pull request #4942 from ericrius1/deleteLook
deleted look.js (no longer needed) and removed from default scripts
|
2015-05-22 10:55:37 -07:00 |
|
Brad Hefta-Gaub
|
7ed3a97bf2
|
Merge pull request #4939 from Atlante45/perf_timer_tweaks
Deactivate PerformanceTimer when not in use
|
2015-05-22 10:46:13 -07:00 |
|
Seth Alves
|
380fed7aee
|
metersToVoxelCoordinates and voxelCoordinatesToMeters
|
2015-05-22 10:37:48 -07:00 |
|
Clément Brisset
|
e276926608
|
Add include/remove duplicate type
|
2015-05-22 18:23:42 +01:00 |
|
Eric Levin
|
d40d9cca69
|
deleted look.js (no longer needed) and removed from default scripts
|
2015-05-22 10:02:28 -07:00 |
|
Atlante45
|
c6ce5e7680
|
PerformanceTimer deactivated when not in use
|
2015-05-22 18:54:40 +02:00 |
|
Andrew Meadows
|
01cc629224
|
fix crashes during init and shutdown
|
2015-05-22 09:20:08 -07:00 |
|
Seth Alves
|
ed082800f5
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-22 08:38:22 -07:00 |
|
Philip Rosedale
|
3a75dc4d1e
|
Merge pull request #4937 from ctrlaltdavid/dde-face-detection-interval
Throttle DDE face acquisition attempts in order to reduce CPU usage
|
2015-05-22 07:42:15 -07:00 |
|
Philip Rosedale
|
a1d0f4e3b8
|
Merge pull request #4936 from ericrius1/particleFix
fixed problem with particle entities not showing up on other clients …
|
2015-05-22 07:30:57 -07:00 |
|
David Rowe
|
a0c3c974a9
|
Throttle DDE face acquisition attempts in order to reduce CPU usage
|
2015-05-21 19:44:38 -07:00 |
|
Eric Levin
|
fe99941de3
|
fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp
|
2015-05-21 19:35:27 -07:00 |
|
Seth Alves
|
b57ccc80e8
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-21 18:38:33 -07:00 |
|
Brad Hefta-Gaub
|
9b469226f3
|
Merge pull request #4934 from sethalves/fix-edit-js
fix edit.js -- selectionManager.selections holds ids, not properties
|
2015-05-21 18:32:05 -07:00 |
|
Seth Alves
|
ab9d6a948c
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-05-21 18:22:09 -07:00 |
|
Seth Alves
|
258e3b901d
|
fixes Sam made in my branch while trying to get a mesh to render
|
2015-05-21 18:20:52 -07:00 |
|
Seth Alves
|
1100c832eb
|
clean up diff
|
2015-05-21 18:18:04 -07:00 |
|
Seth Alves
|
f85cc89946
|
clean up diff
|
2015-05-21 18:17:07 -07:00 |
|