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

520 Commits

Author SHA1 Message Date
Emma Krantz 5e41791d84 Added tests for updated bing maps imagery 2019-05-03 15:31:32 +10:00
Hannah 718282191d
Merge branch 'master' into master 2019-04-30 16:15:33 -04:00
TrubieTurner fe4171adde Update CONTRIBUTORS.md 2019-04-30 15:36:09 -04:00
Abu Darda c7ae01d32f empty objects in options have been replaced 2019-04-29 22:06:15 +01:00
Richard Becker d2eafc63a7 fix merge conflict with contribution 2019-04-25 15:59:30 -07:00
Merijn Wijngaard a005af7bf7 Add contributor 2019-04-21 08:56:31 +02:00
Richard Becker 22dc3d24cf Added properties to allow particle system billboards to be sized in world space as opposed to screen space. 2019-04-15 11:29:07 -07:00
Eric Strabala 21f262644b Fixed labels don't show for individual entities in datasources when clustering is enabled #6087 2019-04-15 08:49:35 -05:00
Alexander Popiak 53b32ac741 add apopiak to contributors.md 2019-03-12 17:07:39 +01:00
hpinkos 85af0cfcf1 CONTRIBUTORS.md 2019-02-25 10:52:46 -05:00
Spencer T. Parkin 92e1e6015a
Merge branch 'master' into slope-and-aspect 2018-12-30 21:46:42 -07:00
Hannah 551be0ddc0
Merge branch 'master' into doubleclick-untrack 2018-12-27 14:41:21 -05:00
Hannah 88cc1c8356
Update CONTRIBUTORS.md 2018-12-27 14:02:56 -05:00
Hannah a408471b94
Merge branch 'master' into master 2018-12-26 13:19:05 -05:00
Spencer Parkin f305696061 be optimistic that i can actually get this to work 2018-12-12 16:14:34 -07:00
Hannah 3f6eebfac7
Merge pull request #7356 from baloola/planeGeometry_spec 
#6768 adding a Plane geometry spec
 2018-12-11 13:06:54 -05:00
Chris Cooper 59be44ec00 revert the revert 2018-12-06 14:09:21 +11:00
baloola d7ffa18ead adding my info to contributors list 2018-12-02 18:31:55 +01:00
Adrien David 12597f4552 Update contributors.md 2018-11-26 18:02:28 +01:00
André 4991abb86c added support for emojis 2018-11-21 15:21:58 +01:00
mircokroon f930fe0be6 Added myself 2018-11-17 19:32:28 +02:00
Sean Lilley f8e7075710 Revert "Merge pull request #7137 from PropellerAero/mousefix" 
This reverts commit 13b1064521, reversing
changes made to a80022191a.
 2018-11-01 14:09:15 -04:00
Daniel Cooper b7623c0514 Merge origin/master 2018-10-27 18:13:43 +11:00
Hannah a0a8ad47f5
Merge pull request #7066 from dwastberg/clock_stop_event 
Clock stop event
 2018-10-23 17:58:39 -04:00
Hannah 1dd8d9c83f
Merge branch 'master' into patch-1 2018-10-23 15:01:04 -04:00
Daniel Cooper d2835d7459 Added contributor and added to changelog 2018-10-11 18:25:53 +11:00
nahgrin 8c1cd56c8d Merge remote-tracking branch 'cesium/master' into partial-ellipsoid 2018-10-09 09:23:46 -05:00
Dag Wästberg d6c92d8600 Update Contributors 2018-09-25 13:21:37 +02:00
Hannah 5352b53cda
Merge pull request #7053 from cleroux/master 
Fix entity show issues, issue #7048
 2018-09-21 10:06:30 -04:00
