dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
16781 commits 1 branch 39 tags 169 MiB
Commit graph

16781 commits

This branch
This branch
All branches
Author SHA1 Message Date
fatherbushido
49d86dcd9f Fix a portrait icon reference. Accepted by Enrique. 
This was SVN commit r19169.
 2017-01-25 15:24:53 +00:00
Enrique
d10f84a157 Improved structure icons by wowgetoffyourcellphone. Thanks! 
This was SVN commit r19168.
 2017-01-24 22:47:52 +00:00
Enrique
528f38f4dd Fixed ptolemaic skirmisher portrait as mercenary 
Fixed mauritarian archer portrait as citizen soldier
Fixed judean slingers portrait as citizen soldier
Thanks wowgetoffyourcellphone for the portraits!

This was SVN commit r19167.
 2017-01-24 22:03:49 +00:00
fatherbushido
90e876f328 Some changes for Ptolemies. Allow training their new champion pikeman in the fortress. Train their heros in civic center instead of fortress. Replace the Nubian archer with the more historically accurate Cretan one. Train mercenary skirmisher at the civic center and the archer at the barrack. Accepted by scythetwirler and elexis. 
Differential Revision: https://code.wildfiregames.com/D56
This was SVN commit r19166.
 2017-01-24 15:51:00 +00:00
elexis
4f01db4831 Split TurnManager classes into individual files per class. Patch by echotangoecho, fixes #4095. 
Remove the "Net" prefix from the non-networked classes.
Use variadic macros and mark the client turnmanager as NONCOPYABLE.

Differential Revision: D16
Reviewed By: leper
This was SVN commit r19165.
 2017-01-24 02:04:50 +00:00
mimo
43c7551202 fix a typo in 8adc6b0a04, noticed by Sandarac 
This was SVN commit r19164.
 2017-01-23 22:33:21 +00:00
mimo
8adc6b0a04 petra: cleanup and improve regicide support, patch by Sandarac, refs #4142 
This was SVN commit r19163.
 2017-01-23 20:36:12 +00:00
mimo
5725542fc4 petra: respond to neutral requests from enemies, patch by Sandarac, refs #4431 
This was SVN commit r19161.
 2017-01-21 10:59:18 +00:00
wraitii
8fec942e8a Fix Atlas under macOS Sierra. 
We were polling SDL messages from two different threads (by mistake),
and Sierra now refuses to do that.
Tested by Stan, Itms, Fatherbushido, and discussed with Philip for the
code change itself.
Fixes #4408.
Differential Revision: https://code.wildfiregames.com/D42
This was SVN commit r19160.
 2017-01-21 09:54:08 +00:00
Imarok
8813888fe0 Color the garrison panel buttons more nicely 
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D52
This was SVN commit r19159.
 2017-01-20 11:16:20 +00:00
fatherbushido
0901167349 Remove an unused duplicated unit. Accepted by Itms. 
Differential Revision: ​https://code.wildfiregames.com/D58
This was SVN commit r19158.
 2017-01-20 10:16:12 +00:00
leper
be1a205f91 Add support for const methods in components and make those that can be const const. 
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D75
This was SVN commit r19156.
 2017-01-20 02:25:19 +00:00
elexis
678e082230 Remove the "quit" simulation command and restrict the "set-shading-color" simulation command to AIs, 
since they are only useful for AI debugging and counterproductive in
multiplayer mode, refs #3551.

Instead, enable AI developers to exit the game from a new AI API
command,
allowing to batch simulate matches. Refs #2755.

Differential Revision: D65
Reviewed By: leper
Consulted: mimo

This was SVN commit r19155.
 2017-01-19 14:45:32 +00:00
fatherbushido
13529b04a3 Fix 03ecf8508f. Bug noticed by mimo. Some objects are not instance of Vector3D after deserialization. 
This was SVN commit r19154.
 2017-01-18 13:25:38 +00:00
Enrique
5c2495db52 Small improvement in Carthaginian normal map. 
Fixed carthaginian market actors.
Fixed gate structure template. Patch by Stanislas69
fixes #2524

