1
0
forked from 0ad/0ad
Commit Graph

17914 Commits

Author SHA1 Message Date
215a102c27 Count Trained Cattle as resource and not as unit. Also only count the net amount of gathered/used food for cattle.
Reviewed by: temple
Fixes: #3948
Differential Revision: https://code.wildfiregames.com/D1052
This was SVN commit r20543.
2017-11-27 19:47:45 +00:00
aec1ff5493 Wild domestic animals should stay visible in FOW.
This is broken since 9d232fd39a.

Reviewed by: temple
Differential Revision: https://code.wildfiregames.com/D1071
This was SVN commit r20542.
2017-11-27 19:38:00 +00:00
5ce9a2f19d Rename gui/savedgames/ to gui/savegame/ so that the page XML filename always matches the directory name.
This was SVN commit r20541.
2017-11-27 18:50:06 +00:00
f84d195b9d Fix Builder and ProductionQueue schemas inconsistencies
Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D1070
This was SVN commit r20540.
2017-11-27 18:42:46 +00:00
1375925367 Split locale and locale_advanced GUI page into two directories.
Include the entire directory instead of all files in the directory,
completing D619.

This was SVN commit r20539.
2017-11-27 18:05:34 +00:00
2b31ebad0d Cleanup summary screen init.
First fill all global helper variables before pushing the data to the
GUI (IPO model).
init should always be the first function declaration in a file.
Split and rename init functions.
Fill g_ScorePanelsData from init so that it becomes independent from the
file include order.
Include all files of the summary directory instead of each file
individually, as in D619.

This was SVN commit r20538.
2017-11-27 17:35:55 +00:00
63522189a0 Disjoint save and load GUI page.
Include the entire directory as in D619.

This was SVN commit r20537.
2017-11-27 17:02:24 +00:00
c326b4fab6 Fix lineendings of the new files in 77a2f484a2, 0146c705ce, efd9b3e212.
This was SVN commit r20536.
2017-11-27 16:56:45 +00:00
9950e06d4c Include entire directories in GUI pages instead of a subset of the files contained, where possible.
This allows mods to add new JS files without introducing a hardly
maintainable copy of the XML file.

Differential Revision: https://code.wildfiregames.com/D619
Proofread By: bb
This was SVN commit r20535.
2017-11-27 16:29:23 +00:00
683723faf8 Fix whitespace of createDecoration calls.
Add one missing constraint in mainland of 822e37f70c.
Remove unneeded grass patch min/max angle value.

This was SVN commit r20532.
2017-11-27 01:30:19 +00:00
ff6bb138ba Fix clFood and constraint argument forgotton in createFood calls of 822e37f70c as reported by temple.
Fix whitespace of all createFood calls while at it.

This was SVN commit r20531.
2017-11-27 00:25:04 +00:00
d0ca03d7ba Fix OSX compilation
A check for OSX version that seemed useless broke compilation on Xcode
9.

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D986
This was SVN commit r20530.
2017-11-26 16:50:21 +00:00
6a10797355 gamesetup panel should indicate the AI level without having to open the AI-config panel
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1066
This was SVN commit r20529.
2017-11-26 14:42:10 +00:00
89055ef858 Delete GetCivData from MapGeneratorWorker.cpp which is redundant with the ReadJSONFile from 871ed04521.
Unify civ file loading from gui/common/functions_civinfo.js and
rmgen/library.js in globalscripts/Templates.js.
Delete the two forgotton headers in 4275a8a33c.

Refs #4868, #4804, D900.
Differential Revision: https://code.wildfiregames.com/D1062
Discussed with: leper

This was SVN commit r20528.
2017-11-26 13:30:57 +00:00
ba8d1c6166 Fix Builder test following 3a5be78aa9, refs #4870.
Also fix confusion of playerID and playerEntityID in that test following
c14a7a0b0b.

Differential Revision: https://code.wildfiregames.com/D1067
Reviewed By: bb, Itms
Comments By: Stan
This was SVN commit r20527.
2017-11-26 11:51:59 +00:00
69b7f39bf1 Rename RMS to Engine.
This was SVN commit r20525.
2017-11-25 22:17:01 +00:00
bb
65fe9737b1 Enlarge dropdown size for the ingame gamespeed dropdown, so the scrollbar is hidden for replays.
Patch By: temple
Reviewed By: elexis, vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1053
This was SVN commit r20524.
2017-11-25 19:01:42 +00:00
94db174b25 Fix the pkgconfig premake module when headers are force-included.
This fixes a bug with premake5 happening when using
--with-system-mozjs38.

