root
/
cesium
mirror of https://github.com/CesiumGS/cesium.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
39,211 Commits 405 Branches 210 Tags 944 MiB
Commit Graph

575 Commits

Author SHA1 Message Date
Sean Lilley e0a5f45a2f Merge branch 'master' into 3d-tiles 2016-10-25 11:56:51 -04:00
Matthew Amato 47332a3e8c Merge pull request #4517 from erikmaarten/add-missing-pragmas 
Add missing pragmas
 2016-10-25 11:15:00 -04:00
Erik Andersson cf77e71ac8 Add myself to CONTRIBUTORS.md 2016-10-25 12:49:17 +02:00
Sean Lilley 69c432df6a Add Judy Weng to CONTRIBUTORS.md 2016-10-24 11:32:49 -04:00
Sean Lilley 5b5d14357d Merge branch 'master' into 3d-tiles 2016-10-24 11:30:26 -04:00
Leesa Fini d823cdd489 contributors 2016-10-21 15:58:19 -04:00
Patrick Cozzi feffb71cc2 Whitespace 2016-10-21 09:50:22 -04:00
Dylan Brown c1dbc4abd1 updated contributors 2016-10-20 23:27:09 -04:00
Tom Payne 9addd0eed4 Add twpayne to CONTRIBUTORS.md. 2016-10-19 12:07:47 -04:00
Dan Bagnell 28703a70dc Update CHANGES.md and add @jorpiell to CONTRIBUTORS.md. 2016-10-18 14:39:54 -04:00
Sean Lilley 366fa63f19 Merge branch 'master' into 3d-tiles 2016-09-28 12:15:41 -04:00
Judy Weng 25de74b510 added name to CONTRIBUTORS.md 2016-09-22 16:19:58 -04:00
HeercoGrond 0ca80b25e7 Update with credentials (see #4340 and #4341) 
Per Request - Added our Organization details and my name to Contributors.md
 2016-09-21 11:27:14 +02:00
Sean Lilley dcb47e3a52 Merge branch 'master' into 3d-tiles 2016-08-09 10:37:22 -04:00
Patrick Cozzi 126ac75d2d Add Andy Fry to CONTRIBUTORS.md 2016-08-09 10:14:21 -04:00
Sean Lilley 6f20f39bc4 Merge branch 'master' into 3d-tiles 2016-08-04 13:05:44 -04:00
Andrey Orlov 737b0f110a add Geoscan to contributors 2016-07-29 11:51:33 +03:00
Dan Bagnell f6e27f577b Merge branch 'master' into 3d-tiles 2016-06-29 16:07:17 -04:00
Patrick Cozzi 77d877476d Fix bad merge in CONTRIBUTORS.md 2016-06-28 09:34:46 -04:00
Patrick Cozzi af0292c794 Merge e-andersson/zooming_toward_target_point to master 2016-06-28 09:33:08 -04:00
Patrick Cozzi de802bd6f5 Add Simulation Curriculum to CONTRIBUTORS.md 2016-06-28 09:31:55 -04:00
Patrick Cozzi 191a93b530 Add Simulation Curriculum to CONTRIBUTORS.md 2016-06-28 08:53:53 -04:00
Erik Andersson 3a7bc5833e merged in master 2016-06-27 23:43:54 +02:00
Tom Fili ffa9691052 Updated changes and contributors files. 2016-06-27 10:30:51 -04:00
Brandon McAllister bdf3ae004f Fix can't read x of undefined when getting window coordinates 
In certain situations, 2D mode and zoomed out far, calling
SceneTransforms.wgs84ToWindowCoordinates without passing in a result
object results in "TypeError: Cannot read property 'x' of undefined".
 2016-06-14 16:30:43 -05:00
Erik Andersson 03ae248e59 added myself to CONTRIBUTORS.md 2016-06-13 16:49:48 +02:00
Sean Lilley 481c7751c6 Merge branch 'master' into 3d-tiles 2016-06-06 13:52:01 -04:00
Kangning Li fe883a79ae Updated CONTRIBUTORS.md 2016-05-24 11:28:36 -04:00
JoshuaStorm 0b4fcdefb0 Added myself to CONTRIBUTORS.md 2016-05-23 16:36:18 -04:00
Matthew Amato 1f16a58372 Merge remote-tracking branch 'origin/master' into 3d-tiles 
# Conflicts:
#	LICENSE.md
#	Source/Renderer/DrawCommand.js
#	Specs/Scene/TileBoundingBoxSpec.js
 2016-04-21 17:56:35 -04:00
Olivier G-R b294e92625 add theOgrable to the CONTRIBUTORS.md file 2016-04-13 21:05:48 +02:00
Hannah fb8193c019 Merge pull request #3695 from novacto2/camera-flyTo 
Fix flyTo rectangle in 2D
 2016-04-05 16:34:09 -04:00
Patrick Cozzi 20888dbb73 Merge master to 3d-tiles 2016-04-05 14:47:24 -04:00
novacto2 d2d1779d1e Fix formatting 2016-04-04 19:45:59 +02:00
tsmith717 9e6dcba3b5 Update CONTRIBUTORS.md 2016-03-30 10:17:07 -04:00
Patrick Cozzi 3d44e431f9 Merge master to 3d-tiles 2016-03-23 07:07:25 -04:00
Taglang 4a25923ab4 Updated CONTRIBUTORS.md and CHANGES.md 2016-03-22 11:58:06 -04:00
Patrick Cozzi a116fcd5df Merge remote-tracking branch 'origin/master' into 3d-tiles 2016-03-08 14:57:59 -05:00
Mati O 7200d376e4 fix missing wgs84 crs, 
add myself as contributor
 2016-03-06 18:13:42 +02:00
Patrick Cozzi ea5b8a7c6f Merge remote-tracking branch 'origin/master' into 3d-tiles 2016-02-26 07:12:05 -05:00
Matthew Amato f4fc82f513 Add @vrittis to CONTRIBUTORS.md 
CC #3597
 2016-02-25 10:04:36 -05:00
Allen Korenevsky c8d556eb17 Merge branch 'master' into fixZoomLimits 
# Conflicts:
#	CHANGES.md
 2016-02-22 13:36:39 -08:00
Matthew Amato 756edc489c Merge remote-tracking branch 'origin/master' into 3d-tiles 2016-02-22 13:55:07 -05:00
Hannah da2dfb67dd Merge pull request #3604 from Aviture/groundEllipseRotationFix 
Fix rotation for a GroundPrimitive with an EllipseGeometry
 2016-02-22 12:56:35 -05:00
Allen Korenevsky 1a2b20c13d Merge branch 'master' into fixZoomLimits 
# Conflicts:
#	CONTRIBUTORS.md
 2016-02-19 13:56:42 -08:00
Patrick Cozzi 84a570c626 Remove old link 2016-02-18 20:20:29 -05:00
Jed Fong da652f8f2a Update EllipseGeometry.createShadowVolume to allow rotation 2016-02-18 15:42:08 -06:00
Allen Korenevsky 55f48c32a1 Adding name per pull request docs 2016-02-17 01:11:51 -08:00
Patrick Cozzi a6e6ee38c4 Merge master to 3d-tiles 2016-02-10 07:25:05 -05:00
Sanuj 04216d0204 Replace "use strict" by 'use strict' 2016-02-09 11:07:51 +05:30
Sean Lilley 12c6493638 Merge branch 'master' into 3d-tiles 2016-02-02 10:35:36 -05:00
Sean Lilley 2656aea8af Merge branch 'master' into 3d-tiles 2016-01-13 13:34:34 -05:00
Patrick Cozzi 6fbe53f52d Merge pull request #3410 from mlimper/KHR_common_materials-compatibility 
KHR_common_materials compatibility (merge to gltf-materials)
 2016-01-12 08:01:45 -05:00
Thomas Pedbereznak c8f9c1bfe5 Updated CHANGES.md and CONTRIBUTORS.md 2016-01-11 15:36:01 -05:00
Max Limper 9d34c124d0 Fixed merge conflict in CONTRIBUTORS.md 2016-01-11 15:14:17 +01:00
Sean Lilley 43d9d44676 Merge branch 'master' into 3d-tiles 2016-01-06 14:20:07 -05:00
Max Limper 09a7fae0d2 Update CONTRIBUTORS.md 2015-12-14 13:47:01 +01:00
Alex Gilleran 3017edeef3 Reflecting tile load progress event in changelog and adding AlexGilleran to contributors. 2015-12-11 17:42:51 +11:00
Sean Lilley ac3e263ac6 Merge remote-tracking branch 'origin/master' into 3d-tiles 2015-12-08 18:57:40 -05:00
Dmitriy Pushkov c95738e3a8 Synchronizing with master. 
Conflicts:
	CONTRIBUTORS.md
 2015-12-03 21:47:14 +03:00
Dmitriy Pushkov fe5d1c8786 CONTRIBUTORS.md has been updated. 2015-12-03 20:20:41 +03:00
Erik Andersson 719e59c2b0 Merge branch '3d-tiles' of https://github.com/e-andersson/cesium into 3d-tiles-tree-loading 2015-11-27 09:08:27 +01:00
Erik Andersson d4cd7d3c44 added company+name to contributors 2015-11-23 09:29:36 +01:00
eputnam e9b5036128 added name to CONTRIBUTORS.md 2015-11-21 15:20:44 -08:00
Matthew Amato 5a97e7b81d Add bflood-agi to contributors 
Also update CHANGES after #3213
 2015-11-17 09:23:00 -05:00
Patrick Cozzi c911e60a31 Added Sarah Chow to CONTRIBUTORS.md 2015-11-16 13:09:37 -05:00
Arthur Street 8dc0342cfa merge with latest CHANGES.md 2015-11-05 12:15:36 +11:00
Tucker Tibbetts b9d441a1fa Add to contributors file 2015-11-03 14:35:50 -05:00
Arthur Street c16b4af255 add to contributors, changes 2015-10-29 10:36:31 +11:00
Denver Pierce a60d242084 Minor doc fixes for HeadingPitchRange. 2015-10-27 23:16:50 -05:00
Kevin Ring c73c6f9e8c Merge remote-tracking branch 'upstream/master' into issue2878-cleanup 
Conflicts:
	CONTRIBUTORS.md
 2015-10-28 10:15:13 +11:00
Cole 34a7eb95a4 Update CONTRIBUTORS.md 2015-10-27 15:06:02 -04:00
Keat Tang 756ad559ba added myself to contributors 2015-10-19 09:52:32 +11:00
Nathan Schulte c60e9c98cc update CONTRIBUTORS link (nmschulte) 2015-10-14 10:25:15 -05:00
ggetz fcac2fb22b Updated CONTRIBUTORS 2015-10-13 16:35:34 -04:00
Kevin Ring 679cbd5906 Update CHANGES and CONTRIBUTORS. 2015-10-13 15:29:20 +11:00
Piero Toffanin bd2a6ca589 Added individual to contributors, noted changes for 1.15 2015-10-02 10:25:00 -05:00
Matthew Amato b161b6429b Update CONTRIBUTORS.md 2015-09-28 15:48:12 -04:00
Kogis IWI 11613e0a8a Use all url templates provided by terrain config file 2015-09-22 09:24:17 +02:00
Tiffany Lu b3b73b78e2 Added Tiffany Lu and Adam Cole to contributors 2015-09-11 11:43:24 -04:00
Sean Lilley 4ed4c8798a added myself as cesium developer 2015-08-20 15:55:00 -04:00
slozier 31ab731af9 Update CHANGES.md 2015-08-18 16:02:32 -04:00
Patrick Cozzi b5ab6075d2 Add slozier to CONTRIBUTORS.md 2015-08-05 13:25:37 -04:00
Nathan Schulte eb66cdd61a use proxy for picking in ArcGIS MapServer provider 
causes the pickFeatures method to make pick requests via proxy, if specified
includes a test ensuring the proxy is used if specified
 2015-07-01 18:05:03 -05:00
abdou farouk 895dc2bc12 adding myself in CONTRIBUTORS.md 2015-05-29 06:42:22 +02:00
Kai Ninomiya 582f0aaef3 Add myself to CONTRIBUTORS.md 2015-05-21 16:49:04 -04:00
Ed Mackey 9d30867570 Added Ilia Choly to CONTRIBUTORS.md 2015-05-13 18:07:47 -04:00
Ed Mackey b691b8aab7 Update CONTRIBUTORS.md 2015-04-07 10:13:29 -04:00
Keith Pomakis 538de53622 Added my name (Keith Pomakis) to the contributers list. 2015-01-07 16:08:52 -05:00
Patrick Cozzi 70e8410d64 Added Sergio to contributors 2014-12-14 15:53:54 -05:00
Matthew Amato 8dd55730ff Merge remote-tracking branch 'origin/master' into wmts-cleanup 
Conflicts:
	CONTRIBUTORS.md
 2014-11-13 16:01:44 -05:00
Matthew Amato 232f40c5ac WMTS cleanup 
This is some cleanup to some stuff I noticed while reviewing #2275.

1. The WMTS provider is always `ready`, so remove the uneeded if checks and variable.
2. Add spec for WMTS url generation code.
3. Add @relet as a contributor.
4. Update changes (which I forgot to mention in #2275).
 2014-11-13 15:56:43 -05:00
Matthew Amato 561beb4eb2 Update CONTRIBUTORS.md 
Add gberaudo, hist first contribution was #2259.
 2014-11-12 08:58:12 -05:00
flinsalata 5597fe9fe8 Update CONTRIBUTORS.md 2014-10-31 11:35:22 -04:00
kgrochow 8f8a4208c9 contributor and changes updates 2014-09-02 13:57:48 +10:00
gcebelieu 7642798183 gcebelieu is a new cesium contributor. 2014-07-29 18:52:30 +02:00
Patrick Cozzi 86c45dd328 Added Pat Mahoney 2014-07-24 10:54:34 -04:00
Patrick Cozzi 1bbe612bae Add Rene Schwarz to CONTRIBUTORS.md 2014-07-07 08:07:00 -05:00
Matthew Amato c92a405c94 Merge remote-tracking branch 'origin/master' into velocity 2014-06-06 11:17:35 -04:00
Kevin Ring 08318a95fb Add myself to CONTRIBUTORS.md under NICTA. 2014-06-05 22:19:14 -04:00
Michael Dunkel bee9a59f5c Adding myself to the contributors list. 2014-05-28 15:20:57 -04:00
Patrick Cozzi 7c15160ffa Added Kevin to individuals section 2014-05-02 10:57:20 -04:00
Mike Macaulay 8048e41dd6 Updating Contributing.md to remove confusing link to apache CLAs and updating contributors.md to include Aviture Inc 2014-02-17 14:46:12 -06:00
Ed Mackey 8818c35ae5 Rename all instances of cesium.agi.com to cesiumjs.org. 
Cherry-picked from @kring's d0e34a7a.
 2013-11-27 13:19:40 -05:00
Kevin Ring a59addf2d7 Add David Hite to the individual CLA list. 2013-10-21 15:22:55 -04:00
Patrick Cozzi 7945221706 Added Dan Yankowsky to CONTRIBUTORS.md 2013-09-24 08:52:51 -04:00
Patrick Cozzi 88c5a83c47 Added Alex Wood to CONTRIBUTORS.md 2013-08-30 14:33:59 -04:00
Patrick Cozzi 8c0175097b Fix whitespace 2013-08-29 10:37:13 -04:00
Patrick Cozzi 29f9e3ac29 Merge master to triangulationformat 2013-08-29 10:36:18 -04:00
Patrick Cozzi 4ba21786d7 Fix formatting 2013-08-29 10:07:44 -04:00
Patrick Cozzi 0047c961c2 Added David Hudlow to CONTRIBUTORS.md 2013-08-29 09:49:35 -04:00
Matthew Amato 0964a406ba Add Rathyeon and David Hudlow to contributors. 2013-08-29 08:57:43 -04:00
Matthew Amato 7af95f4fa7 Add Evax Software to list of contributors 
There first pull request was #1034

Also update CHANGES since we didn't do it in #1034
 2013-08-27 15:25:00 -04:00
Dan Bagnell 36b3cee327 Merge branch 'master' into batching 
Conflicts:
	Apps/Sandcastle/gallery/Custom Rendering.html
 2013-07-09 19:12:49 -04:00
Patrick Cozzi 58df3123c6 Added @fstoner to CONTRIBUTORS.md 2013-07-02 06:33:48 -04:00
Patrick Cozzi 9ed1dd32bf Merge branch 'master' into batching 2013-05-25 10:04:04 -04:00
Scott Hunter eee522210d Add @YouLu to CONTRIBUTORS 2013-05-24 12:27:21 -04:00
Patrick Cozzi 4c988158b4 Added Akos Maroy to CONTRIBUTORS.md 2013-05-21 16:21:23 -04:00
Scott Hunter f9eabf379e Reorder AGI contributors chronologically to match the individual contributors. 2013-05-16 13:30:39 -04:00
Matthew Amato 367fe28d38 Add ayudhDas, his first pull request was #727 2013-05-02 12:05:00 -03:00
Scott Hunter f059fd2296 Add @ognjenb to CONTRIBUTORS 2013-04-30 16:31:37 -04:00
Scott Hunter aecc138c91 Add @nobelium to CONTRIBUTORS 2013-04-26 14:42:05 -04:00
Dan Bagnell 933092dec2 Adding andre-nunes to Contributors. #668 was his first merged pull request. 2013-04-22 15:38:16 -04:00
Matthew Amato b26d2d1ee4 Add macoda to Contributors 
#655 was hist first merged pull request.
 2013-04-22 12:27:08 -03:00
Scott Hunter 94467415fc Add CONTRIBUTORS.md page listing all Cesium contributors. 2013-04-19 14:06:06 -04:00