Seth Alves
00296faa51
trying to get polyvox to build on osx
2015-05-27 20:00:37 -07:00
Seth Alves
aff82a90ce
try, try again
2015-05-27 19:16:50 -07:00
Seth Alves
4961c10e17
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 19:05:01 -07:00
Seth Alves
f403698e36
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-05-27 19:04:54 -07:00
Seth Alves
6151a7cf1a
Merge pull request #4983 from AndrewMeadows/bispinor
...
fix for glitchy grabs and failure to take simulation ownership
2015-05-27 18:50:03 -07:00
Seth Alves
05cd7fb8c4
update polyvox external source
2015-05-27 18:39:13 -07:00
Seth Alves
4b564e2eee
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:38:44 -07:00
Seth Alves
4fa6f388b9
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:20:59 -07:00
Andrew Meadows
0a0eba8277
merge
2015-05-27 18:07:00 -07:00
Andrew Meadows
aba539928d
fix grab glitches and failure to own simulation
2015-05-27 18:05:59 -07:00
Brad Hefta-Gaub
0553f7ca4c
Merge pull request #4961 from hyperlogic/ajt/particle-net-anim-fix
...
Particle entities should avoid resetting simulation when setMaxParticles is called
2015-05-27 17:44:44 -07:00
Seth Alves
25df777132
fix polyfox url
2015-05-27 16:15:58 -07:00
Brad Hefta-Gaub
5da3a9440e
Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples
...
[REQUIRES #4962 ] Remove global collision and update examples
2015-05-27 16:09:14 -07:00
Seth Alves
95c5ed66fc
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 15:37:33 -07:00
Seth Alves
43dd8b3fb1
Merge pull request #4980 from ericrius1/pointer
...
Pointer
2015-05-27 15:37:24 -07:00
Seth Alves
c3c701f807
polyvox no longer has a color
2015-05-27 15:23:01 -07:00
Seth Alves
8cb5717b86
formatting, cleanups
2015-05-27 15:16:15 -07:00
Seth Alves
5cc038e1c6
polyvox no longer has a color
2015-05-27 15:12:26 -07:00
Eric Levin
07c8fb6c02
turned pointer and draw funcitonality off be default
2015-05-27 15:11:16 -07:00
Seth Alves
ded79609de
back out unrelated change
2015-05-27 15:10:27 -07:00
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
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
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
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
