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
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
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
Josh
65ec6a2102
Merge pull request #1 from meet-mrmaker/meet-mrmaker-patch-1
...
Update to address issue #101
2018-01-03 18:36:52 +11:00
Josh
5a994fe437
Update to address issue #101
2018-01-03 18:36:18 +11:00
Simon Fortier
415500faa9
Merge pull request #103 from simon987/mongo
...
Loading & Saving support for MongoDB
2018-01-02 20:36:29 -05:00
James T
3ded64cb16
Update #66 : add newest Server/Server.iml file
2018-01-02 15:29:14 -08:00
simon
1a0291d517
New players are now scattered around the spawn point
2018-01-02 18:11:24 -05:00
simon
4e76d57ef9
Loading & Saving support for MongoDB
2018-01-02 17:45:58 -05:00
Simon Fortier
2a5d6b5a13
Fixes #99
2018-01-01 16:12:42 -05:00
simon
e2763faeee
Fixes #97
2018-01-01 15:58:42 -05:00
simon
2a8658c598
Fixes #90
2018-01-01 15:28:12 -05:00
simon
85548ec3cb
CHanged default energy value for biomass to 4000 + code styling
2018-01-01 15:21:39 -05:00
Simon Fortier
0f7b40f3ae
Merge pull request #95 from djsheehy/master
...
Inventory hardware: clearing a biomass yields energy. Fixes #94
2018-01-01 15:19:50 -05:00
simon
ee60216784
Small adjustments for laser hw, Improved OffsetOverFlow handling, Increased maximum guest count
2018-01-01 15:17:24 -05:00
Simon Fortier
c3a0d1bd4d
Merge pull request #93 from ChartreuseK/bug-80
...
Added handling of offset overflow and DUP factor overflow
2018-01-01 15:12:01 -05:00
Dylan Sheehy
cd8d883134
Charging energy from biomass now looks up value in config.properties
2018-01-01 13:39:57 -06:00
Simon Fortier
c7946a6356
Merge pull request #87 from ChartreuseK/bug-81
...
Added minimum length check to 'DW' parsing
2018-01-01 14:36:38 -05:00
Dylan Sheehy
7ee361b0bc
Inventory hardware: Now clearing a biomass gains 4000 kJ.
2018-01-01 13:15:14 -06:00
simon
1e26c63358
Boolean result of ComPort actions are stored in B register
2018-01-01 12:03:36 -05:00
Simon Fortier
d832f65535
Merge pull request #84 from mlaga97/npc-combat
...
Allow ability to damage NPCs with Laser. Fixes #34
2018-01-01 11:07:04 -05:00
Hayden Kroepfl
e47e573b61
Added handling of offset overflow and DUP factor overflow, added new exception type.
2018-01-01 08:30:39 -07:00
Simon Fortier
93786d92cb
Merge pull request #83 from Francessco121/feature/pushf-popf
...
Add PUSHF and POPF instructions
2018-01-01 10:20:27 -05:00
