Eric Levin
ca85401b77
added button so user can toggle pointer on/off
2015-05-27 15:08:52 -07:00
Seth Alves
c933c42b18
move polyvox external source to s3
2015-05-27 15:02:20 -07:00
Seth Alves
1109444c3d
attempt to make sure the ray that picks against polyvox entities is long enough
2015-05-27 14:57:12 -07:00
Seth Alves
386b3301f4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 14:46:37 -07:00
Seth Alves
1cdb36f7fb
Merge pull request #4974 from ctrlaltdavid/fix-c4351
...
Fix Windows C4351 build warning
2015-05-27 14:46:03 -07:00
Seth Alves
bfa0e9c234
recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 14:44:23 -07:00
Stephen Birarda
c7c542ef4c
decouple STUN from DS check in
2015-05-27 14:24:15 -07:00
Seth Alves
968643a38c
Merge pull request #4977 from highfidelity/revert-4973-avatarInvokableFixes
...
Revert "removed const keyword from Q_INVOKABLE for avatar getter meth…
2015-05-27 14:21:24 -07:00
Seth Alves
ba0467aafe
Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…"
2015-05-27 14:10:45 -07:00
Seth Alves
7f99f261c2
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 13:59:13 -07:00
Seth Alves
75a1d43bce
Merge pull request #4973 from ericrius1/avatarInvokableFixes
...
removed const keyword from Q_INVOKABLE for avatar getter methods such…
2015-05-27 13:58:58 -07:00
Seth Alves
29cb5ed126
Merge pull request #4967 from ericrius1/pointer
...
modified pointer script to allow users to draw on surfaces
2015-05-27 13:56:17 -07:00
Seth Alves
e016bc42a4
Merge pull request #4968 from ericrius1/blockWorld
...
added blockWorld script to generate floor of tiles and drop jenga blo…
2015-05-27 13:56:06 -07:00
Eric Levin
8edc883e4d
adding serialization for Qvector
2015-05-27 13:47:47 -07:00
Eric Levin
62539719df
line width added as property to line entities
2015-05-27 13:31:47 -07:00
Seth Alves
7c4b89d917
get polyvox to build on osx
2015-05-27 11:56:57 -07:00
David Rowe
a2272d3f42
Fix Windows C4351 build warning
...
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
2015-05-27 11:49:00 -07:00
Eric Levin
eb0f35e041
removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 11:44:37 -07:00
Howard Stearns
380723d1c5
Merge pull request #4970 from AndrewMeadows/thermonuclear
...
rewritten MassProperties with complete unit tests
2015-05-27 10:42:17 -07:00
Seth Alves
5e66a079c4
make this build on older gcc
2015-05-27 10:38:15 -07:00
Stephen Birarda
4b6b34836d
repair anomalies in timing table
2015-05-27 10:30:45 -07:00
Seth Alves
6fd38fabe4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 10:06:53 -07:00
Seth Alves
14c68519f3
limit size of polyvox data property to below MTU
2015-05-27 09:59:18 -07:00
Seth Alves
429cc631f3
limit size of polyvox data property to below MTU
2015-05-27 09:48:32 -07:00
Seth Alves
3af916e27e
use enum for polyvox surface style
2015-05-27 09:32:10 -07:00
Howard Stearns
4b4bf9fd90
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-27 09:29:06 -07:00
Brad Hefta-Gaub
afb09e81a6
Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts
...
Entity events in normal scripts
2015-05-27 09:24:50 -07:00
andrew
2a6955ce12
fix windows build
2015-05-27 09:14:11 -07:00
Seth Alves
1749ec83db
adapting to entitypointer merge
2015-05-27 09:00:59 -07:00
Seth Alves
f310da9cd3
adapting to entitypointer merge
2015-05-27 08:59:44 -07:00
Seth Alves
b02e452b19
adapting to entitypointer merge
2015-05-27 08:58:03 -07:00
Seth Alves
c1f75506ae
adapting to entitypointer merge
2015-05-27 08:57:22 -07:00
Seth Alves
df795cf296
adapting to entitypointer merge
2015-05-27 08:54:15 -07:00
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -07:00
Seth Alves
0f81445cee
flag for polyvox to select minecraft vs walking-cubes. uppack to unpack
2015-05-27 07:04:44 -07:00
Andrew Meadows
39d8244255
use highfideltiy style for class data member names
2015-05-26 22:59:29 -07:00
Andrew Meadows
708203089c
replace tabs with spaces
2015-05-26 22:53:57 -07:00
Andrew Meadows
efbb9b0238
rewritten MassProperties with complete unit tests
2015-05-26 22:48:45 -07:00
Seth Alves
6930008f74
remove debugging spew
2015-05-26 21:40:50 -07:00
Seth Alves
6b5020285b
set last-edited in properties when changing voxel data
2015-05-26 21:32:33 -07:00
Seth Alves
5acc018bda
debugging
2015-05-26 20:58:23 -07:00
Seth Alves
ebae87136f
debugging
2015-05-26 20:57:58 -07:00
Brad Davis
09085f1cd9
Working towards display plugins
2015-05-26 18:42:38 -07:00
Eric Levin
4fb5f0796c
added props for encoding and decoding
2015-05-26 18:40:15 -07:00
Eric Levin
811f5db419
fixed linker error in lineentityitem.cpp
2015-05-26 18:36:24 -07:00
Eric Levin
dc4196df30
line entities
2015-05-26 18:26:25 -07:00
Seth Alves
cd2b6473ba
debugging
2015-05-26 18:21:45 -07:00
Seth Alves
517d4372fa
debugging
2015-05-26 16:53:11 -07:00
Stephen Birarda
9cb6ccaa46
thread safe timing of domain connection
2015-05-26 16:49:18 -07:00
Eric Levin
3fb5476968
added blockWorld script to generate floor of tiles and drop jenga blocks at random points above floor
2015-05-26 16:46:01 -07:00