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

16400 commits

This branch
This branch
All branches
Author SHA1 Message Date
Itms
caef42084d Add missing JSAutoRequest calls. (hopefully all of them have been spotted now) 
Patch by echotangoecho, refs #4053

This was SVN commit r18730.
 2016-09-18 09:34:45 +00:00
Itms
184d64cdc8 Fix building on Fedora, by adding the Position Independant Code flag when building with gcc. This flag is not supposed to break anything and did not cause troubles when testing it on some other platforms than Fedora. 
Based on patch by bb, fixes #3869

This was SVN commit r18729.
 2016-09-18 08:54:27 +00:00
elexis
eb09c2a8c5 Show the portrait of the most common (or most costly) unit type in the selection group buttons on the left hand side. Patch by Imarok, fixes #2163. 
This was SVN commit r18728.
 2016-09-16 10:47:00 +00:00
Itms
72a26857e9 Use the current OS X version instead of a hardcoded value in the path to the OSX development tools, when building the OSX bundle. 
Patch by jurgemaister, plus some little fixes, fixes #3884.
Tested on OSX 10.11.

This was SVN commit r18726.
 2016-09-15 13:41:16 +00:00
elexis
c92e74138a Use the local timezone when localizing UTC timestamps. Patch by Imarok, fixes #3350, refs #2938. 
Thus show the correct time in the lobby, savegame and replay menu.

This was SVN commit r18725.
 2016-09-15 13:16:48 +00:00
elexis
5d3f1ce348 Extend the shared ally vision tech tooltip to mention the allied summary screen entries and the resource / population tooltips. Patch by Imarok, reviewed by fatherbushido. 
This was SVN commit r18724.
 2016-09-13 16:54:39 +00:00
elexis
1ca4c7c988 List Bahrain as a naval map, since ships are required to cross the persian gulf to Bahrain and Qatar. 
This was SVN commit r18723.
 2016-09-12 22:15:07 +00:00
fatherbushido
85a187b89f Tweaks hp modification of the phase city tech to keep the current balance as tech modifications calculations changed in 9368ffe345. 
This was SVN commit r18722.
 2016-09-12 15:38:13 +00:00
elexis
c43654c120 Display the number of clients too when typing the /list chat command. 
This was SVN commit r18720.
 2016-09-12 02:23:19 +00:00
elexis
24a488bacc Increase the maximum observer limit to 32 for the upcoming release, refs #4210. 
This was SVN commit r18719.
 2016-09-11 22:46:00 +00:00
Itms
5f67763e97 Remove or fix some broken art files. Bring wrld_med_plant.png back from the dead. 
Based on patch by stanislas69, refs #2524
Fixes #3796

This was SVN commit r18718.
 2016-09-11 16:28:45 +00:00
elexis
ca51672225 Fix typo in a68881dd0f. 
This was SVN commit r18717.
 2016-09-11 15:30:06 +00:00
fatherbushido
fb9da87264 Restores armour entry in economic structure template wich was mistakenly removed in 27c46a0a68. Slighty reduces stats compares to a20. Fixes #4195. Reported by Warbeast. Agreed by scythetwirler. Reviewed by elexis. 
This was SVN commit r18716.
 2016-09-10 11:24:22 +00:00
elexis
a68881dd0f Five new random map scripts by _kali: Bahrain, Harbor, Howe Sound, Ngorongo and Rouen. 
Besides harbor, they are portraying actual geographic regions.
Some environmental improvements by niektb.

This was SVN commit r18714.
 2016-09-07 20:06:01 +00:00
elexis
f63cef5ad0 Fix few typos in comments. 
This was SVN commit r18713.
 2016-09-07 17:02:25 +00:00
Itms
a8403bd7e5 Add a linker flag on Windows allowing the game to be large address aware. This allows the game to use more than 2GB of RAM. https://msdn.microsoft.com/en-us/library/wz223b1z.aspx 
However, this can mask memory issues, so this flag will not be enabled
by default. The autobuilder will use it, so SVN playtesters and release
users can benefit from it. Windows users compiling the game themselves
will have the 2GB limitation.

Fixes #4190, refs #1619, #4191
Flag tested by Stan

This was SVN commit r18711.
 2016-09-07 09:03:47 +00:00
FeXoR
64b1da0ddf Adds globalscripts/BicubicInterpolation.js, the corresponding license_mit.txt and points to it for other files with the same license in LICENSE.txt - reviewed by Philip and Itms. Uses that to fix an interpolation issue in gaia.js and also fixes a "fail by one" there - reviewed by elexis. Fixes #4174 
This was SVN commit r18710.
 2016-09-06 21:49:57 +00:00
