Commits · 00424af4c010d1e2c914ce2c8532547c62244bb8 · macaronideath / fc-pregmod

Dec 07, 2019
- Renamed saRules per pregmodder · 00424af4
  MouseOfLight authored 5 years ago
  
  00424af4
Dec 06, 2019
- Moved proxies.js into 004-base to ensure that it loads before anything that... · 21b65bbb
  MouseOfLight authored 5 years ago
  
  Moved proxies.js into 004-base to ensure that it loads before anything that requires V to exist. Undid jquery load function on saRules.
  21b65bbb
- Fixed Matron undefined · 30db09a1
  MouseOfLight authored 5 years ago
  
  30db09a1
- Merge branch 'linting' into 'pregmod-master' · 338b2a56
  Pregmodder authored 5 years ago
  
  Various linting See merge request pregmodfan/fc-pregmod!5503
  338b2a56
- Revert "tabs and spaces SpecialForce.js" · 79ecb51c
  Skriv authored 5 years ago
  
  This reverts commit 65829200.
  79ecb51c
- Revert "Revert "linting"" · bfae7ce1
  Skriv authored 5 years ago
  
  This reverts commit 60bfa0b6. duh
  bfae7ce1
- Revert "tabs and spaces secExp.js" · a6dead41
  Skriv authored 5 years ago
  
  This reverts commit dca6b7c7.
  a6dead41
- Revert "linting" · 60bfa0b6
  Skriv authored 5 years ago
  
  This reverts commit 3d54e65d.
  60bfa0b6
- move back · 54ec502a
  Skriv authored 5 years ago
  
  54ec502a
- gradual increase of bribeCost · 2d6fe03f
  Skriv authored 5 years ago
  
  2d6fe03f
- tabs and spaces secExp.js · dca6b7c7
  Skriv authored 5 years ago
  
  dca6b7c7
- tabs and spaces SpecialForce.js · 65829200
  Skriv authored 5 years ago
  
  65829200
- linting · 3d54e65d
  Skriv authored 5 years ago
  
  3d54e65d
- Master merge · 2d51076e
  Skriv authored 5 years ago
  
  2d51076e
Dec 05, 2019
- Merge branch 'SlaveDemand' into 'pregmod-master' · 45d88eb6
  Pregmodder authored 5 years ago
  
  Rent rounding See merge request pregmodfan/fc-pregmod!5502
  45d88eb6
- fix · 54fd834f
  Jones authored 5 years ago
  
  54fd834f
- Merge branch 'pregmod-master' into SlaveDemand · 7b122014
  Jones authored 5 years ago
  
  7b122014
- Merge branch 'pregmod-dev' into 'pregmod-master' · 428d17af
  Pregmodder authored 5 years ago
  
  Fixed wayward rule.rules See merge request pregmodfan/fc-pregmod!5501
  428d17af
- Fixed wayward rule.rules · 3ec00f23
  Pregmodder authored 5 years ago
  
  3ec00f23
- Merge branch 'pregmod-dev' into 'pregmod-master' · 6a3918d3
  Pregmodder authored 5 years ago
  
  PCCheatMenu re-enabled See merge request pregmodfan/fc-pregmod!5500
  6a3918d3
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev · 18a70c51
  Pregmodder authored 5 years ago
  
  18a70c51
- PCCheatMenu updated · f8f76f82
  Pregmodder authored 5 years ago
  
  f8f76f82
- Merge branch 'fix' into 'pregmod-master' · e5e969db
  Pregmodder authored 5 years ago
  
  sanity: remove old code Closes #1190 See merge request pregmodfan/fc-pregmod!5499
  e5e969db
- lint and move dTree to lib · f71d8763
  Skriv authored 5 years ago
  
  f71d8763
- sanity: remove old code · 1df9f486
  Arkerthan authored 5 years ago
  
  1df9f486
- Merge branch 'fix' into 'pregmod-master' · edb6b721
  Pregmodder authored 5 years ago
  
  sanity fixes See merge request pregmodfan/fc-pregmod!5498
  edb6b721
- unused removal · d401706e
  Jones authored 5 years ago
  
  d401706e
- update ignoredVariables · 62fb28de
  Arkerthan authored 5 years ago
  
  62fb28de
- fixes · e8ccbcc8
  Arkerthan authored 5 years ago
  
  e8ccbcc8
- Some rounding · 895fc272
  Jones authored 5 years ago
  
  895fc272
- Merge branch 'pregmod-dev' into 'pregmod-master' · 48e3f441
  Pregmodder authored 5 years ago
  
  50/50 See merge request pregmodfan/fc-pregmod!5497
  48e3f441
- 50/50 · 295c18c5
  Pregmodder authored 5 years ago
  
  295c18c5
- Merge branch 'pregmod-dev' into 'pregmod-master' · ee46e49d
  Pregmodder authored 5 years ago
  
  unfucked playerdatatypecleanup See merge request pregmodfan/fc-pregmod!5496
  ee46e49d
- really good at this · 26b2a5b0
  Pregmodder authored 5 years ago
  
  26b2a5b0
- unfucked playerdatatypecleanup · 070085d0
  Pregmodder authored 5 years ago
  
  070085d0
- Merge branch 'pregmod-dev' into 'pregmod-master' · 6620bc53
  Pregmodder authored 5 years ago
  
  truncs See merge request pregmodfan/fc-pregmod!5495
  6620bc53
- truncs · 0b4e3db5
  Pregmodder authored 5 years ago
  
  0b4e3db5
- Merge branch 'pregmod-dev' into 'pregmod-master' · 82a29779
  Pregmodder authored 5 years ago
  
  Dataype cleanup work + budget fix See merge request pregmodfan/fc-pregmod!5494
  82a29779
- fix · 7e256db5
  Pregmodder authored 5 years ago
  
  7e256db5
- Merge branch 'RESS-outfits' into 'pregmod-master' · 82caa450
  Pregmodder authored 5 years ago
  
  RESS outfits See merge request pregmodfan/fc-pregmod!5493
  82caa450