gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
23,908 Commits 1 Branch 39 Tags
71cd4ecf985ce7fd8d68b01ea6debee64132f0a4
Commit Graph

23908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wowgetoffyourcellphone 71cd4ecf98 [Fix] 2e68fccd1d -> restore loyalty_regen.json 
Patch by: @marder
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D5210
Fixes #6891

This was SVN commit r27964.
 2023-12-02 19:00:34 +00:00
wowgetoffyourcellphone 37a49249fa [Gameplay] New temple tech "Sacrificial Ritual" 
Patch by: @borg-
Accepted by: @real_tabasco_sauce
Comments by: @chrstgtr, @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D5188
This was SVN commit r27963.
 2023-12-02 18:44:06 +00:00
phosit 6ee136dd11 Split Receiver from SharedState 
The Function is not restricted to std::function anymore. Move only
function become possible.

Differential Revision: https://code.wildfiregames.com/D4840
This was SVN commit r27962.
 2023-11-30 09:20:35 +00:00
Freagarach 5ce3478317 Fix typo in serapis_cult noticed by @rollieoo at Transifex. 
This was SVN commit r27960.
 2023-11-27 07:55:07 +00:00
wowgetoffyourcellphone 955c1d9183 [Art] Improve the UV mapping of the pers_palace model 
This was SVN commit r27959.
 2023-11-25 21:51:48 +00:00
wowgetoffyourcellphone 9c0e458f2d [Gameplay] New Mauryan paired food techs. 
Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Comments by: @chrstgtr, @genava55

Differential Revision: https://code.wildfiregames.com/D5175
This was SVN commit r27958.
 2023-11-25 18:49:15 +00:00
wowgetoffyourcellphone 75812d43e6 Improve the wording of the Delian League description 
This was SVN commit r27957.
 2023-11-24 20:53:45 +00:00
wowgetoffyourcellphone 71d45cd9ce [Gameplay] "Woad Warriors" civ bonus for the Britons 
Patch by: @borg-
Accepted by: @wowgetoffyourcellphone
Comments by: @real_tabasco_sauce, @chrstgtr
Differential Revision: https://code.wildfiregames.com/D5190
This was SVN commit r27956.
 2023-11-24 20:03:51 +00:00
wowgetoffyourcellphone a0592a3c37 [Gameplay] "Satrapy Tribute" feature for the Persian Throne Hall structure 
This adds an upgrade option for the Persian "Apadana" (will be renamed
later to "Tachara"), where the player can choose to receive a trickle of
a desired resource, like taxes or tribute from their subject peoples.
Call this the "Satrapy Tribute" feature.

Patch by: @wowgetoffyourcellphone
Accepted by: @real_tabasco_sauce
Comments by: @chrstgtr, @borg-

Differential Revision: https://code.wildfiregames.com/D5192
This was SVN commit r27954.
 2023-11-24 02:58:32 +00:00
phosit 949be94aab Introduce CLogger::ScopedReplacement and FileLogger 
Comments By: @sera, @vladislavbelov, @Stan
Differential Revision: https://code.wildfiregames.com/D5167
This was SVN commit r27953.
 2023-11-23 20:42:18 +00:00
marder 63a4799f56 Fix mapgeneration of ambush & frontier in atlas 
56f15f0869 broke those maps in atlas where g_MapSettings.TeamPlacement
is never initialized.

Bug found by @elexis
Fix not objected by @elexis (comments: committable if 56f15f0869 should
not be reverted and developer time is limited)

Differential revision: https://code.wildfiregames.com/D5200
This was SVN commit r27952.
 2023-11-21 21:44:31 +00:00
wowgetoffyourcellphone 62ab340622 [Gameplay] Ptolemaic Polybolos attack rate increased 
Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D5170
This was SVN commit r27951.
 2023-11-21 17:37:04 +00:00
wowgetoffyourcellphone 5494110015 [Gameplay] Add forgotten loot in the new cataphract mixin 
Patch by: @borg-
Differential Revision: https://code.wildfiregames.com/D5197
This was SVN commit r27950.
 2023-11-21 17:31:58 +00:00
wowgetoffyourcellphone a2e7e4a08c [Gameplay] Fix apartment and academy loot 
Patch by: @borg-
Differential Revision: https://code.wildfiregames.com/D5191
This was SVN commit r27949.
 2023-11-21 17:24:14 +00:00
phosit 1e3f11ff6d Disallow conversion in Future return 
Differential Revision: https://code.wildfiregames.com/D4812
This was SVN commit r27947.
 2023-11-19 21:04:40 +00:00
marder 6a43f91630 Fix oversight in 56f15f0869 regarding iber wall placement 
Needed until / if D5082 lands.
Until then we also still need: `g_PlayerbaseTypes`.

