Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Thijs Wenker
67e945b884
fix unit test
2015-08-22 03:32:53 +02:00
Anthony J. Thibault
b7009b4631
Fix for animation resources
...
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.
So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
2015-08-21 16:09:06 -07:00
Thijs Wenker
d89ecc1e42
Move WebSocketServer to be accessable from Assignment-Client:Agent only.
2015-08-21 22:43:49 +02:00
Thijs Wenker
fd82f05307
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-21 19:29:38 +02:00
Thijs Wenker
55fd847636
removed unused code, renamed UnitTest.ready() to UnitTest.done()
2015-08-21 19:07:33 +02:00
Brad Davis
1e5f9b0442
Merge pull request #5624 from PhilipRosedale/master
...
First pass, grenade and basketball toys.
2015-08-20 23:56:44 -07:00
Philip Rosedale
cee570d2b2
First pass at basketball, just appears in front of you with some reasonable values
2015-08-20 23:06:05 -07:00
Philip Rosedale
7284e3aa3c
added a little bit of spin, too.
2015-08-20 22:20:51 -07:00
Philip Rosedale
ef4ad3107e
First pass, grenade toy. Needs art.
2015-08-20 22:11:11 -07:00
Brad Hefta-Gaub
6f3b34982e
Merge pull request #5614 from samcake/punk
...
Script improvments with render Engine debug.js
2015-08-20 15:00:16 -07:00
Thijs Wenker
7f5fc64f6c
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-20 21:09:22 +02:00
Sam Gateau
84d244ec52
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-08-20 11:33:18 -07:00
Ryan Huffman
f834418384
Fix edit.js to warn when creating entities outside of world bounds
2015-08-20 11:23:16 -07:00
ZappoMan
010a3d8220
fix create in negative space bug
2015-08-19 17:12:03 -07:00
Andrew Meadows
5a442bdb30
Merge pull request #5555 from ZappoMan/centerOrigin
...
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
2015-08-19 15:59:04 -07:00
Chris Collins
846ca3b86b
removed mouselook
...
removed mouselook
2015-08-19 12:58:26 -07:00
Chris Collins
9605294ea8
Removed HMDcontrol.js from default scripts
...
Removed HMDcontrol.js from default scripts. Will put back when
HMDcontrol is fixed
2015-08-19 12:55:52 -07:00
Thijs Wenker
fd7d186ffb
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-19 20:23:45 +02:00
ZappoMan
684ee3bdd0
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-19 11:20:15 -07:00
Andrew Meadows
990dce6795
Merge pull request #5578 from sethalves/polyvox
...
Polyvox improvements
2015-08-19 10:31:13 -07:00
Thijs Wenker
9af7205672
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-19 16:49:39 +02:00
David Rowe
f6815c215a
Fix edit toolbar moving to top left of screen
2015-08-18 10:59:49 -07:00
ZappoMan
5715042102
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-17 21:53:45 -07:00
Thijs Wenker
29c857f1fa
- unitTests for WebSockets + WebSocketServer (added some asynchronous functionality to the unitTest.js library , previous functionality intact)
2015-08-18 03:24:26 +02:00
Seth Alves
c60a8e7dfc
minecraft style voxel editing largely works
2015-08-16 12:52:55 -07:00
Seth Alves
a57278ba3c
ray-picks against cubic-voxels seem right, now
2015-08-16 11:51:04 -07:00
Seth Alves
4ffb5c9716
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-16 11:05:03 -07:00
Seth Alves
6db115bed5
try to make adding and removing voxels work more like expected
2015-08-16 09:36:13 -07:00
Seth Alves
f6cbeb37f8
put a green sphere at the point being pointed to
2015-08-16 09:35:50 -07:00
Seth Alves
5ecdbaa19d
have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords
2015-08-15 15:18:25 -07:00
Seth Alves
79a7755cdb
add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style
2015-08-15 12:18:36 -07:00
Brad Hefta-Gaub
53c5c75071
Merge pull request #5574 from bwent/solar-system
...
Updates to solarsystem.js
2015-08-15 11:25:40 -07:00
Brad Hefta-Gaub
b1a4715ce1
Merge pull request #5572 from bwent/particleDance
...
Example particle scripts
2015-08-15 11:24:44 -07:00
Brad Hefta-Gaub
821063f6d2
Merge pull request #5575 from SamGondelman/sam/input-plugins
...
Working on toybox script, squeezeHands, and default mappings
2015-08-15 10:59:04 -07:00
Brad Hefta-Gaub
a0e92e71a5
Merge pull request #5562 from AlexanderOtavka/overlay-docs
...
Documentation for overlay changes.
2015-08-14 18:53:34 -07:00
bwent
8609129228
fix header
2015-08-14 17:07:01 -07:00
bwent
889d9c54a5
add newline at end of file
2015-08-14 16:24:11 -07:00
bwent
45fe6a438c
Example particle scripts
2015-08-14 16:18:07 -07:00
ZappoMan
44fcf71f07
change domain to be 32k and still have origin centered at 0
2015-08-14 15:26:49 -07:00
bwent
7834a18bcf
add untracked changes
2015-08-14 15:11:05 -07:00
bwent
7bd9e2653c
more bug fixes
2015-08-14 15:09:48 -07:00
bwent
68fcf4ec8a
formatting
2015-08-14 11:06:44 -07:00
bwent
2c5c362957
adding rocket and refresh icons
2015-08-14 10:19:57 -07:00
Ryan Huffman
ee11b74c8b
Update click move distance threshold
2015-08-14 10:13:05 -07:00
Ryan Huffman
56501490a1
Update edit.js mouse click code to be more lenient to micro movements
2015-08-14 10:09:16 -07:00
bwent
58713c0d57
more minor bug fixes
2015-08-14 09:55:05 -07:00
ZappoMan
5fdd7304aa
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-14 09:33:53 -07:00
bwent
2dbba322fd
bug fixes, ride through system
2015-08-13 18:13:08 -07:00