Tony Luk dfe518aff9 Update contributors.md 2018-09-21 14:28:57 +10:00
cleroux 8ffa22fcaf
Update CONTRIBUTORS.md 2018-09-19 22:04:05 -07:00
Mohamed marrouchi ccef75b5e2 Add optional params + bbox + minor fixes 2018-09-06 13:43:48 +01:00
Mohamed marrouchi b9eca2c124 Add support for OpenCage geocoder 2018-09-05 17:39:04 +01:00
Hannah 01c8f234e2
Update CONTRIBUTORS.md 2018-08-30 13:50:39 -04:00
Michael Squires 1d5053858e Altered Model's cacheKey to use a GUID. 2018-08-23 11:18:40 -04:00
Sean Lilley 57c9b69ee9 Revert CHANGES.md and CONTRIBUTORS.md 2018-07-31 16:46:16 -04:00
Xavier Tassin 3efadf0476
Added myself 2018-07-31 09:43:05 +02:00
Matt Petry dbacbbef5a updated changes.md and contributors.md 2018-07-26 17:18:13 -04:00
Ben Kuster ddaa260347 typo fixes in PostProcessStageLibrary and Collection 2018-07-25 09:05:06 +02:00
Brandon Barker 1b409915df Add change notes 2018-07-06 13:07:17 -07:00
Jane (Yuan) Xu d75427407e
Merge branch 'master' into master 2018-06-18 09:53:50 -04:00
Omar Shehata 38c1a99078 Removed support for directories without a given json filename 2018-06-11 14:09:36 -04:00
loshjawrence 88e16f223d updating to conform to code style 2018-06-04 15:36:34 -04:00
loshjawrence 2f1f1b3933 added myself to the CONTRIBUTORS.md 2018-06-04 15:31:09 -04:00
Xu 385e6ed11f adding corresponding changes to CHANGES.md, added myself as a contributor, and fixed wording on the update to Coding Guide 2018-05-21 14:44:53 -04:00
Luke San Antonio Bialecki 2c0e4b2610 Add name to CONTRIBUTORS.md 2018-05-21 14:21:28 -04:00
hanbollar 8b80aab352 added self to contributors.md 2018-04-30 19:44:15 -04:00
Mark Erikson ee8f9b6794
Merge branch 'master' into patch-1 2018-04-17 14:31:04 -04:00
Mark Erikson a3d525dd7e Fix lint errors and add myself to CONTRIBUTORS 2018-04-17 14:30:09 -04:00
Hannah 855f849b8f
Update CONTRIBUTORS.md 2018-04-17 13:17:33 -04:00
Matthew Amato 31bf9cdd4d
Merge pull request #6413 from roderickgreen/fix-3945 
Fixes #3945: Flickering when adding a new polygon entity
 2018-04-13 10:44:04 -04:00
roderickgreen 88a8de1a45 Fixes #3945: Flickering when adding a new polygon entity 2018-04-02 23:21:44 -04:00
Dan Bagnell 78dcea9d2d Merge branch 'master' into log-depth-buffer 2018-04-02 16:39:11 -04:00
Arne Schilling 4d2ee4f990
Merge branch 'master' into fix_alpha_blending 2018-03-21 15:07:05 +01:00
Arne Schilling 1eaf1473d5 added myself in CONTRIBUTORS.md 
changes in CHANGES.md
 2018-03-21 15:00:30 +01:00
Arne Schilling abb2e4dab3 :wq 
evert "added myself in CONTRIBUTORS.md"

This reverts commit c328362fee.
 2018-03-21 14:55:06 +01:00
Arne Schilling c328362fee added myself in CONTRIBUTORS.md 
changes in CHANGES.md
 2018-03-21 14:39:24 +01:00
Dan Bagnell 2f53039478 Merge branch 'master' into log-depth-buffer 2018-03-20 15:45:14 -04:00
gabriel-macario dc0d99702d Update CONTRIBUTORS.md 2018-03-16 00:39:08 -07:00
gabriel-macario a045e3f1e9 Update CONTRIBUTORS.md 2018-03-16 00:39:08 -07:00
Dan Bagnell 1635c92da2 Merge branch 'master' into log-depth-buffer 2018-03-12 17:13:49 -04:00
Sean Lilley 2f710dea8b Merge branch 'master' into log-depth-buffer 2018-03-05 15:06:00 -05:00
Steve Wiseman fbf4071acd fixes issue #6272 2018-03-01 22:12:59 -05:00
Patrick Cozzi 2d02f6d690 More Cesium -> CesiumJS 2018-02-27 16:53:45 -05:00
Dan Bagnell e62f28b929 Merge remote-tracking branch 'origin/master' into log-depth-buffer 2018-02-19 16:27:14 -05:00
George Vinokhodov 9f7c4d8442 Merge branch 'cesium-master' into log-depth-buffer 
# Conflicts:
#	Source/Scene/PointCloud3DTileContent.js
 2018-02-09 14:13:01 +03:00