fatherbushido
a673a330a5 Fixes a typo in 8c6944f58f. 
This was SVN commit r18709.
 2016-09-06 13:14:51 +00:00
fatherbushido
baed376b06 Removes Town class from wallset template. It was misleading because palisades and walls are not Town structure and they didn't even count as such buildings because the built walls don't inherit class from wallset. 
This was SVN commit r18708.
 2016-09-06 12:47:09 +00:00
fatherbushido
8c6944f58f Adds Capturable component tests. Fixes a message. Thanks elexis and sanderd17 for the remarks. Fixes #4149. 
This was SVN commit r18707.
 2016-09-05 20:02:33 +00:00
fatherbushido
58c8812cc7 Removes duplicated entries in crannog template. Noticed by Imarok. 
This was SVN commit r18706.
 2016-09-05 14:08:55 +00:00
fatherbushido
417aec9495 Fixes village, town, city classes inconsistencies in templates. Reported by WarBeast. Refs #4147. 
This was SVN commit r18705.
 2016-09-05 12:45:07 +00:00
Itms
b60cf4663d Whitespace fixes, patch by echotangoecho, refs #1619 
This was SVN commit r18704.
 2016-09-05 08:34:19 +00:00
elexis
c056b9bfb9 Fix critical gamesetup bug again where the game can't be started after a previously assigned disconnected client rejoins a full game. Same as #3602, reintroduced by b642f0d876, refs #3120. Fixes #4120. 
This was SVN commit r18702.
 2016-09-05 02:15:04 +00:00
elexis
565709701e Hide the "I'm ready" button to observers. Patch by echotangoecho, fixes #4112. 
Right-align the affected buttons and neighboring GUI objects.

This was SVN commit r18701.
 2016-09-05 01:53:08 +00:00
elexis
f61f051d74 New random map script Marmara by _kali, reviewed by niektb. 
This was SVN commit r18700.
 2016-09-04 22:30:03 +00:00
elexis
c118467c33 Fix broken transparency of the mediterranean mappreview image. 
This was SVN commit r18699.
 2016-09-04 22:25:57 +00:00
fatherbushido
ff2fe5d04a Fixes immortals technology as it affected also the persian mercenary champion spearman. Reported by WarBeast. 
This was SVN commit r18698.
 2016-09-04 21:36:45 +00:00
elexis
488b4482d9 Skirmish map Two Seas overhaul by Stan, refs #2881. 
Adds starting resources and units, forests, mines, animals, treasures
and some decoratives.

This was SVN commit r18697.
 2016-09-04 21:19:14 +00:00
elexis
e0c30745f9 Template manager cleanup. Patch by leper, refs #2951. 
Move an early return to the top of the function.
Add an early return in case an error was determined.
Remove unneeded variables ok and templatePath.
Replace includeSubdirectories boolean with a flags int to merge
duplicate vfs::ForEachFile calls.

This was SVN commit r18696.
 2016-09-04 15:28:36 +00:00
fatherbushido
2e1441d2ba Fixes a copy paste error introduced in 46ead523b8 for a roman hero aura, noticed by WarBeast. Reviewed by elexis. 
This was SVN commit r18695.
 2016-09-04 10:34:57 +00:00
elexis
c2078bd0c6 Supress an error warning that isn't valid for unsortable ordered lists and hide sorting sprites if sorting is disabled. Based on patch by Imarok, refs #3905. 
This was SVN commit r18694.
 2016-09-03 22:22:11 +00:00
fatherbushido
53d5f9f573 Adds melee cavalry to garrison arrow classes for some buildings and ships that can garrison cavalry. Previously all ranged units and all infantry were allowed wich was misleading. Discussed with Yves and reviewed by elexis. 
This was SVN commit r18693.
 2016-09-03 13:09:08 +00:00
elexis
317502d915 Objectives dialog. Icon by Lionkanzen. Reviewed by bb, fixes #3263 #4141. 
Explain the new victory conditions and last man standing option in the
gamesetup.
Add an ingame dialog showing these explanations and all other chosen
gamesetup options,
so that players don't have to recall them and late observers don't have
to ask.

This was SVN commit r18692.
 2016-09-03 09:11:02 +00:00
elexis
9b52dfb554 Allow queuing orders if an action is preselected. Patch by Imarok, refs #1720. 
This was SVN commit r18691.
 2016-09-03 07:42:08 +00:00
