230 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
simon	a9e580f2ce	Fixed OF and CF flags being always set to false	2017-12-29 17:06:28 -05:00
simon	c4caf4ab0b	Changed CLEAR action for the inventory to 0 for consistency	2017-12-29 16:16:28 -05:00
simon	0c06d0bf09	Fixes #62	2017-12-29 15:53:29 -05:00
simon	017b89f97f	Characters can be escaped in string literals	2017-12-29 14:35:26 -05:00
Simon Fortier	bd276e0a93	Merge pull request #60 from ScarySpider/More-Maven-fixes ... More maven fixes	2017-12-29 13:48:56 -05:00
simon	72d43fccf7	Fixes #58	2017-12-29 13:39:13 -05:00
simon	18aaf91991	Fixed RET instruction that wouldn't assemble without any parameter	2017-12-29 13:09:47 -05:00
Jacob Swehla	bbcadbf253	Merge branch 'master' into More-Maven-fixes	2017-12-29 11:26:12 -06:00
Jacob Swehla	3d60f9a67c	Merge remote-tracking branch 'upstream/master'	2017-12-29 11:25:55 -06:00
Jacob Swehla	b43cf9ac33	Moved config file and fixed some warnings	2017-12-29 11:25:31 -06:00
simon	293795b215	Fixes #55 and commas & semicolon can be inserted in string literals	2017-12-29 11:06:48 -05:00
Jacob Swehla	fde79ed97e	Merge branch 'master' into More-Maven-fixes	2017-12-29 10:06:44 -06:00
Jacob Swehla	fcd339c315	Merge remote-tracking branch 'upstream/master'	2017-12-29 10:06:20 -06:00
Jacob Swehla	59e3e9430e	Maven and file access ... - Server config file is now accessed through the class loader - Maven outputs server.jar, moves dependencys to adjacent /libs, and plugins to adjacent /plugins	2017-12-29 10:00:19 -06:00
simon	45ec7191b4	Added string literals support for the assembler	2017-12-29 08:28:04 -05:00
simon	d9732557fc	Removed unused files	2017-12-28 23:08:05 -05:00
simon	eced45a358	Merge remote-tracking branch 'origin/master'	2017-12-28 22:39:22 -05:00
simon	0fee35baec	Fixes #53	2017-12-28 22:35:49 -05:00
Simon Fortier	729debb1a3	Fixes #56	2017-12-28 20:41:02 -05:00
simon	2fb7d2f73e	Fixes #54	2017-12-28 20:33:57 -05:00
simon	dab5cab602	Updated incorrect documentation	2017-12-28 19:29:48 -05:00
Jacob Swehla	c23ee0dc86	stuff	2017-12-28 17:02:41 -06:00
Jacob Swehla	96cce8478e	Merge remote-tracking branch 'upstream/master'	2017-12-28 16:44:03 -06:00
Jacob Swehla	9d184cb515	Merge remote-tracking branch 'upstream/master'	2017-12-28 16:41:05 -06:00
Jacob Swehla	09e00fd032	maven work	2017-12-28 16:40:53 -06:00
simon	e1d0833c3a	Recovering accidentally deleted file	2017-12-28 17:40:05 -05:00
simon	8a980fec6a	Very small modifications for keyboard hardware	2017-12-28 16:51:03 -05:00
simon	e96b7982c8	Fixed Biomass pickup problem	2017-12-28 15:33:28 -05:00
simon	21ec4ae704	Cubot are now passable + Bug fixes	2017-12-28 13:34:11 -05:00
Simon Fortier	690b7e8d31	Merge pull request #47 from ScarySpider/Basic-Maven-fixes ... Basic maven fixes	2017-12-28 09:57:03 -05:00
simon	d28ca387d0	Fixes ConcurrentModificationException errors	2017-12-28 09:17:31 -05:00
simon	f2b6387cc9	Fixes #50	2017-12-28 09:15:19 -05:00
simon	f3b20b3a2d	Fixes #51	2017-12-28 08:43:13 -05:00
Simon Fortier	f4fd3866eb	Merge pull request #48 from cooprocks123e/bugfix ... Modified "RET imm" to add imm + 1 to the SP instead of imm	2017-12-27 19:20:42 -05:00
Cooper Harasyn	965ca91cb6	Modified "RET imm" to add imm + 1 to the SP instead of imm	2017-12-27 19:18:10 -05:00
Jacob Swehla	556f443ec2	Now outputs .jar files to /target ... -Server jar outputs to /target/ -All other jars output to /target/plugins	2017-12-27 17:52:40 -06:00
Jacob Swehla	3158dd75ea	Fixed Maven ... Maven now builds correctly, may need further refinement.	2017-12-27 15:36:08 -06:00
Simon Fortier	1b6927c575	Merge pull request #41 from cooprocks123e/bugfix ... Fixed typo in SubInstruction	2017-12-27 15:55:30 -05:00
Cooper Harasyn	3bd34bfcba	Fixed typo in SubInstruction	2017-12-27 15:52:00 -05:00
simon	2e9248ea2e	Factory Integration, NPC improvements. #19 & #31. v1.3a	2017-12-24 14:26:19 -05:00
simon	4f1342593f	Added Factory object #31	2017-12-23 12:17:36 -05:00
simon	3548928218	Improved World update performance. Decreased save file size. Added Harvester NPC #19.	2017-12-16 15:40:03 -05:00
simon	cd41db9e58	Added Passive energy source for Cubots #14	2017-12-16 11:35:04 -05:00
simon	597118bd07	Removed files that I accidentally added	2017-12-09 10:52:13 -05:00
simon	9dd9b45d2d	Added Day/Night Cycle #14	2017-12-09 10:50:37 -05:00
Simon Fortier	9597a80edf	Merge pull request #30 from StevenBerdak/master ... Keep backup of old saved files #8	2017-12-08 18:31:16 -05:00
Steven Robert Berdak	d24363fd82	Added file management ... .	2017-12-04 17:25:55 -08:00
simon	be45979ed0	Added biomass respawn feature #22	2017-12-02 10:26:59 -05:00
simon	29cac77e79	Changed maven artifactID names	2017-11-22 17:05:50 -05:00
simon	6be2a496c6	Added maven framework support. Started working on NPCs #19	2017-11-21 20:22:11 -05:00