1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Commit Graph

931 Commits

Author SHA1 Message Date
MewMew
e9dc451f6f half research cost / fixes 2019-11-04 00:20:52 +01:00
MewMew
34de036281 update
hatchery regeneration
desync fix
lost won sounds
2019-11-03 23:31:52 +01:00
muppet9010
d5f92eb5bd undo the GUI blocking of joining team south made previously in this pull and all affects of Training mode will affect both north and south.
remove the ghost-spectate button from Team Manager and the functionaility it triggered
added Training Mode button to Team manager to toggle on/off behaviour.

When turned on:
Teams will feed themselves instead of the enemy while enabled (messages updated for this).
Empty teams will not get sent any attacking groups and won't get threat & evo increases (as it looks odd)
Team balance and Lobby minimum player counts not active
2019-11-03 21:26:34 +00:00
MewMew
c76ebe203c starting items 2019-11-03 21:11:33 +01:00
muppet9010
d9fcda9b24 Merge branch 'master' into Biter_Battle_Training_Mode 2019-11-03 20:04:22 +00:00
muppet9010
b027977d31
Merge pull request #1 from M3wM3w/master
sync from Comfy
2019-11-03 19:58:31 +00:00
MewMew
62f0c6cc0a Merge remote-tracking branch 'origin/master' 2019-11-03 20:48:24 +01:00
MewMew
0f5b8e3846 floaty feed texts 2019-11-03 20:48:17 +01:00
Gerkiz
5aaf9c0398
Merge pull request #85 from Gerkiz/development
minor fix
2019-11-03 20:42:39 +01:00
Gerkiz
4f95962536 minor fix 2019-11-03 20:41:24 +01:00
MewMew
a6d956371b spawn positions fix 2019-11-03 20:29:19 +01:00
MewMew
c9c22265e6 Construction robot restriction 2019-11-03 20:09:51 +01:00
MewMew
b33e2c6c01 spawn ores 2019-11-03 19:52:01 +01:00
MewMew
d6cb33b8b7 center river, map description 2019-11-03 19:34:36 +01:00
MewMew
4f6dde5090 WIP
added soft reset, unit commands
2019-11-03 18:57:36 +01:00
MewMew
aa5f310174 WIP 2019-11-03 17:46:18 +01:00
MewMew
98c166ed82 Update
Fused boss units into biter_health_booster.
Unit evasion replaced with custom unit health pool.
Boss Units no longer update their healthbar infinitely fast.
Map Intro moved into the main panel.
some globals to locals
2019-11-03 13:35:19 +01:00
MewMew
50e0741623 hotfix 2019-11-02 18:41:17 +01:00
MewMew
868512ae49 locals 2019-11-02 16:29:22 +01:00
MewMew
3491cfdcd4 terrain update and optimizations 2019-11-02 16:09:58 +01:00
Gerkiz
3f6e67c4d6
Merge pull request #82 from Gerkiz/development
removed event that is not in use
2019-11-01 19:14:40 +01:00
Gerkiz
89dd79bdb3 removed event that is not in use 2019-11-01 19:13:03 +01:00
Gerkiz
d51ec03271
Merge pull request #81 from Gerkiz/development
refactor global.rpg to rpg_t
2019-11-01 19:11:02 +01:00
Gerkiz
8c65245549 refactor rpg_frame_icons 2019-11-01 19:08:15 +01:00
Gerkiz
bdfb4131ed refactor global.rpg to rpg_t 2019-11-01 19:00:46 +01:00
Gerkiz
2aa26618e1
Merge pull request #80 from Gerkiz/development
added: clear corpses command
2019-11-01 17:55:44 +01:00
Gerkiz
7a1b479a3e added: clear corpses command 2019-11-01 17:55:10 +01:00
MewMew
aa15dc585b optimizations 2019-11-01 16:24:44 +01:00
MewMew
797b5dd25f difficulty tweaks 2019-11-01 11:46:28 +01:00
MewMew
b73d4b7eb8 tweaks 2019-10-31 16:18:17 +01:00
MewMew
3eea0e663c Config Tab; Fixes and tweaks 2019-10-31 10:13:47 +01:00
MewMew
d56f14ee03 terrain update
3 more levels
2019-10-30 20:00:32 +01:00
MewMew
0255c0ab18 update
added chat color and symbols for ore vein findings;
wave defense difficulty progression is no longer linear;
wave defense - fixed wrong worm turret rolls;
smol flame turret buff;
less angry trees;
2019-10-30 17:29:15 +01:00
MewMew
5fcc46b900 Merge remote-tracking branch 'origin/master' 2019-10-29 20:07:32 +01:00
MewMew
a17987e264 fix 2019-10-29 20:07:19 +01:00
Gerkiz
bc2192ae32
removal from _G
removed server_commands from _G
2019-10-29 19:46:54 +01:00
MewMew
31cfcf13ff give a coin for each rock mined 2019-10-29 15:35:01 +01:00
MewMew
9f5a5afada re-enabled fish tag for cargo 2019-10-29 12:40:51 +01:00
MewMew
4e8f694a23 more nest building 2019-10-29 12:26:04 +01:00
MewMew
6de15cfd2a update
sci packs added to loot
spawners contain inhabitants for wd
2019-10-29 12:14:28 +01:00
MewMew
a88e476687 updates, fixes and angry trees 2019-10-29 11:26:59 +01:00
Gerkiz
eb3302ab04
Merge pull request #79 from Gerkiz/player_modifer_fix
minor fix
2019-10-28 23:57:32 +01:00
Gerkiz
898cab3408 minor fix 2019-10-28 23:57:06 +01:00
MewMew
99f6280f71 melee fix 2019-10-28 20:20:56 +01:00
Gerkiz
511278821c
Merge pull request #78 from Gerkiz/rebase_v1
new module system and removal from _G
2019-10-28 17:54:26 +01:00
Gerkiz
eb299b4421 new module system and removal from _G 2019-10-28 17:38:36 +01:00
MewMew
9db9d71c33 display of threat / minute 2019-10-28 13:29:15 +01:00
MewMew
a569571a5a soft reset fix for not refreshing player modifiers 2019-10-28 11:15:39 +01:00
MewMew
3f066aa6a1 Merge remote-tracking branch 'origin/master' 2019-10-28 09:53:12 +01:00
MewMew
8b858cee14 no friendly fire xp gain 2019-10-28 09:52:58 +01:00