 Danielv123
|
87cfe1bc46
|
Sending signals over Clusterio now works
Closes #19
|
2016-10-07 20:29:35 +02:00 |
|
|
Danielv123
|
a3aafd8b1d
|
JS part of signals kinda finished but it aint working
|
2016-10-07 17:54:23 +02:00 |
|
|
Danielv123
|
20c591bf71
|
Removed DB from repo
|
2016-10-06 17:49:16 +02:00 |
|
|
Danielv123
|
b123d485d2
|
Slave sending combinator signals finished
So working on #22.
|
2016-10-06 17:47:03 +02:00 |
|
|
Danielv123
|
9011665a80
|
Merged branch master into dev
|
2016-10-02 11:41:45 +02:00 |
|
|
Danielv123
|
9b14da470e
|
Use silent-command to avoid spamming chat. Thanks HanziQ!
|
2016-10-02 10:20:05 +02:00 |
|
|
Thomas Deal
|
f9d6d9e001
|
Add Transmit/Receive Combinators. Transmit combinators are Deciders which also output into txbuffer.txt. Receive Combinators are Constants which replay frames received from external sources via remote calls to receiveFrame and recieveMany.
|
2016-10-01 21:20:18 -04:00 |
|
|
Daniel
|
4f8ad5eec6
|
Merge pull request #18 from Danielv123/dev
MP desync issues fixed, prerealease 1
|
2016-10-01 23:35:36 +02:00 |
|
|
Danielv123
|
6d12bac32a
|
Merged branch master into dev
|
2016-10-01 19:03:02 +02:00 |
|
|
TheAIBot
|
090910aeef
|
Merge remote-tracking branch 'refs/remotes/Danielv123/master'
|
2016-10-01 02:46:06 +02:00 |
|
|
TheAIBot
|
7e67ae5068
|
fixed up the last things about the output tank
|
2016-10-01 02:44:45 +02:00 |
|
|
TheAIBot
|
9ca013590d
|
fixed merge error
|
2016-10-01 02:27:08 +02:00 |
|
|
TheAIBot
|
72cef84df5
|
Merge remote-tracking branch 'refs/remotes/origin/json-parser'
# Conflicts:
# clusterio_0.0.2/control.lua
|
2016-10-01 02:26:29 +02:00 |
|
|
TheAIBot
|
d22b7e3de4
|
multiplayer fixed
|
2016-10-01 02:26:08 +02:00 |
|
|
Danielv123
|
5670bdb77a
|
Working on adding charts to master GUI
|
2016-09-30 23:23:01 +02:00 |
|
|
Danielv123
|
379f8398c7
|
Merged branch dev into dev
|
2016-09-30 19:27:40 +02:00 |
|
|
Danielv123
|
e33109703d
|
Minor minor
|
2016-09-30 19:27:10 +02:00 |
|
|
Danielv123
|
181e570972
|
Master webpage syntax
|
2016-09-30 19:16:46 +02:00 |
|
|
TheAIBot
|
9391b33cc9
|
Merge remote-tracking branch 'refs/remotes/Danielv123/master'
|
2016-09-30 18:24:44 +02:00 |
|
|
Danielv123
|
aa93af6d06
|
More cleanup
|
2016-09-29 09:16:01 +02:00 |
|
|
Danielv123
|
db47320951
|
Removed outdated script
|
2016-09-29 09:15:42 +02:00 |
|
|
Daniel
|
d820c483e6
|
Merge pull request #15 from Danielv123/dev
Prerelease: Solved #10 and solved #14
|
2016-09-27 11:26:01 +02:00 |
|
|
Danielv123
|
da9d2c14dc
|
Solved #14 and #10, preparing for prerelease
|
2016-09-27 11:24:55 +02:00 |
|
|
Danielv123
|
1e65eb40c5
|
Changed up the tranfer format, everything works!
|
2016-09-26 08:07:19 +02:00 |
|
|
Danielv123
|
06a4d49884
|
WIP, still not working
|
2016-09-09 08:25:39 +02:00 |
|
|
Danielv123
|
129ef8d2f8
|
Tried to cache rcon requests, ended up with dupe machine
Me needs help, I don't understand where the game is getting free items from.
|
2016-08-25 20:50:00 +02:00 |
|
|
Daniel
|
e326ae093a
|
Merge pull request #13 from TheAIBot/json-parser
Added Json parser for remote call ImportMany
|
2016-08-25 13:02:47 +02:00 |
|
|
TheAIBot
|
f3c6fdaa3b
|
added json parser for importMany
|
2016-08-23 22:51:54 +02:00 |
|
|
TheAIBot
|
b3aa96cddf
|
Merge remote-tracking branch 'refs/remotes/Danielv123/master' into json-parser
|
2016-08-23 22:49:27 +02:00 |
|
|
Daniel
|
a12d818cdb
|
Revert "Merge pull request #11 from TheAIBot/master"
This reverts commit 3252eefcfc.
|
2016-08-23 21:45:08 +02:00 |
|
|
Daniel
|
3252eefcfc
|
Merge pull request #11 from TheAIBot/master
fix desync
|
2016-08-23 21:32:56 +02:00 |
|
|
TheAIBot
|
11ff85ca74
|
fixed desync
|
2016-08-23 21:12:02 +02:00 |
|
|
TheAIBot
|
62c07c77f2
|
initial tank chose fluid
|
2016-08-23 20:31:43 +02:00 |
|
|
TheAIBot
|
c9d5509c85
|
Merge pull request #2 from Danielv123/master
update
|
2016-08-23 20:15:47 +02:00 |
|
|
Danielv123
|
258946fe51
|
Added sample server-settings.json to repo
|
2016-08-23 19:42:34 +02:00 |
|
|
Danielv123
|
410b3e5e53
|
Added webpage to display network contents
|
2016-08-23 19:31:27 +02:00 |
|
|
Danielv123
|
8ea74821b4
|
webserver and API endpoint for getting network contents
|
2016-08-23 14:16:24 +02:00 |
|
|
TheAIBot
|
f2f832333c
|
Merge pull request #1 from Danielv123/master
update
|
2016-08-21 10:48:03 +02:00 |
|
|
TheAIBot
|
2fe0844fd8
|
Merge remote-tracking branch 'refs/remotes/Danielv123/master'
|
2016-08-21 10:43:48 +02:00 |
|
|
Danielv123
|
fcb9c5add5
|
Changed name of mod and descriptions, updated readme.md
|
2016-08-19 16:42:30 +02:00 |
|
|
Danielv123
|
0e9fb267c4
|
Working on #7 configs
|
2016-08-17 22:52:44 +02:00 |
|
|
Danielv123
|
601d5edb27
|
Cleanup, readme
|
2016-08-17 18:31:43 +02:00 |
|
|
Danielv123
|
44e311feea
|
Fixed js, items are now created correctly and dupe/loss glitches removed
|
2016-08-17 09:20:14 +02:00 |
|
|
Danielv123
|
440ecfad30
|
Everything works! (using rcon)
|
2016-08-16 12:41:55 +02:00 |
|
|
Daniel
|
74253908d5
|
Merge pull request #6 from TheAIBot/master
added UPDATE_RATE to config
|
2016-08-16 11:54:10 +02:00 |
|
|
TheAIBot
|
4897f019f6
|
added UPDATE_RATE to config
|
2016-08-16 11:43:18 +02:00 |
|
|
Daniel
|
a3f931fbec
|
Merge pull request #5 from TheAIBot/master
added tank, made code faster and added another remote call
|
2016-08-16 10:36:02 +02:00 |
|
|
TheAIBot
|
7beef11f08
|
added tank, made code faster and added another remote call
|
2016-08-16 02:03:11 +02:00 |
|
|
Daniel
|
1a9fc933d4
|
Merge pull request #3 from TheAIBot/master
Only use as many resources as given
|
2016-08-14 11:06:25 +02:00 |
|
|
TheAIBot
|
ba98a0cfe0
|
removed uneeded print statements
|
2016-08-14 10:59:31 +02:00 |
|