Tamar Cohen 8c28b97692 Use ellipsoid for coordinate calculations in KmlDataSource 2018-02-06 11:37:55 -08:00
srtrotter bc8faee2cb
Merge branch 'master' into partial-ellipsoid 2018-01-12 07:37:46 -06:00
hanbollar 9ff8f83d20 added myself to contributors.md 2018-01-09 13:26:13 -05:00
George Vinokhodov 2fb7ed2bee Merge branch 'cesium-master' into log-depth-buffer 
# Conflicts:
#	Source/Scene/Scene.js
 2018-01-09 17:27:48 +03:00
srtrotter 595fa8e367
Merge branch 'master' into partial-ellipsoid 2017-12-01 14:40:41 -06:00
Jeremy Marzano a5730ef3f4
Merge branch 'master' into master 2017-11-30 11:01:34 -05:00
srtrotter 3e8f06fba9
Merge branch 'master' into partial-ellipsoid 2017-11-21 11:57:57 -06:00
srtrotter 613dc63fa6
Added srtrotter to contributors 2017-11-21 10:59:56 -06:00
JeremyMarzano-ISPA 34cef557e8 Update CONTRIBUTORS.md 2017-11-21 08:14:02 -05:00
Martine d4013fd81e Add my name to CONTRIBUTORS 2017-11-13 11:20:09 -08:00
JeremyMarzano-ISPA 7bb806ca1e Added Unit test and listed the changes and contributor 2017-11-09 11:11:57 -05:00
George Vinokhodov a65596f667 Merge branch 'cesium-master' into log-depth-buffer 2017-11-07 21:30:52 +03:00
Yavuz Selim Abidin 9ac395cacb fixes #5943 2017-11-01 00:22:15 +03:00
Matthew Amato 9933716241 Merge pull request #5771 from hodbauer/rtl-labels-support 
Rtl labels support
 2017-10-25 10:04:08 -04:00
Joshua Bernstein f6154caeb2 Merge branch 'master' into 5819_fix_for_empty_icon_tag 2017-10-19 22:29:38 -04:00
hodbauer 00203372e8 Merge branch 'master' into rtl-labels-support 2017-10-19 18:52:04 +03:00
Tom Fili 83cd5f785b Merge branch 'master' into master 2017-10-18 16:21:09 -04:00
Justin Burr ea7e429035 Add Novetta to contributors file. 2017-10-18 16:43:17 +00:00
Joshua Bernstein 650066affc Merge branch 'master' into 5819_fix_for_empty_icon_tag 2017-10-17 13:38:55 -04:00
hodbauer df1ddeadb4 * add more tests for better code coverage 
* fix some edge cases
* change the regex that identify right-to-left languages to use unicode instead of hebrew chars for js engines that can't parse this letters (like jscoverage)
 2017-10-16 22:55:57 +03:00
hodbauer 3432f03674 Merge branch 'master' into rtl-labels-support 
# Conflicts:
#	CHANGES.md
 2017-10-15 13:26:54 +03:00
George Vinokhodov 7133aa5dce Merge branch 'cesium-master' into log-depth-buffer 2017-10-13 17:57:03 +03:00
nrivera-Novetta af60ced5dc Merge branch 'master' into master 2017-10-13 08:55:25 -04:00
hpinkos d52bd77a9a Remove fcayre from individual 2017-10-03 15:10:03 -04:00
nrivera-Novetta 18453b4026 Merge branch 'master' into master 2017-10-02 11:57:01 -04:00
nrivera-Novetta c917ed9a95 Update CONTRIBUTORS.md 2017-10-02 11:55:29 -04:00
Josh Bernstein cd9c061a11 Remove extra space #5819 2017-09-29 15:34:00 +00:00
Josh Bernstein 848e6af6cd Fix URL for company #5819 2017-09-29 14:19:33 +00:00
Josh Bernstein 31efd9d22a Include company name in CONTRIBUTORS.md #5819 2017-09-29 14:16:16 +00:00
Josh Bernstein 0bf2659053 Add my name to contributors file #5819 2017-09-29 13:02:34 +00:00
hodbauer bcc762c084 Merge branch 'master' into rtl-labels-support 
# Conflicts:
#	CHANGES.md
#	CONTRIBUTORS.md
 2017-09-28 23:06:01 +03:00
