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
18366 commits 1 branch 39 tags 169 MiB
Commit graph

18366 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stan
ca09c07f32 Fix the golden fleece and remove now unused textures. 
This was SVN commit r21037.
 2018-01-27 23:15:24 +00:00
bb
2d57478781 Create a saveSettingAndWriteToUserConfig() function to absorb some duplication in the gui 
Patch By: ffffffff
Comments By: leper, mimo
Differential Revision: https://code.wildfiregames.com/D1211
This was SVN commit r21036.
 2018-01-27 20:59:19 +00:00
Stan
cb8a7e48a0 New spears by Alexandermb 
Thread:
https://wildfiregames.com/forum/index.php?/topic/23907-task-spears-remesh/
Completeness by : Stan
Review by Stan

This was SVN commit r21035.
 2018-01-27 15:47:03 +00:00
Gallaecio
1a1f6ba048 build (human units) → train, build (siege weapons) → construct 
This was SVN commit r21034.
 2018-01-27 13:54:12 +00:00
Gallaecio
4e42459c79 Rephrase Druids aura description 
This was SVN commit r21032.
 2018-01-27 12:06:46 +00:00
Itms
b79b783a36 Fix the translation updates by removing a typo in e50beaedc0. 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1259
This was SVN commit r21031.
 2018-01-27 11:52:23 +00:00
mimo
259a4e8e57 fix typo in fe3668aebe 
This was SVN commit r21030.
 2018-01-27 11:06:18 +00:00
mimo
d9809f464e lock teams in some scenarios which would otherwise be unbalanced, fixes #4817 
This was SVN commit r21029.
 2018-01-27 10:56:09 +00:00
mimo
1976f367a3 ai: additional cleanup following fe3668aebe 
This was SVN commit r21028.
 2018-01-27 10:46:03 +00:00
mimo
fe3668aebe petra adaptation to multiple victory conditions, in preparation of D1240 
This was SVN commit r21027.
 2018-01-27 10:10:55 +00:00
elexis
8585040f27 Cleanup TileClass prototype and use vector arguments for countInRadius, countMembersInRadius, countNonMembersInRadius, refs #4992. 
This was SVN commit r21026.
 2018-01-27 04:37:00 +00:00
elexis
2ac7d4fd32 Stop identifying TileClasses by a customly defined TileClassID, but just identify the prototype instance directly, refs #4804, 0e0ed94926. 
Delete hence unneeded validClass, getTileClass, addToClass and
removeFromClass.

Use vectors for the TileClass add and remove function, refs #4992.
Use createArea call for addCivicCenterAreaToClass.

This was SVN commit r21025.
 2018-01-27 04:04:02 +00:00
elexis
de3c50adf0 Floor operation on vectors. 
Useful to get the coordinates of a tile of an entity position for
instance.

This was SVN commit r21024.
 2018-01-27 01:38:23 +00:00
elexis
95179c5e46 Don't trigger a NetServerTurnManager debug breakpoint if a modified or unmodified client sends a non-sequential turnnumber. 
Disconnect that client.

Refs #3643
Differential Revision: https://code.wildfiregames.com/D1256
Reviewed By: echotangoecho
This was SVN commit r21023.
 2018-01-26 23:02:13 +00:00
elexis
c53adeaaa6 Unify structree production queue loading duplication. 
Differential Revision: https://code.wildfiregames.com/D1192
Reviewed By: s0600204
This was SVN commit r21022.
 2018-01-26 22:18:35 +00:00
elexis
2f7610160f Change placeObject, placeStartingWalls, wall builder library and wall demo to use vectors, refs #4845, #4992. 
This was SVN commit r21021.
 2018-01-26 20:53:37 +00:00
elexis
2156171994 Fix hardcoded biome references following the new directory in 626d89a726, refs #4954. 
Sorry for the noise.

This was SVN commit r21020.
 2018-01-26 20:12:17 +00:00
mimo
bfd6cb6e41 The gui shouldn't load again needed templates on each turn 
Reviewed By: echotangoecho
Differential Revision: https://code.wildfiregames.com/D1258
This was SVN commit r21019.
 2018-01-26 19:09:48 +00:00
