Commit Graph

3693 Commits

Author SHA1 Message Date
Olivier Gagnon
f4ecbd9b48 merge dev 2021-10-08 00:26:35 -04:00
hydroflame
58d969f01e
Merge pull request #1434 from danielyxie/dev
Script editor filename fix
2021-10-08 00:22:50 -04:00
Olivier Gagnon
7db1164a1a build script editor filename issue 2021-10-08 00:22:32 -04:00
Olivier Gagnon
3ca7c49ce8 Fixed Script Editor last filename not keeping proper track 2021-10-08 00:21:30 -04:00
Olivier Gagnon
528a8f30db more elements around 2021-10-08 00:13:18 -04:00
Olivier Gagnon
500063e87e Merge branch 'dev' into sg 2021-10-07 23:53:49 -04:00
Olivier Gagnon
ec3037f8c6 readded font 2021-10-07 23:53:44 -04:00
Olivier Gagnon
8d7f0488f8 merge dev 2021-10-07 17:58:32 -04:00
hydroflame
06b706beca
Merge pull request #1433 from danielyxie/dev
Convert everything to hostname as primary
2021-10-07 17:56:19 -04:00
Olivier Gagnon
7d0536a4d2 finish convert to hostname 2021-10-07 17:55:49 -04:00
Olivier Gagnon
2958034ad4 more ip conversion 2021-10-07 17:04:32 -04:00
Olivier Gagnon
a7dfb1a537 more convertion from ip to hostname 2021-10-07 16:56:01 -04:00
Olivier Gagnon
be29481689 unexport AllServers 2021-10-07 16:04:04 -04:00
hydroflame
8c0f65785a
Merge pull request #1432 from danielyxie/dev
improve logbox
2021-10-07 15:12:21 -04:00
Olivier Gagnon
1d488565c6 build logbox 2021-10-07 15:11:58 -04:00
Olivier Gagnon
42890843fb Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2021-10-07 15:08:27 -04:00
hydroflame
cdfd094d1c
Merge pull request #1431 from danielyxie/dev
Improve logbox behavior
2021-10-07 15:03:12 -04:00
Olivier Gagnon
c06aff3437 Improve logbox behavior 2021-10-07 15:02:54 -04:00
Olivier Gagnon
62bdfb1875 notes 2021-10-07 14:49:40 -04:00
hydroflame
123f071c12
Merge pull request #1427 from Tyasuh/dev
Corpo Typo Fixes
2021-10-07 13:55:15 -04:00
tyasuh.taeragan@gmail.com
0edd4ffdf1 Corpo Typo Fixes 2021-10-07 13:46:33 -04:00
Olivier Gagnon
8e5c10cc2f enable dev for beta 2021-10-07 01:47:13 -04:00
Olivier Gagnon
15a03dd532 enable dev for beta 2021-10-07 01:42:06 -04:00
Olivier Gagnon
8e58482db0 sg 2021-10-07 01:36:59 -04:00
hydroflame
f2589a0ade
Merge pull request #1426 from danielyxie/dev
revert growthAnalyze stuff because it causes errors
2021-10-06 19:41:54 -04:00
Olivier Gagnon
b1d1de9118 revert growthAnalyze stuff because it causes errors 2021-10-06 19:41:36 -04:00
hydroflame
997c746d78
Merge pull request #1424 from danielyxie/dev
corp bonus time consumes faster
2021-10-06 02:35:56 -04:00
Olivier Gagnon
83a84c6d38 corp bonus time consumes faster 2021-10-06 01:59:41 -04:00
hydroflame
3a0b3612bf
Merge pull request #1423 from danielyxie/dev
fix netscript port read not correctly converting ns1 objects
2021-10-05 16:38:16 -04:00
Olivier Gagnon
75a2742911 fix netscript port read not correctly converting ns1 objects 2021-10-05 16:37:54 -04:00
hydroflame
3891d0fae1
Merge pull request #1422 from danielyxie/dev
fix bug with hacknet servers and grow
2021-10-05 15:23:44 -04:00
Olivier Gagnon
a420a87eba fix bug with hacknet servers and grow 2021-10-05 15:23:30 -04:00
hydroflame
1b26d38a44
Merge pull request #1421 from danielyxie/dev
made log box resize a tad better
2021-10-05 01:45:35 -04:00
Olivier Gagnon
f579ee398b made log box resize a tad better 2021-10-05 01:44:46 -04:00
hydroflame
28e42b448d
Merge pull request #1420 from danielyxie/dev
log boxes are resizable
2021-10-05 01:30:43 -04:00
Olivier Gagnon
4901c84d34 remove some unused css 2021-10-05 01:30:37 -04:00
Olivier Gagnon
227fbd7060 made log box resizable 2021-10-05 01:23:20 -04:00
Olivier Gagnon
70796e7674 use react-draggable 2021-10-05 00:59:40 -04:00
Olivier Gagnon
da746a63c3 add incremental game plaza stuff 2021-10-04 23:56:24 -04:00
Olivier Gagnon
2f677c7ec8 more work 2021-10-04 23:51:39 -04:00
Olivier Gagnon
c5e29dafc4 fix mc 2021-10-04 22:31:07 -04:00
Olivier Gagnon
bb0bdb776b extracted some of the Netscript functions into their own file. 2021-10-04 22:25:21 -04:00
hydroflame
aab88931ff
Merge pull request #1419 from danielyxie/dev
Added font size to text editor
2021-10-04 21:07:10 -04:00
Olivier Gagnon
48b839d68c Added font size to text editor 2021-10-04 21:06:55 -04:00
hydroflame
1d71254777
Merge pull request #1418 from danielyxie/dev
grow, weaken, time compression
2021-10-04 19:58:57 -04:00
Olivier Gagnon
c47a5bc8cc added grow, weaken, and time compression 2021-10-04 19:58:34 -04:00
Olivier Gagnon
33ea31be87 convert autocomplete to tooltip 2021-10-04 17:52:20 -04:00
hydroflame
1604aad151
Merge pull request #1416 from danielyxie/dev
fix corp ui text fields now clearing on city change
2021-10-04 13:49:53 -04:00
Olivier Gagnon
27fc90c87a fix corp ui text fields now clearing on city change 2021-10-04 13:49:27 -04:00
hydroflame
1c06dbbbc8
Merge pull request #1414 from danielyxie/dev
cat now accepts newline
2021-10-04 13:15:20 -04:00