Differential revision: https://code.wildfiregames.com/D5196
This was SVN commit r27946.
 2023-11-19 20:54:12 +00:00
phosit 1bccfef6fb Don't use std::shared_ptr in ScriptInterface 
Differential Revision: https://code.wildfiregames.com/D5159
This was SVN commit r27945.
 2023-11-19 20:13:19 +00:00
phosit e33aafc4e2 Put the CMapGeneratorWorker completely inside the task 
The return-slot provided by the `Future` is used for synchronisation.

Refs: #5874

Comments By: @Stan, @vladislavbelov, @wraitii
Differential Revision: https://code.wildfiregames.com/D5001
This was SVN commit r27944.
 2023-11-19 19:19:32 +00:00
marder 56f15f0869 Move createBasesByPattern() functionality from rmgen2 to rmgen-common 
This means deprecate `createBasesByPattern` in rmgen2 and add new
function `playerPlacementByPattern` in common

Differential revision: https://code.wildfiregames.com/D5194
This was SVN commit r27943.
 2023-11-19 15:21:26 +00:00
marder 818ed56c0e Don't rely on default args in placePlayerBase 
rather be explicit

Differential revision: https://code.wildfiregames.com/D5193
This was SVN commit r27942.
 2023-11-19 12:00:01 +00:00
marder 3c1436223f Move placement options from rmgen2 to rmgen-common 
Move the placement functions and the getTeamArray from rmgen2 to
rmgen-common, so that those maps can use the placement options as well,
without having to load the whole rmgen2 library.

Differential revision: https://code.wildfiregames.com/D4948
This was SVN commit r27941.
 2023-11-19 11:30:04 +00:00
wowgetoffyourcellphone 6002acf833 [Art] Portraits for Persian palace upgrades 
This was SVN commit r27940.
 2023-11-19 00:18:14 +00:00
wowgetoffyourcellphone 2d0339c77f [Art] Fix a few Persian building props. 
This was SVN commit r27939.
 2023-11-19 00:11:37 +00:00
marder eeaa4bf159 Fix incorrect random selection for team placement 
accepted by: @Freagarach
Differential revision: https://code.wildfiregames.com/D5077
This was SVN commit r27938.
 2023-11-18 16:52:40 +00:00
marder f544c6776b Turret walls on Jebel Barkal & outposts on Danubius again 
After they had been broken in 21e866fcf0

Author / patch by: @lairkers

Troubleshooting / comments by @elexis @Freagarach

Fixes #6831

This was SVN commit r27937.
 2023-11-18 16:10:58 +00:00
Freagarach 0dcaefc2f6 Add error to TechMan. when trying to finish a non-existing technology (e.g. wrong allied_view tech defined). 
This was SVN commit r27935.
 2023-11-16 09:40:44 +00:00
wowgetoffyourcellphone a90a3a7e48 [Gameplay] Technology | Roman Roads | A special technology for the Romans 
Patch by: @wowgetoffyourcellphone
Accepted by: @real_tabasco_sauce
Comments by: @borg-, @chrstgtr
Differential Revision: https://code.wildfiregames.com/D5183
This was SVN commit r27934.
 2023-11-13 15:50:28 +00:00
wowgetoffyourcellphone efbee041e9 [Art] Maps | Improve the terrains on Greek Acropolis 4 
This was SVN commit r27932.
 2023-11-13 00:05:41 +00:00
wowgetoffyourcellphone d8b89fae71 [Gameplay] Correct loot for mercenaries cavs 
Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5187
This was SVN commit r27930.
 2023-11-11 18:01:57 +00:00
wowgetoffyourcellphone 415d0bb999 [Gameplay] Fix healer loot 
Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5186
This was SVN commit r27929.
 2023-11-11 18:00:07 +00:00
wraitii 0fec859267 Fix serialization test following 7350b9042e - Fix CalculateTerritories after deserialization 
This fixes an issue revealed by 7350b9042e that affected deserialized
games.
Adding tests further highlighted a bug in the calculations, which is
fixed.

Reviewed By: phosit
Fixes #6883

Differential Revision: https://code.wildfiregames.com/D5181
This was SVN commit r27928.
 2023-11-11 10:34:24 +00:00
vladislavbelov ba1a67a824 Adds test for loading actor and model having proper flags. 
Differential Revision: https://code.wildfiregames.com/D5172
This was SVN commit r27925.
 2023-11-08 23:23:03 +00:00
vladislavbelov debbcba9a6 Reduces code duplication of specular calculation in shaders. 
Differential Revision: https://code.wildfiregames.com/D5178
This was SVN commit r27924.
 2023-11-08 23:07:11 +00:00
