gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
18,352 Commits 1 Branch 39 Tags
c53adeaaa60e36992736c4aac083dd2e8ea9cd7f
Commit Graph

18352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mimo 4c2269135b petra: improve a08606a9d9 so that it also works in naval maps 
This was SVN commit r20985.
 2018-01-23 18:46:53 +00:00
elexis 366db189e8 Fix consistent-return linting issue reported by mimo in 442c9848b8. 
This was SVN commit r20984.
 2018-01-23 17:59:59 +00:00
elexis c02db59c96 Use vectors for getHeight and remove the global proxy, refs #4992. 
This was SVN commit r20983.
 2018-01-23 17:54:30 +00:00
mimo 5025bcb1c5 fix loot warning from d8ed8b1462 reported by temple 
This was SVN commit r20982.
 2018-01-23 17:53:42 +00:00
elexis e9394e2f75 Fix missing change in Ardennes Forest in 2ac3d3119d and create the explorable Area correctly following 9272153ee7. 
This was SVN commit r20981.
 2018-01-23 17:49:04 +00:00
elexis a5de00b9c4 Use vectors in the Terrain prototype, refs #4992. 
This was SVN commit r20980.
 2018-01-23 16:52:01 +00:00
elexis 55a0d194b5 Use vectors for inMapBounds, refs #4992. 
This was SVN commit r20979.
 2018-01-23 15:52:58 +00:00
elexis 1b786af5ad Use vectors in Constraints, refs #4992. 
This was SVN commit r20978.
 2018-01-23 15:31:25 +00:00
elexis 2ac3d3119d Return vectors instead of objects with x and z property for all Placers and Painters, refs #4992, #4845. 
Create the vectors sooner, so that the conditions can use them
eventually too and since the loops might be replaced with vector
getters.
Fix missing comma in Deep Forest de2f30c7b9.
No measurable performance decline was noticed.

This was SVN commit r20977.
 2018-01-23 14:49:31 +00:00
elexis 5447a20318 Delete checkIfInClass proxy from 59ce8b3081. 
This was SVN commit r20975.
 2018-01-23 04:43:08 +00:00
elexis 6550d3a71c Pass vectors to the ChainPlacer instead of the components individually, refs #4992, #4845. 
Support non-integer numbers.

This was SVN commit r20974.
 2018-01-23 03:40:39 +00:00
elexis 23e0a6c888 Pass a vector to createStoneMineFormation, refs #4992. 
On India,
remove another mysterious lake size area factor on India, refs #4958,
increase the lakesize on small maps and
simplify constraints.

This was SVN commit r20973.
 2018-01-23 03:16:28 +00:00
elexis 948c0b1026 Revert ineffective Alpine Lakes code from a2477f9d40. 
It is ineffective because the first action of createAreas is to
overwrite the carefully chosen location with a random location.
The code was evidently copied to Island Stronghold, Polar Sea and
African Plains, refs #4805.

This was SVN commit r20972.
 2018-01-23 02:50:55 +00:00
elexis de2f30c7b9 Pass a vector to the ClumpPlacer instead of the vector components individually, refs #4992. 
Support non-integer values and remove some unneeded floor / rounds.
Use more vector math in Caledonian Meadows, Oasis and Wild Lake, refs
#4845.

This was SVN commit r20971.
 2018-01-23 00:25:39 +00:00