Commit graph

25966 commits

Author SHA1 Message Date
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume
Smooth initial crash volume
2015-06-05 08:40:09 -07:00
Philip Rosedale
164df99f93 Merge pull request #5056 from ericrius1/paint
marker ball now stays without mouse whether or not user is drawing
2015-06-04 21:42:47 -07:00
Eric Levin
fd8126510d marker ball now stays without mouse whether or not user is drawing 2015-06-04 21:41:19 -07:00
Philip Rosedale
84c03b29ef Merge pull request #5055 from ericrius1/paint
added redo and undo functionality to mouse component of paint script,…
2015-06-04 21:15:11 -07:00
Eric Levin
9264ef980c added redo and undo functionality to mouse component of paint script, and fixed overlay not being deleted on script ending bug 2015-06-04 21:13:16 -07:00
Philip Rosedale
8c32f8f396 Merge pull request #5054 from ericrius1/paint
added paint.js and line rider script. Users can paint lines with hydr…
2015-06-04 20:52:23 -07:00
Philip Rosedale
ead1b63f05 Merge pull request #5050 from ericrius1/pointerFix
updated pointer.js script to work with new line entity
2015-06-04 20:44:03 -07:00
Eric Levin
f276ca30cd refactoring for common functions. Fix for randFloat 2015-06-04 17:55:55 -07:00
Eric Levin
241330442c added paint.js and line rider script. Users can paint lines with hydra or mouse, and then go on a ride over the line they just created. 2015-06-04 17:35:26 -07:00
Philip Rosedale
6d29524610 Merge pull request #5052 from ericrius1/lineSanitization
added sanitization for invalid line points data. Fixed bug where occa…
2015-06-04 17:22:48 -07:00
Eric Levin
1fd0650955 removing overlay on script ending 2015-06-04 16:54:52 -07:00
Eric Levin
5e15c14539 added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script" 2015-06-04 16:45:32 -07:00
Eric Levin
a2ae51371b updated pointer.js script to work with new line entity 2015-06-04 15:44:39 -07:00
Howard Stearns
407d3b6a6e Pitch is dependent on (largest dimension of) minimum bounding, not max.
Adjust sound range of full volume.
2015-06-04 14:23:51 -07:00
Howard Stearns
5cbb5dadca More perspicacious zero. 2015-06-04 14:21:12 -07:00
Howard Stearns
5727400b9a Sound toys script (in examples/soundToys.js) 2015-06-04 14:20:19 -07:00
Howard Stearns
0b52f85c60 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-initial-crash-volume 2015-06-04 09:10:42 -07:00
Brad Davis
a12fd5c3d0 Merge pull request #5023 from AndrewMeadows/bispinor
fix crash in ~OffscreenGlCanvas on linux shutdown
2015-06-03 17:21:39 -07:00
Stephen Birarda
cf67d22ec7 Merge pull request #5036 from venkatn93/master
Fixed snapshot bug. Snapshots now save and load ok
2015-06-03 18:57:29 -04:00
Niraj Venkat
29a15453ac Visual studio tab issues fixed 2015-06-03 15:35:04 -07:00
Niraj Venkat
4db110a6e1 Final fixes. Snapshot should be good now 2015-06-03 15:09:45 -07:00
Niraj Venkat
92248d23e7 more indentation changes 2015-06-03 14:59:07 -07:00
Niraj Venkat
694272ffaa "fixed" formatting issues and code cleanup 2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7 Fixed snapshot bug. Snapshots now save and load ok 2015-06-03 14:29:39 -07:00
Howard Stearns
407746b842 Fix (consistent) typo in non-magic-number constant's name. 2015-06-03 10:38:20 -07:00
Howard Stearns
c036b5fd4b Actually commit the changes this time! 2015-06-03 10:19:28 -07:00
Howard Stearns
304eda77a8 Merge branch 'master' of https://github.com/highfidelity/hifi into pitch-shifted-collision-sounds 2015-06-03 10:01:26 -07:00
Andrew Meadows
b0fdb0413c Merge pull request #5024 from ctrlaltdavid/20561
CR for #20561 - Fix address bar dialog text
2015-06-03 09:33:29 -07:00
Brad Hefta-Gaub
66aa7c1adf Merge pull request #5026 from sethalves/polyvox
icon for create-polyvox button
2015-06-02 18:43:27 -07:00
David Rowe
878227ab8b Increase address bar dialog size
Including font size, just for this dialog.
2015-06-02 16:33:09 -07:00
Seth Alves
a85a0b863d icon for create-polyvox button 2015-06-02 16:25:38 -07:00
David Rowe
ec1cb72dd5 Rework QML font sizing to be more consistent across platforms 2015-06-02 14:49:33 -07:00
David Rowe
a8a3c677ad Darken address bar hint text so that it's better visible on the DK2 2015-06-02 14:49:32 -07:00
Andrew Meadows
9e0c2a3c6c fix crash in ~OffscreenGlCanvas on linux shutdown 2015-06-02 14:36:34 -07:00
Andrew Meadows
2702e07863 Merge pull request #5015 from sethalves/polyvox
PolyVox improvements -- depends on #5008
2015-06-02 14:34:49 -07:00
Brad Hefta-Gaub
2a8e758559 Merge pull request #5010 from ericrius1/lineEntity
Modified the line entity to take two new properties: lineWidth and linePoints
2015-06-02 14:25:44 -07:00
Eric Levin
7527efc2d6 removed unsuded variable 2015-06-02 13:58:09 -07:00
Eric Levin
a98baef736 another code cleanup 2015-06-02 13:56:18 -07:00
Eric Levin
55ffb7f1c0 code style changes 2015-06-02 12:51:45 -07:00
Brad Hefta-Gaub
2892b2bc8d Merge pull request #5020 from ctrlaltdavid/20559
DO NOT MERGE - QA for #20559 - Fix crash when setting avatar body with Preferences dialog closed
2015-06-02 12:37:29 -07:00
Stephen Birarda
c90114e1ef Update BUILD_OSX.md 2015-06-02 10:49:45 -07:00
Seth Alves
11eb073bcf fix comment 2015-06-02 10:04:39 -07:00
Seth Alves
d201f7791e oops 2015-06-02 10:01:43 -07:00
Seth Alves
20d3814c1b code review 2015-06-02 10:00:07 -07:00
Howard Stearns
8e6a20ec42 Merge branch 'master' of https://github.com/highfidelity/hifi into pitch-shifted-collision-sounds 2015-06-02 09:38:54 -07:00
Eric Levin
e7c5a24e3d fixed packet number increment logic 2015-06-02 09:38:45 -07:00
Philip Rosedale
faf9120b10 Merge pull request #5019 from howard-stearns/pitch-shifted-collision-sounds
Pitch shifted collision sounds
2015-06-02 09:38:13 -07:00
Howard Stearns
67c0a8354a Merge branch 'master' of https://github.com/highfidelity/hifi into pitch-shifted-collision-sounds 2015-06-02 09:36:56 -07:00
Howard Stearns
0837c016c5 Update constant to use AudioConstants.h 2015-06-02 09:18:45 -07:00