1594 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
willyb321	736c700aa0	orbis trial	2018-07-31 15:13:25 +10:00
willyb321	de1cb901fc	more WIP for orbis	2018-07-28 11:36:44 +10:00
willyb321	3d9d6397f6	fix url shortener	2018-07-28 07:09:16 +10:00
willyb321	dbe836729f	WIP for orbis	2018-07-27 11:44:14 +10:00
William Blythe	82fa93e676	Merge branch 'develop' into 'master'	2018-07-26 11:31:08 +10:00
willyb321	90a3392b80	oops i forgot a thing	2018-07-26 11:11:45 +10:00
willyb321	b7f715bd5e	fix dockerfile to copy the right config	2018-07-26 08:58:27 +10:00
willyb321	5f88f46770	oops, remove ports and fix branch	2018-07-26 08:39:32 +10:00
willyb321	2244c91a64	Merge remote-tracking branch 'origin/develop' into develop	2018-07-26 08:33:54 +10:00
willyb321	78134404c3	prettify nginx, dockerfile updates	2018-07-26 08:33:05 +10:00
William	c9cd6b175d	Merge pull request #333 from felixlinker/autoloader-sdps ... SDPS takes autoloader into account	2018-07-26 08:06:09 +10:00
willyb321	5f70d283e0	do reset to branch	2018-07-26 07:25:32 +10:00
willyb321	cd1e27fd11	fix nginx conf	2018-07-25 11:48:01 +10:00
willyb321	0fd1c19514	dont reset	2018-07-25 11:25:21 +10:00
willyb321	a82dffd77d	initial docker	2018-07-25 11:22:58 +10:00
Felix Linker	d3eed87077	new module method getSDps that takes autoloader into account	2018-07-25 02:07:53 +02:00
willyb321	d99f8ad7e7	remove preinstall script	2018-07-25 10:05:23 +10:00
William	e933305407	Merge pull request #329 from felixlinker/resistance-stacking ... Caps for resistances introduced	2018-07-22 07:36:46 +10:00
felixlinker	690bc5a64a	Resistance special effects now applied correctly	2018-07-20 17:54:07 +02:00
felixlinker	d2380a5c9c	Armour resistances caps introduced	2018-07-20 14:11:33 +02:00
felixlinker	c2d0a6e9e0	Removed duplicate code on armour calculations	2018-07-20 14:11:33 +02:00
Felix Linker	a8c44fddca	Shield resistances caps introduced	2018-07-20 14:11:33 +02:00
willyb321	0e6b306bdc	Merge branch 'develop'	2018-07-20 07:31:29 +10:00
William	9b2a47ba0c	Merge pull request #327 from felixlinker/sb-fixes ... Fixes for shieldboost mods and special effects on shield booster	2018-07-20 07:29:49 +10:00
Felix Linker	3038ebc1c7	sb mod displays percentage change relative to 1+boost; sb special effect applied correctly	2018-07-19 17:37:34 +02:00
willyb321	5a48d5b400	Merge branch 'develop'	2018-07-19 10:26:21 +10:00
willyb321	f36edfe98d	Fix guardian HRPs not calculating ... Fixes #325	2018-07-19 10:22:42 +10:00
willyb321	3e80d6e13b	Merge branch 'develop'	2018-07-18 08:30:07 +10:00
willyb321	c8f0a1ccc6	Fix #137 ... Recalculate stats after drag and drop	2018-07-18 08:29:08 +10:00
William	79325a3129	Merge pull request #319 from felixlinker/blueprint-special-resets ... Resetting special effects for blueprints now re-calculates all stats	2018-07-18 08:04:39 +10:00
felixlinker	1ca0fffe5e	Resetting special effects for blueprints now re-calculates all stats	2018-07-17 18:21:10 +02:00
willyb321	f5b9842b2e	Merge branch 'develop'	2018-07-14 10:54:46 +10:00
willyb321	72ea3f125e	guardian shard cannon	2018-07-14 10:52:28 +10:00
willyb321	f7a2408e44	add shock cannon	2018-07-14 10:32:47 +10:00
willyb321	c05de9a085	Merge branch 'develop'	2018-07-14 10:10:45 +10:00
willyb321	fc657f3b2d	add guardian mrps and hrps	2018-07-14 10:09:45 +10:00
willyb321	e388de0364	Merge branch 'develop'	2018-07-11 12:02:30 +10:00
willyb321	26e55afb29	fix #315	2018-07-10 14:38:29 +10:00
willyb321	9b8e1039f6	also hide / disable buttons on firefox	2018-07-09 06:51:15 +10:00
willyb321	082d14ba50	tell user sending to edengineer doesnt work with firefox	2018-07-09 06:44:54 +10:00
willyb321	87ead595c6	possible fix for shopping list	2018-07-06 07:28:23 +10:00
willyb321	fb073acdc3	fix send to edengineer button disabled for some people	2018-07-06 07:09:05 +10:00
willyb321	3dda4e24bf	update readme	2018-07-04 08:43:18 +10:00
willyb321	c966bd08ed	preinstall clone coriolis-data	2018-07-04 08:37:11 +10:00
willyb321	692c73a6d0	add esdoc	2018-07-04 07:28:39 +10:00
willyb321	849b484b4d	register specials in shopping list ... ref msarilar/EDEngineer#431	2018-07-03 08:27:12 +10:00
William Blythe	9489baccda	update .gitignore	2018-07-02 10:34:24 +10:00
willyb321	62cac15222	a couple fixes on /import	2018-07-02 06:41:01 +10:00
willyb321	0ee9ce2958	fix more args	2018-07-01 13:41:23 +10:00
willyb321	a83007fc6c	fix parameter in the wrong function	2018-07-01 13:34:29 +10:00