Commit Graph

174 Commits

Author SHA1 Message Date
Jack 4c862ef313 Update src/Faction/ui/FactionsRoot.tsx 2022-03-21 23:11:04 +08:00
phyzical 796881f35d fix the correct base point for sorting 2022-03-21 21:23:34 +08:00
phyzical 5532b81285 add similar sort to the faction invite list 2022-03-21 20:13:28 +08:00
hydroflame 9922ffb3c2 Merge branch 'dev' into issues/2308 2022-03-20 14:22:32 -04:00
Olivier Gagnon cbeb6d13d3 fix misnamed factions 2022-03-19 11:37:13 -04:00
phyzical 44ea479043 update constants
* added OperationNames
* added faction names
* used citynames where appropriate
2022-03-19 16:09:59 +08:00
Master-Guy d4f01c8b40 Fix for SRC folder 2022-03-18 11:07:29 +01:00
Master-Guy 9dd933ecee Changed .keyCode to .key for files in "src" 2022-03-18 10:43:56 +01:00
BB 4eb59ac70c Turned on no-useless-concat lint and fixed it in code 2022-03-16 20:44:52 +01:00
hydroflame 8c9e14ac0e Merge pull request #3119 from nickofolas/fix/augmentations-left
Fix `Augmentations Left` with gang factions
2022-03-16 14:51:14 -04:00
nickofolas 7dbb285f8a Simplify conditions 2022-03-11 17:56:34 -06:00
nickofolas 7220cab437 More robust augs left calculations
- Should fix all issues with incorrect amount remaining
2022-03-11 13:04:17 -06:00
BB 5e2ccc71ec Mixing spaces and tabs, extra semicolons and lonely ifs are now forbidden 2022-03-11 16:32:48 +01:00
nickofolas beebcefb18 Initialize purchasingAugs state to correct value
Overwritten in merge commit, just fixing before I forget haha
2022-03-10 21:21:08 -06:00
Olivier Gagnon dfb29626f3 fix mc 2022-03-10 22:17:01 -05:00
hydroflame b7ffdeb5e2 Merge pull request #3076 from ApamNapat/turned_two_eslint_rules_on
Trailing whitespace and files not ending with \n are now illegal
2022-03-10 22:12:17 -05:00
hydroflame c13ff7ea52 Merge branch 'dev' into improvement/aug-page-link 2022-03-10 21:40:58 -05:00
nickofolas e960fbfa28 Implement faction augs page shortcut 2022-03-10 18:39:54 -06:00
Jack 2f40906d4b Update src/Faction/ui/FactionRoot.tsx
Co-authored-by: ApamNapat <ApamNapat@users.noreply.github.com>
2022-03-09 22:49:50 +08:00
phyzical de0b0f9fa9 added logic to show a sorry page when augmenting with faction screen open 2022-03-09 22:02:34 +08:00
BB 2f4d879c16 Trailing whitespace and files not ending with \n are now illegal 2022-03-08 22:51:02 +01:00
hydroflame 1c1b696853 Merge pull request #3046 from jjayeon/nicer-factions-page
add box showing remaining augments per faction
2022-03-08 16:33:02 -05:00
BB 2c3e0985c4 Simplified some relative imports 2022-03-06 05:05:55 +01:00
hydroflame 46d37a89b0 Merge pull request #3045 from jjayeon/dev
sort player's joined factions for cleaner rendering
2022-03-01 10:53:06 -05:00
autumn ef230b8265 Update FactionsRoot.tsx 2022-02-28 21:20:58 -05:00
jjayeon e74d6107c9 add box showing remaining augments per faction 2022-02-28 07:04:47 -05:00
jjayeon e0611a5aa3 sort player's joined factions for cleaner rendering 2022-02-28 06:47:37 -05:00
Justin Wade 0e4affdf0e fix typo in FactionInfo.tsx 2022-02-03 22:31:39 -05:00
hydroflame 2fe8a334ef Merge pull request #2747 from smolgumball/improve-faction-root
ui: cleanup styles + presentation in FactionsRoot.tsx
2022-01-26 00:44:55 -05:00
smolgumball 1c856bf7ef Resort imports 2022-01-21 15:57:44 -07:00
smolgumball f28c5b3b45 Improve row spacing 2022-01-21 15:55:10 -07:00
smolgumball 275e8c8756 Cleanup styles + presentation in FactionsRoot.tsx 2022-01-21 15:29:24 -07:00
nickofolas a954095519 Prevent FactionRoot options from extending beyond the window 2022-01-21 16:15:41 -06:00
nickofolas ab841f7530 Refactor for ... in loops 2022-01-15 18:45:03 -06:00
zeddrak 693169996c Make the augments multiplier look nicer
Sorry about the last one, thought that was format Exponent not Experience.
I used formatMultiplier this time, which seems more appropriate. :)
Might still need to go to a larger number type format, but that might be better addressed by modifying the formatMultiplier, so I'll leave it at just this for now. :)
2022-01-12 12:41:47 -08:00
David Ragusa e033670a35 fix typo 2022-01-10 23:15:59 -08:00
David Ragusa 056f2e0375 Fix apostrophe typo 2022-01-08 23:36:23 -08:00
hydroflame bc1c5346f5 Merge pull request #2465 from kittycat2002/dev
Optimized favor calculations.
2022-01-08 14:22:52 -05:00
kittycat2002 4fd95a322e Optimized favor calculations. 2022-01-08 08:14:13 -05:00
Martin Fournier 78a91d9997 Add local reference to mathjax context 2022-01-08 07:48:10 -05:00
Jared Jolton bd375851a4 Fix typo on Augmentations page 2021-12-20 22:28:55 -07:00
theit8514 d59601f848 Add return value and code style cleanup 2021-12-15 20:48:19 -05:00
theit8514 ad57f3dc73 Work functions do not take focus
setFocus readded and updated to send the user to the Work page if focusing.
2021-12-15 20:33:48 -05:00
Olivier Gagnon d64ce5271e fix receiving multiple times the same invite 2021-12-08 18:29:56 -05:00
Olivier Gagnon d4ebc46a19 merge dev 2021-12-03 15:35:45 -05:00
Olivier Gagnon b941753e1b more fixes 2021-11-26 18:54:06 -05:00
Olivier Gagnon 42518c3caa fix few bugs 2021-11-22 11:36:13 -05:00
Olivier Gagnon 632de50a73 convert BN13 to a more conventional one. 2021-11-18 15:38:19 -05:00
Olivier Gagnon 631bb9fe1b few bugfix 2021-11-17 17:50:02 -05:00
Olivier Gagnon 56ddcd9a45 more work on bn13 2021-11-13 22:44:17 -05:00