1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-08 00:39:30 +02:00
Commit Graph

1383 Commits

Author SHA1 Message Date
hanakocz
ec3d1538c8
Add files via upload 2020-02-14 21:06:52 +01:00
hanakocz
ad6791fcfc
Merge pull request #1 from M3wM3w/master
update to match main
2020-02-14 21:02:02 +01:00
MewMew
61c84fc095 worm turret tier tweak 2020-02-10 18:08:20 +01:00
MewMew
37147bfd3e Merge pull request #139 from Masamune0/adminLogFixSwitchMutagen
Admin log : fix bug of always switching to mutagen log by using the dropdown
2020-02-08 09:46:40 +01:00
Masamune
b84eb35633 Merge remote-tracking branch 'upstream/master' into adminLogFixSwitchMutagen 2020-02-08 09:40:56 +01:00
Masamune
864eb97e88 fix for admin log bug which was always going back to mutagen log using dropdown 2020-02-08 09:40:28 +01:00
MewMew
506d3117e2 Merge pull request #137 from Masamune0/fixCrashMutagenLog
Fix crash mutagen log
2020-02-08 09:32:48 +01:00
MewMew
673b6b81bc update
unit spawners are saved in global
biter terrain changes
random attack angles removed
2020-02-08 09:32:10 +01:00
Masamune
e24d8547f5 Merge remote-tracking branch 'upstream/master' into fixCrashMutagenLog 2020-02-07 18:38:44 +01:00
Masamune
314c13e4a7 Update mutagen log : fix crash case 2020-02-07 18:37:36 +01:00
MewMew
4ac13ba721
Merge pull request #135 from Masamune0/bugFixMutagenLogEmptyISSUE134
[MUTAGENLOG]Fixed the loop not always doing 7 iterations for all science : crashing summary info of feeding
2020-02-07 10:02:05 +01:00
Masamune
a6342ba529 [MUTAGENLOG]Fixed the loop not always doing 7 iterations for all science 2020-02-06 20:40:05 +01:00
MewMew
1860b911ed to local 2020-02-05 09:38:13 +01:00
MewMew
080845d948 noise 2020-02-04 09:39:48 +01:00
MewMew
c0b02ed725 gui + thingies 2020-02-03 10:33:27 +01:00
MewMew
4ce0a40327 progress 2020-02-03 09:57:10 +01:00
MewMew
b8ca5dfa6b new stuff 2020-02-03 08:35:20 +01:00
MewMew
4ea7ac8b1d
Merge pull request #133 from AwesomePatrol/improve-log
Fix feeding message formatting for discord
2020-02-03 07:22:56 +01:00
MewMew
5a87b8e01b
Merge pull request #127 from Masamune0/mutagenLogFilters
Mutagen log filters : bug fix and 3 filters added (force, science, evo jump)
2020-02-03 07:20:26 +01:00
MewMew
713fd5cc9f removal of unused 2020-02-03 07:10:58 +01:00
Aleksander Mistewicz
35ddd5cab3 Use simpler message format for discord 2020-02-02 17:27:57 +01:00
MewMew
411b774d86
Merge pull request #129 from AwesomePatrol/improve-log
Improve discord logs of Biter Battles
2020-02-02 13:37:44 +01:00
Aleksander Mistewicz
521cde4a6b Post feeding messages to discord 2020-02-02 02:13:35 +01:00
Masamune
958835c8e1 fix for error on heavy mode : frame refresh code update on mutagen log 2020-02-01 23:05:05 +01:00
Aleksander Mistewicz
01664d3b7f Post spectator-related messages to discord 2020-02-01 21:49:12 +01:00
Aleksander Mistewicz
d074ef7189 Post join message when switching forces to discord
When in tournament no messages are sent related to team management.
2020-02-01 21:48:55 +01:00
MewMew
ac91ef02b4
Merge pull request #128 from cogito123/planet_prison_1_1_0
Planet prison 1 1 0
2020-02-01 18:35:51 +01:00
MewMew
fba9c7df81 fix for mirrored entities glitch 2020-02-01 18:34:41 +01:00
Masamune
6e82163c9d Cleaned code 2020-02-01 11:22:44 +01:00
Masamune
7bfe38f69e Made dropdown_sers_choice global to remove desync 2020-02-01 11:15:43 +01:00
Masamune
5b38d03780 Added more loops in mutagen log for easier reading 2020-02-01 10:30:07 +01:00
cogito
2e7b66605d pp: bump to 1.1.0 2020-02-01 10:08:36 +01:00
cogito
4350efa9f6 pp: nerf robot followers count 2020-02-01 10:08:36 +01:00
cogito
42f28dc9e6 pp: balance merchant prices 2020-02-01 10:08:36 +01:00
cogito
9e5012c582 pp: add annihilation ending
Map will be reset, when this happens.
2020-02-01 10:08:36 +01:00
cogito
5ef9052b16 pp: change default player name template
Changes default player name template into something easier to memorize.
2020-02-01 10:08:36 +01:00
cogito
04ceb853dc pp: remove uranium and cliffs 2020-02-01 10:08:36 +01:00
cogito
e4abd83f9f pp: disable bandits flashlight
Bandits will have flashlights disabled.
2020-02-01 10:08:36 +01:00
cogito
7460989c13 pp: add raid event
Adds a quite complex system that calculates stuff within player
borders and sends raids based on given costs, just like in rimworld.
2020-02-01 10:08:36 +01:00
cogito
cffb655300 pp: common: make create_bounding_box_by_points more generic
This function was limited only to objects that had either
'bounding_box' or 'position'  datafield. This changes broades this
limitation.
2020-02-01 10:08:36 +01:00
cogito
284ed14b74 planet_prison: add claim system
Adds claim system to mark player bases.
2020-02-01 10:08:36 +01:00
cogito
cfd35eb9bd pp: fix map brightness for 0.18.1 2020-02-01 10:08:36 +01:00
cogito
e4d3469c5f pp: fix blood for 0.18.2 2020-02-01 10:08:36 +01:00
MewMew
bc9d16c104 Merge remote-tracking branch 'origin/master' 2020-01-31 05:54:07 +01:00
MewMew
e2b9f4d59a fixed water under silo glitch (once more); worm turrets are farther out 2020-01-31 05:52:01 +01:00
Masamune
7f9f0a560c removed comment for biter battles in control.lua 2020-01-30 17:34:58 +01:00
Masamune
2930bc9147 Merge remote-tracking branch 'upstream/master' into mutagenLogFilters 2020-01-30 17:26:15 +01:00
Masamune
92ad567236 Name change for sci : now use the original science name for mutagen logs 2020-01-30 17:23:05 +01:00
Gerkiz
83e74b654e
Update jail.lua
Fixed so plebs who aren't admin does not trigger an embed message.
2020-01-29 22:40:26 +01:00
MewMew
cfd737dace
Merge pull request #126 from AwesomePatrol/improve-main-attack-performance
Improve main attack performance
2020-01-29 17:28:16 +01:00