859 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Felix Linker	14b92b2b10	Fix medium gimballed beam laser powerdraw ... Closes https://github.com/EDCD/coriolis/issues/485	2019-04-27 15:15:16 +02:00
willyb321	5b248092e8	Merge branch 'feature/3.4' into develop	2019-04-24 07:33:05 +10:00
willyb321	0468790176	fix power, desc, rating	2019-04-15 06:53:22 +10:00
willyb321	fc827aed69	fix IDs and cost for adv dc and sc assist	2019-04-15 06:49:25 +10:00
willyb321	e4d544f2d3	gitflow-feature-stash: 3.4	2019-04-15 06:41:03 +10:00
willyb321	b3c530c745	Merge remote-tracking branch 'origin/develop' into develop	2019-04-11 05:38:55 +10:00
willyb321	c756f9b478	3.4 new slots	2019-04-11 05:38:21 +10:00
willyb321	52bfe34cd5	Merge branch 'master' into develop	2019-04-10 06:49:03 +10:00
willyb321	1e8cf46580	fix #490	2019-04-09 06:10:16 +10:00
willyb321	33ca21e1c7	add g5 ls, rapidfire cannons,	2019-03-22 07:06:57 +11:00
willyb321	ed67d91a1d	add new g4 scb recipes	2019-03-06 06:51:00 +11:00
willyb321	9e06db8e33	dist	2019-03-04 07:11:28 +11:00
William	c8dc830a52	Merge pull request #65 from opl-/fix/ship-keys ... Fix ships keys not in alphabetical order	2019-03-04 07:07:28 +11:00
William	e6df896c0e	Merge pull request #67 from akuma12/master ... Fixed Medium Gimballed Shock Cannon damage	2019-03-03 08:42:29 +11:00
Jim Rohrer	6a28e701fb	Fixed Medium Gimballed Shock Cannon damage	2019-03-02 12:01:17 -06:00
opl-	21d8c9a10b	Fix ships keys not in alphabetical order	2019-02-25 19:43:41 +01:00
willyb321	e6e706d154	dist	2019-02-12 07:08:45 +11:00
William	d5d0dd7c82	Merge pull request #64 from eyeonus/patch-1 ... Fix EDDB ID for Krait Phantom	2019-02-11 08:22:04 +11:00
willyb321	d4efdee180	add official fdev names and description to all modules	2019-02-11 08:21:01 +11:00
Jonathan Jones	f51c623fa2	Fix EDDB ID for Krait Phantom	2019-01-30 19:52:05 -07:00
willyb321	cbb18df776	i ran a script to add edids / symbols from edcd/fdevids repo	2019-01-30 08:42:51 +11:00
willyb321	0f74b08f97	fix ggc edid	2019-01-30 08:39:18 +11:00
Willyb321	acbc30f1a9	Merge branch 'develop'	2019-01-24 07:40:46 +11:00
William	c21155357c	Fix turreted scl power	2019-01-22 19:15:46 +11:00
William	49321449a2	Create LICENSE.md	2019-01-22 09:30:42 +11:00
William Blythe	2e7f22a60b	Merge branch 'develop'	2019-01-11 07:22:14 +11:00
William Blythe	ac24e6657f	lots of eddbID updates	2019-01-11 07:21:20 +11:00
William Blythe	15b40142d9	apparently the gpd broke again	2019-01-11 07:03:20 +11:00
William Blythe	f06f468796	Fix mamba eddbID ... Closes EDCD/coriolis#461	2019-01-11 07:00:13 +11:00
William Blythe	89efe00b49	Merge branch 'master' into develop	2019-01-11 06:57:33 +11:00
William	daa1cd28a1	Merge pull request #63 from TomW1605/patch-1 ... fixed dirty drive G3 optimal mass	2019-01-08 08:00:30 +11:00
Thomas White	f3015bf48f	fixed dirty drive G3 optimal mass ... please see https://github.com/EDCD/coriolis/issues/459	2019-01-07 15:51:47 +08:00
William Blythe	0ec5bc8eaf	Merge remote-tracking branch 'origin/master'	2019-01-04 07:39:54 +11:00
William Blythe	3a385adde9	Merge branch 'develop'	2019-01-04 07:39:45 +11:00
William Blythe	6fe0d33cae	Fix DSS engineering ... Closes edcd/coriolis#457	2019-01-04 07:39:26 +11:00
Willyb321	46c27b72f8	Merge branch 'develop'	2019-01-03 08:54:37 +11:00
William Blythe	868ae56a6b	fix DSS mass	2018-12-31 10:30:44 +11:00
William Blythe	93907a82a7	remove old DSS BPs	2018-12-31 08:21:01 +11:00
William Blythe	dd5652ccfc	Merge branch 'develop'	2018-12-31 08:19:18 +11:00
William Blythe	3e7bd412f2	add new DSS bp	2018-12-27 08:17:57 +11:00
William Blythe	d906f29fa1	update package.json homepage	2018-12-26 09:23:57 +11:00
William Blythe	4e92802156	Merge branch 'develop'	2018-12-26 09:07:36 +11:00
William Blythe	78dec01ec6	abrasion blaster	2018-12-26 08:51:55 +11:00
William Blythe	e70a2596dc	sdm (not fully confirmed stats)	2018-12-22 07:09:00 +11:00
William Blythe	cb0e476d37	prep for sub surface displacement misiles	2018-12-22 06:54:23 +11:00
William Blythe	86c51649fa	scl prices	2018-12-22 06:52:10 +11:00
William Blythe	2f210007f3	pwa prices	2018-12-22 06:49:58 +11:00
Willyb321	db9bb3baec	Merge branch 'develop'	2018-12-20 13:10:33 +11:00
Willyb321	da018a50c2	fix mamba again	2018-12-20 13:10:21 +11:00
Willyb321	012510b1f8	Merge branch 'develop'	2018-12-20 08:36:31 +11:00