ZappoMan
|
f9bcb65467
|
change removing more glColor calls
|
2015-01-28 14:52:40 -08:00 |
|
ZappoMan
|
7bd45ba0ca
|
change removing more glColor calls
|
2015-01-28 14:52:33 -08:00 |
|
ZappoMan
|
2f4e98082b
|
remove glColor calls related to text rendering
|
2015-01-28 13:54:48 -08:00 |
|
ZappoMan
|
7d9de6d0eb
|
added some TODO comments and some cleanup
|
2015-01-28 11:03:05 -08:00 |
|
ZappoMan
|
6821f31f14
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
libraries/gpu/src/gpu/GLBackend.cpp
|
2015-01-28 10:46:30 -08:00 |
|
ZappoMan
|
30f985a6fe
|
some cleanup
|
2015-01-28 10:30:05 -08:00 |
|
Andrew Meadows
|
7a849e97ec
|
Merge pull request #4184 from samcake/temp0
Fix windows crash on start
|
2015-01-28 10:25:20 -08:00 |
|
Sam Gateau
|
dc01611f26
|
Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded
|
2015-01-28 10:22:37 -08:00 |
|
ZappoMan
|
9631761f70
|
get sphere normals correct
|
2015-01-27 21:39:59 -08:00 |
|
ZappoMan
|
e7742351b7
|
get sizing for spheres to work properly
|
2015-01-27 20:30:58 -08:00 |
|
Brad Hefta-Gaub
|
347c74ebae
|
Merge pull request #4181 from ctrlaltdavid/20276
CR for Job #20276 - Add Scripting Support for changes in Audio Devices
|
2015-01-27 19:36:17 -08:00 |
|
David Rowe
|
7286a9c5fb
|
Merge branch 'master' into 20276
|
2015-01-27 19:08:40 -08:00 |
|
Brad Hefta-Gaub
|
8994b9f51c
|
Merge pull request #4182 from AndrewMeadows/isentropic
fix bad integration of rapidly spinning objects
|
2015-01-27 18:33:31 -08:00 |
|
Brad Hefta-Gaub
|
aa2011a543
|
Merge pull request #4160 from samcake/temp0
Introducing the gpu::Texture class and using it for model rendering
|
2015-01-27 18:30:06 -08:00 |
|
Brad Hefta-Gaub
|
7f1df726bf
|
Merge pull request #4183 from Atlante45/master
Revert "Use QDickCache for every QNAM"
|
2015-01-27 18:28:35 -08:00 |
|
Atlante45
|
98fc1836d8
|
Revert "Use QDickCache for every QNAM"
This reverts commit 2f39b93823.
|
2015-01-27 18:09:22 -08:00 |
|
Andrew Meadows
|
58bb137c4d
|
bulletRotationStep --> computeBulletRotationStep
|
2015-01-27 17:37:12 -08:00 |
|
Grayson Stebbins
|
0bf20a207c
|
Added gverb instructions
|
2015-01-27 17:35:53 -08:00 |
|
Grayson Stebbins
|
24845b7856
|
Added gverb
|
2015-01-27 17:34:00 -08:00 |
|
Andrew Meadows
|
23bd3f90d9
|
Bullet-style rotation integration for kinematics
and for dead reckoning after wire-transfer
|
2015-01-27 17:27:15 -08:00 |
|
Grayson Stebbins
|
14f9d627f6
|
Note about Qxmpp version and support for Oculus Rift
|
2015-01-27 17:16:31 -08:00 |
|
Grayson Stebbins
|
dc1051b6a9
|
Reminder that everything should be 32-bit
|
2015-01-27 17:10:09 -08:00 |
|
ZappoMan
|
5df45c7dce
|
build buster and warnings fixes
|
2015-01-27 16:55:16 -08:00 |
|
ZappoMan
|
4a6cc5c6f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/ui/overlays/ImageOverlay.cpp
|
2015-01-27 16:44:11 -08:00 |
|
David Rowe
|
2ee1570a40
|
Merge branch 'master' into 20276
|
2015-01-27 16:38:41 -08:00 |
|
Andrew Meadows
|
b9ac5bb915
|
merge upstream/master into andrew/isentropic
|
2015-01-27 16:24:45 -08:00 |
|
Andrew Meadows
|
d1cf6559c5
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/physics/src/ObjectMotionState.cpp
|
2015-01-27 16:24:11 -08:00 |
|
Andrew Meadows
|
026c39e010
|
Merge pull request #4131 from Atlante45/pull_out_menu_mess
Settings - Part I
|
2015-01-27 16:23:23 -08:00 |
|
Brad Hefta-Gaub
|
1dd037c7cf
|
Merge pull request #4180 from huffman/edit-focus
Update editEntities to auto-focus on selection
|
2015-01-27 16:03:05 -08:00 |
|
Ryan Huffman
|
1ba398c0e3
|
Remove blank line
|
2015-01-27 15:57:27 -08:00 |
|
Ryan Huffman
|
defb796c1e
|
Update editEntities to auto-focus on selection
|
2015-01-27 15:56:24 -08:00 |
|
Andrew Meadows
|
d5c0c200de
|
optimization for when physics engine doesn't step
|
2015-01-27 15:54:32 -08:00 |
|
Andrew Meadows
|
aebdd3b335
|
fix bad extrapolation of rapidly spinning objects
|
2015-01-27 15:53:37 -08:00 |
|
Sam Gateau
|
f619acc3b5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-01-27 15:43:27 -08:00 |
|
Sam Gateau
|
4592bdcb4f
|
fixes after review by Brad
|
2015-01-27 15:42:56 -08:00 |
|
Stephen Birarda
|
346381efc9
|
Merge pull request #4179 from Atlante45/move_setup_essentials
Move setApplication/Organisation to setupEssentials
|
2015-01-27 15:39:41 -08:00 |
|
Grayson Stebbins
|
baba56a793
|
Add another link back to BUILD.md
|
2015-01-27 15:34:54 -08:00 |
|
Atlante45
|
a28195a334
|
Move setApplication/Organisation to setupEssentials
|
2015-01-27 15:28:06 -08:00 |
|
Grayson Stebbins
|
e6673327a2
|
Minor edits, addition of note about PATH
|
2015-01-27 14:37:22 -08:00 |
|
Brad Hefta-Gaub
|
2403533e0e
|
Merge pull request #4178 from huffman/fix-mesh-textures
Fix failing QMetaObject::invokeMethod call
|
2015-01-27 14:00:58 -08:00 |
|
Ryan Huffman
|
7ececd793a
|
Fix failing QMetaObject::invokeMethod call
|
2015-01-27 13:59:46 -08:00 |
|
Grayson Stebbins
|
e290fa2e7f
|
Small changes, removed VS section
Removed the Visual Studio section -- now that we have a better Visual Studio 2013 section it was unnecessary.
|
2015-01-27 13:42:24 -08:00 |
|
Grayson Stebbins
|
acb1494e3e
|
Small edits to links
|
2015-01-27 13:38:58 -08:00 |
|
Grayson Stebbins
|
36e9f6b9e0
|
Reminder about all dependencies
|
2015-01-27 13:33:29 -08:00 |
|
Andrew Meadows
|
e2ffe00c38
|
Merge pull request #4172 from huffman/fix-image-overlay-rescale
Fix image overlay rescale
|
2015-01-27 13:07:15 -08:00 |
|
Brad Hefta-Gaub
|
0c4dc4100d
|
Merge pull request #4176 from huffman/fix-inspect
Fix inspect + editEntities cameras from clashing
|
2015-01-27 13:05:33 -08:00 |
|
Brad Hefta-Gaub
|
0c53193e79
|
Merge pull request #4175 from cozza13/20283
CR for Job #20283 - Clean up scripts that have recently been added.
|
2015-01-27 13:05:17 -08:00 |
|
Brad Hefta-Gaub
|
a46fda3749
|
Merge pull request #4174 from huffman/delete-entity
Update deleteEntity to obey entity locked property
|
2015-01-27 13:05:05 -08:00 |
|
Brad Hefta-Gaub
|
064f49db3d
|
Merge pull request #4173 from thoys/patch-2
Update README.md
|
2015-01-27 13:04:53 -08:00 |
|
Andrew Meadows
|
6b6e846378
|
Merge pull request #4177 from ZappoMan/fixGlitches
Some physics improvements
|
2015-01-27 13:02:11 -08:00 |
|