simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-12 22:38:54 +00:00
Code Issues Projects Releases Wiki Activity

Commit Graph

  • 9bc3cbf4ce Remove NPC reference to Factory on death simon 2018-01-03 19:22:45 -05:00
  • 9b908a5310 Biomass count on NPC death is loaded from config simon 2018-01-03 19:19:19 -05:00
  • 8ceeca564a Merge pull request #66 from jtara1/master Simon Fortier 2018-01-03 19:00:55 -05:00
  • d4fcf22550 Merge pull request #105 from sg495/master Simon Fortier 2018-01-03 17:09:23 -05:00
  • d25d42534a Merge pull request #104 from meet-mrmaker/meet-mrmaker-patch-1 Simon Fortier 2018-01-03 17:08:10 -05:00
  • 58a378d77f Updated instructions for Windows installation and running. sg495 2018-01-03 20:14:31 +01:00
  • cfaf46ad52 Added installation instructions for Windows (tested on Windows 10). sg495 2018-01-03 17:59:46 +01:00
  • eb3deba544 Merge branch 'master' of https://github.com/simon987/Much-Assembly-Required Dylan Sheehy 2018-01-03 07:03:56 -06:00
  • ba53212986 Merge pull request #1 from simon987/master sg495 2018-01-03 13:04:59 +01:00
  • 7bb5f68ff2 Edited for style conformance Josh 2018-01-03 22:24:32 +11:00
  • 65ec6a2102 Merge pull request #1 from meet-mrmaker/meet-mrmaker-patch-1 Josh 2018-01-03 18:36:52 +11:00
  • 5a994fe437 Update to address issue #101 Josh 2018-01-03 18:36:18 +11:00
  • 415500faa9 Merge pull request #103 from simon987/mongo Simon Fortier 2018-01-02 20:36:29 -05:00
  • 3ded64cb16 Update #66: add newest Server/Server.iml file James T 2018-01-02 15:29:14 -08:00
  • 1a0291d517 New players are now scattered around the spawn point simon 2018-01-02 18:11:24 -05:00
  • 4e76d57ef9 Loading & Saving support for MongoDB simon 2018-01-02 17:45:58 -05:00
  • c7da764505 Added entries to .gitignore to ignore files that vscode's java extension generates Dylan Sheehy 2018-01-02 07:04:14 -06:00
  • 2a5d6b5a13 Fixes #99 Simon Fortier 2018-01-01 16:12:42 -05:00
  • e2763faeee Fixes #97 simon 2018-01-01 15:58:42 -05:00
  • 2a8658c598 Fixes #90 simon 2018-01-01 15:28:12 -05:00
  • 85548ec3cb CHanged default energy value for biomass to 4000 + code styling simon 2018-01-01 15:21:39 -05:00
  • 0f7b40f3ae Merge pull request #95 from djsheehy/master Simon Fortier 2018-01-01 15:19:50 -05:00
  • ee60216784 Small adjustments for laser hw, Improved OffsetOverFlow handling, Increased maximum guest count simon 2018-01-01 15:17:24 -05:00
  • c3a0d1bd4d Merge pull request #93 from ChartreuseK/bug-80 Simon Fortier 2018-01-01 15:12:01 -05:00
  • cd8d883134 Charging energy from biomass now looks up value in config.properties Dylan Sheehy 2018-01-01 13:39:57 -06:00
  • c7946a6356 Merge pull request #87 from ChartreuseK/bug-81 Simon Fortier 2018-01-01 14:36:38 -05:00
  • 7ee361b0bc Inventory hardware: Now clearing a biomass gains 4000 kJ. Dylan Sheehy 2018-01-01 13:15:14 -06:00
  • 1e26c63358 Boolean result of ComPort actions are stored in B register simon 2018-01-01 12:03:36 -05:00
  • d832f65535 Merge pull request #84 from mlaga97/npc-combat Simon Fortier 2018-01-01 11:07:04 -05:00
  • e47e573b61 Added handling of offset overflow and DUP factor overflow, added new exception type. Hayden Kroepfl 2018-01-01 08:30:39 -07:00
  • 93786d92cb Merge pull request #83 from Francessco121/feature/pushf-popf Simon Fortier 2018-01-01 10:20:27 -05:00
  • 34178016b1 Added minimum length check to 'DW' parseing, fixes indexoutofboundsexception Hayden Kroepfl 2018-01-01 05:17:37 -07:00
  • b31c187ad5 Allow NPCs to be damaged and killed Luc Lagarde 2017-12-31 18:26:44 -06:00
  • deb3859dff Add PUSHF and POPF instructions Ethan Lafrenais 2017-12-31 18:25:46 -05:00
  • b21e33601e Added links to VS code extensions Simon Fortier 2017-12-31 11:44:09 -05:00
  • b2474494cc Merge pull request #75 from sgerrand/dockerize Simon Fortier 2017-12-31 09:56:07 -05:00
  • 6b2e3c17ed Merge branch 'master' into dockerize Simon Fortier 2017-12-31 09:54:41 -05:00
  • 079a63e39c Merge branch 'master' into dockerize Simon Fortier 2017-12-31 09:52:45 -05:00
  • 347dc2bce0 Merge pull request #76 from arthurpaulino/renaming-action-labels Simon Fortier 2017-12-31 09:42:20 -05:00
  • 90ad8e82eb Merge pull request #74 from mlaga97/patch-1 Simon Fortier 2017-12-31 09:38:39 -05:00
  • 04374e6e0a aligning action labels with documented examples Arthur Paulino 2017-12-31 09:34:43 -03:00
  • 4a6ee4cce6 📖 Add installation and running documentation Sasha Gerrand 2017-12-31 08:45:11 +00:00
  • 37e40d0329 ✂️ Remove extraneous whitespace Sasha Gerrand 2017-12-31 08:37:31 +00:00
  • 99cefba245 🍴 Orchestrate server and dependencies using containers Sasha Gerrand 2017-12-31 08:35:02 +00:00
  • 7821d428e2 🐳 Add Dockerfile Sasha Gerrand 2017-12-31 08:34:17 +00:00
  • 93bea49a3e Add Linux build instructions to README.md Luc Lagarde 2017-12-30 23:47:08 -06:00
  • cca68ba139 Merge pull request #69 from renpnal/patch-2 Simon Fortier 2017-12-30 20:00:25 -05:00
  • 83f05efff6 Support for color in hologram. Renamed classes: fixes #72 simon 2017-12-30 19:58:47 -05:00
  • ea3b06c54c Fix typos Jesse Nieminen 2017-12-30 23:52:06 +02:00
  • 1ed9e9e4db Fixed bug that sent console buffer to random players for real this time simon 2017-12-30 16:41:14 -05:00
  • 08f1aa8686 Fixed bug that sent console buffer to random players. simon 2017-12-30 16:29:39 -05:00
  • 55d4c19fe1 Added Console output, Cubots can receive data from ComPort, Fixed BOM being added to string literals, Fixed legs changing direction for free when energy < 100, Changed some log levels. simon 2017-12-30 15:30:44 -05:00
  • 2398219fab Update #66: rm npc plugin dependency from plant.event plugin James T 2017-12-30 11:08:43 -08:00
  • 81767ed5cf Updates for #66: reorganize and relocate some methods and calls James T 2017-12-30 09:01:58 -08:00
  • 2ef6f492c4 Fixes #64 simon 2017-12-30 11:14:45 -05:00
  • 70a55dce59 Added features to Hologram hardware - Fixes #63 and #67 simon 2017-12-30 11:03:09 -05:00
  • fe0be03ab8 Fixes #68 & Reformatted code simon 2017-12-30 10:35:56 -05:00
  • fd73a47796 Fixes #65 simon 2017-12-30 10:30:18 -05:00
  • eea9420192 HarvesterNPC should spawn a biomass in-place after they die (#33) James T 2017-12-29 22:35:02 -08:00
  • 9e402fe8a1 Fixed Radio Tower range simon 2017-12-29 22:36:52 -05:00
  • b3d88b2813 Fixed Radio Tower range simon 2017-12-29 22:32:39 -05:00
  • ef7f573256 Added basic Radio Tower functionality #32 Keypress buffer is cleared on code upload simon 2017-12-29 21:49:42 -05:00
  • 5afa767b4a Fixed OF and CF flags being always set to false in the other function simon 2017-12-29 17:09:30 -05:00
  • a9e580f2ce Fixed OF and CF flags being always set to false simon 2017-12-29 17:06:28 -05:00
  • c4caf4ab0b Changed CLEAR action for the inventory to 0 for consistency simon 2017-12-29 16:16:28 -05:00
  • 0c06d0bf09 Fixes #62 simon 2017-12-29 15:53:29 -05:00
  • 017b89f97f Characters can be escaped in string literals simon 2017-12-29 14:35:26 -05:00
  • bd276e0a93 Merge pull request #60 from ScarySpider/More-Maven-fixes Simon Fortier 2017-12-29 13:48:56 -05:00
  • 72d43fccf7 Fixes #58 simon 2017-12-29 13:39:13 -05:00
  • 18aaf91991 Fixed RET instruction that wouldn't assemble without any parameter simon 2017-12-29 13:09:47 -05:00
  • bbcadbf253 Merge branch 'master' into More-Maven-fixes Jacob Swehla 2017-12-29 11:26:12 -06:00
  • 3d60f9a67c Merge remote-tracking branch 'upstream/master' Jacob Swehla 2017-12-29 11:25:55 -06:00
  • b43cf9ac33 Moved config file and fixed some warnings Jacob Swehla 2017-12-29 11:25:31 -06:00
  • 293795b215 Fixes #55 and commas & semicolon can be inserted in string literals simon 2017-12-29 11:06:48 -05:00
  • fde79ed97e Merge branch 'master' into More-Maven-fixes Jacob Swehla 2017-12-29 10:06:44 -06:00
  • fcd339c315 Merge remote-tracking branch 'upstream/master' Jacob Swehla 2017-12-29 10:06:20 -06:00
  • 59e3e9430e Maven and file access Jacob Swehla 2017-12-29 10:00:19 -06:00
  • 45ec7191b4 Added string literals support for the assembler simon 2017-12-29 08:28:04 -05:00
  • d9732557fc Removed unused files simon 2017-12-28 23:08:05 -05:00
  • eced45a358 Merge remote-tracking branch 'origin/master' simon 2017-12-28 22:39:22 -05:00
  • 0fee35baec Fixes #53 simon 2017-12-28 22:35:49 -05:00
  • 729debb1a3 Fixes #56 Simon Fortier 2017-12-28 20:41:02 -05:00
  • 2fb7d2f73e Fixes #54 simon 2017-12-28 20:33:57 -05:00
  • dab5cab602 Updated incorrect documentation simon 2017-12-28 19:29:48 -05:00
  • c23ee0dc86 stuff Jacob Swehla 2017-12-28 17:02:41 -06:00
  • 96cce8478e Merge remote-tracking branch 'upstream/master' Jacob Swehla 2017-12-28 16:44:03 -06:00
  • 9d184cb515 Merge remote-tracking branch 'upstream/master' Jacob Swehla 2017-12-28 16:41:05 -06:00
  • 09e00fd032 maven work Jacob Swehla 2017-12-28 16:40:53 -06:00
  • e1d0833c3a Recovering accidentally deleted file simon 2017-12-28 17:40:05 -05:00
  • 8a980fec6a Very small modifications for keyboard hardware simon 2017-12-28 16:51:03 -05:00
  • e96b7982c8 Fixed Biomass pickup problem simon 2017-12-28 15:33:28 -05:00
  • 21ec4ae704 Cubot are now passable + Bug fixes simon 2017-12-28 13:34:11 -05:00
  • 690b7e8d31 Merge pull request #47 from ScarySpider/Basic-Maven-fixes Simon Fortier 2017-12-28 09:57:03 -05:00
  • d28ca387d0 Fixes ConcurrentModificationException errors simon 2017-12-28 09:17:31 -05:00
  • f2b6387cc9 Fixes #50 simon 2017-12-28 09:15:19 -05:00
  • f3b20b3a2d Fixes #51 simon 2017-12-28 08:43:13 -05:00
  • f4fd3866eb Merge pull request #48 from cooprocks123e/bugfix Simon Fortier 2017-12-27 19:20:42 -05:00
  • 965ca91cb6 Modified "RET imm" to add imm + 1 to the SP instead of imm Cooper Harasyn 2017-12-27 19:18:10 -05:00
  • 556f443ec2 Now outputs .jar files to /target Jacob Swehla 2017-12-27 17:52:40 -06:00
  • 3158dd75ea Fixed Maven Jacob Swehla 2017-12-27 15:36:08 -06:00