Stephen Birarda
|
cc909507f4
|
get GLEW for all platforms as external project
|
2015-08-05 12:34:11 -07:00 |
|
Stephen Birarda
|
4b673838ac
|
Merge pull request #5508 from jherico/marge
Removing integrated glew
|
2015-08-05 11:31:17 -07:00 |
|
Bradley Austin Davis
|
04d579be7a
|
Removing integrated glew
|
2015-08-05 11:21:59 -07:00 |
|
samcake
|
6783ec300a
|
Merge pull request #5499 from jherico/homer
CORE PROFILE: Fix star point smoothing... sort of
|
2015-08-04 20:15:09 -07:00 |
|
samcake
|
a2a47bc0fc
|
Merge pull request #5507 from jherico/lisa
CORE PROFILE: Fix diagonal slashes in text
|
2015-08-04 20:10:17 -07:00 |
|
Bradley Austin Davis
|
fc5ec22810
|
Fix diagonal slashes in text
|
2015-08-04 17:28:42 -07:00 |
|
Brad Davis
|
8dfe129da3
|
Merge pull request #5505 from samcake/punk
CORE PROFILE: Fixing the rear view mirror rendering problems
|
2015-08-04 17:02:31 -07:00 |
|
Sam Gateau
|
730ad2da2f
|
removing dead code
|
2015-08-04 16:37:01 -07:00 |
|
Sam Gateau
|
d2360d1406
|
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
|
2015-08-04 16:31:33 -07:00 |
|
Sam Gateau
|
fc0ee28b84
|
FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD
|
2015-08-04 16:31:20 -07:00 |
|
Bradley Austin Davis
|
2221c839c3
|
Fix star point smoothing... sort of
|
2015-08-04 16:29:07 -07:00 |
|
samcake
|
59b69be251
|
Merge pull request #5501 from jherico/lisa
CORE PROFILE: Working on HMD crash on mac
|
2015-08-04 16:27:37 -07:00 |
|
Bradley Austin Davis
|
4f759ee46a
|
Merge remote-tracking branch 'upstream/master' into core
|
2015-08-04 16:26:16 -07:00 |
|
Seth Alves
|
9af6b00403
|
Merge pull request #5500 from SamGondelman/controlBug
Possible fix for infrequent inability to move on Windows startup
|
2015-08-04 16:13:47 -07:00 |
|
Seth Alves
|
fcec6cb1f0
|
Merge pull request #5464 from nnesse/master
Remove redundant code in getOrCreateChildElementAt()
|
2015-08-04 15:54:14 -07:00 |
|
Seth Alves
|
a218f0de83
|
Merge pull request #5483 from AndrewMeadows/caesium
remove legacy shapes and friends
|
2015-08-04 15:40:20 -07:00 |
|
Bradley Austin Davis
|
241ee00ca5
|
Working on HMD crash on mac
|
2015-08-04 15:18:01 -07:00 |
|
Eric Levin
|
f506e58687
|
Merge pull request #5490 from howard-stearns/restart-animations-at-specified-parameters
restart animations at specified parameters
|
2015-08-04 15:09:11 -07:00 |
|
Eric Levin
|
4693100026
|
Merge pull request #5491 from howard-stearns/basic-rig-state-with-fight-club-defaults
basic fight club animations
|
2015-08-04 15:09:03 -07:00 |
|
Sam Gateau
|
79e4cdd514
|
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
|
2015-08-04 14:55:00 -07:00 |
|
samcake
|
a2536c75f4
|
Merge pull request #5498 from jherico/lisa
CORE PROFILE: Fix bug in lightmap and specular map fragment shaders
|
2015-08-04 14:54:09 -07:00 |
|
SamGondelman
|
52be44d621
|
uninitialized value
|
2015-08-04 14:50:38 -07:00 |
|
Brad Davis
|
6d15a274a6
|
Merge pull request #5496 from samcake/daft
CORE PROFILE: Removing the line width completely from gpu::lib
|
2015-08-04 14:42:00 -07:00 |
|
Sam Gateau
|
10fcce7064
|
FIx again the issue of the COlor 32 format to NUINT8
|
2015-08-04 14:38:43 -07:00 |
|
Bradley Austin Davis
|
c454bc96a0
|
Fix bug in lightmap and specular map fragment shaders
|
2015-08-04 14:36:42 -07:00 |
|
Sam Gateau
|
0d727934bb
|
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
|
2015-08-04 14:27:30 -07:00 |
|
samcake
|
3c55e8b5e1
|
Merge pull request #5497 from jherico/homer
Fix white rendering of many primitives
|
2015-08-04 14:26:57 -07:00 |
|
Bradley Austin Davis
|
89aa596717
|
Fix white rendering of many primitives
|
2015-08-04 14:05:05 -07:00 |
|
Sam Gateau
|
34183b9ddf
|
COmmenting the remove of the glLIneWidth and demoving dead code
|
2015-08-04 12:36:35 -07:00 |
|
Sam Gateau
|
d07ab353fc
|
remove glLineWidth completely because it s not available anymore for wide lines in core
|
2015-08-04 11:57:20 -07:00 |
|
Bradley Austin Davis
|
3c76c0d4b6
|
Merge remote-tracking branch 'upstream/master' into core
|
2015-08-04 10:23:54 -07:00 |
|
Howard Stearns
|
597316b208
|
Merge pull request #5493 from thoys/fix-model-overlay-rig-crash
Fix crash for ModelOverlays, caused by Rig changes
|
2015-08-04 07:23:52 -07:00 |
|
Thijs Wenker
|
4bf6f8ed77
|
ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model.
|
2015-08-04 14:47:13 +02:00 |
|
Bradley Austin Davis
|
ed5f70039f
|
Merge branch 'master' into core
|
2015-08-03 22:18:38 -07:00 |
|
samcake
|
a3846b399a
|
Merge pull request #5492 from jherico/homer
Fixing the skinning shaders sizing problems
|
2015-08-03 21:45:17 -07:00 |
|
Bradley Austin Davis
|
1a589160f4
|
Fixing the skinning shaders sizing problems
|
2015-08-03 18:44:51 -07:00 |
|
Howard Stearns
|
61afc362e7
|
For startAnimation (but not startAnimationByRole), use the specified parameters even if the animation
was already playing. This fixes the behavior exercised by the squeezeHands.js script.
Fixes https://app.asana.com/0/32622044445063/44025709513292
|
2015-08-03 17:00:39 -07:00 |
|
Brad Davis
|
3da2a1c64c
|
Merge pull request #5488 from samcake/punk
Fixing the skinning by simply reverting the change to the format for the inSkinIndex
|
2015-08-03 16:17:05 -07:00 |
|
Howard Stearns
|
2e5142e9bb
|
Fix end of idle.
|
2015-08-03 16:09:48 -07:00 |
|
Sam Gateau
|
44e7223547
|
Fixing the skinning by simply reverting the change to the format for the inSkinIndex
|
2015-08-03 16:05:04 -07:00 |
|
Brad Davis
|
9e76c0296d
|
Merge pull request #5487 from samcake/daft
Remove completely GL transform legacy support
|
2015-08-03 15:54:01 -07:00 |
|
Howard Stearns
|
cdb697760f
|
Remove some debug.
|
2015-08-03 15:51:07 -07:00 |
|
Howard Stearns
|
4c1d1a65d5
|
Provide initial fight club animations and use them in rig.
Still only active when you do Settings.setValue('enableRig', true) and restart.
(Will be more exposed after fadein/fadeout is implemented.)
|
2015-08-03 15:41:15 -07:00 |
|
samcake
|
caa5732e06
|
Remove completely GL transform legacy support
|
2015-08-03 14:51:57 -07:00 |
|
Eric Levin
|
3f5f75d6d2
|
Merge pull request #5430 from AlexanderOtavka/floating-ui
Improvements to overlays.
|
2015-08-03 14:35:52 -07:00 |
|
Brad Davis
|
5dce2dcf23
|
Merge pull request #5486 from samcake/daft
GL CORE PROFILE: Update BackendINput to work with 4.1 and remove glColor4f
|
2015-08-03 14:24:38 -07:00 |
|
Brad Davis
|
f0ba0a4f47
|
Merge pull request #5485 from ctrlaltdavid/reduce-hmd-velocity
Reduce the speed of movement when in HMD view
|
2015-08-03 14:16:56 -07:00 |
|
Sam Gateau
|
4b1d2f00fb
|
Merge branch 'core' of https://github.com/highfidelity/hifi into daft
|
2015-08-03 13:41:23 -07:00 |
|
Sam Gateau
|
647abe5009
|
Replace the glCOlor4f by a glVertexAttribute4f on the color slot instead
|
2015-08-03 13:41:02 -07:00 |
|
Sam Gateau
|
f23df03ea9
|
REsolve the bracket issue,
|
2015-08-03 13:10:06 -07:00 |
|