Itms
8284cc4302 SpiderMonkey 38 upgrade: 35/35 
Some comments for the next SpiderMonkey upgrade. That's all folks, fixes
#3708

This was SVN commit r18689.
 2016-09-02 16:55:13 +00:00
Itms
2a33c4476f SpiderMonkey 38 upgrade: 34/35 
Use the C++ API for Maps. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1121332

This was SVN commit r18688.
 2016-09-02 16:54:00 +00:00
Itms
0cc23c1964 SpiderMonkey 38 upgrade: 33/35 
Remove a workaround. Note that this removal is incomplete. Based on
patch by leper.

This was SVN commit r18687.
 2016-09-02 16:53:22 +00:00
Itms
9b794593db SpiderMonkey 38 upgrade: 32/35 
JS_GetStringCharsAndLength was removed, use
JS_Get{Latin1,TwoByte}StringCharsAndLength instead.

Actually handle strings in both the Latin1 and TwoByte cases since we
need to.
This saves some space when serializing and also when running as they are
stored that way in the vm.
Also handle the error case.

Patch by leper.
For more information:
https://blog.mozilla.org/javascript/2014/07/21/slimmer-and-faster-javascript-strings-in-firefox/
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1037869

This was SVN commit r18686.
 2016-09-02 16:51:09 +00:00
Itms
72ec5d9767 SpiderMonkey 38 upgrade: 31/35 
Remove workaround for crash when using multiple ctxts per runtime, this
was fixed upstream. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=890243 and
https://bugzilla.mozilla.org/show_bug.cgi?id=905926

This was SVN commit r18685.
 2016-09-02 16:50:07 +00:00
Itms
f06eb5536b SpiderMonkey 38 upgrade: 30/35 
Upstream added a compartment option to preserve JIT code during
non-shrinking GCs, so use it. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1068697

This was SVN commit r18684.
 2016-09-02 16:48:41 +00:00
Itms
27c434e2bd SpiderMonkey 38 upgrade: 29/35 
We now have better error messages, so fix the tests to account for that.
Patch by leper.

This was SVN commit r18683.
 2016-09-02 16:47:33 +00:00
Itms
fe52bf0457 SpiderMonkey 38 upgrade: 28/35 
The GC API changed to have explicit start and step methods, and the
start/shrink cases now take the gc kind as a parameter. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1099152

This was SVN commit r18682.
 2016-09-02 16:46:39 +00:00
Itms
80c8c2c3d6 SpiderMonkey 38 upgrade: 27/35 
JS_NewRuntime had the useHelperThreads param removed and a
maxNurseryBytes param added. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=941805 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1034621

This was SVN commit r18681.
 2016-09-02 16:45:45 +00:00
Itms
58cace1156 SpiderMonkey 38 upgrade: 26/35 
JS_Define{,UC}Property{,ById} has the attrs parameter moved in front of
the getter and setter params. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=959787
https://bugzilla.mozilla.org/show_bug.cgi?id=1088002 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1211607

This was SVN commit r18680.
 2016-09-02 16:44:33 +00:00
Itms
99534a15f1 SpiderMonkey 38 upgrade: 25/35 
Remove the proto parameter from JS_DefineObject. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1127494

This was SVN commit r18679.
 2016-09-02 16:41:36 +00:00
Itms
ffd4207c30 SpiderMonkey 38 upgrade: 24/35 
Work around upstream API breakage by moving from a define to a const
member and not using the namespace explicitly.

This is caused by https://bugzilla.mozilla.org/show_bug.cgi?id=896116
and this patch by leper was submitted at
https://bugzilla.mozilla.org/show_bug.cgi?id=1236373

This was SVN commit r18678.
 2016-09-02 16:40:01 +00:00
Itms
ef6d1c77c8 SpiderMonkey 38 upgrade: 23/35 
JS_GetArrayBufferData now takes an AutoCheckCannotGC parameter. Patch by
leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1061288

This was SVN commit r18677.
 2016-09-02 16:38:31 +00:00
Itms
c396155ad8 SpiderMonkey 38 upgrade: 22/35 
Parallel compilation was renamed to Offthread compilation. Patch by
leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1020364

This was SVN commit r18676.
 2016-09-02 16:37:35 +00:00
Itms
2db0fb27ae SpiderMonkey 38 upgrade: 21/35 
The naming conventions for typed array types changed. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1021790

This was SVN commit r18675.
 2016-09-02 16:36:40 +00:00