Commit graph

160 commits

Author SHA1 Message Date
Brian Ricketts
b67b1d2bd3 Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git 2013-01-18 05:29:42 -06:00
Brian Ricketts
a68490ba6f Added new conveyor belt state and attempted to fix crates 2013-01-18 05:28:35 -06:00
Rseifert
3dd7fdada1 Changed item render for rejector
Change out the item render for the rejector block. Also corrected a
minor model issue with the robotic arm but nothing major changed with
it.
2013-01-17 21:00:06 -05:00
Rseifert
c6e3320609 Changed out the model for the Block
*Still need to do the item view
*I also removed some unneeded textures
*Change gitignore to not include thumb.db files since they always seem
to change
2013-01-17 20:32:53 -05:00
Brian Ricketts
787da0aeae Changed sound length so it's more "responsive" in game 2013-01-16 03:41:03 -06:00
Brian Ricketts
cac04ed7e4 Added sounds to the Conveyor Belts 2013-01-16 03:28:18 -06:00
Brian Ricketts
bf9f9d2392 Added conveyor sound resource 2013-01-16 02:34:54 -06:00
Brian Ricketts
7a048652ac Tried fixing ArmBot again... 2013-01-15 03:40:17 -06:00
Brian Ricketts
5c5f4395bb Started implementing a Lua API to act as a "wrapper" for the ArmBot. 2013-01-14 17:01:00 -06:00
Brian Ricketts
1fd05aade7 Improved armbot slightly 2013-01-14 15:35:29 -06:00
Henry Mao
e0ef452563 Rebuilt Recommended Build 2013-01-14 18:43:59 +08:00
Henry Mao
35a196701e Removed Unused API 2013-01-14 18:29:27 +08:00
Brian Ricketts
7e38f9027f First go at implementing the CC API for the ArmBot 2013-01-14 01:13:28 -06:00
Brian Ricketts
d89ad4a27f Aaaaaaaand fixed the .gitignore file and added the CC API back in -.- 2013-01-14 00:38:18 -06:00
Brian Ricketts
fb4e53eb02 Fixed more armbot derpiness 2013-01-13 03:27:41 -06:00
Brian Ricketts
947d229057 New recommended build 2013-01-13 02:35:28 -06:00
Henry Mao
ceb784fa26 AL 0.2.3 Release! 2013-01-13 15:51:43 +08:00
Henry Mao
b8423ef4e8 Fixed Armbots not initiating properly 2013-01-13 00:02:51 +08:00
Henry Mao
f02f085599 Got Armbot working nicely 2013-01-12 23:55:12 +08:00
Henry Mao
eb323c77ec Added Armbot recipe 2013-01-12 23:10:19 +08:00
Henry Mao
10312d6110 Finished Imprinter 2013-01-12 22:57:46 +08:00
Henry Mao
cab2361358 Briman, you do know about ItemStack.isItemEqual? 2013-01-12 22:38:34 +08:00
Henry Mao
bf481c0eca Fixed BIG ISidedInventory Bug 2013-01-12 22:26:34 +08:00
Henry Mao
7f08eaa0ef Removed weird extra function in manipulator 2013-01-12 22:23:35 +08:00
Henry Mao
09f519ede1 More work on the imprinter 2013-01-12 22:22:08 +08:00
Henry Mao
8a561c5921 Reworked Imprinter to have an inventory 2013-01-12 12:41:01 +08:00
Henry Mao
f58b88d30e Some work on imprinter 2013-01-12 12:12:07 +08:00
Brian Ricketts
09d4febe13 Some work on ArmBot (trying to smooth things up a bit) 2013-01-11 22:11:18 -06:00
Henry Mao
67a59a6af7 More work on Armbot 2013-01-11 23:56:36 +08:00
Henry Mao
f2a0867399 Fixed stacking glitch 2013-01-11 23:26:42 +08:00
Henry Mao
9b4665a6b5 Added repeat command 2013-01-11 22:41:57 +08:00
Henry Mao
b6bfa34561 Made grab and drop commmands work 2013-01-11 22:41:50 +08:00
Brian Ricketts
8668049be7 Some more work on the ArmBot and command handling
TODO: Make the client not "simulate smoothness" if the thing hasn't
received any power in a while (right now it twitches)
2013-01-10 13:02:08 -06:00
Henry Mao
6521bfa305 Added command parameters 2013-01-10 21:41:12 +08:00
Henry Mao
e07b10b47f Fixed command processing to work 2013-01-10 21:18:17 +08:00
Henry Mao
af74b4230b Make disks work on Armbot 2013-01-10 21:04:20 +08:00
Henry Mao
f1cd1bf848 Briman you doin' it wrong! :D 2013-01-10 19:54:25 +08:00
Henry Mao
7d822b0cee Fixed up slanted belt render 2013-01-10 19:50:11 +08:00
Rseifert
370681e042 Textured Slanted Model
well mostly, the Up slant needs a seperate texture unless someone can
think of a way to use the current without rotating the model alot.
2013-01-10 01:22:26 -05:00
Rseifert
d62c13e675 Correct Slanted Belt Render Issue
Some one on the forum noticed this issue with Slanted Belts not
rendering connected. I didn't know this was a feature that was usable or
i would have caught it sooner. Anyways its mostly fixed but needs a
texture which i'll try to create.

Also who every made the conveyor belt textures animated like that nice
job.
2013-01-09 23:11:17 -05:00
Brian Ricketts
1fa56d7827 Major work on ArmBot.
Command/task management system still needs lots of work.
2013-01-09 19:54:07 -06:00
Brian Ricketts
ab51a5203d Removed list of commands from disk
Users will have too many commands! The list will be taller than the
screen! D:
2013-01-09 15:31:50 -06:00
Brian Ricketts
34abdcd933 Fixed merge errors 2013-01-09 15:27:34 -06:00
Brian Ricketts
2a7c9ff03c Finished GUI encoder.
(This is also an attempt to merge a Git conflict...let's see how it works)
2013-01-09 15:15:40 -06:00
Henry Mao
7e9073fe55 Cheapened Recipe 2013-01-09 21:42:22 +08:00
Henry Mao
e029a35c6a Added rotate command 2013-01-09 21:24:23 +08:00
Henry Mao
c5b703a48f Fixed minor render bug 2013-01-09 21:21:03 +08:00
Henry Mao
b96dfd8783 Reorganized Commands 2013-01-09 21:12:48 +08:00
Henry Mao
93352fb3df Made belts render as connected when slanted 2013-01-09 20:49:17 +08:00
Henry Mao
74c631c691 Made conveyor belts have stair collision 2013-01-09 20:43:42 +08:00