games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Code Issues Releases Activity
3,036 Commits 2 Branches 467 Tags 31 MiB
cba8f26b21
Commit Graph

3036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
danielmartin0
cba8f26b21 secret update - economy rescaling 2022-04-30 03:15:50 +01:00
danielmartin0
55fced9972 fix 2022-04-29 23:48:49 +01:00
danielmartin0
a059ebe8fc v.1.12; Since other people are now expected to read these, some changelogs will be provided 
- Biters now drop coins on death
- Boat input/output expanded to 4-lanes
- Captain's store removed and replaced by physical markets
- Resolved highscore table conflict with base comfy code
 2022-04-29 23:48:34 +01:00
danielmartin0
b6316644eb v1.1.1.5.6 2022-04-29 17:43:46 +01:00
Gerkiz
b372661680
Merge pull request #257 from ComfyFactory/fix 
remove test file
 2022-04-23 18:26:25 +02:00
Gerkiz
12cee19db9 remove test file 2022-04-23 18:25:24 +02:00
Gerkiz
72e27238d9
Merge pull request #256 from ComfyFactory/issues 
fix minor gui issues
 2022-04-23 18:24:17 +02:00
Gerkiz
984b73b365 fix minor gui issues 2022-04-23 18:22:00 +02:00
Gerkiz
67988c9ad4
Merge pull request #255 from ComfyFactory/fixes 
rpg and autostash fixes
 2022-04-23 17:11:19 +02:00
Gerkiz
8bc93d8d6c rpg and autostash fixes 2022-04-23 17:10:15 +02:00
Gerkiz
71f81efdb3
Merge pull request #254 from ComfyFactory/rpg 
rpg - fix issues
 2022-04-21 21:59:10 +02:00
Gerkiz
e33409e7a1 rpg - fix issues 2022-04-21 21:05:02 +02:00
Gerkiz
bd72e8be29
Merge pull request #253 from ComfyFactory/changes 
Minor fixes.
 2022-04-18 18:49:08 +02:00
Gerkiz
083c9f0d06 small fix 2022-04-18 18:48:23 +02:00
Gerkiz
b31379378c minor fixes 2022-04-18 18:46:19 +02:00
Gerkiz
4fdcbd3fca
Merge pull request #252 from ComfyFactory/changes 
Various fixes and tweaks
 2022-04-18 01:21:20 +02:00
Gerkiz
766003c8c7 make luacheck happy 2022-04-18 01:20:26 +02:00
Gerkiz
1ccbbb6c0e minor change to diff gui 2022-04-18 01:18:58 +02:00
Gerkiz
a3cd26b88f fix rpg 2022-04-18 01:18:25 +02:00
Gerkiz
378dfe373d fix gui issues 2022-04-18 01:18:06 +02:00
Gerkiz
5e89190141 lock bottom frames whenever a player rejoins 2022-04-18 01:17:42 +02:00
Gerkiz
4b1577616c mtn v3 fixes 2022-04-18 01:17:26 +02:00
Gerkiz
11a0f7f7ca wave defense fixes 2022-04-18 01:17:16 +02:00
Gerkiz
7021324f6c
Merge pull request #251 from ComfyFactory/rpg 
fix minor issue with rpg
 2022-04-11 21:14:53 +02:00
Gerkiz
9bf24f6659 fix minor issue with rpg 2022-04-11 21:13:33 +02:00
Gerkiz
0f8ca8b84b
Merge pull request #249 from danielmartin0/develop 
adapt to new Comfy Gui
 2022-04-10 11:33:28 +02:00
Gerkiz
24d65cb06d
fix small whitespace 2022-04-10 11:32:32 +02:00
Gerkiz
2b90f23e4a
Merge branch 'develop' into develop 2022-04-10 11:28:27 +02:00
Gerkiz
d861528fa3
Merge pull request #250 from ComfyFactory/fixes 
Fixes
 2022-04-10 11:24:36 +02:00
Gerkiz
568a94a88d make luacheck happy 2022-04-10 11:23:27 +02:00
Gerkiz
548747d9df Mtn v3 - fix radar scanning 2022-04-10 11:21:52 +02:00
Gerkiz
7438b07cce Test another welcome message when a player joins the game 2022-04-10 11:21:43 +02:00
danielmartin0
4203f740f2 adapt to new Comfy Gui 2022-04-08 23:44:41 +01:00
Gerkiz
9e13b99fd0
Merge pull request #248 from ComfyFactory/pirates_panel_fix 
Fix minor panel issue
 2022-04-08 22:49:37 +02:00
Gerkiz
c6caeed025 Pirates - fix a minor issue that was missed in the PR 2022-04-08 22:47:56 +02:00
Gerkiz
f15fa41c97
Merge pull request #247 from ComfyFactory/changes 
Small changes
 2022-04-08 22:40:46 +02:00
Gerkiz
7f8ad0b184 small tweak 2022-04-08 22:39:15 +02:00
Gerkiz
d9ec7d40cf mtn v3 - fix for rpg 2022-04-08 22:00:49 +02:00
Gerkiz
8c50414566 rpg - add callbacks instead of messy function 2022-04-08 22:00:39 +02:00
Gerkiz
3b02582750
Merge pull request #246 from ComfyFactory/panel_update 
Add Pirate ship to the panel
 2022-04-08 17:00:50 +02:00
Gerkiz
3aff9a5ce7 minor fix 2022-04-08 16:59:30 +02:00
Gerkiz
1e378bf3cd Add Pirate ship to the panel 2022-04-08 16:56:40 +02:00
Gerkiz
0d8c05f760
Merge pull request #244 from danielmartin0/develop 
Merge in Pirate Ship now that the main branch has deflate
 2022-04-08 16:54:45 +02:00
Gerkiz
4e8231f05d
Merge branch 'develop' into develop 2022-04-08 16:51:52 +02:00
danielmartin0
185e6b4dde gitignore fix 7 2022-04-08 15:47:07 +01:00
danielmartin0
a4a51dda4f gitignore fix 6 2022-04-08 15:46:15 +01:00
danielmartin0
52d1000731 gitignore fix 5 2022-04-08 15:25:19 +01:00
danielmartin0
f87b5cc335 gitignore fix 3 2022-04-08 15:13:51 +01:00
danielmartin0
46f17c735a gitignore fix 2 2022-04-08 15:13:28 +01:00
Gerkiz
28fba9ac7e
Merge pull request #245 from ComfyFactory/mtn_v3 
fix collapse and shuffle the zones more
 2022-04-08 16:12:34 +02:00