Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
270 workflow run results
270 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Linter fixes (thanks checks) Check for merge conflicts #20: Pull request #4 opened by morrowwolf
October 12, 2023 21:57 12s
October 12, 2023 21:57 12s
Attempt to solve mapping issues Check for merge conflicts #19: Pull request #3 opened by morrowwolf
October 12, 2023 21:55 12s
October 12, 2023 21:55 12s
Game master panel part 1 Check for merge conflicts #18: Pull request #2 opened by morrowwolf
October 12, 2023 21:37 13s
October 12, 2023 21:37 13s
Slight change to idle pathfinding and map Check for merge conflicts #17: Commit 648733e pushed by morrowwolf
October 12, 2023 21:35 12s master
master
October 12, 2023 21:35 12s
Removes unused behaviors Check for merge conflicts #16: Commit 4777e39 pushed by morrowwolf
October 12, 2023 19:36 10s master
master
October 12, 2023 19:36 10s
More map! Check for merge conflicts #15: Commit dbaaffb pushed by morrowwolf
October 12, 2023 09:31 12s master
master
October 12, 2023 09:31 12s
Remove race stripes (for now) Check for merge conflicts #14: Commit c425530 pushed by morrowwolf
October 12, 2023 08:20 11s master
master
October 12, 2023 08:20 11s
Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #13: Commit 4a97d5a pushed by morrowwolf
October 12, 2023 08:12 14s master
master
October 12, 2023 08:12 14s
This squad code is literal ass Check for merge conflicts #12: Commit 748c3eb pushed by morrowwolf
October 12, 2023 08:11 11s master
master
October 12, 2023 08:11 11s
More map progress and "soulful" ranks/titles Check for merge conflicts #11: Commit 08dcd79 pushed by morrowwolf
October 12, 2023 07:39 12s master
master
October 12, 2023 07:39 12s
shoots generate_documentation.yml Check for merge conflicts #10: Commit a26c110 pushed by morrowwolf
October 12, 2023 05:37 14s master
master
October 12, 2023 05:37 14s
Config framework for new map, plus hyper early map Check for merge conflicts #9: Commit e4d4116 pushed by morrowwolf
October 11, 2023 11:24 13s master
master
October 11, 2023 11:24 13s
increases ranks of personnel, makes sure we only get slots we want Check for merge conflicts #8: Commit 07fc1bd pushed by morrowwolf
October 11, 2023 10:08 15s master
master
October 11, 2023 10:08 15s
Xenos ignore non-conscious people, die at -400 now Check for merge conflicts #7: Commit 78396b7 pushed by morrowwolf
October 11, 2023 09:09 16s master
master
October 11, 2023 09:09 16s
99 round mk1 Check for merge conflicts #6: Commit f088681 pushed by morrowwolf
October 11, 2023 08:43 11s master
master
October 11, 2023 08:43 11s
Engi/Con skill buffs, marine gloves insulated Check for merge conflicts #5: Commit fb6e54a pushed by morrowwolf
October 11, 2023 08:43 15s master
master
October 11, 2023 08:43 15s
Cleans up the gamemode Check for merge conflicts #4: Commit cfc9e46 pushed by morrowwolf
October 11, 2023 08:30 12s master
master
October 11, 2023 08:30 12s
Removes a bunch of intel stuff, fixes PROC_REFs Check for merge conflicts #3: Commit baaf06c pushed by morrowwolf
October 11, 2023 08:27 12s master
master
October 11, 2023 08:27 12s
Update README.md Check for merge conflicts #2: Commit db05559 pushed by morrowwolf
October 9, 2023 21:52 11s master
master
October 9, 2023 21:52 11s
Merge remote-tracking branch 'CMSS13/PvE-CM' Check for merge conflicts #1: Commit e021b21 pushed by morrowwolf
October 9, 2023 21:44 Startup failure master
master
October 9, 2023 21:44 Startup failure
ProTip! You can narrow down the results and go further in time using created:<2023-10-09 or the other filters available.