This was SVN commit r19153.
 2017-01-18 00:51:07 +00:00
elexis
3448a98d1f Remove three unused AI helper functions, likely remains of the AEGIS bot removed in 3f1db1ef01. 
Reviewed By: mimo
Differential Revision: D74
This was SVN commit r19152.
 2017-01-17 20:45:16 +00:00
Imarok
c791b9ade3 Add the confirm hotkey to the prelobby window 
This was SVN commit r19151.
 2017-01-17 14:33:26 +00:00
Imarok
42204dce46 Cleanup of Batch training 
This was SVN commit r19150.
 2017-01-17 10:41:32 +00:00
wraitii
b3b47c1718 Avoid recreating the dirtiness grid every turn by swapping. Significantly reduces the number of allocations, and slight speedup (particularly on larger maps). Reviewed by Leper. 
Differential Revision: https://code.wildfiregames.com/D70
This was SVN commit r19149.
 2017-01-17 07:24:41 +00:00
fatherbushido
5f859c5784 Don't send MT_Attacked message when an ally help capturing back. 
Differential Revision: https://code.wildfiregames.com/D69
This was SVN commit r19148.
 2017-01-16 14:17:38 +00:00
fatherbushido
03ecf8508f Remove a useless function in AttackDetection. Accepted by wraitii. 
Differential Revision: https://code.wildfiregames.com/D68
This was SVN commit r19147.
 2017-01-16 12:19:38 +00:00
wraitii
0a6a42321d Improve cache efficiency of CcmpPathfinder::UpdateGrid substantially. On very large maps, this can be a very substantial improvement (I have measured up to 30ms) 
This was SVN commit r19146.
 2017-01-16 10:41:35 +00:00
wraitii
ad76352cef Prevent the AI manager from copying the pathfindinder dirtiness grid every turn. 
Review by Itms

Differential Revision: https://code.wildfiregames.com/D25
This was SVN commit r19145.
 2017-01-16 08:38:31 +00:00
Imarok
df1b542c5a CLeanup the nickNotify in gamesetup 
This was SVN commit r19143.
 2017-01-15 22:40:59 +00:00
leper
3a85d0b3fa Remove unused parameter from template loading code 
Templates should be the same for all players, techs can be used to
provide
different lists of templates if that is needed.

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D25
This was SVN commit r19142.
 2017-01-15 18:41:53 +00:00
fatherbushido
ba76f60c53 Fix portraits icon leftovers in templates. Accepted by enrique. 
Differential Revision: https://code.wildfiregames.com/D67
This was SVN commit r19141.
 2017-01-15 11:56:32 +00:00
fatherbushido
6b9725892e Remove remaining colour occurence in art files as done in b1c4e29ac8. Patch by stanislas69. Refs #4458. 
This was SVN commit r19140.
 2017-01-14 16:14:00 +00:00
fatherbushido
103a59ec1e Fix a space tab inconsistency detected by python3. 
This was SVN commit r19139.
 2017-01-13 08:40:54 +00:00
fatherbushido
19e1be6e7b Remove a target moving spread factor for ranged attack. That one was a bit redundant as a moving target has yet a big advantage. Accepted by wraitii. 
Differential Revision: https://code.wildfiregames.com/D61
This was SVN commit r19136.
 2017-01-12 11:33:25 +00:00
fatherbushido
0706fe8410 Add history tag to Carthaginians units from design docs. Replace a generic one by the specific one. Remove a TBD tooltip. 
This was SVN commit r19135.
 2017-01-12 10:58:35 +00:00
Enrique
b84be743fa Adds garrisoned variant to carthage super dock. Patch by Stanislas69 
Improves carthage market obstruction and rubble actor. Patch by
Stanislas69

This was SVN commit r19134.
 2017-01-10 23:08:31 +00:00
fatherbushido
dc1835bb1d Add missing history entries to Macedonian units and set their slinger as mercenary in agreement of design doc. 
This was SVN commit r19133.
 2017-01-10 20:41:07 +00:00
