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

#248

#248

#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

• f8eec652ae basic skeleton Kevin Ramharak 2019-01-20 13:10:06 +01:00
• 762bad758b Fixes #188 #187 simon987 2019-01-15 21:02:25 -05:00
• 3e2422775e Merge branch 'master' into implement-SETcc-instructions#184 Kevin Ramharak 2019-01-15 19:32:19 +01:00
• 993838651f Fixes #185 simon987 2019-01-14 18:24:34 -05:00
• ce8c5375ee Merge remote-tracking branch 'origin/master' simon987 2019-01-14 18:16:45 -05:00
• 91ebb51389 Merge pull request #186 from KevinRamharak/master Simon Fortier 2019-01-14 18:16:42 -05:00
• d113f635a1 Merge remote-tracking branch 'origin/master' simon987 2019-01-14 18:14:44 -05:00
• 78a9f78a54 fix merge conflict Kevin Ramharak 2019-01-14 18:46:23 +01:00
• 4f8eb2725e fix typo Kevin Ramharak 2019-01-14 18:37:42 +01:00
• ff4f6c23eb adjust source code so all instructions use the same patterns Kevin Ramharak 2019-01-14 18:32:27 +01:00
• c5a34c7a3f adjust source code so all instructions use the same patterns Kevin Ramharak 2019-01-14 18:32:27 +01:00
• 1d3d441996 allow instructions to override the encode method Kevin Ramharak 2019-01-14 17:48:49 +01:00
• 7ba46ec36e Updated dependencies simon987 2019-01-09 18:36:33 -05:00
• 63cdfb22ac Merge branch 'master' of https://github.com/simon987/Much-Assembly-Required simon987 2019-01-09 18:47:01 -05:00
• f9898f57f4 Updated dependencies simon987 2019-01-09 18:36:33 -05:00
• 2548242da8 Updated dependencies Data Archivist 2019-01-09 18:36:33 -05:00
• 46d5c9b51e HackedNPC code section offset same as Cubot (for real this time) simon 2019-01-01 10:16:54 -05:00
• 7fd1c35f7a Merge remote-tracking branch 'origin/master' simon 2018-12-23 12:47:38 -05:00
• 0dbec1d258 HackedNPC code section offset same as Cubot simon 2018-12-23 12:47:32 -05:00
• 45d3b84dd0 Merge pull request #181 from simon987/blueprints Simon Fortier 2018-12-23 11:56:24 -05:00
• af4ddbdd89 Increased HackedNPC specs & reverted accidental change simon 2018-12-23 11:54:47 -05:00
• 84ca3acb52 revert debug values simon 2018-12-22 18:17:53 -05:00
• 0973548b71 Merge pull request #179 from simon987/factory-rewrite Simon Fortier 2018-12-22 17:55:12 -05:00
• 5f95c17aed More refactoring, updated mongodb driver + transactions on supported clusters simon 2018-12-22 17:48:29 -05:00
• b361f87154 NPC Plugin refactoring simon 2018-12-22 15:29:58 -05:00
• e4a06e79d4 Hacked NPC minimum viable simon 2018-12-22 11:26:34 -05:00
• 955d61ce99 Password moved from vault door to settlement simon 2018-12-21 14:04:42 -05:00
• 201d83f8d8 Bump version simon 2018-12-21 14:00:47 -05:00
• 94b8ef5395 NPC Plugin rewrite. Plugin-level data can be stored in DB simon 2018-12-21 14:00:18 -05:00
• 70eeb1442d Added Fluid Tile simon 2018-12-21 10:47:46 -05:00
• bbaa338469 Fix 500 internal error when autologin option is not specified in the config simon 2018-12-21 10:23:03 -05:00
• 5de909cd9c Fixed some debug commands. Added blueprint item deserialization, Added inventory SCAN and SEEK actions Simon 2018-12-06 11:13:06 -05:00
• 71e88afdc9 Fixed typos & cleaned comments. Added autologin debug option. Added construction site base Simon 2018-12-02 20:04:45 -05:00
• ae41bd9cb9 Added construction plugin module Simon 2018-11-30 21:51:34 -05:00
• de45eb1827 Fixes #160 Simon 2018-11-30 16:35:58 -05:00
• 6c7a2f0a73 Fixes #169 Simon 2018-11-30 15:11:24 -05:00
• 3776070689 Fixes #170, #155 Simon 2018-11-27 16:02:21 -05:00
• 54ed05b86c Move hologram-related fields to proper class. Breaks existing database saves! Simon 2018-11-27 14:38:33 -05:00
• b361583252 Added memory location option for LiDAR GET_PATH. Fixes #140 Simon 2018-11-27 13:52:00 -05:00
• 04c837d692 Removed TEMPORARY guest policy. Fixes #25 Simon 2018-11-27 13:35:42 -05:00
• aaeb18068d Removed useless argument Simon 2018-11-27 13:26:20 -05:00
• e848fd8b8a Updated Phaser to 2.11, Added magnetic tile sprite Simon 2018-11-27 12:50:18 -05:00
• 1435d31d36 Implemented guest BLOCK and ALLOW options #25 Simon 2018-11-27 10:25:21 -05:00
• 950f6b6b4b Minor cleanup Simon 2018-11-27 09:30:03 -05:00
• 6a9cfb3acb Cubot drill module now functional Simon 2018-11-15 12:24:37 -05:00
• 4be1bf2e8a TileMap now uses Tile instances instead of ints. No changes in the way it is stored in the database Simon 2018-11-15 12:08:44 -05:00
• e50bcdeab7 Merge pull request #177 from Wiewiogr/148-secret-key Simon Fortier 2018-10-28 13:17:17 -04:00
• c8214236ab update properties on secret key change Wiewiogr 2018-10-28 18:13:56 +01:00
• 37b7bbff98 Merge pull request #2 from Wiewiogr/master Wiewiogr 2018-10-28 18:12:37 +01:00
• be7304aa0b Merge pull request #1 from simon987/master Wiewiogr 2018-10-28 17:50:01 +01:00
• 0845438297 Fixed potential error in ServerConfiguration and added ability to programmatically modify server configuration Simon 2018-10-28 09:45:36 -04:00
• 564a692c2e Merge pull request #176 from Wiewiogr/138-add-items-container Simon Fortier 2018-10-28 09:43:17 -04:00
• a40a0712f0 changed fields names Wiewiogr 2018-10-27 18:26:24 +02:00
• f89c39c756 changed implementation to list Wiewiogr 2018-10-27 18:13:43 +02:00
• a6f0ce1dfb moved test to correct folder Wiewiogr 2018-10-27 18:11:56 +02:00
• 2f80205b2a added secret_key property to config.properties Wiewiogr 2018-10-27 17:23:07 +02:00
• 71f96f27d1 add secretKey field to GameServer Wiewiogr 2018-10-27 17:22:20 +02:00
• 98402dd45b Added SecretKeyGenerator class Wiewiogr 2018-10-27 17:21:12 +02:00
• 548d756e90 Added tests for ItemsContainer Wiewiogr 2018-10-27 15:51:21 +02:00
• 1a2332bc32 Create ItemsContainer.java Wiewiogr 2018-10-27 15:49:39 +02:00
• 9a73b7b7d1 Merge pull request #175 from senatormailman/readme Simon Fortier 2018-10-12 18:49:43 -04:00
• d860591cc8 Minor formatting fixes following simon987's suggestion. Liam Hogan 2018-10-12 17:45:38 -04:00
• 268acda773 Minor formatting fix. Liam Hogan 2018-10-12 15:35:30 -04:00
• 6d66e19dc5 Added installation instructions for macOS. Pulled some of the formatting from Anarcroth's Linux instructions. Liam Hogan 2018-10-12 15:30:34 -04:00
• 40e7899cf6 Merge pull request #174 from Anarcroth/add-arch-install-instructions Simon Fortier 2018-10-03 21:47:27 -04:00
• abb92bfc75 Added Arch Linux installation instructions Martin Nestorov 2018-10-03 19:46:49 +03:00
• becf6e5feb Merge pull request #173 from bobbyjudd/issue-172 Simon Fortier 2018-09-06 15:56:07 -04:00
• 8af652482d Fixed memory displacement when subtracting labels, and added corresponding test Bobby Judd 2018-09-05 21:11:11 -07:00
• 205845d6af Changed the way port configuration is done Simon 2018-09-03 17:04:29 -04:00
• 64193ecf7a Should fix user creation problem Simon 2018-09-03 16:12:22 -04:00
• a1cf279b6f Merge pull request #171 from Francessco121/bug/unicode-string-crash Simon Fortier 2018-08-30 17:24:32 -04:00
• 6074238131 Catch string unescape exceptions when parsing DW string operands Ethan Lafrenais 2018-08-29 23:15:06 -04:00
• fa62c49fa8 Add the Visual Studio Code workspace directory to .gitignore Ethan Lafrenais 2018-08-29 23:13:08 -04:00
• a0aaee7ee7 Added find cubot button Simon 2018-08-13 15:59:46 -04:00
• 96fc3ed68c Should fix server crash problem when harvesting biomass Simon 2018-08-13 15:43:41 -04:00
• e69111ff3c Should fix user creation problem Simon 2018-08-13 15:41:08 -04:00
• e7e9a3e6fb Merge pull request #168 from Mozzi20/master Simon Fortier 2018-06-08 12:09:36 -04:00
• a73aa7c3a5 Moved radioactive obstacle. Unknown 2018-06-08 09:58:52 +02:00
• e8543082ce Fixed radioactive obstacle. Unknown 2018-06-07 23:24:49 +02:00
• 4b7ebd7ad6 Added radioactive obstacle. Unknown 2018-06-07 21:40:59 +02:00
• c389bbc92e Refactored SocketServer.tick() method Simon 2018-06-04 18:06:31 -04:00
• 78f98c8227 JSONSerialisable objects now have a debug function #156 Simon 2018-06-04 17:07:20 -04:00
• 92008e553a ServerPlugin no longer implements JSONSerialisable (this feature was unused) Simon 2018-06-04 17:06:11 -04:00
• 45d34c37ad Commented out some debug messages & fix for #161 Simon 2018-06-04 16:44:32 -04:00
• a9cc9662f4 Changed unreliable sequential integer object id to BSON ObjectId #162 Simon 2018-06-04 14:53:20 -04:00
• df9c466827 Avoid thread safety issues with objectIds #162 Simon 2018-06-04 12:18:21 -04:00
• b65c57ceba Fixed exception showing when tick-based broadcast happens exactly when a user is connected but not authenticated pt.2 Simon 2018-06-04 11:46:31 -04:00
• 2f74dd45fc Reformat + Should fix #159 Simon 2018-06-04 10:49:34 -04:00
• 07160138aa Fixed exception showing when tick-based broadcast happens exactly when a user is connected but not authenticated Simon 2018-06-04 10:46:55 -04:00
• b6a206f3c7 Added basic Cubot.toString() and fixed account page debug info Simon 2018-05-31 22:33:56 -04:00
• ed1c4cff0b Fixed bug that prevents RadioReceiverHardware from being correctly loaded from database Simon 2018-05-31 22:28:35 -04:00
• a005e2b163 Reverted accidental change caused by search and replace Simon 2018-05-31 22:21:33 -04:00
• a7bdbd2513 I broke everything pt. 1: Moved helditem into CubotInventory, added debug commands for CubotInventory, Added vault complete GameEvent, moved CPU to Cubot, renamed CpuHardware to HardwareModule, moved HardwareModule to Cubot & added HardwareHost interface, removed getParent() in ControllableUnit, moved items to the Item class, started moving tiles to Tile classes, renamed Programmable to MessageReceiver Simon 2018-05-31 22:13:07 -04:00
• ee9eeeef55 Reverted value of factory_spawn_rate that was accidentally changed simon 2018-05-12 20:33:41 -04:00
• 4b67798180 Added structure class #145 and moved many constants to config.properties simon 2018-05-12 20:32:10 -04:00
• be8dd14d36 Added method to find objects of particular type in a world simon 2018-05-12 19:09:00 -04:00
• 80f45f1eb0 Added catch clause to prevent crash when socket is not opened simon 2018-05-12 19:07:55 -04:00
• 3368268924 Cubot object id is no longer stored inside every CpuHardware in the database. Renamed some fields in the database to make them more readable simon 2018-05-12 16:16:24 -04:00
• 4cd58c86a5 Refactor: changed the way game objects and cpu hardware are saved/loaded from the database #151 simon 2018-05-12 15:32:41 -04:00
• 8d029cf621 Added vagrant instructions in readme #152 simon 2018-05-11 21:23:41 -04:00