1
0
forked from mirrors/0ad
Commit Graph

11877 Commits

Author SHA1 Message Date
elexis d97542e9c6 Fix missing update to options.json in be06299e28 / D1128.
This was SVN commit r20946.
2018-01-21 17:09:07 +00:00
bb ac7b5ce861 New UI for gamesetup settings
Nuke the more options window
Create 3 tabs containing all options from more options and map options,
giving more space for new options
Rename options => settings in gamesetup

Reviewed By: elexis
Comments By: ffffffff and gentz
Differential Revision: https://code.wildfiregames.com/D1027
This was SVN commit r20945.
2018-01-21 12:35:47 +00:00
Stan 7c338b5755 Add missing icons, and update boudica's
Noticed by: mimo.
This was SVN commit r20944.
2018-01-20 20:03:12 +00:00
elexis df3a64c269 Unify Corsica & Sardinia and Pyrennean Sierra slope and smoothened height computation, refs #4805, 9016b8d866, a796800bb1.
Receive vectors as arguments, refs #4992 and don't introduce a RandomMap
object proxy.

This was SVN commit r20943.
2018-01-20 19:25:00 +00:00
Stan bae4156c3a Fix chamfron for champion ptol cavalry.
Noticed by: Wackyserious
This was SVN commit r20942.
2018-01-20 17:19:29 +00:00
Stan 3725f69e11 New peytrals textures by wackyserious
Reviewed by: Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/23863-task-improved-horse-and-elephant-peytrals/&tab=comments#comment-346412

This was SVN commit r20941.
2018-01-20 16:45:40 +00:00
elexis 5eead1d77a Fix typo in c5b7ecefa1 reported by Imarok.
This was SVN commit r20940.
2018-01-20 16:40:21 +00:00
mimo 2214f206b7 Garrisoned units are lost after an upgrade towards a non garrison holder
Differential Revision: https://code.wildfiregames.com/D1228
This was SVN commit r20939.
2018-01-20 15:22:02 +00:00
mimo 1bcc70a1cc fix miraged properties in GuiInterface changes from 30f0e80dae
Differential Revision: https://code.wildfiregames.com/D1230
This was SVN commit r20938.
2018-01-20 15:09:42 +00:00
mimo cfda5f8a02 petra: fix builder counters when one builder is created and destroyed in the same ai-turn, fixes #4991
This was SVN commit r20937.
2018-01-20 13:03:33 +00:00
elexis 8cfd8cd845 Use vectors for positions in setHeight in random map scripts.
This was SVN commit r20936.
2018-01-20 05:29:35 +00:00
elexis 899041f107 Pass vectors from paintRiver to the map script, refs #4992.
This was SVN commit r20935.
2018-01-20 04:50:23 +00:00
elexis 46dee69668 Randomize map angle on Guadalquivir River and Latium (refs 903e094f62), fixes #4855, refs
This was SVN commit r20934.
2018-01-20 04:16:48 +00:00
elexis 903e094f62 Randomize map angle on random maps with linear playerposition pattern, refs #4855, #4845.
This was SVN commit r20933.
2018-01-20 02:21:22 +00:00
elexis 5519742e7f Move ExportMap code from global helper to RandomMap object, refs #4804.
Delete WATER_LEVEL_CHANGED global, refs #4964.

This was SVN commit r20932.
2018-01-20 00:41:25 +00:00
Stan 664821a5e0 Add back the capture anim i previously removed from the actor in 097c19a6a0 thanks elexis for making me notice.
This was SVN commit r20931.
2018-01-20 00:20:38 +00:00
Stan 487e29c2ae New pouch for macedonians slingers
Reviewed by : Wowgetoffyourcellphone, Wackyserious
Discussion
:https://wildfiregames.com/forum/index.php?/topic/22184-task-hellenic-unit-textures/

This was SVN commit r20930.
2018-01-20 00:06:47 +00:00
Stan 097c19a6a0 Add templates for some heroes who already have actors
Discussion here:
https://wildfiregames.com/forum/index.php?/topic/23825-creating-templates-for-heroes/

This was SVN commit r20929.
2018-01-19 23:51:33 +00:00
elexis 28a0b0068d Cleanup smoothing on Pyrenean Sierra, refs a796800bb1.
Remove unnoticeable randomization near the shore and specific texturing
of parts of the passages.

This was SVN commit r20928.
2018-01-19 23:17:21 +00:00
Stan e05135d5e0 New cavalry icons by Wowgetoffyourcellphone for iberians, last was carthaginians.
Reviewed by : Stan

This was SVN commit r20927.
2018-01-19 23:02:58 +00:00
Stan e17ca101ab New cavalry icons by Wowgetoffyourcellphone for Iberians
Reviewed by : Stan

This was SVN commit r20926.
2018-01-19 23:00:49 +00:00
Stan ca4a3d55a4 New cavalry icons by Wowgetoffyourcellphone for gauls
Reviewed by : Stan

This was SVN commit r20925.
2018-01-19 22:49:14 +00:00
Stan 5576d5c78b New cavalry icons by Wowgetoffyourcellphone for brits
Reviewed by : Stan

This was SVN commit r20924.
2018-01-19 22:37:36 +00:00
Stan fd7100ddd1 New cavalry icons by Wowgetoffyourcellphone for spartiates
Reviewed by : Stan

This was SVN commit r20923.
2018-01-19 22:33:32 +00:00
Stan e5aa7285a0 Move unused icons files to the art source
This was SVN commit r20922.
2018-01-19 22:29:33 +00:00
Stan abb8aaed16 New cavalry icons by Wowgetoffyourcellphone for seleucids
Reviewed by : Stan