Enrique
4f7b4e97d8 Improved slinger attack animation. 
fixed build animation mallet placement.
fixed iberian helmet to fit new head meshes.
fixed mauryan turbans to fit new head meshes.
fixed persian camel trader prop placement
fixed female carry meat prop placement
fixed tool prop gather grain placement

This was SVN commit r19132.
 2017-01-10 19:26:02 +00:00
Enrique
ef7fcd4674 Batch of patches from Stanislas69 
Fixes #3813
Refs #2524 and #4440

-Fixes stoyas foundations
-Fixes walls foundations
-Fixes carth superdock foundation
-Fixes cape_chariot variant
-Fixes missing referenced files in #2524

This was SVN commit r19131.
 2017-01-10 19:22:54 +00:00
Enrique
0a68ace52d Upgraded Carthaginian market from Stanislas69. Thanks! 
This was SVN commit r19130.
 2017-01-10 19:17:17 +00:00
Enrique
004c8679d4 Updated unit portraits from wowgetoffyourcellphone. Thanks! 
This was SVN commit r19129.
 2017-01-10 19:13:47 +00:00
fatherbushido
d51ad4fbdf Remove useless empty specific name and history entries in templates. Refs fd4e899f11. Fix #4445. 
This was SVN commit r19128.
 2017-01-10 15:39:19 +00:00
fatherbushido
8229ca499c Handle case where diminishing returns equal to 1. Accepted by mimo. 
Differential Revision: https://code.wildfiregames.com/D57
This was SVN commit r19127.
 2017-01-10 14:05:43 +00:00
mimo
2e636af9bc fix missing semicolons 
This was SVN commit r19126.
 2017-01-09 19:03:24 +00:00
Gallaecio
b096728618 “an huge army” → “a huge army” 
Differential Revision: https://code.wildfiregames.com/D55
This was SVN commit r19124.
 2017-01-08 22:22:31 +00:00
Gallaecio
449ea2b6ed “setting a game” → “setting up a game” 
Differential Revision: https://code.wildfiregames.com/D54
This was SVN commit r19123.
 2017-01-08 22:19:24 +00:00
fatherbushido
0e77bdd911 Add some missing auras and remove some tooltip. Accepted by elexis. 
Differential Revision: https://code.wildfiregames.com/D37
This was SVN commit r19122.
 2017-01-08 16:06:20 +00:00
fatherbushido
4ad6890cad Add a simulation test to the previous commit of s0600204's patch. Refs #4263. 
This was SVN commit r19121.
 2017-01-08 14:04:23 +00:00
fatherbushido
6c97d8118b Merge different logics of technology requirements and fix the related bugs. Create a global script which derive the technology requirements objects in a form usable for structure tree, gui, simulation and AI. Reviewed by mimo (for AI) and fatherbushido. Fixes #3993, #1646, #4263, #4217. Refs #4108. 
This was SVN commit r19120.
 2017-01-08 14:00:20 +00:00
leper
b5991e188b TemplateLoader cleanup. 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D26
This was SVN commit r19119.
 2017-01-07 17:52:32 +00:00
mimo
a859f3cd91 Fix double-click on hero button when the hero is garrisoned in a ram garrisoned somewhere, refs #4291 
Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D46
This was SVN commit r19118.
 2017-01-07 10:33:30 +00:00
fatherbushido
d73d656cc5 Adress a Todo in auras code. Add player type aura. Improve tests. Accepted by mimo. 
Differential Revision: https://code.wildfiregames.com/D41
This was SVN commit r19117.
 2017-01-06 20:14:39 +00:00
mimo
32d2375e55 petra: start implementing responses to alliance requests, patch by sandarac, refs #4431 
This was SVN commit r19116.
 2017-01-06 19:24:15 +00:00
wraitii
2bae30c454 Fix [19027] by using generic code for conversions and fixing a few other issues. Refs #3403. Reviewed by leper. 
Also fix some of the warnings that jenkins showed.

Differential Revision: https://code.wildfiregames.com/D24
This was SVN commit r19115.
 2017-01-06 11:14:03 +00:00
mimo
1a038b1735 fixes a typo in 3c56638e8b, spotted by sandarac 
This was SVN commit r19113.
 2017-01-05 18:00:53 +00:00