Steve Harris
40a5bc1683
12.11.1-7 baseline
...
Former-commit-id: 79a5638de9d8ca6b9005
2012-10-23 16:40:50 -05:00
Steve Harris
30c786a885
12.11.1-6 baseline
...
Former-commit-id: 5c1f3cdc46fba4a443a0
2012-10-18 15:53:01 -05:00
Steve Harris
362d6ffaca
12.11.1-5 baseline
...
Former-commit-id: a0eaf651ff03f3f3c36a
2012-10-18 15:46:42 -05:00
Steve Harris
98171b5de9
12.11.1-4 baseline
...
Former-commit-id: 6958b861f0d3497e47eb
2012-10-16 13:27:07 -05:00
Steve Harris
196afa0e5f
12.11.1-3 baseline
...
Former-commit-id: 5d796f775c2d0c424713
2012-10-15 16:30:31 -05:00
Steve Harris
75901860c2
12.11.1-2 baseline
...
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 1e02387ff1c12ee14e66
2012-10-08 13:26:20 -05:00
Steven Harris
0e86bfd1d3
12.11.1-1 baseline
...
Former-commit-id: feec28f274618aa3f316
2012-09-27 15:57:45 -05:00
Steve Harris
b062e4de8f
12.10.1-8 baseline
...
Former-commit-id: 73d29311d0dbd73151ca
2012-09-25 10:26:58 -05:00
Steve Harris
2ee78eaf6d
12.10.1-7 baseline
...
Former-commit-id: 7b37cfca85b754630136
2012-09-25 10:21:10 -05:00
Steve Harris
81d91a8289
12.10.1-6 baseline
...
Former-commit-id: ba648f8e72cebe6534ae
2012-09-25 10:14:23 -05:00
Steve Harris
82feb4de50
12.10.1-5 baseline
...
Former-commit-id: 4fd8893e55a96d35a1fa
2012-09-17 15:42:31 -05:00
Steve Harris
790af9ec63
Merge branch 'ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into ss_builds
...
Former-commit-id: b06a9469b113adee3fe9
2012-09-17 08:18:31 -05:00
Bryan Kowal
40e2924ce0
Fix the git ignore file
...
Former-commit-id: 4d7cb017ce2e1fe9663c
2012-09-14 12:04:24 -05:00
Steve Harris
9cd1f3ec0f
12.10.1-4 baseline
...
Former-commit-id: 92cc2d8605791ef6cedf
2012-09-13 12:33:36 -05:00
Steve Harris
e38e81ab8c
12.10.1-4 baseline
...
Former-commit-id: 49c3861597fd19ca5624
2012-09-13 12:08:11 -05:00
Steve Harris
22dac5c82e
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
...
Former-commit-id: fd5e214e72077ced354e
2012-09-12 13:10:36 -05:00
Steve Harris
de1639aea2
12.10.1-3 baseline
...
Former-commit-id: 969e7e6dfd21f430062b
2012-09-11 16:00:38 -05:00
Steve Harris
dde1f4c54d
12.10.1-2 baseline
...
Former-commit-id: a66f3f4b60250f0ccac9
2012-09-11 15:50:57 -05:00
Steve Harris
0abf64b77c
12.10.1-1 baseline
...
Former-commit-id: d708932029195158c004
2012-09-04 12:07:27 -05:00
Steve Harris
4bf4f0043a
12.9.1-12 baseline
...
Former-commit-id: 150bc967a5948766c387
2012-09-04 11:47:38 -05:00
Steve Harris
d07c18918d
12.9.1-11 baseline
...
Former-commit-id: fc405efab76eb6b0909b
2012-08-30 14:36:12 -05:00
Steve Harris
bdb45cdfae
12.9.1-10 baseline
...
Former-commit-id: cb9b80f3a03adc50a783
2012-08-30 14:28:27 -05:00
Steve Harris
c6d64fed20
12.9.8-10 baseline
...
Former-commit-id: d3916212a54adcf9b970
2012-08-30 14:16:26 -05:00
Steve Harris
7a4f4ac493
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b77a4d40d7b8ab6066f6
2012-08-22 16:00:33 -05:00
Steve Harris
a1d931fd44
12.9.1-5 baseline
...
Former-commit-id: f2fac3942861f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
36c108e960
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96ddcda3a2290
2012-08-15 15:19:10 -05:00
Steve Harris
c11f7d396e
12.9.1-3 baseline
...
Former-commit-id: 84bbf2573e36d80b1f60
2012-08-15 14:26:10 -05:00
Steve Harris
27871051e3
12.9.1-2 baseline
...
Former-commit-id: a198b3a807d1d877d319
2012-08-15 14:12:24 -05:00
Steve Harris
8309193ce9
12.9.1-1 baseline
...
Former-commit-id: 79ce6cfd9731ae7ea218
2012-08-15 13:59:00 -05:00
Steve Harris
6244359a80
12.8.1-10 baseline
...
Former-commit-id: ca25d508ecb5e8fee24d
2012-08-06 09:34:26 -05:00
Steve Harris
2653ddc2e3
12.8.1-5 baseline
...
Former-commit-id: cd49ef3edafd2abfb6f1
2012-08-01 10:45:37 -05:00
Steve Harris
11f96dbedd
12.7.1-8 baseline
...
Former-commit-id: c42ae0fa3916bf591a33
2012-07-19 16:20:40 -05:00
Steve Harris
7c064b6868
12.6.1-9 baseline
...
Former-commit-id: 27afa603452c0ff851ca
2012-07-10 07:53:49 -05:00
Steve Harris
d2e6687295
Issue #708 - removed extraneous files
...
Former-commit-id: fbe7e504171a67fdba3f
2012-06-20 08:15:55 -05:00
Steve Harris
5a5db8dc6a
Merge branch 'master' into ss_sync
...
Former-commit-id: 645359deafd507f3b71d
2012-06-13 14:56:52 -05:00
Steve Harris
8552902906
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5b13cbb7e00
2012-06-08 13:39:48 -05:00
Max Schenkelberg
2ef208b263
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: e3d6962fe63fe183277b
2012-05-01 18:36:09 -05:00
Steve Harris
4ec294b525
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: 7b75b781ad2ed7249613
2012-05-01 18:31:09 -05:00
Steve Harris
4bfbdad17d
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff89f8cb727a5
2012-05-01 18:06:13 -05:00
Max Schenkelberg
e03ee60c75
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 90a5c20b5a1294fa0ca1
2012-04-19 11:11:34 -05:00
Steve Harris
63f11892e8
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: 625cd4262c4d7572a632
2012-04-19 11:11:02 -05:00
Steve Harris
750b7543dd
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c67a5a68300
2012-04-18 15:18:16 -05:00
Max Schenkelberg
74458bfb73
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 07cf5069ba9b0d01f8b5
2012-03-30 10:51:31 -05:00
Steve Harris
a4e4792bb5
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: 5cdda77afbd3ad6095b7
2012-03-30 09:50:48 -05:00
Steve Harris
0e4128712b
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd94068f5295f
2012-03-30 08:38:33 -05:00
Steve Harris
0665862abe
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: a0abcf812070357d90bc
2012-03-29 10:03:05 -05:00
Steve Harris
94e6323c0a
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 54a1d9cdbc132d68acc6
2012-03-29 10:01:55 -05:00
Max Schenkelberg
66eaffb9ee
Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
...
descriptor than the actual descriptor as the descriptor is used purely
for convenience
Former-commit-id: f10f1a531915a9245592
2012-03-28 13:32:04 -05:00
Max Schenkelberg
468c812dde
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: b9085db25dcd6ebd80d4
2012-03-16 10:13:31 -05:00
Max Schenkelberg
97edff9f7c
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: 258d57e825cc111ab9ac
2012-03-16 09:03:50 -05:00