Tested By: temple
Differential Revision: https://code.wildfiregames.com/D1028
This was SVN commit r20523.
2017-11-25 16:56:56 +00:00
3a5be78aa9 Units should only be able to build structures from their owner's civ, and not from their identity civ
Reviewed By: elexis
Trac Tickets: #4870

Differential Revision: https://code.wildfiregames.com/D1065
This was SVN commit r20521.
2017-11-25 16:22:03 +00:00
60ae523f92 Fix territory borders not showing up on OSX when compiled with the lastest xCode.
The bug came from inlining the copy constructor of Grid, which ended up
reading from un-initialized variables.

Discussed with leper who had a similar fix for a test failure locally.

Fixes #4859

Differential Revision: https://code.wildfiregames.com/D1048
This was SVN commit r20520.
2017-11-25 12:48:37 +00:00
f7206dc77d More ScriptInterface const.
Reviewed By: elexis; some comments by bb
Differential Revision: https://code.wildfiregames.com/D863
This was SVN commit r20519.
2017-11-25 06:49:58 +00:00
60801158b5 Remove +1 in getPlayerTeam and areAllies of rmgen/ and -1 in the calls to that following 8097eeb8ab.
This was SVN commit r20517.
2017-11-25 00:37:41 +00:00
993869ffb8 Remove getTeamsArray copy from Island Stronghold (875a774da9) following the introduction of rmgen2 in 6d52a71d4a (d8ed6d828a).
(Don't replace the starting base code of that map to a call to
placeStronghold because the code in this variant is the only one that
doesn't have resource collisions on tiny maps currently, refs #3851.)

This was SVN commit r20516.
2017-11-25 00:24:44 +00:00
bbe1ddc5cf Corsica & Sardinia player placement simplification, refs 9016b8d866.
The code intended to group players per team on a single island (even if
more than 4 players in one team).
But since it used sortAllPlayers playerIDs instead of onIsland, the
players were not actually grouped per team.
Drop the additional, slightly redundant complexity and just place at
most 4 players per side like the other naval maps do too.
If greater groups per side are wished, it can be changed later
consistently for all maps.

This was SVN commit r20515.
2017-11-25 00:09:33 +00:00
0146c705ce Adds basic tests for the CinemaManager component
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D1013
This was SVN commit r20514.
2017-11-24 22:38:03 +00:00
713a26368e Remove +1 playerID offset in getCivCode and -1 offset in the calls to that following 8097eeb8ab.
This was SVN commit r20513.
2017-11-24 22:16:29 +00:00
446fef2b35 Delete FALLBACK_CIV "athen" and related code in rmgen/, refs #4034.
It was only triggered if a civ wasn't set in Atlas.
Because civs are expected to be well-defined everywhere, alwas set the
property in Atlas too, fixing the non-GUI part of #4869.
Use the existing player defaults value then instead of hardcoding a
fallback civ string.

This was SVN commit r20512.
2017-11-24 21:01:12 +00:00
817763f6ef petra: improve the way to detect that an ally is attacked
This was SVN commit r20511.
2017-11-24 20:08:04 +00:00
2662a0297a petra: decrease the number of trained siege units in easier difficulty levels
This was SVN commit r20510.
2017-11-24 19:58:55 +00:00
9687a7af1a AIManager: loads only the used templates when starting (or deserializing) a game
Discussed with leper

Differential Revision: https://code.wildfiregames.com/D1049
This was SVN commit r20509.
2017-11-24 19:13:28 +00:00
c0439d04a2 New gaul stable
Reviewed by Lordgood.

This was SVN commit r20508.
2017-11-24 17:27:12 +00:00
4275a8a33c Unify two rmgen and GUI JSON file loading script functions, refs #4868.
Revert the introduction of the exact copies of FileExists ReadJSONFile
functions in MapGenerator.cpp introduced by 871ed04521.
Include JSInterface_VFS.cpp from MapGenerator.cpp to remove that code
while gaining the other missing VFS file loading functions in rmgen/.
Split RegisterScriptFunctions of JSInterface_VFS.cpp from eb4e66aab3
into RegisterReadOnlyScriptFunctions and RegisterWriteScriptFunctions to
prevent unintentional write access.

This was SVN commit r20507.
2017-11-24 17:19:16 +00:00
7a17a3152c Pass the size in meters of a terrain grid tile from Terrain.h to the rmgen JS code to avoid hardcoding thereof.
Refs #4034, D900
Differential Revision: https://code.wildfiregames.com/D1059
Reviewed By: s0600204
This was SVN commit r20504.
2017-11-23 20:54:48 +00:00
4734997098 Always generate the island on Phoenician Levant (by using 100 intead of 10 retries).
Fix resource collisions on that island.
Incrase the radius, not the area of the island proportionally to the map
radius.
Prevent the island from becoming passable without ships.
Use the non-deprecated createObjectGroups variant.

This was SVN commit r20503.
2017-11-23 10:18:05 +00:00
bb
e6dff349bd Fix scrollbare edgy-case and off by 1's in dropdown
Reviewed By: Imarok
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D1030
This was SVN commit r20500.
2017-11-21 20:07:23 +00:00
bb
2fa4457453 Allow walls to have rally-points
While at it also nuking some duplicate template entries

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1038
This was SVN commit r20498.
2017-11-21 17:06:48 +00:00
235f452765 Let units face away from the building they were trained or ungarrisoned from.
Uses the vector functions from 8ee2a8aca2 and fixes the TODO from
08db7ebe13 / 0aaddf62aa.

Differential Revision: https://code.wildfiregames.com/D1037
Patch By: temple
This was SVN commit r20497.
2017-11-21 16:22:09 +00:00
8ee2a8aca2 Add Vector2D angleTo and Vector3D horizAngleTo function.
Use it to illustrate the building placement preview rotation and
focusing of attacked units.

Split from D1037
Patch By: temple
This was SVN commit r20496.
2017-11-21 16:17:30 +00:00
7e8849366b Remove useless ungiven specific names, add drop props for the briton workshop, and fixed a broken drop prop in the elephant stable that caused warnings. convert files from utf-8 with bom, to without. fixes 8ee600b979
This was SVN commit r20495.
2017-11-21 14:47:11 +00:00
70e7c5e806 Fix broken (as with wrong parent) template. noticed by Imarok
fixes c6356b41b4

This was SVN commit r20494.
2017-11-21 14:42:39 +00:00
c6356b41b4 mauryan range and workshop
This was SVN commit r20492.
2017-11-21 13:22:04 +00:00
4e8eac9857 Change onager footprint to better reflect its shape add player color and icon (Textures edited by WowGetOffYourCellPhone)
And change its specific name to onager

This was SVN commit r20491.
2017-11-21 09:23:32 +00:00
19c123b213 New tools made by Alexandermb + fix for the berry basket uv (UV was out of bounds, and since texture do not tile, it appeared stretched)
reviewed by Lordgood

This was SVN commit r20488.
2017-11-20 22:51:08 +00:00
f737bc4be0 put back a line removed unintentionally in 1af6ccbd41
This was SVN commit r20487.
2017-11-20 18:32:55 +00:00
2bde5874a7 fix an inconsistency in 3b6c612975, noticed by leper
This was SVN commit r20486.
2017-11-20 18:30:21 +00:00
9cdf20f123 New goat mesh, reviewed by Lordgood and Wowgetoffyourcellphone.
Made on fatherbushido's request.

This was SVN commit r20485.
2017-11-20 17:14:47 +00:00
b244e5db78 Fix broken fireraiser actor, and unify them. Use Alexandermb's units as placeholders for the time being.
This was SVN commit r20484.
2017-11-20 16:29:47 +00:00
23e750ac88 New siege fire animations for units, made by AlexanderMb and some cleanup in those files done by myself.
Reviewed by Lordgood

This was SVN commit r20483.
2017-11-20 16:28:45 +00:00
f132e1ca66 Add new textures for Pureon's onager, so it can be used as a unit, or as a prop.
This was SVN commit r20482.
2017-11-20 16:08:11 +00:00
3b6c612975 allow the ai to run without loading all templates at startup (not yet enabled).
This was SVN commit r20480.
2017-11-19 19:05:54 +00:00