mimo
61d62207a8 petra: renamed entities were not properly taken into account when they were guarding a critical entity (i.e. hero in regicide mode) 
This was SVN commit r21018.
 2018-01-26 18:22:27 +00:00
elexis
3f4c476476 Fix getHeight call in Latium in c02db59c96 and the setBiome call on Celedonian Meadows following 626d89a726. 
This was SVN commit r21017.
 2018-01-26 17:42:23 +00:00
mimo
97aea21626 petra: fix undefined property reported in D1240 when several victory conditions 
This was SVN commit r21016.
 2018-01-26 17:17:56 +00:00
Imarok
3d6444a999 Fix the positions of the top panel bottom 
Patch by OptimusShepard
Differential Revision: https://code.wildfiregames.com/D1238
This was SVN commit r21015.
 2018-01-25 21:34:14 +00:00
elexis
193eff6d5b Fix AuraManager OOS on rejoin following c90d72deb5 / D1108. 
The AuraManager serialized the affects array of the aura JSON files,
while the Auras components create new affects arrays upon
deserialization.
So the AuraManager of rejoined clients failed to identify and remove the
according aura effects of units who received the aura effect before the
rejoin.

Fix it by not serializing the array but only the strings inside the
array.
It were preferable to rebuild the modification cache and remove the
serialization altogether, refs #3834.

f24523dc8f introduced the same OOS on rejoin, refs #3909, #4239, but it
wasn't noticed due to the revert in d7e51f2a4f.

Differential Revision: https://code.wildfiregames.com/D1201
Reviewed By: bb
Comments By: gameboy
Fixes #4924

This was SVN commit r21014.
 2018-01-25 16:45:58 +00:00
