Commit Graph

3874 Commits

Author SHA1 Message Date
Olivier Gagnon
3915fcaab4 Merge branch 'master' into dev 2021-10-28 16:42:03 -04:00
Olivier Gagnon
cc438cbabd revert safeguard 2021-10-28 16:41:37 -04:00
hydroflame
4b794bf554
Merge pull request #1615 from danielyxie/dev
safeguyard against Formulas.exe missing
2021-10-28 15:59:22 -04:00
Olivier Gagnon
ee5eaf9658 safeguyard against Formulas.exe missing 2021-10-28 15:59:04 -04:00
hydroflame
2c41877717
Merge pull request #1612 from danielyxie/dev
background primary and secondary are different colors, fix bug with growth security
2021-10-28 15:25:01 -04:00
Olivier Gagnon
dc88d9b478 minor tweak 2021-10-28 15:24:33 -04:00
Olivier Gagnon
f710c52bdc background primary/secondary and fix securtiy with grow 2021-10-28 15:22:55 -04:00
hydroflame
61a27c3a58
Merge pull request #1604 from danielyxie/dev
Real Estate takes up a little bit of room
2021-10-28 00:07:19 -04:00
Olivier Gagnon
cb6dfd1656 Real Estate takes a LITTLE bit of room 2021-10-28 00:06:57 -04:00
Olivier Gagnon
2e8cdc23d9 use NetscriptDefinitions as source of truth 2021-10-27 23:58:07 -04:00
hydroflame
f2c53bc556
Merge pull request #1603 from danielyxie/dev
Formulas.exe was added.
2021-10-27 23:43:05 -04:00
Olivier Gagnon
e892e16585 Formulas.exe 2021-10-27 23:41:47 -04:00
hydroflame
4fbcb1c4e9
Merge pull request #1602 from danielyxie/raw
netscript def is raw loaded
2021-10-27 23:19:31 -04:00
Olivier Gagnon
91877dc172 netscript def is raw loaded 2021-10-27 23:19:19 -04:00
hydroflame
71542dbe7f
Merge pull request #1600 from danielyxie/dev
added ram cost for new functions.
2021-10-27 21:14:12 -04:00
Olivier Gagnon
d4849cf50f added ram cost for new functions. 2021-10-27 21:13:57 -04:00
hydroflame
a27aa2e30f
Merge pull request #1599 from danielyxie/dev
added some funcions
2021-10-27 21:08:22 -04:00
Olivier Gagnon
53cb37a9fd added some funcions 2021-10-27 21:07:58 -04:00
hydroflame
366188e413
Merge pull request #1598 from danielyxie/dev
convert infiltration to use key instead of keyCode
2021-10-27 20:52:26 -04:00
Olivier Gagnon
b1328b02ce convert infiltration to use key instead of keyCode 2021-10-27 20:52:16 -04:00
hydroflame
804bc25283
Merge pull request #1596 from danielyxie/dev
fix autoc single letter flags
2021-10-27 19:21:40 -04:00
Olivier Gagnon
6835cbaa26 fix autoc single letter flags 2021-10-27 19:21:28 -04:00
hydroflame
a4d4ebe2a2
Merge pull request #1594 from danielyxie/dev
Fix ram miscalc and ls with tiemstamps
2021-10-27 19:10:38 -04:00
Olivier Gagnon
f92db3b8f8 fix ram miscalc 2021-10-27 19:10:15 -04:00
hydroflame
82d1560f52
Merge pull request #1591 from danielyxie/ram-miscalc
Ram miscalc
2021-10-27 18:55:33 -04:00
Olivier Gagnon
8ab9a27966 fix ram miscalc 2021-10-27 18:55:06 -04:00
Olivier Gagnon
4ce0b59310 maybe ram miscalc? 2021-10-27 18:25:22 -04:00
hydroflame
565aaba8ee
Merge pull request #1589 from danielyxie/dev
fix static ram miscalc for stock market
2021-10-27 17:35:15 -04:00
Olivier Gagnon
a7632aed29 fix static ram miscalc for stock market 2021-10-27 17:35:02 -04:00
hydroflame
3414eb8306
Merge pull request #1588 from danielyxie/dev
Fix static ram miscalc
2021-10-27 16:17:19 -04:00
Olivier Gagnon
49d807c9a9 fix static ram calc 2021-10-27 16:17:02 -04:00
Olivier Gagnon
9f14f2b863 comment 2021-10-27 15:56:04 -04:00
hydroflame
02bdb41768
Merge pull request #1587 from danielyxie/dev
fix Alter Reality
2021-10-27 15:55:25 -04:00
Olivier Gagnon
c9565a2263 fix Alter Reality 2021-10-27 15:55:11 -04:00
hydroflame
288987a93d
Merge pull request #1586 from danielyxie/dev
v0.58.0 - Road to Steam
2021-10-27 15:24:21 -04:00
Olivier Gagnon
97ec193aac add more changelog 2021-10-27 15:23:52 -04:00
Olivier Gagnon
dc09b2a286 v0.58.0 2021-10-27 15:19:53 -04:00
Olivier Gagnon
8f097ebb32 v0.58.0 2021-10-27 15:16:16 -04:00
hydroflame
76ffecc7bb
Merge pull request #1585 from danielyxie/dev
remove memory leak
2021-10-27 14:29:24 -04:00
Olivier Gagnon
b255318a20 remove memory leak 2021-10-27 14:29:13 -04:00
hydroflame
daddf5eace
Merge pull request #1581 from danielyxie/dev
Money tracked more precisely.
2021-10-27 14:19:05 -04:00
Olivier Gagnon
48988e228e track money more precisely. 2021-10-27 14:18:33 -04:00
Olivier Gagnon
9f6767062b money is readonly 2021-10-27 13:28:36 -04:00
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