Commit Graph
100 Commits
Author SHA1 Message Date
devZoGok d3576711da Merge pull request #304 from devZoGok/revert-279-bf-255-minimaps-updating
Revert "Fixed Minimap Updating"
2026-08-21 06:46:19 +00:00
devZoGok b5ff653c72 Revert "Fixed Minimap Updating" 2026-08-21 06:45:45 +00:00
devZoGok e08ac9a58d Merge pull request #279 from devZoGok/bf-255-minimaps-updating
Fixed Minimap Updating
2026-08-21 06:44:41 +00:00
devZoGok 03781d10d8 Merge pull request #278 from devZoGok/develop
Develop
2026-06-17 16:40:57 +00:00
devZoGok 2926e09413 Merge pull request #277 from devZoGok/bf-276-pausing
Bf 276 pausing
2026-06-17 16:40:10 +00:00
devZoGok 8be00aac10 Merge pull request #275 from devZoGok/bf-273-274-crash-fixes
bf-273-274-crash-fixes
2026-06-16 17:10:35 +00:00
devZoGok 7c490dc9fc Merge pull request #272 from devZoGok/bf-271-player-none
bf-271-player-none
2026-06-16 16:41:18 +00:00
devZoGok fadf8f3375 Merge pull request #270 from devZoGok/imo-269-rm-files
Imo 269 rm files
2026-06-16 16:26:39 +00:00
devZoGok 0c0ad4566e Merge pull request #251 from devZoGok/develop
Develop
2026-05-26 16:58:04 +00:00
devZoGok 2ad584fc79 Merge pull request #250 from devZoGok/bf-249-no-debug-render
bf-249-no-debug-render
2026-05-26 16:56:59 +00:00
devZoGok 3d3683abf2 Merge pull request #248 from devZoGok/imp-247-unit-icons
Imp 247 unit icons
2026-05-26 15:50:34 +00:00
devZoGok 02f78a7bf5 Merge pull request #246 from devZoGok/develop
Develop
2026-05-23 09:50:46 +00:00
devZoGok c40e21237d Merge pull request #245 from devZoGok/imp-244-unit-improvements
Imp 244 unit improvements
2026-05-15 15:40:06 +00:00
devZoGok c4fe166bf4 Merge pull request #243 from devZoGok/imp-242-map-improvements
Imp 242 map improvements
2026-05-13 16:17:08 +00:00
devZoGok 304ced2ca3 Merge pull request #239 from devZoGok/imp-237-map-regions
Imp 237 map regions
2026-05-01 11:55:12 +00:00
devZoGok 5e7d5b839e Merge pull request #236 from devZoGok/bf-234-debug-off-ai-update
bf-234-debug-off-ai-update
2026-04-24 20:13:14 +03:00
devZoGok 52756ace47 Merge pull request #235 from devZoGok/imp-233-fog-of-war-explo
Imp 233 fog of war explo
2026-04-24 19:57:20 +03:00
devZoGok ce621d6102 Merge pull request #232 from devZoGok/bf-231-unit-movement
bf-231-unit-movement
2026-04-24 19:33:08 +03:00
devZoGok 4b4e0df9f3 Merge pull request #230 from devZoGok/bf-223-paths-to-shore
finding paths between water and land cells
2026-03-15 18:26:35 +00:00
devZoGok 445e9b6230 Merge pull request #229 from devZoGok/imp-222-p2w-cpu-ai
Imp 222 p2w cpu ai
2026-03-15 18:06:10 +00:00
devZoGok f37aa9ba34 Merge pull request #228 from devZoGok/bf-224-landmass-fix
Bf 224 landmass fix
2026-03-15 13:20:16 +00:00
devZoGok ede2a9d461 Merge pull request #221 from devZoGok/develop
Develop
2026-02-05 18:18:46 +00:00
devZoGok 499721ccd4 Merge pull request #220 from devZoGok/bf-210-rover-gathering
Bf 210 rover gathering
2026-02-05 18:17:21 +00:00
devZoGok 94a8fcc049 Merge pull request #219 from devZoGok/bf-209-sub-diving
Bf 209 sub diving
2026-02-01 15:05:46 +00:00
devZoGok bd12a393b8 Merge pull request #218 from devZoGok/ft-217-depth-charge
Ft 217 depth charge
2026-01-29 18:49:43 +00:00
devZoGok 6ffa182150 Merge pull request #216 from devZoGok/imp-215-freezer-weapons
Imp 215 freezer weapons
2026-01-29 18:42:32 +00:00
devZoGok c3dddf7784 Merge pull request #214 from devZoGok/imp-123-turret-hor-constr
Imp 123 turret hor constr
2026-01-29 18:37:36 +00:00
devZoGok fb044d1778 Merge pull request #212 from devZoGok/imp-99-unit-models
Imp 99 unit models
2026-01-04 18:16:50 +00:00
devZoGok 7ca104ee0f Merge pull request #211 from devZoGok/imp-207-shoot-down-missiles
Imp 207 shoot down missiles
2026-01-03 10:03:45 +00:00
devZoGok f4ff951bd7 Merge pull request #206 from devZoGok/imp-184-placement-check
Imp 184 placement check
2025-12-06 14:20:57 +00:00
devZoGok 0de7b89f99 Merge pull request #205 from devZoGok/bf-112-alignment
Bf 112 alignment
2025-11-21 07:36:57 +00:00
devZoGok 6eef89f258 Merge pull request #204 from devZoGok/bf-1-map-crashes
Bf 1 map crashes
2025-07-28 05:32:59 +00:00
devZoGok f9b223bf06 Merge pull request #203 from devZoGok/bf-202-build-err
Bf 202 build err
2025-07-07 06:43:07 +00:00
devZoGok 5959e7a284 Merge pull request #200 from devZoGok/bf-198-mechanics-fixes
Bf 198 mechanics fixes
2025-07-07 05:29:12 +00:00
devZoGok 1a534bffe4 Merge pull request #199 from devZoGok/bf-197-gui-bugfixes
Bf 197 gui bugfixes
2025-06-23 13:41:20 +00:00
devZoGok 9aa6ec9a79 Merge pull request #195 from devZoGok/ft-142-music
Ft 142 music
2025-06-23 05:21:50 +00:00
devZoGok 5eaefb47a5 Merge pull request #194 from devZoGok/imp-192-unit-rendering
Imp 192 unit rendering
2025-06-19 15:24:39 +00:00
devZoGok d192dd4fc6 Merge pull request #193 from devZoGok/ft-191-demo-unit-implementations
Ft 191 demo unit implementations
2025-06-19 15:12:38 +00:00
devZoGok 6ea9baaed4 Merge pull request #190 from devZoGok/ft-144-player-trading
Ft 144 player trading
2025-04-26 15:34:10 +00:00
devZoGok 2f2a88b17b Merge pull request #189 from devZoGok/ft-187-ability-buttons
Ft 187 ability buttons
2025-04-14 15:51:54 +00:00
devZoGok d9858816dc Merge pull request #188 from devZoGok/ft-145-loading-screens
Ft 145 loading screens
2025-04-07 20:31:12 +03:00
devZoGok e5377a5152 Merge pull request #186 from devZoGok/imp-182-p2w-ai
Imp 182 p2w ai
2025-03-24 17:37:32 +00:00
devZoGok 2cd25cb618 Merge pull request #185 from devZoGok/ft-183-selectable-players
Ft 183 selectable players
2025-03-24 16:58:15 +00:00
devZoGok bbfcbbd65c Merge pull request #181 from devZoGok/develop
Develop
2025-02-12 14:06:59 +00:00
devZoGok a1011e14f0 Merge pull request #180 from devZoGok/imp-156-adjust-sub-depth
imp-156-adjust-sub-depth
2025-02-12 14:06:28 +00:00
devZoGok 0c0b6af17e Merge pull request #179 from devZoGok/bf-157-sub-dive
bf-157-sub-dive
2025-02-12 12:03:43 +00:00
devZoGok 9655cf64ba Merge pull request #178 from devZoGok/bf-168-pathfinding-lag
bf-168-pathfinding-lag
2025-01-10 17:38:13 +00:00
devZoGok 0c994d0cce Merge pull request #175 from devZoGok/bf-172-wrong-orders
garrison order validation
2024-11-30 14:54:23 +00:00
devZoGok 5777e8585b Merge pull request #174 from devZoGok/bf-172-wrong-orders
Bf 172 wrong orders
2024-11-30 14:52:37 +00:00
devZoGok d653c5e2e9 Merge pull request #173 from devZoGok/bf-107-unpause-stats
Bf 107 unpause stats
2024-11-30 14:11:52 +00:00
devZoGok 272417666e Merge pull request #171 from devZoGok/develop
Develop
2024-10-19 13:51:16 +00:00
devZoGok a370d02ff7 Merge pull request #170 from devZoGok/ft-169-release-script
ft-169-release-script
2024-10-11 18:02:17 +00:00
devZoGok b0d24bbf5b Merge pull request #166 from devZoGok/bf-165-stb
Bf 165 stb
2024-09-27 17:32:27 +00:00
devZoGok 824364318f Merge pull request #164 from devZoGok/ft-143-minimap
Ft 143 minimap
2024-09-27 15:23:05 +00:00
devZoGok f760de87a6 Merge pull request #163 from devZoGok/ft-35-fog-of-war
Ft 35 fog of war
2024-09-26 17:33:54 +00:00
devZoGok bdf450c556 Merge pull request #162 from devZoGok/imp-161-ram-usage
Imp 161 ram usage
2024-09-06 17:25:52 +00:00
devZoGok ae1b3b94a4 Merge pull request #160 from devZoGok/imp-153-test-maps
Imp 153 test maps
2024-07-28 13:44:29 +00:00
devZoGok 4e6efb90af Merge pull request #159 from devZoGok/bf-155-off-screen-selection
only selecting units on screen
2024-07-28 12:10:04 +00:00
devZoGok b2f01e6ddb Merge pull request #158 from devZoGok/bf-154-vessel-pathfinding
Bf 154 vessel pathfinding
2024-07-28 11:51:27 +00:00
devZoGok c1123f0a06 Merge pull request #152 from devZoGok/bf-148-raycast-lag
Bf 148 raycast lag
2024-07-21 13:26:16 +00:00
devZoGok fce287968c Merge pull request #151 from devZoGok/bf-147-unit-selection
Bf 147 unit selection
2024-07-21 13:22:34 +00:00
devZoGok 0a3ce65002 Merge pull request #150 from devZoGok/bf-146-screen-to-space
Bf 146 screen to space
2024-07-21 13:16:24 +00:00
devZoGok dc6ea9a679 Merge pull request #149 from devZoGok/ft-132-color-models
Ft 132 color models
2024-07-21 13:13:03 +00:00
devZoGok dd5a7f732f Merge pull request #138 from devZoGok/ft-118-unit-fx
Ft 118 unit fx
2024-07-07 13:51:42 +00:00
devZoGok 94fe50900d Merge pull request #137 from devZoGok/master
Merge updated README into develop
2024-06-26 05:34:52 +00:00
devZoGok 93f801723e Merge pull request #136 from devZoGok/doc-135-win-build-doc
doc-135-win-build-doc
2024-06-26 05:33:41 +00:00
devZoGok 6e86eecbb4 Merge pull request #131 from devZoGok/bf-130-alpha-layer
Added alpha layer
2024-06-16 09:12:25 +00:00
devZoGok dba0c6d72d Merge pull request #129 from devZoGok/bf-127-map-crashes
Bf 127 map crashes
2024-06-15 17:18:39 +00:00
devZoGok b0da786869 Merge pull request #128 from devZoGok/bf-125-cpp-std
Bf 125 cpp std
2024-06-15 17:13:55 +00:00
devZoGok 0454ab51d4 Merge pull request #126 from devZoGok/bf-123-windows-argv
Bf 123 windows argv
2024-06-15 09:32:17 +00:00
devZoGok 5700e3d9e4 Merge pull request #124 from devZoGok/imp-122-stat-dyn-build
Imp 122 stat dyn build
2024-06-13 07:55:56 +00:00
devZoGok 6e653122c4 Merge pull request #121 from devZoGok/imp-116-extractor-building
Imp 116 extractor building
2024-06-12 16:37:43 +00:00
devZoGok 8949df76c9 Merge pull request #120 from devZoGok/bf-106-exit-button
Bf 106 exit button
2024-06-11 17:51:00 +00:00
devZoGok f00d52eaea Merge pull request #119 from devZoGok/ft-115-in-game-gui
Ft 115 in game gui
2024-06-11 17:26:27 +00:00
devZoGok ae93ada2c4 Merge pull request #95 from devZoGok/bf-93-missile-folder
bf-93-missile-folder
2024-03-10 14:21:08 +00:00
devZoGok 038bb495ae Merge pull request #94 from devZoGok/ft-38-trading
Ft 38 trading
2024-03-10 14:12:34 +00:00
devZoGok e7c26e699c Merge pull request #92 from devZoGok/ft-43-tech-research
Ft 43 tech research
2024-03-10 14:06:45 +00:00
devZoGok 42d9b6f739 Merge pull request #85 from devZoGok/bf-82-vb01
bf-82-vb01
2024-02-17 13:25:39 +00:00
devZoGok 4f209d343e Merge pull request #90 from devZoGok/ft-88-engi-weapons
Ft 88 engi weapons
2024-02-17 13:25:15 +00:00
devZoGok 4ff7bfa606 Merge pull request #87 from devZoGok/ft-82-unit-states
Ft 82 unit states
2024-02-17 09:27:58 +00:00
devZoGok d285cf76ef Merge pull request #86 from devZoGok/ft-83-cpu-ai
Ft 83 cpu ai
2024-02-16 14:04:40 +00:00
devZoGok e35fda7b68 Merge pull request #80 from devZoGok/imp-71-resource-consumption
Imp 71 resource consumption
2024-02-03 08:03:34 +00:00
devZoGok f560bfc535 Merge pull request #79 from devZoGok/ft-69-forts
Ft 69 forts
2024-02-03 07:54:46 +00:00
devZoGok 12a4c0c6cf Merge pull request #78 from devZoGok/bf-73-config-update
Bf 73 config update
2024-02-03 07:48:21 +00:00
devZoGok a9464967f4 Merge pull request #77 from devZoGok/imp-68-obj-lua-config
Imp 68 obj lua config
2024-02-03 07:44:26 +00:00
devZoGok 65e8a123d2 Merge pull request #67 from devZoGok/ft-62-carriers
Ft 62 carriers
2024-01-24 16:52:41 +00:00
devZoGok aeee79826f Merge pull request #66 from devZoGok/imp-61-diff-transports
Imp 61 diff transports
2024-01-24 16:46:39 +00:00
devZoGok 15ce487081 Merge pull request #65 from devZoGok/imp-39-harvesters
Imp 39 harvesters
2024-01-24 13:02:44 +00:00
devZoGok 894e711633 Merge pull request #64 from devZoGok/ft-60-submarines
Ft 60 submarines
2024-01-24 12:53:51 +00:00
devZoGok 93b323a35b Merge pull request #63 from devZoGok/ft-59-cruisers
Ft 59 cruisers
2024-01-24 12:41:26 +00:00
devZoGok 0ed518d8dd Merge pull request #58 from devZoGok/imp-55-pathfinding
Imp 55 pathfinding
2024-01-06 13:44:07 +00:00
devZoGok 5a0f85a939 Merge pull request #57 from devZoGok/bf-56-large-maps
bf-56-large-maps
2024-01-06 13:07:28 +00:00
devZoGok 2b7f92c9be Merge pull request #54 from devZoGok/develop
v0.1
2023-12-30 13:45:43 +00:00
devZoGok e20809c592 Merge pull request #53 from devZoGok/ft-53-game-over-stats
Ft 53 game over stats
2023-12-30 13:31:06 +00:00
devZoGok 070a77f9dc Merge pull request #51 from devZoGok/ft-41-cpu-ai
Ft 41 cpu ai
2023-12-24 09:27:59 +00:00
devZoGok 49f12ab154 Merge pull request #50 from devZoGok/ft-49-playtest-units
Ft 49 playtest units
2023-12-24 09:20:22 +00:00
devZoGok 6db47bcb83 Merge pull request #48 from devZoGok/ft-36-units
Ft 36 units
2023-11-25 06:38:35 +00:00
devZoGok dc41f343ac Merge pull request #47 from devZoGok/imp-31-game-class
Imp 31 game class
2023-10-12 15:21:45 +00:00
devZoGok f59dbf92d3 Merge pull request #46 from devZoGok/ft-30-resources
Ft 30 resources
2023-10-12 15:17:15 +00:00
devZoGok 267c1f60f2 Merge pull request #29 from devZoGok/bf-26-dev-submodules
Bf 26 dev submodules
2023-09-28 17:08:29 +00:00