Commit Graph

3581 Commits

Author SHA1 Message Date
hydroflame
623031c8ad
Merge pull request #1580 from danielyxie/dev
fix gang earnings
2021-10-27 11:06:07 -04:00
Olivier Gagnon
150b8600e4 fix gang earnings 2021-10-27 11:04:28 -04:00
Olivier Gagnon
080b5a4a1f merge dev 2021-10-26 23:11:47 -04:00
hydroflame
e680730450
Merge pull request #1579 from danielyxie/dev
Gang changes
2021-10-26 23:04:56 -04:00
Olivier Gagnon
e49dda0b35 build 2021-10-26 23:03:30 -04:00
Olivier Gagnon
738152d614 New sf -1 and changes to gang to rely more on territory 2021-10-26 23:02:46 -04:00
hydroflame
87f78cbc6f
Merge pull request #1577 from danielyxie/dev
few fixes
2021-10-26 22:25:45 -04:00
Olivier Gagnon
c1448cfe65 few fixes 2021-10-26 22:25:30 -04:00
hydroflame
c7cf9c501b
Merge pull request #1576 from danielyxie/dev
Fix rep transfer on new job
2021-10-26 22:03:50 -04:00
Olivier Gagnon
7733ee0375 Fix rep transfer on new job 2021-10-26 22:03:34 -04:00
Olivier Gagnon
d4ba39995f Merge branch 'sg' of github.com:danielyxie/bitburner into sg
t push# especially if it merges an updated upstream into a topic branch.
2021-10-26 21:22:47 -04:00
Olivier Gagnon
326e827368 few changes 2021-10-26 21:22:40 -04:00
Olivier Gagnon
504ee46950 terminal colors 2021-10-26 20:26:05 -04:00
hydroflame
b2f09e4880
Merge pull request #1574 from danielyxie/dev
revert incite violence effect
2021-10-26 19:55:48 -04:00
Olivier Gagnon
6865fe6463 revert incite violence effect 2021-10-26 19:55:34 -04:00
hydroflame
f3d162e5cd
Merge pull request #1573 from danielyxie/dev
fix bug in corp
2021-10-26 17:45:41 -04:00
Olivier Gagnon
f242bb5107 fix bug in corp 2021-10-26 17:43:35 -04:00
hydroflame
52b5dd801f
Merge pull request #1572 from danielyxie/dev
Added kill all scripts button
2021-10-26 15:51:08 -04:00
Olivier Gagnon
ba72fd7fb5 Added kill all scripts button 2021-10-26 15:50:55 -04:00
hydroflame
00dd4cbc35
Merge pull request #1571 from danielyxie/dev
fix some issues with badges
2021-10-25 11:17:52 -04:00
Olivier Gagnon
f915ba61a9 fix some issues with badges 2021-10-25 11:17:41 -04:00
hydroflame
c757c52661
Merge pull request #1570 from Saynt-Garmo/sg
Update FragmentInspector.tsx
2021-10-25 11:17:26 -04:00
tyasuh.taeragan@gmail.com
514150e589 Update FragmentInspector.tsx
Power to Base Power, Fragment Inspector
2021-10-25 10:34:15 -04:00
Olivier Gagnon
c69888f66d Added one definition to NetscritpDefinitions 2021-10-25 10:05:19 -04:00
hydroflame
e35de9ee3a
Merge pull request #1566 from danielyxie/dev
fix sleeve in netscript def
2021-10-24 12:19:11 -04:00
Olivier Gagnon
65ac7ff6e3 fix sleeve in netscript def 2021-10-24 12:19:01 -04:00
hydroflame
3b6057798d
Merge pull request #1565 from danielyxie/dev
no longer remove badges because apparently lmao everything is bugges
2021-10-24 11:14:38 -04:00
Olivier Gagnon
f044dc6603 no longer remove badges because apparently lmao everything is bugges 2021-10-24 11:14:21 -04:00
hydroflame
ddb86ebfba
Merge pull request #1562 from danielyxie/dev
Fix a few bugs
2021-10-23 16:04:09 -04:00
Olivier Gagnon
c34d53bc14 Added recent scripts subpage of active scripts 2021-10-23 16:04:00 -04:00
Olivier Gagnon
6d39fda3fa fix a few bugs 2021-10-23 15:22:58 -04:00
Olivier Gagnon
0afb2e5f5d remove comments 2021-10-23 14:40:57 -04:00
Olivier Gagnon
a0039d9667 beautify using monaco 2021-10-23 14:40:46 -04:00
Olivier Gagnon
148611dd4f Merge branch 'dev' of github.com:danielyxie/bitburner into dev
t push
2021-10-23 14:36:13 -04:00
Olivier Gagnon
f5b23262f6 fix react error 2021-10-23 14:36:07 -04:00
hydroflame
74331f6399
Merge pull request #1560 from Saynt-Garmo/dev
Hacknet Core Bonus applies on new core bought.
2021-10-23 14:16:50 -04:00
tyasuh.taeragan@gmail.com
82c85b381c Hacknet Core Bonus applies on new core bought. 2021-10-23 11:42:18 -04:00
Olivier Gagnon
9493768c0b fmt 2021-10-23 10:09:43 -04:00
Olivier Gagnon
eec75b0840 Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2021-10-23 10:08:11 -04:00
Olivier Gagnon
9982951650 move air 2021-10-23 10:08:06 -04:00
hydroflame
bbb69952e8
Merge pull request #1559 from Saynt-Garmo/dev
Toasts and Typos.
2021-10-23 10:07:39 -04:00
tyasuh.taeragan@gmail.com
2e7f164b5f Prettified 2021-10-22 16:35:05 -04:00
Olivier Gagnon
63939509e5 Chaos has a bigger effect and Incite Violence has diminishing return 2021-10-22 15:54:14 -04:00
Saynt-Garmo
9dcd74462c
Merge branch 'danielyxie:dev' into dev 2021-10-22 15:42:01 -04:00
tyasuh.taeragan@gmail.com
b843958110 Typo correction, Toasts to Noodle Bar, Hopsitlized Functions 2021-10-22 15:32:44 -04:00
tyasuh.taeragan@gmail.com
4f7199c0bd Toasts for Noodles Eaten, Hospitalized. 2021-10-22 15:30:13 -04:00
Olivier Gagnon
a2aa5aa9f3 Merge branch 'dev' of github.com:danielyxie/bitburner into dev
t push
2021-10-22 15:21:15 -04:00
Olivier Gagnon
dce11f525a fix a few bug 2021-10-22 15:21:10 -04:00
hydroflame
5e4934615f
Merge pull request #1554 from CalvinTrop/dev
Added "solarish-dark" and "solarish-light" themes to script editor based on Solarized
2021-10-22 14:30:52 -04:00
hydroflame
93c5841ecb
Merge pull request #1555 from Snarling/netscriptfunctions-streamlining
Some NetscriptFunctions fixes/streamlining
2021-10-22 14:30:37 -04:00