Commit graph

25958 commits

Author SHA1 Message Date
Stephen Birarda
94131908fb update polyvox for xcode C++11 build 2015-06-01 14:53:11 -07:00
Seth Alves
ea3f002a65 ifdef out debug pritns 2015-06-01 14:38:07 -07:00
Stephen Birarda
12bcbbf338 Merge pull request #5012 from ctrlaltdavid/20555
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
2015-06-01 17:08:00 -04:00
Seth Alves
d1bb6473d9 more work on edge handling and resizing 2015-06-01 13:57:28 -07:00
David Rowe
7d12482a49 Untabify 2015-06-01 13:54:14 -07:00
David Rowe
9c52c79fe1 Combine icon and input areas into a single SVG 2015-06-01 13:29:36 -07:00
Stephen Birarda
293af425ac remove vhacd block from windows build guide 2015-06-01 12:49:26 -07:00
Seth Alves
43a1519e29 better handling of changes to the size of voxel space. limit each dimension to 32 2015-06-01 12:01:45 -07:00
Eric Levin
5cce4edec8 fix merge conflicts attemp 1 2015-06-01 11:18:33 -07:00
Eric Levin
b6b5078048 removed unneeded append methods from OctreePacketData 2015-06-01 11:11:08 -07:00
Eric Levin
93c3f90c95 clened up read and write of qVec- no longer converting between qVector and qByteArray 2015-06-01 11:08:48 -07:00
David Rowe
b166e24ff5 Fix initial fade-in 2015-06-01 11:06:33 -07:00
samcake
b676036895 Merge pull request #5007 from SamGondelman/master
Fixed avatar billboards not displaying
2015-06-01 10:54:19 -07:00
Seth Alves
175926736d Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-01 09:59:01 -07:00
Eric Levin
7b08537574 code standards fixes 2015-06-01 09:51:24 -07:00
Philip Rosedale
6290f8c992 Merge pull request #5013 from ericrius1/grab
removed sounds from grab script
2015-06-01 09:39:04 -07:00
Eric Levin
45331e5a0e removed sounds from grab script 2015-06-01 09:37:54 -07:00
Philip Rosedale
63ae711015 Merge pull request #5005 from howard-stearns/sound-parameter-tweaks
Sound parameter tweaks
2015-06-01 09:37:36 -07:00
Eric Levin
8a191a661d adding flag for points changed 2015-06-01 09:35:32 -07:00
Howard Stearns
6a57d52b22 Merge branch 'master' of https://github.com/highfidelity/hifi into sound-parameter-tweaks 2015-06-01 09:07:20 -07:00
David Rowe
9a8bb67f37 Tidy address bar dialog code 2015-06-01 09:01:11 -07:00
David Rowe
e41b4c1b7b Add new address bar dialog error message
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
2015-06-01 09:01:11 -07:00
David Rowe
05e251eba4 Add icon to address bar dialog 2015-06-01 09:01:10 -07:00
David Rowe
881941b64d Restyle address bar dialog
Made the dialog a stand-alone QML file that doesn't inherit from other
dialog QML files so that don't need to rework all dialogs right now.
2015-06-01 09:01:09 -07:00
David Rowe
a43593c3b2 Dialog opacity transition tidying 2015-06-01 09:01:08 -07:00
David Rowe
2a931119bd Replace expand/collapse dialog animation with fade in/out 2015-06-01 09:01:08 -07:00
Seth Alves
d04b61d6a8 oops 2015-06-01 07:16:16 -07:00
Seth Alves
00af0a4376 trying to make thing behave when voxel-space is resized 2015-06-01 07:15:37 -07:00
Eric Levin
9ca5310c21 cleaned up another qDebugging line 2015-05-31 15:33:51 -07:00
Eric Levin
9641b11086 array of points takes absolute positions now, so script writer has an easier time 2015-05-31 14:59:09 -07:00
Eric Levin
115bf3dd25 cleaned up logging and testing code. 2015-05-31 14:52:44 -07:00
Eric Levin
27b59b5f72 fixed bug in qvec unpacking code 2015-05-31 14:46:20 -07:00
Eric Levin
5e22af8643 points and line width persistent accross clients 2015-05-31 14:21:28 -07:00
Seth Alves
cfeab893e7 fix voxelToLocalMatrix 2015-05-31 09:28:33 -07:00
Seth Alves
b9202ebfb6 added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look 2015-05-31 09:14:59 -07:00
Seth Alves
a3589788df allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items. 2015-05-30 18:33:35 -07:00
Seth Alves
f955cb45b2 keep track of number of non-zero voxels, use this information when deciding on shape-type 2015-05-30 18:14:54 -07:00
Seth Alves
ad71d7b7a2 allow changing of voxel-volume-size with edit.js 2015-05-30 18:14:36 -07:00
Seth Alves
c5a0dd72ec keep track of number of non-zero voxels, use this information when deciding on shape-type 2015-05-30 18:13:57 -07:00
Seth Alves
fe59f8846f recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape 2015-05-30 16:43:11 -07:00
Philip Rosedale
396a20c72d Merge pull request #5006 from ericrius1/brownianFun
added brownianFun script to apply random forces to balls in a pen
2015-05-30 15:25:38 -07:00
Eric Levin
cb72b620cf printing bytes out correctly 2015-05-29 19:42:07 -07:00
Seth Alves
96a40bd673 basic collisions with cubic polyvoxes 2015-05-29 18:50:26 -07:00
Eric Levin
8dda86f80d added brownianFun script to apply random forces to balls in a pen 2015-05-29 17:02:51 -07:00
Eric Levin
7d5dd278a1 adding unpacking 2015-05-29 16:54:40 -07:00
Sam Gondelman
c19115a485 actually fixed billboard 2015-05-29 16:53:01 -07:00
Sam Gondelman
4c83c6918d fixed avatar billboards not displaying 2015-05-29 16:44:16 -07:00
Howard Stearns
9c56f6270e Remove debug print. 2015-05-29 16:21:57 -07:00
Howard Stearns
6e2378e676 Sound parameter tweaks. 2015-05-29 16:19:41 -07:00
Philip Rosedale
11844463d1 Merge pull request #4915 from AndrewMeadows/isothermal
DO NOT MERGE grabHockey.js script can safely manipulate misc objects again
2015-05-29 16:07:32 -07:00