Howard Stearns
80763b3fc5
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 13:45:25 -07:00
Howard Stearns
146ddd2240
Cleanup false starts.
2015-07-27 13:42:18 -07:00
Howard Stearns
ef52c0703f
Merge pull request #8 from AndrewMeadows/cadmium
...
remove unused legacy Shapes from Model and friends
2015-07-27 13:20:41 -07:00
Howard Stearns
8196770ed3
Wiring, including avatar position/velocity/orientation data, and an enableRig setting so that we don't break stuff unless turned on.
2015-07-27 12:58:43 -07:00
Howard Stearns
990f0d6d07
Pass correct position/velocity/orientation to Rig simulation.
2015-07-27 12:57:39 -07:00
Andrew Meadows
81831975b5
remove legacy CapsuleShape from SkeletonModel
2015-07-27 12:27:17 -07:00
Niraj Venkat
d2ee74f7c7
Shader code indentation
2015-07-27 12:20:41 -07:00
Niraj Venkat
1193b89918
Coding standard and tab fixes
2015-07-27 12:14:29 -07:00
Bing Shearer
c46e73434c
Added small fix to error message code
2015-07-27 11:59:09 -07:00
Niraj Venkat
92595583ec
Coding standard and building
2015-07-27 11:55:17 -07:00
Brad Hefta-Gaub
9783740b21
Merge pull request #5436 from huffman/edit-oob
...
Show an alert window when new objects would be out of bounds
2015-07-27 11:47:54 -07:00
Brad Hefta-Gaub
9464fe8f90
Merge pull request #5433 from hyperlogic/ajt/particle-render-fix
...
Improved ParticleEffectEntityItem rendering and updates
2015-07-27 11:47:09 -07:00
Ryan Huffman
ceffbb6383
Update edit.js to show an alert window when new objects would be out of bounds
2015-07-27 11:41:53 -07:00
Andrew Meadows
73ac941230
remove unused legacy Shapes from Model and friends
2015-07-27 11:15:33 -07:00
Brad Hefta-Gaub
e6f97810f4
Merge pull request #5434 from birarda/master
...
fix for OctreeSceneStat unpacking in Application
2015-07-27 11:14:57 -07:00
Bing Shearer
d54543e83c
Tidied up per Brad's request
2015-07-27 10:19:42 -07:00
Stephen Birarda
d3c6d8b3cc
move call to get VoxelPositionSize inside debug that uses it
2015-07-27 10:06:34 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02:00
Stephen Birarda
615218c77d
use a ref in stats unpacking
2015-07-27 09:58:58 -07:00
Stephen Birarda
9c57d1544f
fix OctreeSceneStat unpacking in Application
2015-07-27 09:53:27 -07:00
Seth Alves
a3c6a4b9bc
merge from upstream
2015-07-27 09:29:18 -07:00
Anthony J. Thibault
604ef5dc71
Fixed float constant.
2015-07-27 09:28:56 -07:00
Anthony J. Thibault
5844b594dc
Converted magic numbers to constants.
2015-07-27 09:27:16 -07:00
Howard Stearns
185f6bef9f
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 09:21:41 -07:00
Howard Stearns
dac6667ee6
Start of state.
2015-07-27 09:21:24 -07:00
Niraj Venkat
51e386aabd
Merge branch 'avatar' of https://github.com/venkatn93/hifi into avatar
2015-07-27 09:20:42 -07:00
Howard Stearns
1ec0518d05
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 09:20:30 -07:00
Niraj Venkat
83e0856279
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-27 09:20:19 -07:00
Niraj Venkat
1f58ad5d87
Merging master
2015-07-27 09:18:24 -07:00
Kevin M. Thomas
a82bf1d407
Merge branch 'master' of https://github.com/highfidelity/hifi into 20622
2015-07-27 12:15:40 -04:00
Kevin M. Thomas
d17ddae537
Added .js file to examples/example/audio and added public bucket url functionality.
2015-07-27 12:14:50 -04:00
Seth Alves
81375e47e0
remove methods from MyAvatar: setJointRotations setJointData clearJointData clearJointsData
2015-07-27 09:07:26 -07:00
Seth Alves
7e58283041
change the methods that aren't called from outside the class to be private
2015-07-27 08:54:08 -07:00
Seth Alves
8ac06c4059
remove friend class from Avatar
2015-07-27 08:48:16 -07:00
Marcel Verhagen
7c5961ea63
Merge remote-tracking branch 'upstream/master'
2015-07-27 17:22:41 +02:00
Seth Alves
73be57f54a
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-27 07:56:02 -07:00
Brad Hefta-Gaub
a9d5723eb3
Merge pull request #5410 from kevinmthomas-carpool/20618
...
CR for Job #20618 - Move Reload Content item to Developer menu.
2015-07-26 21:54:55 -07:00
Seth Alves
ac53b6b22c
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-26 20:00:56 -07:00
Anthony J. Thibault
5cc0b45850
Improved ParticleEffectEntityItem rendering and updates
...
* Created custom pipelines and shaders for untextured and textured
particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
now we just update all the time. (super cheap tho, if there are no particles
animating)
2015-07-26 17:21:17 -07:00
Brad Hefta-Gaub
8a34df380c
Merge pull request #5432 from sethalves/quiet-compiler
...
quiet compiler
2015-07-26 12:06:40 -07:00
Brad Hefta-Gaub
89d1e82f89
Merge pull request #5431 from jherico/homer
...
Limit the amount of time consumed by QML rendering
2015-07-26 11:54:05 -07:00
Seth Alves
5abed29a43
merge from upstream
2015-07-25 21:15:57 -07:00
Seth Alves
75df3cea15
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-25 21:14:04 -07:00
Seth Alves
24fff719c5
quiet compiler
2015-07-25 21:11:23 -07:00
Marcel Verhagen
d25e09af74
removed the last 2 filename lines, they should not be there.
2015-07-26 00:48:31 +02:00
Brad Davis
f66492b444
Merge pull request #5422 from ctrlaltdavid/20591
...
CR for 20591 - Fix setting WebWindow's width and height
2015-07-25 11:49:53 -04:00
Brad Davis
843a333727
Merge pull request #5424 from samcake/yellow
...
Cleaning up the FBO cache and the output stage in general
2015-07-25 11:49:22 -04:00
Bradley Austin Davis
7be33dcb58
Limit the amount of time consumed by rendering QML
2015-07-25 11:40:58 -04:00
Kevin M. Thomas
52fd45da2c
Merge branch 'master' of https://github.com/highfidelity/hifi into 20622
2015-07-25 08:02:54 -04:00
Kevin M. Thomas
beccd4fc93
Merge branch 'master' of https://github.com/highfidelity/hifi into 20628
2015-07-25 07:59:06 -04:00
