Commit graph

27788 commits

Author SHA1 Message Date
ZappoMan
d1e511efcb more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl 2015-07-15 15:52:12 -07:00
ZappoMan
2ad2c4d554 remove some dead code 2015-07-15 15:33:28 -07:00
Brad Hefta-Gaub
7d8f2e906b Merge pull request #5340 from cozza13/20617
CR for Job #20617 - Change default Minimum Desktop FPS
2015-07-15 14:59:43 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect
Remove the glow effect.
2015-07-15 14:50:15 -07:00
Brad Hefta-Gaub
ae6e7f05b6 Merge pull request #5341 from samcake/daft
Remove the glGet( viewport ) from DeferredLightingEffect
2015-07-15 14:26:08 -07:00
samcake
5e2fe8dbec Merge pull request #5333 from ZappoMan/removeNakeGL
Remove more naked GL
Tested
2015-07-15 14:19:05 -07:00
ZappoMan
849b584596 more GlowEctomy 2015-07-15 13:16:38 -07:00
Chris Collins
ff288fdd5d While we work on FPS I have decreased the default LOD FPS
While we work on FPS I have decreased the default LOD FPS. In a new
users preferences this will now show as 15 desktop and 30 HMD.
2015-07-15 13:09:55 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Sam Gateau
48f23a6eaf Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-15 11:29:41 -07:00
ZappoMan
6b06987700 remove dead code for magnifier 2015-07-15 10:48:07 -07:00
ZappoMan
0eeddddd6b removed naked GL from drawOnHUD overlays. 2015-07-15 09:46:58 -07:00
Brad Davis
029af5354f Merge pull request #5330 from ZappoMan/removeNakeGL
Remove More Naked GL
2015-07-15 09:21:57 -07:00
samcake
f9e7558c3c Merge pull request #5313 from jherico/marge
Make scribe generated shaders more readable
2015-07-15 09:06:01 -07:00
ZappoMan
53c3e3d731 fix CR feedback 2015-07-15 09:03:07 -07:00
Brad Davis
b18dd54c10 Merge pull request #5331 from samcake/punk
Caching the input buffers' gpuObject in GLBackend
2015-07-15 06:57:13 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
samcake
a6148ab73d Remove naked gl call 2015-07-14 22:59:55 -07:00
samcake
c9112966ba revert debug code 2015-07-14 22:00:32 -07:00
ZappoMan
e39ea72daf removed dead code 2015-07-14 21:25:49 -07:00
ZappoMan
5d43c98ebc fix image overlays to not use Naked GL 2015-07-14 20:56:36 -07:00
ZappoMan
8bb6616a25 remove nakedGL from skeleton IK constraint rendering 2015-07-14 18:47:35 -07:00
Sam Gateau
98a3141e11 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-14 18:38:21 -07:00
Sam Gateau
440464f884 Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile 2015-07-14 18:35:11 -07:00
ZappoMan
5a927c4c90 remove dead code 2015-07-14 18:25:50 -07:00
Brad Davis
1e6c2e737a Merge pull request #5328 from ZappoMan/removeNakeGL
removing Naked GL calls
2015-07-14 18:25:38 -07:00
ZappoMan
47dad82d50 removed dead code 2015-07-14 18:09:58 -07:00
samcake
de9f97d675 Merge pull request #5327 from ZappoMan/master
Remove the NodeBounds feature
2015-07-14 18:06:07 -07:00
ZappoMan
f1b85aefa9 more dead code removal: NodeBounds 2015-07-14 17:59:20 -07:00
samcake
be5ce2114d Merge pull request #5326 from ZappoMan/master
Remove some dead code
2015-07-14 17:59:13 -07:00
ZappoMan
23b89a6f7d remove naked gl/dead code from line and cube overlays 2015-07-14 17:04:07 -07:00
ZappoMan
d19c7125da remove naked gl calls 2015-07-14 16:49:43 -07:00
ZappoMan
bc251de43c delete dead code 2015-07-14 16:49:22 -07:00
Philip Rosedale
17ec524253 Merge pull request #5324 from ZappoMan/fixLaggingTouch
fix lagging touch events
2015-07-14 16:28:00 -07:00
ZappoMan
68f4fe6566 fix lagging touch events 2015-07-14 16:03:44 -07:00
Philip Rosedale
221a92eeee Merge pull request #5322 from ctrlaltdavid/fix-eye-direction
Fix eye directions so that they're correct when avatar leans backwards
2015-07-14 15:38:56 -07:00
Stephen Birarda
6cd584ddd9 Merge pull request #5276 from Atlante45/clear_cache_and_restart
Reload content menu item
2015-07-14 15:30:33 -07:00
Atlante45
22f0dbdefb CR 2015-07-14 15:16:00 -07:00
David Rowe
bfad3ee02a Fix eye directions so that they're correct when avatar leans backwards 2015-07-14 14:07:32 -07:00
Atlante45
8fb69ecc96 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 13:50:58 -07:00
Clément Brisset
17c6f41db6 Merge pull request #5306 from ctrlaltdavid/20606
CR for 20606 - If an external texture isn't found, still display the model
2015-07-14 13:49:00 -07:00
Clément Brisset
573b3e3997 Merge pull request #5321 from howard-stearns/fst-packager-free-joints
Fix https://app.asana.com/0/32622044445063/39927009585710
2015-07-14 13:46:48 -07:00
Howard Stearns
3cd1e318b2 Fix https://app.asana.com/0/32622044445063/39927009585710 2015-07-14 13:15:24 -07:00
Atlante45
a32f54da2f Cleanup 2015-07-14 12:36:18 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Seth Alves
9b37b83eb6 Merge pull request #5320 from AndrewMeadows/barium
fix grab.js when using the spring action
2015-07-14 11:02:42 -07:00
Seth Alves
3394c50499 Merge pull request #5319 from howard-stearns/sword-update-2
Update sword script for current controller/physics behavior.
2015-07-14 10:59:41 -07:00
Brad Hefta-Gaub
f88163b99c Merge pull request #5314 from jherico/homer
Qt 5.5 fixes
2015-07-14 10:35:12 -07:00
Brad Hefta-Gaub
049419cec7 Merge pull request #5307 from howard-stearns/remove-octreeFades
Remove old octreeFade code that wasn't working anyway
2015-07-14 10:24:01 -07:00