Nacho Carnicero d9f78355c1 Added nacho-carnicero to contributors 2017-09-28 14:28:36 +02:00
George Vinokhodov 87f8415a99 Merge branch 'master' into log-depth-buffer 2017-09-28 14:51:51 +03:00
George Vinokhodov bd5428ff94 added to CONTRIBUTORS 2017-09-27 16:19:21 +03:00
fcayre 327907b4fc Merge branch 'master' into fix-polyline-collection 2017-09-25 09:25:19 +02:00
fcayre 10636bcb32 Add Logilab to corporate contributors 2017-09-25 09:21:52 +02:00
Yonatan 99010f26c9 Updated contributors list 2017-09-17 08:48:36 +03:00
Yonatan ea5ceeb11a Updated contributors 2017-09-17 08:48:35 +03:00
wallw-bits 2d29282c8d Merge branch 'master' into maintain-camera-heading-on-zoom 2017-09-07 17:32:38 -06:00
Jannes Bolling cc13995ee6 added to contributors 2017-09-01 16:07:42 +02:00
Florent Cayré 81f8a42d06 Added fcayre as a contributor 2017-08-25 14:32:05 +02:00
William Wall d24c5c18e0 Add myself to contributors list 2017-08-02 10:01:41 -06:00
Hannah 342a1a02d8 Add Cody Guldner to CONTRIBUTORS.md 2017-07-26 10:15:21 -04:00
Sean Lilley ea7e20b8d7 Small style fixes 2017-07-13 15:18:58 -04:00
Jason Crow 2617c07561 updated CONTRIBUTORS.md 2017-07-10 09:58:11 -05:00
Jason Crow 153946cd1c updated CONTRIBUTORS.md 2017-07-10 09:35:43 -05:00
Patrick Cozzi a2c00904bc Merge branch 'master' into check-CylinderOutlineGeometry 2017-06-27 17:31:58 -04:00
Rudraksha20 451f1d0411 EllipsoidGeodesic Updated with Check 2017-06-27 15:57:04 -04:00
rms13 396094beec Replaced DeveloperErrors with Check for CylinderOutlineGeometry.js 2017-06-27 15:39:41 -04:00
ESRA ERİK 457833c24c Merge branch 'master' into ellipsoid-default-value 2017-06-19 18:46:11 +03:00
Hannah 0f705712a3 Merge pull request #5497 from esraerik/SceneTransitioner-check 
Remove !defined
 2017-06-19 11:32:34 -04:00
ESRA ERİK 6e8aab652f Merge branch 'master' into SceneTransitioner-check 2017-06-19 18:13:19 +03:00
ESRAERIK be95ff2f13 conflict resolved 2017-06-19 18:11:49 +03:00
ESRAERIK 4863d16a7d Add my name as a contributor 2017-06-19 18:09:44 +03:00
ESRAERIK dea6a078e7 Add my name as a contributor 2017-06-19 18:07:26 +03:00
Sean Lilley e1f08b38d6 Merge branch 'master' into 3d-tiles 2017-06-19 09:25:06 -04:00
hulyayurtman 3c565e8381 Replaced error checking with Check 2017-06-14 09:52:35 +03:00
Matthew Amato e0d8f2abbb Merge remote-tracking branch 'origin/master' into 3d-tiles 
# Conflicts:
#	CHANGES.md
#	Source/DataSources/CzmlDataSource.js
#	Source/DataSources/KmlDataSource.js
 2017-06-07 17:07:29 -04:00
Srinivas Kaza 90ac137fe4 Adds Srinivas to CONTRIBUTORS.md 2017-06-05 12:11:41 -04:00
Matthew Amato 86759b3f7c Merge remote-tracking branch 'origin/master' into 3d-tiles 
# Conflicts:
#	CHANGES.md
#	Source/Scene/GoogleEarthImageryProvider.js
 2017-06-01 16:52:31 -04:00
Ed Mackey adca61cd14 Fix CLA URLs for CONTRIBUTORS.md 2017-05-30 17:11:01 -04:00
WilliamKHo 3b0b1b4a35 resolved merge conflicts in CONTRIBUTORS.md 2017-05-30 16:19:13 -04:00
WilliamKHo b8c60772ad Refactor DeveloperError checks to Check for AttributeCompression 2017-05-30 16:08:02 -04:00
Mohamad Moneimne e81c22a9f4 replaced developer error with check in binarySearch and updated 
contributors
 2017-05-30 15:19:05 -04:00
hpinkos afbb41c73c Merge branch 'master' into 3d-tiles 2017-05-26 08:58:31 -04:00
Matthew Amato 6394242f4b Merge pull request #5344 from jhwohlgemuth/feature/replace-jsHint-with-eslint 
Replace JSHint with ESLint
 2017-05-25 16:46:48 -04:00
