1222 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Greg Matthews	e19688e96f	Add alternate row highlighting for sorted value	2017-11-11 13:25:17 -08:00
Greg Matthews	4f53d75999	Fix whitespace in html	2017-11-11 13:24:57 -08:00
Unknown	7277460060	Merge branch 'release/2.4.2' 2.4.2	2017-11-09 17:23:46 +00:00
Unknown	93c4f6f3c0	Merge branch 'release/2.4.2' into develop	2017-11-09 17:23:32 +00:00
Unknown	c6919a7518	Bumps and changelog	2017-11-09 17:23:15 +00:00
Unknown	ca428e67dc	Package Lock and D3	2017-11-09 17:18:55 +00:00
Unknown	c6726cf020	Merge remote-tracking branch 'BenJuan26/feature/fix-tests' into develop	2017-11-09 17:15:06 +00:00
Unknown	56ae1378da	Merge branch 'feature/slot-commas' into develop	2017-11-09 17:14:49 +00:00
Unknown	e982ab1a3b	Merge branch 'feature/ship-purchase-requirements' into develop	2017-11-09 17:11:32 +00:00
Unknown	0d6aa87e89	Update coriolis to use directory basis	2017-11-09 17:04:23 +00:00
Joshua Campbell	94d06e4025	Show ship purchase requirements on outfitting page	2017-11-07 01:46:58 -05:00
Benjamin Schubert	cee5b297ac	Add create-react-class	2017-11-02 12:02:15 -04:00
Benjamin Schubert	c549213ce0	Switch to babel-preset-env	2017-11-02 11:44:53 -04:00
Benjamin Schubert	f3f9112767	Change jest version	2017-11-02 11:25:32 -04:00
Benjamin Schubert	fb325ea3e2	Add commas to slot cost	2017-11-01 15:56:51 -04:00
Unknown	3773f6f7ec	Merge branch 'release/2.4.1' into develop	2017-10-31 16:52:51 +00:00
Unknown	b90ab6fe48	Merge branch 'release/2.4.1' 2.4.1	2017-10-31 16:52:34 +00:00