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

• 10f088cb66 Updated gitattributes (again) simon 2018-05-11 21:19:36 -04:00
• 159c217d59 Updated gitattributes simon 2018-05-11 21:18:25 -04:00
• c5cb5df335 Merge pull request #153 from simon987/spark Simon Fortier 2018-05-11 21:13:01 -04:00
• 854863ede9 Updated mongodb driver to 3.7.0 simon 2018-05-11 21:06:18 -04:00
• e98575b23f Added vagrant support simon 2018-05-11 21:04:00 -04:00
• 1a5d12a19f updated Docker support simon 2018-05-11 16:42:03 -04:00
• 1678be25c5 Added UserStats and updated leaderboard page simon 2018-05-11 13:16:34 -04:00
• 9c41c16079 Added debug command to save the game simon 2018-05-11 10:25:40 -04:00
• e97ecbe380 Added javadocs simon 2018-05-01 15:41:51 -04:00
• 083af31b84 Fixed websocket problem by upgrading spark version. Also fixed z-index problem with console simon 2018-04-29 17:00:42 -04:00
• 2c856aae80 Editor upload & reload buttons are now working. Floppy upload & download working. simon 2018-04-29 14:00:50 -04:00
• 315e33055e Reorganised css files, some work on the home page design, console screen is now in a resizable panel simon 2018-04-29 11:17:54 -04:00
• e025b6d2da SSL now working and reorganised web server simon 2018-04-28 12:06:55 -04:00
• e3a650a4fc Reorganised debug info in account page and extracted user loading to UserManager simon 2018-04-27 21:59:07 -04:00
• 113aa50d87 Websocket auth up and running simon 2018-04-27 21:28:46 -04:00
• dc034d1437 Users can change their password simon 2018-04-27 20:39:14 -04:00
• 3492e133e1 login/register working and Websocket partially implemented simon 2018-04-27 19:42:53 -04:00
• bd5f8573e8 Added web server and partly integrated frontend simon 2018-04-27 16:58:50 -04:00
• 3c5bfdb30b Fixed build errors simon 2018-04-24 08:09:42 -04:00
• 9349ae108b Removed some unnecessary unit tests simon987 2018-04-02 10:58:24 -04:00
• 292adb5483 Updated maven version numbers. Removed .iml files simon987 2018-04-02 10:52:36 -04:00
• e479d89375 Added Radioactive cloud plugin simon987 2018-04-02 10:41:37 -04:00
• 41d674d74a Removed unused constant simon987 2018-04-02 10:06:44 -04:00
• 227f7ce5aa Merge pull request #144 from mlaga97/ram-corruption Simon Fortier 2018-04-01 22:18:15 -04:00
• a091071d55 Implement RAM corruption effect Luc Lagarde 2018-03-31 17:50:51 -05:00
• f1b8f3dc6d Merge pull request #143 from mlaga97/lidar-vault-fix Simon Fortier 2018-03-29 20:10:44 -04:00
• e62a51ee2e Modify LIDAR_GET_MAP to write to a given memory address Luc Lagarde 2018-03-28 23:37:05 -05:00
• 217c997788 Add action to get world size from LiDAR Luc Lagarde 2018-03-28 23:34:23 -05:00
• ff61433c4b Fixed typo simon 2018-03-11 16:09:28 -04:00
• cbde2450fa Bug fixes: maxShield is now set on user creation and vault objectId is set on world generation simon 2018-03-11 16:06:15 -04:00
• 1d780f7d9b Minor refactor simon 2018-03-11 13:34:10 -04:00
• cbb07891fc Cubot respawns on death. ElectricBox damages near objects simon 2018-03-10 15:22:11 -05:00
• 2565d3338c Implemented shield hardware. Added heal, damage and charge shield debug commands. simon 2018-03-10 13:54:43 -05:00
• e4269b83c4 Fixed hardware deserialization issues simon 2018-03-10 11:51:31 -05:00
• 9cac665101 Debug commands are easier to add. Added comPortMsg command simon 2018-03-10 11:24:29 -05:00
• dc19176dc8 Merge branch 'master' into vaults simon 2018-03-10 09:53:55 -05:00
• 8ed192f8d0 Cubot implements Attackable (untested) simon 2018-03-10 09:49:34 -05:00
• d1a3cf9307 Merge pull request #110 from djsheehy/shield-hardware Simon Fortier 2018-03-05 22:18:44 -05:00
• f8c5dac969 Added logging of vault clears for display in the leaderboard simon 2018-03-05 21:47:28 -05:00
• 0a75cb557d Added objective vault world & its exit portal simon 2018-03-04 15:51:30 -05:00
• f35e6c5a9a Objects can enter & leave vaults simon 2018-03-04 14:56:02 -05:00
• 0ada6c29d4 More work on vaults simon 2018-03-01 10:42:24 -05:00
• 156deb8f4e NPCs decrement World.updatable on death. Fixes problem making Worlds stay loaded forever in RAM simon 2018-02-27 16:51:18 -05:00
• 039088ac00 Added electric boxes, debug command to teleport objects across Worlds. simon 2018-02-27 16:49:32 -05:00
• f530dafdee Basic world generation for entire Vault dimension simon 2018-02-26 17:17:40 -05:00
• 817dbcc6c4 Basic world generation for single Vault world simon 2018-02-26 13:29:08 -05:00
• 62f1403cb3 Started working on Vault worlds generation simon 2018-02-26 10:04:06 -05:00
• 8c6e580ea9 Added support for multiple dimensions simon 2018-02-25 14:15:03 -05:00
• 6a1519d97d Added many debug commands simon 2018-02-25 11:55:53 -05:00
• a7d1a00ae8 Fixes #27 v1.4a simon 2018-02-25 08:51:03 -05:00
• 95a14ad1ab Added basic functionality for debug commands simon 2018-02-17 10:05:53 -05:00
• 8d961ce572 Added JA and JNA Instructions simon 2018-01-20 14:18:44 -05:00
• c772abe0bf Fixed opcode clash for PUSHF instruction simon 2018-01-20 12:33:01 -05:00
• 187a828c79 Fixed opcode clash for PUSHF instruction simon 2018-01-20 09:40:23 -05:00
• ffca185fe5 Vault Door generation simon 2018-01-17 22:01:59 -05:00
• 815f3de234 Changed the walking function to enable interaction with Enterable objects simon 2018-01-17 21:11:16 -05:00
• 3505a466bb Fixed compilation errors simon 2018-01-17 20:31:35 -05:00
• 3d10e4306b Merge branch 'master' into vaults simon 2018-01-17 20:29:37 -05:00
• 210e579995 Number of assembly errors is also sent on code upload simon 2018-01-17 19:02:36 -05:00
• a285b3104e Moved Vault Door code to NPC Plugin. Fixed code styling. Fixed compilation errors simon 2018-01-14 13:33:40 -05:00
• 947deea784 Merge remote-tracking branch 'origin/vaults' into vaults simon 2018-01-14 12:04:04 -05:00
• 4293fc0315 Support for variable World size simon 2018-01-14 12:02:32 -05:00
• 33955d9639 Merge remote-tracking branch 'origin/master' simon 2018-01-14 11:01:23 -05:00
• 6b91251b4e Should fix #125 simon 2018-01-14 11:01:13 -05:00
• 695341428a Merge pull request #126 from mlaga97/patch-2 Simon Fortier 2018-01-11 22:09:51 -05:00
• c610929809 Fix maven build error Luc Lagarde 2018-01-11 21:00:26 -06:00
• 54b72e89b3 Fixes #121 + Saner thread safety simon 2018-01-09 22:10:55 -05:00
• 59fd620e4a Merge pull request #118 from sg495/master Simon Fortier 2018-01-09 20:35:41 -05:00
• 2fbc55d0dd Fixed potential NullPointerException on server loading simon 2018-01-09 20:09:46 -05:00
• e1dfb08635 Merge pull request #123 from Jaggernaut555/feature/logging Simon Fortier 2018-01-09 19:25:30 -05:00
• f1c1f8f807 Merge pull request #120 from sg495/vaults Simon Fortier 2018-01-09 19:22:42 -05:00
• 7cbfb822b8 Updated LogManager Jaggernaut555 2018-01-09 14:00:36 -08:00
• a04207b5e0 Added some cyphers for use in vault doors. sg495 2018-01-09 17:14:31 +01:00
• 6fc583d6f0 Registers are cleared on code upload simon 2018-01-08 19:12:39 -05:00
• 46483b2bf8 Added a RandomString class from stackoverflow, to generate random alphanumeric strings (to be used as passwords). Added some code to VaultDoor, including random password generation and code to encrypt/decrypt under a Vernam-like cypher. Modified door opening policy to include the possibility of keeping the door open. sg495 2018-01-08 20:40:50 +01:00
• d65660b5e9 Merge branch 'master' of https://github.com/simon987/Much-Assembly-Required sg495 2018-01-08 18:28:37 +01:00
• 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