wowgetoffyourcellphone 84d935444f [Gameplay] Ram Garrison improves Ram performance 
Patch by: @wowgetoffyourcellphone
Accepted by: @chrstgtr, @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5179
This was SVN commit r27922.
 2023-11-08 05:12:51 +00:00
vladislavbelov a905932712 Moves single descriptor set binding management for Vulkan to a separate class. 
Differential Revision: https://code.wildfiregames.com/D5163
This was SVN commit r27921.
 2023-11-07 21:43:52 +00:00
vladislavbelov c78ad51057 Fixes incorrect case of GLX extensions. Fixes #6547 
Patch By: xone47
Differential Revision: https://code.wildfiregames.com/D5160
This was SVN commit r27920.
 2023-11-07 21:28:59 +00:00
wowgetoffyourcellphone 2e68fccd1d [Gameplay] Rename the Temple of Vesta aura and make it a more explicit CapturePoints bonus 
Patch by: @wowgetoffyourcellphone
Accepted by: @real_tabasco_sauce
Supporting Comments: @chrstgtr

Differential revision: https://code.wildfiregames.com/D5182
This was SVN commit r27919.
 2023-11-07 16:23:38 +00:00
wowgetoffyourcellphone 41cf14be2c [Art] Fixes an oversight in the variant files 
Patch by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5149
This was SVN commit r27916.
 2023-11-06 04:40:23 +00:00
wowgetoffyourcellphone 97412464ca [Gameplay] "Nile Delta" civ bonus for Ptolemies 
Makes all farming techs at the Farmstead available in the Village Phase
(I) for the Ptolemies.

Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5180
This was SVN commit r27915.
 2023-11-05 23:43:25 +00:00
phosit b38aa7d6dd Fix compile error introduced in 968e55704a 
Change the ternary to a lambda.
Add braces around the while loop body introduced in 50cbe24cc5.

Refs: 968e55704a, 50cbe24cc5

Accepted By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5176
This was SVN commit r27914.
 2023-11-05 17:59:42 +00:00
wowgetoffyourcellphone 2c6e7a590f [art] Better foundation for Temple of Amun 
This was SVN commit r27913.
 2023-11-03 16:22:59 +00:00
wowgetoffyourcellphone 4e9e950c8f [Art][Gameplay] A slightly larger chicken model to improve gameplay 
This creates a slightly larger chicken model, which helps with visual
identification at the start of the match. I have seen multiple let's
plays where finding the initial chickens took too long (in my opinion),
because I believe they are too small for the game world.

Patch by: @wowgetoffyourcellphone
Original model by: @LangBart
Accepted by: @chrstgtr, @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5177
This was SVN commit r27910.
 2023-10-30 03:01:44 +00:00
phosit 1352c13369 Make the sea ground height of Elephantine independent from the mapsize. 
Fixes: #6848

Comments By: @sera
Differential Revision: https://code.wildfiregames.com/D5132
This was SVN commit r27909.
 2023-10-29 14:03:52 +00:00
phosit 968e55704a Make the RLInterface local 
refs: #4211

Comments By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5103
This was SVN commit r27908.
 2023-10-28 21:11:25 +00:00
vladislavbelov f40942f6b3 Moves CVertexBufferManager from global scope to CRenderer. 
Differential Revision: https://code.wildfiregames.com/D5171
This was SVN commit r27907.
 2023-10-28 21:01:22 +00:00
phosit 50cbe24cc5 Combine visual and nonvisual path so that there is only one gameloop 
Differential Revision: https://code.wildfiregames.com/D5161
This was SVN commit r27906.
 2023-10-28 20:54:12 +00:00
phosit dc61483e82 Use std::unique_ptr in CUnitManager and remove unused member functions. 
Accepted By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5173
This was SVN commit r27905.
 2023-10-28 12:57:01 +00:00
phosit c90aeee2b3 Remove two globals from MapBrowserPage.js 
Comments By: @sera, @elexis
Differential Revision: https://code.wildfiregames.com/D5165
This was SVN commit r27904.
 2023-10-28 11:32:37 +00:00
wowgetoffyourcellphone 261d606c25 [Gameplay] Maps | Update the Watering Holes (4 player) skirmish map 
This map is small and should incentivize fast gameplay with its
abundance of hunt and berries.

This was SVN commit r27903.
 2023-10-27 19:15:11 +00:00
wowgetoffyourcellphone ba635f2790 [Gameplay] Use 'dock' variants for Athenian Marines and Mercenary Archers 
Patch by: @real_tabasco_sauce
Accepted by: @chrstgtr, @borg-
Comments by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5168
This was SVN commit r27902.
 2023-10-27 17:08:16 +00:00