1239 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
willyb321	e6c75bf2af	Merge branch 'develop' into feature/beyond-coriolis	2018-04-13 09:16:23 +10:00
willyb321	83f7880c58	bump version	2018-04-13 07:51:07 +10:00
William	51d29aee38	Merge pull request #235 from pnellesen/feature/fueltank_column ... Added fuel tank column to Core Module Classes on Shipyard	2018-04-13 07:38:07 +10:00
William	c7754c0365	Merge pull request #234 from joelgarboden/feature/remote_testing ... Disable 'localhost' host header requirement	2018-04-13 07:34:59 +10:00
Pat	b8c1effecb	Update for issue #183 - use first letter of bulkhead instead of "Max Rating" value	2018-04-09 23:10:28 -05:00
Pat	dd07241dd9	Added fuel tank column to Core Module Classes on Shipyard	2018-04-07 18:57:54 -05:00
Joel Garboden	5ad828a613	Disable 'localhost' limit ... Disale host header so webpack allows more than localhost access	2018-04-07 22:34:50 +00:00
Unknown	9856df5527	Portiguese	2018-03-22 22:00:19 +00:00
Unknown	7b249900ec	Portuguese	2018-03-22 21:59:50 +00:00
Unknown	e3b9267c3f	Merge remote-tracking branch 'origin/feature/beyond-coriolis' into develop	2018-03-22 21:59:37 +00:00
willyb321	a996b8135a	inital engineerless import working	2018-03-23 08:51:48 +11:00
willyb321	5e1237390b	Initial work on 3.0 imports. ... Decided to split journal imports to a separate file.	2018-03-22 16:22:59 +11:00
Willyb321	83571b4bef	add .editorconfig ... Makes contributing and not messing up the codestyle easier	2018-03-22 12:07:19 +11:00
Willyb321	c2a0dad9a8	Export textarea select ... Fixes #146	2018-03-22 12:06:36 +11:00
Unknown	f6f057689c	Merge branch 'feature/chieftain' into develop	2018-01-27 11:47:17 +00:00
willyb321	4378f0020e	add chieftain to map ... also remove console logs that i forgot to remove	2018-01-27 10:55:37 +11:00
Unknown	b7b8ee5580	Merge branch 'release/2.5.1' into develop	2018-01-24 09:18:36 +00:00
Unknown	c630dbbed0	Version Bump	2018-01-24 09:18:21 +00:00
Unknown	fa6703a3b8	Merge remote-tracking branch 'Blackth0rn/feature/#186-passenger-totals' into develop	2018-01-24 08:45:54 +00:00
Unknown	bdcb64c9d1	Merge remote-tracking branch 'willyb321/feature/fix-engineer-values' into develop	2018-01-24 08:45:48 +00:00
Unknown	a1afc869a7	Merge remote-tracking branch 'Ghnuberath/feature/ax-modules' into develop	2018-01-24 08:45:44 +00:00
Unknown	d8ce26c7cf	Merge remote-tracking branch 'origin/master' into develop	2018-01-24 08:44:45 +00:00
Sean McIntyre	95c474dc05	Recategorizing experimental modules into an "experimental" category	2018-01-22 16:48:10 -05:00
Sean McIntyre	56ca73b4ad	Forgot Remote Release Flak Launcher	2018-01-22 16:43:29 -05:00
Sean McIntyre	d82cd6a89e	Removing unnecessary change	2018-01-22 15:21:59 -05:00
Sean McIntyre	bf20d32364	Adding AX modules	2018-01-22 15:20:41 -05:00
willyb321	e968e62fca	Fix clip size (hopefully)	2018-01-16 08:14:21 +11:00
Unknown	b9c9ca9fa1	Merge branch 'release/2.5.0'	2018-01-11 21:59:31 +00:00
Unknown	6e965e2e98	Version Bump	2018-01-11 21:59:20 +00:00
Unknown	7d569f9036	Merge branch 'feature/fix-engineers' into develop	2018-01-11 21:51:35 +00:00
Unknown	df5a77199d	Merge branch 'develop'	2018-01-11 21:50:28 +00:00
Greg Matthews	3c8dfebfdc	Issue #186. Added passenger totals to shipyard screen	2018-01-10 21:20:27 -08:00
Unknown	3cc422596f	Something something consistant naming	2017-12-24 09:47:49 +00:00
Unknown	4ed167de22	Add T10	2017-12-24 09:47:33 +00:00
Unknown	b420647501	Something something consistant naming	2017-12-24 09:46:49 +00:00
Unknown	0c318b5e68	Add T10	2017-12-23 12:03:21 +00:00
willyb321	1c627297b8	shorten the terrible _addModifications call	2017-12-19 16:39:42 +11:00
willyb321	f41e2d0552	fix indent and hopefully fix ammo clip ... dont know if it was broken, if someone has it DM it to me thanks	2017-12-19 16:28:05 +11:00
willyb321	1a1d539c60	fix engagement range slider and armour integrity ... hopefully	2017-12-19 16:18:20 +11:00
willyb321	ba2e46f88f	fix rate of fire ... probably	2017-12-19 14:49:04 +11:00
willyb321	c2f1fa81af	remove console logs	2017-12-17 18:48:24 +11:00
willyb321	752e03fa0f	possible armour fix ... need more data to confirm however	2017-12-17 18:24:34 +11:00
willyb321	1da69664d7	shields should be accurate now ... dont now what the issue with hull is if you see it let me know	2017-12-17 14:49:51 +11:00
willyb321	9aa986a133	thanks webstorm	2017-12-17 12:48:13 +11:00
willyb321	bdbfb28c4a	missed a spot	2017-12-17 12:47:02 +11:00
willyb321	162156bb2b	fix random weird indents	2017-12-17 12:46:18 +11:00
willyb321	64c5d542e9	more work on mods	2017-12-17 12:27:04 +11:00
willyb321	31dc789f6e	initial (re)implementation of engineer mods ... still some kinds to work out.	2017-12-17 11:16:50 +11:00
Unknown	b0e2cfd7db	Merge branch 'feature/#112_ship_table_highlights' into develop	2017-12-04 09:41:54 +00:00
Greg Matthews	54ddb0d014	Rename sortValue and tmpSortValue to be more meaningful	2017-11-11 13:29:59 -08:00