Commit Graph

Select branches

Hide Pull Requests

construction

dependabot/maven/Server/org.apache.commons-commons-text-1.10.0

dependabot/maven/Server/org.springframework.security-spring-security-core-5.5.7

master

refactor-1.6

#102

#103

#104

#105

#106

#110

#117

#118

#119

#119

#120

#123

#126

#143

#144

#149

#149

#153

#168

#171

#173

#174

#175

#176

#177

#178

#179

#181

#186

#189

#191

#192

#194

#195

#196

#199

#201

#203

#204

#205

#206

#207

#208

#209

#209

#210

#211

#212

#213

#215

#215

#219

#221

#224

#225

#226

#235

#235

#236

#236

#237

#238

#239

#240

#240

#241

#241

#242

#243

#244

#244

#246

#246

#247

#28

#28

#29

#30

#41

#42

#42

#47

#48

#59

#60

#66

#69

#70

#70

#74

#75

#76

#83

#84

#85

#85

#87

#93

#95

#98

#98

v1.0a

v1.1a

v1.2a

v1.3a

v1.4a

Mono Color

• 593be7624e Implemented selective loading/unloading of worlds. Summary of changes: sg495 2018-01-08 18:23:10 +01:00
• a14853b12c Changed working directory for tests (temporary fix?) simon 2018-01-07 14:04:24 -05:00
• 735a231767 Moved tests to appropriate directory simon 2018-01-07 13:55:42 -05:00
• 1131e4d512 Fixes #112 (Part two) simon 2018-01-07 13:29:42 -05:00
• cfb02869bb Fixes #112 simon 2018-01-07 13:02:49 -05:00
• cde03af8af Fixes #113 simon 2018-01-07 12:57:06 -05:00
• ff9370fed5
  Merge pull request #117 from ChartreuseK/feature-26 Simon Fortier 2018-01-07 12:44:27 -05:00
• eaef30eb49 Added Inc and Dec instructions based off Add code Hayden Kroepfl 2018-01-06 18:53:35 -07:00
• f68027bb4d Fixes tabs problem with equ simon 2018-01-06 14:04:31 -05:00
• 24d81d194e Fixes #107 simon 2018-01-05 22:08:53 -05:00
• c7b9df0690 Fixes #91 simon 2018-01-05 21:51:47 -05:00
• a8beb8c3e2 Fixes #115 simon 2018-01-05 21:38:07 -05:00
• 0bd25df977 Fixes #114 simon 2018-01-05 21:35:35 -05:00
• 9bb0dc9034 Boilerplate code for Vault Door simon 2018-01-05 20:42:24 -05:00
• 8b0460f5f1 Fixed typos and code cleanup simon 2018-01-05 20:14:38 -05:00
• ce0584a49f Merge remote-tracking branch 'origin/master' simon 2018-01-05 19:46:01 -05:00
• 0dc4ddca0f Fixes de-syncing problem with Factory and their NPCs simon 2018-01-05 19:45:51 -05:00
• 1da894959e fixed serialization code for CubotShield Dylan Sheehy 2018-01-05 11:20:52 -06:00
• 7e773699b6 Created Shield hardware Dylan Sheehy 2018-01-05 11:04:05 -06:00
• bc29c36204 Merge remote-tracking branch 'upstream/master' Dylan Sheehy 2018-01-05 09:14:18 -06:00
• 811a443a4e
  Merge pull request #106 from meet-mrmaker/master Simon Fortier 2018-01-04 17:17:10 -05:00
• 17359161fd
  Update for issue #10 Josh 2018-01-04 17:49:02 +11:00
• afbbce215e
  Merge pull request #2 from simon987/master Josh 2018-01-04 12:14:03 +11:00
• 1a39cf8454
  Create CONTRIBUTING.md Simon Fortier 2018-01-03 20:07:48 -05:00
• 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
• a3064ef8d6 fixed incorrect value being used in actually jumping Jaggernaut555 2018-01-02 13:50:22 -08: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
• 87feb6a280 Added serialization code for CubotRepair Dylan Sheehy 2018-01-01 19:54:52 -06:00
• eef0ddf99b Added CubotRepair.java - Hardware that repairs the cubot and reports HP Dylan Sheehy 2018-01-01 15:35:35 -06:00
• 2a5d6b5a13
  Fixes #99 Simon Fortier 2018-01-01 16:12:42 -05:00
• 336edac556 Merge 068df675691578d92d05f2ba8d8749ec9487e4bc into e2763faeee2b186e678a3f71410c3440c8e061fa djsheehy 2018-01-01 21:00:09 +00:00
• e2763faeee Fixes #97 simon 2018-01-01 15:58:42 -05:00
• 068df67569 Cubot now implements Attackable interface. Dylan Sheehy 2018-01-01 14:33:17 -06: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
• 95f4af1683 Added error flag set and increased cost Jaggernaut555 2017-12-31 18:26:47 -08:00
• b9d66dc30f Added jump/warp movement, animation needs changing Jaggernaut555 2017-12-31 18:03:07 -08: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
• 9e14467ccd Merge branch 'master' of https://github.com/simon987/Much-Assembly-Required into Interupts Brent O'Neil 2017-12-31 13:28:56 +11:00
• ab5810c585 Unhardcoded codeSegmentOffset and the hardware offset. Changed Interrupt(int hw, int offset, boolean retry) to interrupt(boolean hw, int offset). Removed no operand overload of int. Added org_hwIVoddset to config.properties Brent O'Neil 2017-12-31 13:19:04 +11: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
• 9103a6b6c4 Merge 528feaf1d35a3038d6397ce840642e16722efccd into 1ed9e9e4db4fb209aa692a2b096b8507351cfbf0 Arthur Paulino 2017-12-30 22:22:35 +00:00
• 528feaf1d3 Merge branch 'refactoring-action-labels' Arthur Paulino 2017-12-30 19:16:44 -03:00
• 98606247f6 changing action labels to be concise with constants without conflicts - arthur Arthur Paulino 2017-12-30 19:15:31 -03: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