Stan
5f159ea20c Some new icons for the dogs by wowgetoffyourcellphone 
Reviewed by : Stan
Add a new mastiff dog version without spikes (the collar is part of the
mesh so I can't remove it completely)
Tweak the templates to be more like the wolves, hence inheriting the
roaming stuff

This was SVN commit r21013.
 2018-01-25 13:00:08 +00:00
Stan
5d93cbcccd Some new icons by wowgetoffyourcellphone 
Reviewed by : Stan.

This was SVN commit r21012.
 2018-01-25 12:57:06 +00:00
elexis
626d89a726 Extend random biome systme to support map specific biomes, fixes #4954, refs D852 / f2550705d3. 
This was SVN commit r21010.
 2018-01-25 04:44:26 +00:00
elexis
8cd117d489 Fix berries on Danubius following 921850cdef and remove unused translation entry following following 74bfe5fd55. 
This was SVN commit r21009.
 2018-01-25 04:42:12 +00:00
elexis
e047844101 Add uncapturable special filter and use it on Danubius to prevent the palisade walls from being captured right at the gamestart following d5db047c9a. 
Arbitrary special filter AI compatibility was added by 8f05358b5e.

XML file accepted by: bb on irc
This was SVN commit r21008.
 2018-01-25 00:37:25 +00:00
elexis
293342f04d Danubius village / fortress cleanup. 
Don't clone, change and overwrite the gaul stone wallstyle but create
two custom ones from scratch, refs 026dcf10eb / D204.
Move houses away from the gates following ddf868cfdc, so that gaia units
can easily move in and out.
Replace spike template name copies from ddf868cfdc with references.
Try to find a more transparent data structure, at least for the spikes.
Some whitespace changes.

This was SVN commit r21007.
 2018-01-25 00:09:03 +00:00
temple
680ad76249 Fix formation auras 
Differential Revision: https://code.wildfiregames.com/D756
Reviewed by: mimo
Comments by: bb
This was SVN commit r21006.
 2018-01-24 19:17:04 +00:00
temple
b0b24a472b Move minimap color deserialization fix out of the gui 
Differential Revision: https://code.wildfiregames.com/D1250
Reviewed by: elexis
This was SVN commit r21005.
 2018-01-24 19:12:19 +00:00
elexis
3b2273ea55 Fix typo in f27743348e reported by mimo (in 8599a20353). 
This was SVN commit r21004.
 2018-01-24 18:14:22 +00:00
Imarok
7752219cef Unify Gamesetup/Lobby Chat Design 
Patch by fpre/ffffff
Fixes: #4986
Differential Revision: https://code.wildfiregames.com/D1051
This was SVN commit r21003.
 2018-01-24 14:54:47 +00:00
elexis
8599a20353 Complete f27743348e. 
This was SVN commit r21002.
 2018-01-24 05:41:27 +00:00
elexis
f27743348e Delete good old paintClass and unPaintClass proxies and create the painters directly, like we do with the other painters too. 
This was SVN commit r21001.
 2018-01-24 05:11:52 +00:00
elexis
2177a2dca7 Delete createTileClass proxy, refs #4964. 
Even though it prolongs the code, OOP should be prefered.

This was SVN commit r21000.
 2018-01-24 05:02:49 +00:00
elexis
1b7b7fd3ec Move rmgen playerdata getters to the other player-related code, refs #4804. 
This was SVN commit r20999.
 2018-01-24 04:48:29 +00:00
elexis
eb22552c40 Move isCircularMap to RandomMap object and actually use it rather than refering to g_MapSettings, refs #4964. 
Delete leftover from d662ab5a0f and add missing semicolons.

This was SVN commit r20998.
 2018-01-24 04:36:27 +00:00
elexis
d662ab5a0f Move getMapSize to the RandomMap object, refs #4964. 
This was SVN commit r20997.
 2018-01-24 04:28:30 +00:00
elexis
1242356f95 Move getMapCenter and getMapBounds to the RandomMap object, refs #4964. 
The reference to the global should not be hidden behind a proxy function
and
object orientation is preferable over procedural code in general.

This was SVN commit r20996.
 2018-01-24 04:21:22 +00:00
elexis
b11563ddff Delete InitMap and ExportMap proxies and let the random map define the RandomMap object, refs #4804. 
Eventually there should be no direct reference to g_Map in the library,
refs #4964.

This was SVN commit r20995.
 2018-01-24 04:10:00 +00:00
elexis
a97279b4df Use vectors for cornerHeight, getExactHeight, validH and rename the latter to to validHeight, refs #4992. 
Use the height getter and setter rather than directly operating on the
prototype member, which also simplifies the code.

This was SVN commit r20994.
 2018-01-24 04:04:33 +00:00
elexis
b4820b3995 Use vectors for validT and rename it to validTile, refs #4992. 
This was SVN commit r20993.
 2018-01-24 01:34:47 +00:00
elexis
13bd540c45 Fix x/z typo in Schwarzwald in cbcbd19e0b and wrong forest density in Deep Forest in 2ac3d3119d. 
This was SVN commit r20992.
 2018-01-24 01:16:57 +00:00
elexis
19c9a2489a Sacrifice celtic ritual hack, refs 026dcf10eb / D204. 
This was SVN commit r20991.
 2018-01-24 00:24:08 +00:00
elexis
0f52c011d7 Add missing rmgen2 adaptation to Placers returning vectors in 2ac3d3119d. Reported by Grugnas. 
This was SVN commit r20990.
 2018-01-23 22:30:37 +00:00
elexis
5245e9983b Rename expectException from 1cdc8f1356 to TS_ASSERT_EXCEPTION. 
Move it from the test of the testsetup to the setup of the tests, so it
can be reused by tests, refs #4759, D871.

This was SVN commit r20989.
 2018-01-23 20:00:52 +00:00
elexis
b3fa0aaf0f Use vectors for setTexture, refs #4992. 
Simplify duplicate Caledonian Meadows and Wild Lake height-based texture
painting by using for-of loops, texture setter and vectors, refs #4845,
#4998.
Allow setTexture to write to impassable tiles as reported by FeXoR some
time ago, refs #4245.

This was SVN commit r20988.
 2018-01-23 19:42:13 +00:00
mimo
e7c9a2be50 remove a leftover comment in 4c2269135b 
This was SVN commit r20987.
 2018-01-23 18:57:51 +00:00
temple
c4c7b08758 Reset bounding box overlay 
Differential Revision: https://code.wildfiregames.com/D712
Comments by: bb
This was SVN commit r20986.
 2018-01-23 18:48:13 +00:00