Simon Fortier
d1a3cf9307
Merge pull request #110 from djsheehy/shield-hardware
...
Added Shield hardware
2018-03-05 22:18:44 -05:00
simon
156deb8f4e
NPCs decrement World.updatable on death. Fixes problem making Worlds stay loaded forever in RAM
2018-02-27 16:51:18 -05:00
simon
a7d1a00ae8
Fixes #27
2018-02-25 08:51:03 -05:00
simon
8d961ce572
Added JA and JNA Instructions
2018-01-20 14:18:44 -05:00
simon
c772abe0bf
Fixed opcode clash for PUSHF instruction
2018-01-20 12:33:01 -05:00
simon
210e579995
Number of assembly errors is also sent on code upload
2018-01-17 19:02:36 -05:00
simon
33955d9639
Merge remote-tracking branch 'origin/master'
2018-01-14 11:01:23 -05:00
simon
6b91251b4e
Should fix #125
2018-01-14 11:01:13 -05:00
Simon Fortier
695341428a
Merge pull request #126 from mlaga97/patch-2
...
Fix maven build error
2018-01-11 22:09:51 -05:00
Luc Lagarde
c610929809
Fix maven build error
...
Removes a reference to com.sun.istack.internal.Nullable and an associated annotation, which causes the maven build to fail.
2018-01-11 21:00:26 -06:00
simon
54b72e89b3
Fixes #121 + Saner thread safety
2018-01-09 22:10:55 -05:00
Simon Fortier
59fd620e4a
Merge pull request #118 from sg495/master
...
Implemented selective loading/unloading of worlds.
2018-01-09 20:35:41 -05:00
simon
2fbc55d0dd
Fixed potential NullPointerException on server loading
2018-01-09 20:09:46 -05:00
Simon Fortier
e1dfb08635
Merge pull request #123 from Jaggernaut555/feature/logging
...
Only severe are directed to stderr
2018-01-09 19:25:30 -05:00
Jaggernaut555
7cbfb822b8
Updated LogManager
2018-01-09 14:00:36 -08:00
simon
6fc583d6f0
Registers are cleared on code upload
2018-01-08 19:12:39 -05:00
sg495
d65660b5e9
Merge branch 'master' of https://github.com/simon987/Much-Assembly-Required
...
# Conflicts:
# Server/src/main/java/net/simon987/server/GameServer.java
2018-01-08 18:28:37 +01:00
sg495
593be7624e
Implemented selective loading/unloading of worlds. Summary of changes:
...
1. Database is now iteratively updated, rather than dropped and recreated every time the universe is saved.
2. A single connection to the database is opened at server creation time, and used throughout.
3. Worlds, users and server information are now stored with appropriate IDs, so that they can be suitably updated. The world ID can be computed from world coordinates alone.
4. After saving, a world is unloaded from memory if it doesn't contain any updatable objects, and if all of its neighbours are either: (i) uncharted; (ii) not loaded in memory; (iii) without any updatable objects. This ensures that world unloading/reloading cannot be spammed by a single bot repeatedly transitioning in/out of an otherwise empty world.
5. The instance method GameUniverse.getWorld(int,int,boolean) first checks the world with given coordinates is in memory, then tries to load it from database, and only then creates a new one (if required by the boolean flag).
6. Worlds are now stored in a Hashtable indexed by world ID, for faster retrieval.
2018-01-08 18:23:10 +01:00
simon
a14853b12c
Changed working directory for tests (temporary fix?)
2018-01-07 14:04:24 -05:00
simon
735a231767
Moved tests to appropriate directory
2018-01-07 13:55:42 -05:00
simon
1131e4d512
Fixes #112 (Part two)
2018-01-07 13:29:42 -05:00
simon
cfb02869bb
Fixes #112
2018-01-07 13:02:49 -05:00
simon
cde03af8af
Fixes #113
2018-01-07 12:57:06 -05:00
Simon Fortier
ff9370fed5
Merge pull request #117 from ChartreuseK/feature-26
...
Added Inc and Dec Instructions
2018-01-07 12:44:27 -05:00
Hayden Kroepfl
eaef30eb49
Added Inc and Dec instructions based off Add code
2018-01-06 18:53:35 -07:00
simon
f68027bb4d
Fixes tabs problem with equ
2018-01-06 14:04:31 -05:00
simon
24d81d194e
Fixes #107
2018-01-05 22:08:53 -05:00
simon
c7b9df0690
Fixes #91
2018-01-05 21:51:47 -05:00
simon
a8beb8c3e2
Fixes #115
2018-01-05 21:38:07 -05:00
simon
0bd25df977
Fixes #114
2018-01-05 21:35:35 -05:00
simon
8b0460f5f1
Fixed typos and code cleanup
2018-01-05 20:14:38 -05:00
simon
ce0584a49f
Merge remote-tracking branch 'origin/master'
2018-01-05 19:46:01 -05:00
simon
0dc4ddca0f
Fixes de-syncing problem with Factory and their NPCs
2018-01-05 19:45:51 -05:00
Dylan Sheehy
1da894959e
fixed serialization code for CubotShield
2018-01-05 11:20:52 -06:00
Dylan Sheehy
7e773699b6
Created Shield hardware
2018-01-05 11:04:05 -06:00
Dylan Sheehy
bc29c36204
Merge remote-tracking branch 'upstream/master'
2018-01-05 09:14:18 -06:00
Simon Fortier
811a443a4e
Merge pull request #106 from meet-mrmaker/master
...
Removed gather_slow. Fixes #10
2018-01-04 17:17:10 -05:00
Josh
17359161fd
Update for issue #10
...
Removes slow and fast gather and retains gather for 1 tick.
2018-01-04 17:49:02 +11:00
Josh
afbbce215e
Merge pull request #2 from simon987/master
...
Update
2018-01-04 12:14:03 +11:00
Simon Fortier
1a39cf8454
Create CONTRIBUTING.md
2018-01-03 20:07:48 -05:00
simon
9bc3cbf4ce
Remove NPC reference to Factory on death
2018-01-03 19:22:45 -05:00
simon
9b908a5310
Biomass count on NPC death is loaded from config
2018-01-03 19:19:19 -05:00
Simon Fortier
8ceeca564a
Merge pull request #66 from jtara1/master
...
HarvesterNPC should spawn a biomass in-place after they die. Fixes #33
2018-01-03 19:00:55 -05:00
Simon Fortier
d4fcf22550
Merge pull request #105 from sg495/master
...
Windows instructions added
2018-01-03 17:09:23 -05:00
Simon Fortier
d25d42534a
Merge pull request #104 from meet-mrmaker/meet-mrmaker-patch-1
...
Update to address issue #101
2018-01-03 17:08:10 -05:00
sg495
58a378d77f
Updated instructions for Windows installation and running.
2018-01-03 20:14:31 +01:00
sg495
cfaf46ad52
Added installation instructions for Windows (tested on Windows 10).
2018-01-03 17:59:46 +01:00
Dylan Sheehy
eb3deba544
Merge branch 'master' of https://github.com/simon987/Much-Assembly-Required
2018-01-03 07:03:56 -06:00
sg495
ba53212986
Merge pull request #1 from simon987/master
...
getting up to date
2018-01-03 13:04:59 +01:00
Josh
7bb5f68ff2
Edited for style conformance
2018-01-03 22:24:32 +11:00