This was SVN commit r20921.
2018-01-19 22:17:00 +00:00
Stan 49dcd1c886 New cavalry icons by Wowgetoffyourcellphone for ptolemies
Reviewed by : Stan

This was SVN commit r20920.
2018-01-19 22:02:07 +00:00
Stan 5786bc03f4 New cavalry icons by Wowgetoffyourcellphone for persians
Reviewed by : Stan

This was SVN commit r20919.
2018-01-19 21:54:06 +00:00
Stan 5323baaa50 New cavalry icons by Wowgetoffyourcellphone for mauryans
Reviewed by : Stan

This was SVN commit r20918.
2018-01-19 21:52:36 +00:00
Stan 39fa3f5ecd New cavalry icons by Wowgetoffyourcellphone for macedonians
Reviewed by : Stan

This was SVN commit r20917.
2018-01-19 21:47:19 +00:00
Stan 616f33d34c New cavalry icons by Wowgetoffyourcellphone for romans
Reviewed by : Stan

This was SVN commit r20916.
2018-01-19 21:42:42 +00:00
elexis 4cd1161c2d Allow calling fractionToTiles and scaleByMapSize before RandomMap initialization, used by e084885ce9 already.
This was SVN commit r20915.
2018-01-19 21:24:04 +00:00
elexis e084885ce9 Pyrenean Sierra sigmoid-based Mountainrange cleanup, refs a796800bb1.
Use vector algebra and remove duplication, refs #4845, #4805.
Unify the first createTerrain call with InitMap.
Move mountain constants and the information which height receives which
texture to the top.

This was SVN commit r20914.
2018-01-19 20:24:36 +00:00
elexis 3361ff0997 Fix variable naming in Botswanan Haven in c5b7ecefa1 reported by mimo.
This was SVN commit r20913.
2018-01-19 19:11:53 +00:00
elexis cb82a9a84f Move BaseTerrain from the random map JSON files to all other terrain names used by the script.
The gamesetup will never be able to do something useful with it,
especially change it as an option, so it shouldn't be in the JSON file.
Fixes #4973.

This was SVN commit r20912.
2018-01-19 02:21:32 +00:00
elexis 5764ab9021 Cleanup volcano sizes, refs #4939.
This was SVN commit r20911.
2018-01-19 01:23:18 +00:00
elexis 78c2988e88 Randomize map orientation on most river maps, Gulf Of Bothnia and Migration to remove hardcoded magic numbers and add more variation for the player.
Refs #4855, #4845.

This was SVN commit r20910.
2018-01-19 01:09:36 +00:00
elexis 7656cc2eb7 Fix lobby registration of AIBehavior missed in 9c180f660f and 3319c69d97. Fixes #4959.
This was SVN commit r20909.
2018-01-18 21:22:34 +00:00
Stan c56a2381a1 Fix incorrect horse variant noticed by Alexandermb.
This was SVN commit r20908.
2018-01-18 19:24:48 +00:00
elexis e4d5e781d7 Fix fish on mountains on Harbor in a68881dd0f and a wrong negation in c5b7ecefa1. Fixes #4575.
This was SVN commit r20907.
2018-01-18 18:16:06 +00:00
elexis 32210bc6cb Fix pigs and chicken inside the CC and mines on Deep Forest by not using the terrain-painting based approach of placing entities which is free of any collision checks.
Fixes #4830.

This was SVN commit r20906.
2018-01-18 17:59:07 +00:00
elexis bd7ce79966 Delete getMapArea, fractionToSize, sizeToFraction.
Areas proportional to the map radius are easier to comprehend than areas
proportional to the square with the map diameter for sides.

This was SVN commit r20905.
2018-01-18 17:10:57 +00:00
elexis c5b7ecefa1 Delete BaseHeight property from random map JSON files and rmgen library, refs #6, #4973, 9ee44bd9b8, 0e0ed94926.
The height is only a concern to the random map script, not the rmgen
library, nor the gamesetup, nor the simulation.

Reveals the actual initial elevation to the random map script author
without looking up the JSON file.
Group and rename all height constants of random maps below the template
names.
Rename waterHeight to heightSeaGround to prevent confusion with the
actual waterlevel.
Remove useless paintTerrainBasedOnHeight calls on African Plains and
Polar Sea.

This was SVN commit r20904.
2018-01-18 13:57:11 +00:00
elexis d40616c68e Fix Wild Lake in 442c9848b8.
This was SVN commit r20903.
2018-01-18 13:36:59 +00:00
elexis 6462653351 Delete placeTerrain which is just a proxy of createTerrain.
This was SVN commit r20902.
2018-01-17 23:51:28 +00:00
elexis a6c7b4de98 Simplify and inline createSimpleTerrain.
This was SVN commit r20901.
2018-01-17 23:36:11 +00:00
elexis 1ad10e5999 Merge InitMap, initTerrain and resetTerrain successors from 6d33c2eab7.
Lets the random map script decide which baseTerrain and baseHeight it
wants to use before initializing the map,
rather than painting what is in the JSON file, then changing ones mind
and painting something else on top of it.
This cleaner heightmap initialization incidentally addresses the
uninitialized border of the heightmap in that commit (excluding the
Unknown).

This was SVN commit r20900.
2018-01-17 23:27:06 +00:00
mimo 583873103f petra: add a protection for mods without the expected metadata
This was SVN commit r20899.
2018-01-17 22:06:27 +00:00
elexis dfa618903b Rename random map Map to RandomMap, so that it doesn't overwrite the native JS Map object, fixes #4961.
This was SVN commit r20898.
2018-01-17 19:19:21 +00:00
elexis c21ca495f8 Fix a forgotton line in e9e983c2d4 and mess with a 1-tile workaround.
This was SVN commit r20897.
2018-01-17 19:12:22 +00:00