Richard Peter
|
1dbb34523b
|
Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1a07daa97b2000f31ea4fd98890a15477b85b5f3
|
2013-01-14 18:07:17 -06:00 |
|
Steve Harris
|
81849e3cbb
|
13.2.1-1 baseline
Former-commit-id: 30d12654dea302c2bb0546edcb3b7ddd04ddd046
|
2013-01-14 18:42:21 -05:00 |
|
Steve Harris
|
06b8eb8db0
|
13.1.2-8 baseline
Former-commit-id: c8797ef99646b2e093ad60cb9a6ee9643405a13f
|
2013-01-11 16:19:07 -05:00 |
|
Richard Peter
|
328be6ac2b
|
Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c
|
2013-01-09 17:55:05 -06:00 |
|
Steve Harris
|
59969775ad
|
13.1.2-6 baseline
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
4ba416aeb3
|
13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
|
2013-01-06 14:32:24 -06:00 |
|
Ben Steffensmeier
|
bb557546bf
|
Issue #1445 fix time range for accumulations
Former-commit-id: 590d927da3f051ed033c41bc0c89108a25826759
|
2012-12-19 15:14:03 -06:00 |
|
Ben Steffensmeier
|
9da83d3f4f
|
Issue #1415 fix or level node time matching
Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a
Former-commit-id: 7ad0749d76328eafcd2f02137c099f7a302e0387
|
2012-12-13 11:35:15 -06:00 |
|
Steve Harris
|
f6988eefff
|
Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: e733dd9d05d3704f86e2a711607a1834df1a56f2
|
2012-12-11 08:45:53 -06:00 |
|
Steve Harris
|
6d610f8e8a
|
12.12.1-12 baseline
Former-commit-id: ae5110532f5ac5c7842a5483a8e2c3dc299ae814
|
2012-12-06 09:18:28 -06:00 |
|
Ben Steffensmeier
|
1d4f377e7d
|
Issue #1370 fix exception that occurs when cubes of derived parameters are only partially available.
Change-Id: Icd7a7acc2447d7a0d9cebe3107ea05281c2c4bbe
Former-commit-id: 5fe57b5d66fdef047e5b91942c024175c2d3959d
|
2012-11-29 14:40:34 -06:00 |
|
Ben Steffensmeier
|
f6a502fb78
|
Issue #1316 pass original constraints through when doing time queries in derived parameters.
Former-commit-id: 5f67639bdd24711dc6f77b41163f49bf8626b7d3
|
2012-11-21 14:21:01 -06:00 |
|
Ben Steffensmeier
|
b5b472dee1
|
Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: 2242eefb25cd65edb4378b47b9cafbcab8510c53
|
2012-11-12 15:15:49 -06:00 |
|
Ben Steffensmeier
|
2baae0a89f
|
Issue #189 fix for derived parameters when requested times are not available
Former-commit-id: 09d7b089602ac73368202252eaf90f763c0650f4
|
2012-10-18 15:49:31 -05:00 |
|
Ben Steffensmeier
|
666fe70a71
|
Issue #189 fix merge issue with derived parameters going from 12.4 to 12.5
Former-commit-id: f35c55683ab90289526f500b3bc2b623ded433e5
|
2012-10-01 15:41:38 -05:00 |
|
Ben Steffensmeier
|
8682b30383
|
Issue #189 Make Derived parameters spatially aware
Former-commit-id: f7919f7bfc3f631cc76e19710ea18feb6faf35f9
|
2012-09-27 17:01:32 -05:00 |
|
Steve Harris
|
92cc2d8605
|
12.10.1-4 baseline
Former-commit-id: ce574eeff1d197862c8aac2d3fc838a452862576
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
49c3861597
|
12.10.1-4 baseline
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
969e7e6dfd
|
12.10.1-3 baseline
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
a66f3f4b60
|
12.10.1-2 baseline
Former-commit-id: 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c
|
2012-09-11 15:50:57 -05:00 |
|
Steve Harris
|
f2fac39428
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
84bbf2573e
|
12.9.1-3 baseline
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
79ce6cfd97
|
12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
27afa60345
|
12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
3904c4ccf5
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
7b75b781ad
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
used git cherry-pick -m 1 879a2e0
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
8485b90ff8
|
12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
625cd4262c
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 5e1b9319941eed516a08a135a2049c14bad77863
|
2012-04-19 11:11:02 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
Max Schenkelberg
|
48b6d45f00
|
Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements
Former-commit-id: 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6
|
2012-03-01 16:59:40 -06:00 |
|
Matt Nash
|
c83e5ff474
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|