hpinkos 5bdb797442 Merge branch 'master' into 3d-tiles 2017-05-25 11:19:20 -04:00
Joseph Klinger 2d5d7b31b5 Updated CHANGES.md and CONTRIBUTORS.md. 2017-05-22 17:00:32 -04:00
Jason Wohlgemuth 43578febf2 Replace JSHint with ESLint 
- Added .eslintrc configuration files
- Added eslint and eslint-watch gulp tasks (added gulp-eslint and eslint-plugin-html deps)
- Removed jshint gulp tasks (and dependencies)
- Refactored inline disable comments in ESLint syntax
- Cleared all new lint errors
- Updated build and test documentation
- Added ESLint to license file
 2017-05-18 20:11:17 -05:00
Sean Lilley 8420b184ed Merge branch 'master' into 3d-tiles 2017-05-15 10:17:23 -04:00
ryki2658 7e1f0be4e2 Added myself 2017-05-10 09:43:56 -06:00
Sean Lilley dfb938b51f Cleanup 2017-04-27 16:14:35 -04:00
Ed Mackey 07b42cba55 Fix CONTRIBUTORS.md 
Heiko Thiel is already a contributor on the 3d-tiles branch, so
his name was added at the same location here as it already
appears on that branch.
 2017-04-18 17:49:32 -04:00
