Seth Alves
|
ea65ef964f
|
fix an AC race/crash
|
2015-12-04 11:13:36 -08:00 |
|
Brad Hefta-Gaub
|
d9a1563396
|
Merge pull request #6152 from sethalves/parents
Parents
|
2015-12-04 10:26:57 -08:00 |
|
Brad Hefta-Gaub
|
ab63f19b6a
|
Merge pull request #6546 from kencooke/audio-reverb
Reverb
|
2015-12-04 10:19:56 -08:00 |
|
Brad Hefta-Gaub
|
49a7852d76
|
Merge pull request #6540 from Atlante45/warnings
Fix warnings on OS X
|
2015-12-04 10:19:25 -08:00 |
|
Brad Hefta-Gaub
|
8b58aa706a
|
Merge pull request #6534 from jherico/homer
Windows 64 bit updates
|
2015-12-04 10:05:45 -08:00 |
|
Atlante45
|
07387ab8c0
|
Fix most OpenGL warnings
|
2015-12-04 10:01:43 -08:00 |
|
Brad Davis
|
a8f0de20a8
|
Merge pull request #6551 from ZappoMan/cruftRemovalRedux
Cruft removal redux
|
2015-12-04 09:45:22 -08:00 |
|
Atlante45
|
a455cb880f
|
Fix typeid warning
|
2015-12-04 09:23:16 -08:00 |
|
Atlante45
|
cb758ca6b4
|
Fix override warnings on XCode 7
|
2015-12-04 08:55:43 -08:00 |
|
Atlante45
|
cd26422ca0
|
Fix warnings on OS X
|
2015-12-04 08:47:06 -08:00 |
|
Brad Hefta-Gaub
|
18e62290f3
|
fix warnings
|
2015-12-04 08:37:46 -08:00 |
|
Brad Hefta-Gaub
|
f472b515c3
|
remove wantsColor support since its always true and required for entities
|
2015-12-03 21:03:32 -08:00 |
|
Brad Hefta-Gaub
|
81fb4476bc
|
remove coverage map and occulusion culling, since it was always disabled
|
2015-12-03 20:29:23 -08:00 |
|
Ken Cooke
|
aad4743bf0
|
Completely remove Gverb from cmake
|
2015-12-03 18:06:50 -08:00 |
|
Brad Hefta-Gaub
|
44e137ec01
|
Merge pull request #6550 from highfidelity/revert-6538-cruftRemoval
Revert "Cruft removal"
|
2015-12-03 17:40:54 -08:00 |
|
Brad Hefta-Gaub
|
5a75a17174
|
Revert "Cruft removal"
|
2015-12-03 17:40:41 -08:00 |
|
Brad Hefta-Gaub
|
46556b7fa5
|
Merge pull request #6513 from huffman/fix-script-race-condition
Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting
|
2015-12-03 17:17:42 -08:00 |
|
Clément Brisset
|
fa52b97f61
|
Merge pull request #6538 from ZappoMan/cruftRemoval
Cruft removal
|
2015-12-03 17:03:04 -08:00 |
|
Andrew Meadows
|
9c54ee2eaf
|
Merge pull request #6525 from howard-stearns/user-settable-avatar-lod-preference
Add an avatar LOD preference called "Minimum Avatar Display Distance"
|
2015-12-03 17:01:41 -08:00 |
|
Brad Hefta-Gaub
|
6fbb67021f
|
Merge pull request #6530 from hyperlogic/tony/mirrored-model-entity-fix
Fix for mirrored transforms in FBX models
|
2015-12-03 17:01:21 -08:00 |
|
Brad Hefta-Gaub
|
ec7d3ffd63
|
Merge pull request #6536 from huffman/fix-uninitialized-xcolor
Fix uninitialized xColor value when converting script value
|
2015-12-03 16:46:00 -08:00 |
|
Brad Hefta-Gaub
|
528b8e5d3f
|
fix warnings
|
2015-12-03 16:45:01 -08:00 |
|
Brad Hefta-Gaub
|
1df24dd174
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval
|
2015-12-03 16:31:15 -08:00 |
|
Ken Cooke
|
1d01f08324
|
Fix compiler warnings
|
2015-12-03 16:27:35 -08:00 |
|
Clément Brisset
|
d6a2a2550b
|
Merge pull request #6526 from imgntn/butterfly
Update model for butterflies.js
|
2015-12-03 15:25:55 -08:00 |
|
Clément Brisset
|
686673795f
|
Merge pull request #6539 from imgntn/solidtoys
Fix Solidity of some Single Toy Creators
|
2015-12-03 15:17:02 -08:00 |
|
Howard Stearns
|
4a8649c202
|
Change get/setRenderDistanceLow/HighLimit and avatarRenderDistanceHighLimit to get/setRenderDistanceInverseLow/HighLimit and avatarRenderDistanceInverseHighLimit.
|
2015-12-03 14:23:16 -08:00 |
|
samcake
|
902b6b8ea1
|
Merge pull request #6506 from jherico/maggie
OpenGL class cleanup
|
2015-12-03 13:55:29 -08:00 |
|
Brad Davis
|
cc80dfb9e1
|
Fixing case on gl surface format helper
|
2015-12-03 13:08:26 -08:00 |
|
Brad Hefta-Gaub
|
1a5bc5d111
|
removing optional compression
|
2015-12-03 12:40:24 -08:00 |
|
Seth Alves
|
e5b1cfa920
|
fix windows build
|
2015-12-03 11:15:04 -08:00 |
|
James B. Pollack
|
fbca1c9754
|
another toy
|
2015-12-03 11:12:28 -08:00 |
|
Brad Hefta-Gaub
|
849a8707d2
|
remove wantsColor support since its always true and required for entities
|
2015-12-03 11:11:15 -08:00 |
|
James B. Pollack
|
cf5c8c08e2
|
update toys to be inverted while held
|
2015-12-03 11:10:22 -08:00 |
|
Seth Alves
|
4e74c98ae7
|
Merge branch 'master' of github.com:highfidelity/hifi into parents
|
2015-12-03 11:00:13 -08:00 |
|
Seth Alves
|
6f79b381f9
|
working toward making children of avatar joints work
|
2015-12-03 11:00:06 -08:00 |
|
Brad Davis
|
2cea593fbd
|
Remove RealSense & MIDI
|
2015-12-03 11:00:01 -08:00 |
|
Brad Hefta-Gaub
|
0c05ffe9ce
|
remove coverage map and occulusion culling, since it was always disabled
|
2015-12-03 10:20:04 -08:00 |
|
Ryan Huffman
|
667d2b728e
|
Fix uninitialized xColor value when converting script value
|
2015-12-03 09:52:56 -08:00 |
|
Howard Stearns
|
65334659ae
|
Merge pull request #6535 from ZappoMan/rightClickMenu
change camera cycle and context menu to hydra 0 buttons
|
2015-12-03 09:24:31 -08:00 |
|
Brad Davis
|
3854523787
|
Fixing 32 bit build breakage
|
2015-12-03 09:17:41 -08:00 |
|
Brad Hefta-Gaub
|
c0bd54e8a2
|
change hydra secondary thumb to 0 button
|
2015-12-03 09:06:18 -08:00 |
|
Seth Alves
|
2d804555de
|
minor cleanups
|
2015-12-03 08:59:15 -08:00 |
|
Ryan Downe Karpf
|
0e11c0980e
|
Merge pull request #6531 from ericrius1/toyboxSounds
Made ping pong gun have restitution of 0
|
2015-12-03 08:19:08 -08:00 |
|
Brad Hefta-Gaub
|
b122586ea5
|
remove camera cycle and context menu from standard mapping
|
2015-12-03 08:08:04 -08:00 |
|
Brad Davis
|
55799403c9
|
64 bit support for Leap Motion on windows
|
2015-12-02 21:52:06 -08:00 |
|
Brad Davis
|
7a05a664f4
|
Updating GPU for 64 bit
|
2015-12-02 21:34:11 -08:00 |
|
ericrius1
|
dec4cd012e
|
made ping pong gun have restitution of 0
|
2015-12-02 18:26:09 -08:00 |
|
Anthony J. Thibault
|
4f836568ad
|
Tests to verify AnimPose decomposition is working.
|
2015-12-02 17:26:32 -08:00 |
|
Anthony J. Thibault
|
b56cf58e33
|
Fix for mirrored transforms in FBX models
extractScale will now return negative scale for left-handed matrices.
|
2015-12-02 16:55:04 -08:00 |
|