Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 04:10:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
39558 commits 71 branches 59 tags 1.2 GiB
Commit graph

39558 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
ecb03562d3 fix build buster 2016-02-24 16:24:48 -08:00
Brad Hefta-Gaub
ca5de8d6a9 remove some unimplemented menu items 2016-02-24 16:17:11 -08:00
Anthony Thibault
9d9e63a947 Merge pull request #7182 from zzmp/fix/aa-shader 
Fix fxaa shader to use texture
 2016-02-24 13:51:12 -08:00
Brad Hefta-Gaub
568fd3e77f Merge pull request #7164 from ctrlaltdavid/20809 
Restyle message box modal dialogs
 2016-02-24 13:47:00 -08:00
Brad Hefta-Gaub
1699e4a396 Merge pull request #7131 from ctrlaltdavid/20805 
Restyle the Running Scripts dialog
 2016-02-24 13:45:40 -08:00
Brad Hefta-Gaub
9273238b53 Merge pull request #7178 from Nex-Pro/20807 
CR for Job #20807 - Fix vertically mirrored particles.
 2016-02-24 13:43:40 -08:00
Zach Pomerantz
124c84c8b9 Fix fxaa shader to use texture 2016-02-24 13:36:08 -08:00
Seth Alves
ea16a659b2 Merge pull request #7183 from zzmp/fix/avatar-warnings 
Fix avatar warnings
 2016-02-24 13:35:54 -08:00
Zach Pomerantz
3c4ab077be Init validOrientation for myAvatar calc 2016-02-24 13:16:45 -08:00
Zach Pomerantz
e78905a6d1 Rm previousDeltaTimeStep unused field from AvatarActionHold 2016-02-24 13:15:49 -08:00
Brad Hefta-Gaub
2a18127a01 Merge pull request #7171 from jherico/avatar_qml_location 
Allow avatar positioning from QML
 2016-02-24 11:37:12 -08:00
Brad Hefta-Gaub
3df5d0abad Merge pull request #7161 from zzmp/fix/overlay-model-scale 
Use proper getter for model overlay scaling
 2016-02-24 09:31:47 -08:00
Chris Collins
64a07440cc Merge pull request #7180 from jherico/qml 
Several QML fixes
 2016-02-24 08:20:03 -08:00
Chris Collins
7f679af186 Merge pull request #7176 from zzmp/menu/graphics 
Update graphics menus
 2016-02-24 08:18:58 -08:00
Brad Davis
fa23e2023e Fix bad tool window placement 2016-02-23 21:05:57 -08:00
Brad Davis
4074ba172d Fix window confirmation dialog 2016-02-23 20:37:25 -08:00
Brad Davis
b63e4b9d1f Address shutdown crash 2016-02-23 18:15:29 -08:00
Clément Brisset
8e8e23452f Merge pull request #7156 from ZappoMan/depthReticleWork 
Depth reticle work
 2016-02-23 17:54:35 -08:00
Nex Pro
6403bb60a5 added particleOrientationTest.js for testing. 2016-02-24 01:20:49 +00:00
Andrew Meadows
8d91912d4b Merge pull request #7162 from hyperlogic/tony/controller-velocity 
Improve hand controller move and throw velocity
 2016-02-23 17:13:13 -08:00
Nex Pro
864f00ee61 Fixed inverted particle rendering. 2016-02-24 01:02:17 +00:00
David Rowe
a816d835d3 Finesse modal message box dialog layout 2016-02-24 13:59:43 +13:00
Zach Pomerantz
ea8edb3744 Remove antialiasing from menus, default to on 2016-02-23 16:24:44 -08:00
Zach Pomerantz
7ae9752272 Remove Render > Ambient Light menu 2016-02-23 16:24:43 -08:00
Chris Collins
94d018be3e Merge pull request #7172 from zzmp/fix/stats 
Consolidate stats for opaque/transparent/other
 2016-02-23 16:23:11 -08:00
Zach Pomerantz
1f9324c78f Move Graphics... to Developer menu 2016-02-23 16:14:41 -08:00
David Rowe
7ee1edac3a Merge branch '20805' into 20809 2016-02-24 13:08:28 +13:00
David Rowe
beef3f59eb Fix QML warning 2016-02-24 12:59:21 +13:00
Andrew Meadows
2f02e7ff20 Merge pull request #7174 from hyperlogic/tony/avatar-leaning-fix 
MyAvatar: bug fix for avatar leaning
 2016-02-23 15:46:20 -08:00
David Rowe
76ec5e4600 Merge branch 'master' into 20805 2016-02-24 12:38:44 +13:00
David Rowe
ad4d697f38 Use names for HiFi glyph characters 2016-02-24 12:37:23 +13:00
David Rowe
bac703b29e Adjust height of Running Scripts now that fonts are consistently sized 2016-02-24 12:36:46 +13:00
David Rowe
128583660b Specify font sizes in pixels instead of points 
Makes the dialog layout and look consistent across different devices.
 2016-02-24 12:10:19 +13:00
Anthony J. Thibault
8f27424de7 MyAvatar: bug fix for avatar leaning 2016-02-23 14:30:51 -08:00
David Rowe
9dd1bfad2d Fix tree view branch indicator colors 
Using interim HiFi glyphs until branch triangles are added to the font.
 2016-02-24 10:54:36 +13:00
Anthony Thibault
38b29f4709 Revert "Physics: extrapolate kinematic objects as well as dynamic ones." 
This reverts commit e544275500.
 2016-02-23 13:26:15 -08:00
Zach Pomerantz
eb53f44a06 Convert size_t details to int 2016-02-23 12:44:38 -08:00
Brad Davis
2258a9cad9 Allow avatar positioning from QML 2016-02-23 12:16:41 -08:00
Zach Pomerantz
7804ee22d4 Consolidate stats for opaque/transparent/other 2016-02-23 12:14:00 -08:00
Anthony J. Thibault
e544275500 Physics: extrapolate kinematic objects as well as dynamic ones. 2016-02-23 12:07:14 -08:00
Clément Brisset
f82e5e2cd6 Merge pull request #7166 from ericrius1/editFix 
Fixed bug with parsing numbers for edit js
 2016-02-23 11:57:19 -08:00
Clément Brisset
a802f69aa9 Merge pull request #7169 from samcake/red 
Fix the crash when Particle system entities are created and removed quickly
 2016-02-23 11:45:32 -08:00
Stephen Birarda
7e92841367 Merge pull request #7168 from howard-stearns/audio-restart-injector-limits 
audio restart injector limits
 2016-02-23 11:28:38 -08:00
Brad Hefta-Gaub
a71a78b2d3 add comments and license header to reticleDepth.js 2016-02-23 11:22:24 -08:00
Brad Hefta-Gaub
71262c3e64 cleaner QML rejection of mouse messages 2016-02-23 11:14:16 -08:00
samcake
d3cdc5117f clean up one more render::Item::isValid(ID) 2016-02-23 11:01:57 -08:00
Howard Stearns
6a987391d2 Remove debugging code. 2016-02-23 10:55:36 -08:00
samcake
7e39cc7753 clean up a bit the 2 globals RenderItem in APplication.cpp 2016-02-23 10:53:33 -08:00
Howard Stearns
5d9ee84e63 Extend the test for number of active injectors to apply to injector restarts. 2016-02-23 10:42:39 -08:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00