simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-10-26 06:06:52 +00:00
Code Issues Projects Releases Wiki Activity
298 Commits 5 Branches 5 Tags
Commit Graph

298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon
4be1bf2e8a TileMap now uses Tile instances instead of ints. No changes in the way it is stored in the database 2018-11-15 12:08:44 -05:00
Simon Fortier
e50bcdeab7
Merge pull request #177 from Wiewiogr/148-secret-key 
Add secret key generator #148
 2018-10-28 13:17:17 -04:00
Wiewiogr
c8214236ab
update properties on secret key change 2018-10-28 18:13:56 +01:00
Wiewiogr
37b7bbff98
Merge pull request #2 from Wiewiogr/master 
merge
 2018-10-28 18:12:37 +01:00
Wiewiogr
be7304aa0b
Merge pull request #1 from simon987/master 
merge
 2018-10-28 17:50:01 +01:00
Simon
0845438297 Fixed potential error in ServerConfiguration and added ability to programmatically modify server configuration 2018-10-28 09:45:53 -04:00
Simon Fortier
564a692c2e
Merge pull request #176 from Wiewiogr/138-add-items-container 
Added Container object #138
 2018-10-28 09:43:17 -04:00
Wiewiogr
a40a0712f0
changed fields names 2018-10-27 18:26:24 +02:00
Wiewiogr
f89c39c756
changed implementation to list 2018-10-27 18:13:43 +02:00
Wiewiogr
a6f0ce1dfb
moved test to correct folder 2018-10-27 18:11:56 +02:00
Wiewiogr
2f80205b2a
added secret_key property to config.properties 2018-10-27 17:23:07 +02:00
Wiewiogr
71f96f27d1
add secretKey field to GameServer 2018-10-27 17:22:20 +02:00
Wiewiogr
98402dd45b
Added SecretKeyGenerator class 2018-10-27 17:21:12 +02:00
Wiewiogr
548d756e90
Added tests for ItemsContainer 2018-10-27 15:51:21 +02:00
Wiewiogr
1a2332bc32
Create ItemsContainer.java 2018-10-27 15:49:39 +02:00
Simon Fortier
9a73b7b7d1
Merge pull request #175 from senatormailman/readme 
Added MacOS instructions
fixes #152
 2018-10-12 18:49:43 -04:00
Liam Hogan
d860591cc8 Minor formatting fixes following simon987's suggestion. 2018-10-12 17:45:38 -04:00
Liam Hogan
268acda773 Minor formatting fix. 2018-10-12 15:35:30 -04:00
Liam Hogan
6d66e19dc5 Added installation instructions for macOS. Pulled some of the formatting from Anarcroth's Linux instructions. 2018-10-12 15:30:34 -04:00
Simon Fortier
40e7899cf6
Merge pull request #174 from Anarcroth/add-arch-install-instructions 
Added Arch Linux installation instructions in README.md
 2018-10-03 21:47:27 -04:00
Martin Nestorov
abb92bfc75 Added Arch Linux installation instructions 2018-10-03 20:06:49 +03:00
Simon Fortier
becf6e5feb
Merge pull request #173 from bobbyjudd/issue-172 
Fixes issue 172
 2018-09-06 15:56:07 -04:00
Bobby Judd
8af652482d Fixed memory displacement when subtracting labels, and added corresponding test 2018-09-05 21:11:11 -07:00
Simon
205845d6af Changed the way port configuration is done 2018-09-03 17:04:29 -04:00
Simon
64193ecf7a Should fix user creation problem 2018-09-03 16:12:36 -04:00
Simon Fortier
a1cf279b6f
Merge pull request #171 from Francessco121/bug/unicode-string-crash 
Fix assembler crash when invalid Unicode string escape sequences are used
 2018-08-30 17:24:32 -04:00
Ethan Lafrenais
6074238131 Catch string unescape exceptions when parsing DW string operands 2018-08-29 23:15:06 -04:00
Ethan Lafrenais
fa62c49fa8 Add the Visual Studio Code workspace directory to .gitignore 2018-08-29 23:13:08 -04:00
Simon
a0aaee7ee7 Added find cubot button 2018-08-13 15:59:46 -04:00
Simon
96fc3ed68c Should fix server crash problem when harvesting biomass 2018-08-13 15:43:41 -04:00
Simon
e69111ff3c Should fix user creation problem 2018-08-13 15:41:24 -04:00
Simon Fortier
e7e9a3e6fb
Merge pull request #168 from Mozzi20/master 
Added radioactive obstacle
 2018-06-08 12:09:36 -04:00
Unknown
a73aa7c3a5 Moved radioactive obstacle. 2018-06-08 09:58:52 +02:00
Unknown
e8543082ce Fixed radioactive obstacle. 
Added "radioactive obstacle curruption block size" in config.properties and removed its getter and setter.
 2018-06-07 23:24:49 +02:00
Unknown
4b7ebd7ad6 Added radioactive obstacle. 2018-06-07 21:40:59 +02:00
Simon
c389bbc92e Refactored SocketServer.tick() method 2018-06-04 18:06:31 -04:00
Simon
78f98c8227 JSONSerialisable objects now have a debug function #156 2018-06-04 17:07:20 -04:00
Simon
92008e553a ServerPlugin no longer implements JSONSerialisable (this feature was unused) 2018-06-04 17:06:11 -04:00
Simon
45d34c37ad Commented out some debug messages & fix for #161 2018-06-04 16:44:32 -04:00
Simon
a9cc9662f4 Changed unreliable sequential integer object id to BSON ObjectId #162 2018-06-04 14:53:20 -04:00
Simon
df9c466827 Avoid thread safety issues with objectIds #162 2018-06-04 12:18:21 -04:00
Simon
b65c57ceba Fixed exception showing when tick-based broadcast happens exactly when a user is connected but not authenticated pt.2 2018-06-04 11:46:31 -04:00
Simon
2f74dd45fc Reformat + Should fix #159 2018-06-04 10:49:34 -04:00
Simon
07160138aa Fixed exception showing when tick-based broadcast happens exactly when a user is connected but not authenticated 2018-06-04 10:46:55 -04:00
Simon
b6a206f3c7 Added basic Cubot.toString() and fixed account page debug info 2018-05-31 22:33:56 -04:00
Simon
ed1c4cff0b Fixed bug that prevents RadioReceiverHardware from being correctly loaded from database 2018-05-31 22:28:35 -04:00
Simon
a005e2b163 Reverted accidental change caused by search and replace 2018-05-31 22:21:33 -04:00
Simon
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 2018-05-31 22:13:07 -04:00
simon
ee9eeeef55 Reverted value of factory_spawn_rate that was accidentally changed 2018-05-12 20:33:41 -04:00
simon
4b67798180 Added structure class #145 and moved many constants to config.properties 2018-05-12 20:32:10 -04:00