Sean Lilley 85e49768a8 Merge branch 'master' into 3d-tiles 2017-04-18 13:11:32 -04:00
Ed Mackey 3bcfc209ec Tweak 2017-04-15 15:57:16 -04:00
Sravan Kumar ed59547661 fixed white spaces - issue-5192(dataSource to dataSourcePromise 2017-04-14 12:04:34 -07:00
Sean Lilley ef52d0417c Merge branch 'master' into 3d-tiles 2017-04-13 13:10:36 -04:00
Aleksei Kalmykov c487c7301f - Fix Mapbox default warning message showing up all the time 2017-04-10 15:14:48 +02:00
Sean Lilley 1174a8ce40 Fix 2017-03-28 19:31:09 -04:00
Sean Lilley 724422e1c3 Update CONTRIBUTORS.md from 3d-tiles 2017-03-28 09:07:43 -04:00
Heiko Thiel d4306b4529 Added myself to CONTRIBUTORS.md 2017-03-25 01:51:16 +01:00
Dan Bagnell e21d37d614 Merge branch 'master' into 3d-tiles 2017-03-15 14:45:35 -04:00
Dmitry Kiselev 2e4274c48c Add EndPoint and Dmitry Kiselev to contributors 2017-03-14 11:36:39 -03:00
Dan Bagnell d65ba90302 Merge branch 'master' into 3d-tiles 2017-02-22 14:10:53 -05:00
Sean Lilley ae147ce25e Merge branch 'master' into 3d-tiles 2017-02-14 10:51:19 -05:00
Paul Connelly a4be986c04 Instanced3DModel3DTileContent needs to look up BATCH_ID on 
featureTable.json, not on the FeatureTable itself.
 2017-02-13 15:06:11 -05:00
glee2244 7b1b6b9d08 Update CONTRIBUTORS.md 2017-02-13 11:37:23 -05:00
Matthew Amato aefc0094e5 Merge pull request #4961 from mortac8/wallPolylineOutlineFix 
Add outline to polyline walls
 2017-02-12 10:01:52 -05:00
Sean Lilley b8acd843fa Merge branch 'master' into 3d-tiles 2017-02-10 14:10:23 -05:00
Joseph Klinger 95d9b17606 Update CONTRIBUTORS.md 2017-02-09 16:15:55 -05:00
Joseph Klinger 1cad774601 Merge branch 'master' into fuchsia-color-spelling 2017-02-09 16:15:01 -05:00
Joe Klinger e0ff3e0bf3 Fixed spelling of Color.FUCHSIA 2017-02-09 16:11:14 -05:00
Patrick Cozzi f8335d0b46 Add Prasanna Natarajan to CONTRIBUTORS.md 2017-02-09 15:59:31 -05:00
AshleyMort c9a6e51bc4 Add outline to polyline walls 
This fixes the issue referenced in
https://groups.google.com/forum/#!topic/cesium-dev/ZGV9jpxMSIE
 2017-02-07 07:58:39 -06:00
Jane-Of-Art 185a86c411 Moved self to end of contributors list 2017-02-06 18:19:36 -05:00
Jane Guo acf8a5c984 Added self to contributors 2017-02-06 18:13:47 -05:00
Sean Lilley 89047dcadf Merge branch 'master' into 3d-tiles 2017-01-31 10:46:06 -05:00
Aristeidis Bampakos 51ef9f4299 Update CONTRIBUTORS.md 2017-01-25 11:55:40 +02:00
Aristeidis Bampakos 95c890b7d9 Update CONTRIBUTORS.md 
Add empty line at the end of the list
 2017-01-25 11:48:35 +02:00
Aristeidis Bampakos eb4aca3ef8 Add entry to CONTRIBUTORS list. 2017-01-25 10:49:49 +02:00
Patrick Cozzi 08cca59e91 Added @jasonbeverage to CONTRIBUTORS.md 2017-01-19 19:29:41 -05:00
Rachel Hwang f1d4c32039 Updating CONTRIBUTORS.md 2017-01-17 11:41:32 -05:00
Sean Lilley eaaa7245c7 Fix up merge 2017-01-12 13:27:55 -05:00
Sean Lilley 6945d48eb0 Merge branch '3d-tiles' into unaryfns 2017-01-12 13:15:22 -05:00
Patrick Cozzi f213644f25 Merge master to master-to-3d-tiles 2017-01-11 13:19:03 -05:00
Shehzan Mohammed 0703c1cc40 Add shehzan10 to CONTRIBUTORS.md 2017-01-10 11:57:42 -05:00
Patrick Cozzi ab2eb71cb3 Merge branch 'master' into wms-1.3-crs 2017-01-09 20:35:08 -05:00
Austin Eng c0c3877ba7 add myself to CONTRIBUTORS.md 2017-01-09 15:44:39 -05:00
cwgrant 7f45c5d69a Update CHANGES/CONTRIBUTORS for WMS 1.3 2017-01-08 19:21:33 -05:00
Matthew Amato 0f998e982e Merge remote-tracking branch 'origin/master' into 3d-tiles 
# Conflicts:
#	CHANGES.md
#	Specs/pick.js
 2017-01-03 16:38:08 -05:00
Zsolt Simon 7cbcfa6a9b Update CONTRIBUTORS.md 2017-01-03 11:45:25 +10:00
ateshuseyin 3244710e28 update CONTRIBUTORS.md 2016-12-23 19:37:09 +02:00
Leesa Fini e9fd5e11ae fixed whitespace 2016-12-20 15:31:23 -05:00
Leesa Fini 664bf5cd41 some updates 2016-12-20 15:23:29 -05:00
Sean Lilley d46a1d52a3 Merge branch 'master' into 3d-tiles 2016-12-12 16:36:45 -05:00
JDepooter d1de2888ab Add self to CONTRIBUTORS.md 2016-12-02 11:47:30 -08:00
Brad Hover d9869635b8 Add self to CONTRIBUTORS.md 2016-11-30 23:06:54 -08:00
Sean Lilley 98aa22c248 Merge branch 'master' into 3d-tiles 2016-11-15 09:37:15 -05:00
Sean Lilley abfb3d39c7 Merge branch 'master' into 3d-tiles 2016-11-08 10:26:58 -05:00
Abhishek Potnis c688c7121a Added name in Contributors.md 2016-11-08 10:50:52 +05:30
duvi.fn ca73a333c0 add to CONTRIBUTORS.md 2016-11-06 02:02:06 +02:00
Abhishek Potnis 052e8fc5b2 Added function lookAtMtEverest 2016-11-05 10:56:08 +05:30
Frederic Junod 2ec530e8bd Add 'Camptocamp SA' to CONTRIBUTORS.md 
And copy Guillaume into
 2016-11-04 17:04:34 +01:00
Abhishek Potnis 4c021aa39d Changed Toggle to Enable Lighting 2016-11-03 22:48:09 +05:30
Sean Lilley 1e1ab1d59f Merge branch 'master' into 3d-tiles 2016-11-01 11:37:50 -04:00
Patrick Cozzi 0f636ff097 Merge pull request #4539 from malaretv/contrib-docs-travis-fix 
Change docs to say travis-ci.org
 2016-10-28 11:34:08 -04:00
vmalaret 231048bc56 Add self to CONTRIBUTORS.md 2016-10-27 17:28:44 -04:00
Dylan Brown 823c8ac8fb Fix merge conflict (again?) 2016-10-25 16:29:55 -04:00
Dylan Brown 0b2c7acff3 Fix merge conflict 2016-10-25 16:26:31 -04:00
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