Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39895 commits 2 branches 0 tags 1.1 GiB
Commit graph

39895 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
90b5cdb30f Fix bug. Annotate. 2016-02-24 16:27:46 -08:00
Brad Hefta-Gaub
ecb03562d3 fix build buster 2016-02-24 16:24:48 -08:00
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
Zach Pomerantz
20bfdba14b Avoid light prop copies when setting globalLight 2016-02-24 16:20:59 -08:00
Brad Hefta-Gaub
f9b55c4b87 Merge pull request #7185 from ctrlaltdavid/20809 
Fixes for new modal message dialog
 2016-02-24 16:20:40 -08:00
Brad Hefta-Gaub
ca5de8d6a9 remove some unimplemented menu items 2016-02-24 16:17:11 -08:00
ericrius1
0499334938 toadd: different colors for fireworks 2016-02-24 16:14:46 -08:00
Zach Pomerantz
1817b8ef2f Use only skyboxTexture in DeferredLightingEffect 2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7 Wire up zone ambientURL 2016-02-24 16:07:04 -08:00
ericrius1
dea41edf9c tweaks 2016-02-24 16:01:38 -08:00
ericrius1
e245ad93d6 smoke and fire 2016-02-24 15:58:09 -08:00
James B. Pollack
643365bc5a new models 2016-02-24 15:42:51 -08:00
Anthony J. Thibault
62ed5333e0 AvatarActionHold: compute velocities for other avatars 2016-02-24 15:14:56 -08:00
James B. Pollack
5e57366ba7 urls 2016-02-24 15:06:57 -08:00
Anthony J. Thibault
b3b4c6473d Merge branch 'master' into fix-grab-action 2016-02-24 14:34:23 -08:00
David Rowe
b9a1c2051b Fix modal dialog not being opaque to mouse clicks 2016-02-25 10:52:16 +13: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
James B. Pollack
baa030b7b0 cleanup and submit 2016-02-24 13:18:01 -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
James B. Pollack
46fbf38b5d ac movers 2016-02-24 12:36:18 -08:00
ericrius1
5520094bac exploding fireworks 2016-02-24 12:29:54 -08:00
David Rowe
51b41da488 Horizontally center short messages in the dialog 2016-02-25 09:15:07 +13:00
Seth Alves
e1b10e79df don't crash when watching someone else near-grab something 2016-02-24 12:09:51 -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
ericrius1
8b07bd00f8 basic firework 2016-02-24 11:05:02 -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
ericrius1
67ec1732b3 increased eraser range 2016-02-23 18:46:38 -08:00
ericrius1
0ff8201994 fixed line gaps 2016-02-23 18:45:41 -08:00
Brad Davis
b63e4b9d1f Address shutdown crash 2016-02-23 18:15:29 -08:00
Howard Stearns
d1088031bf Longer gap, as an experiment. 2016-02-23 18:13:40 -08:00
ericrius1
045d542f11 lines no longer disapear after drawing for a while 2016-02-23 18:03:38 -08:00
Clément Brisset
8e8e23452f Merge pull request #7156 from ZappoMan/depthReticleWork 
Depth reticle work
 2016-02-23 17:54:35 -08:00
Stephen Birarda
f8392e62a8 some wording tweaks in comments 2016-02-23 17:43:01 -08:00
James B. Pollack
4866ab9ead cleanup by default 2016-02-23 17:35:58 -08:00
Stephen Birarda
0191d75e86 allow temporary domain to upload public key 2016-02-23 17:29:15 -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
13153bcf08 Fix keyLight.ambientURL capitalization 2016-02-23 16:53:16 -08:00