1
0
forked from 0ad/0ad
Commit Graph

13027 Commits

Author SHA1 Message Date
e9e05f4efc Second (main) commit for the SpiderMonkey upgrade.
This commit contains all the required changes to our source files and
build scripts (hopefully).
A next commit will remove the old stuff of SpiderMonkey 1.8.5.

Spcial thanks to:
 - H4writer who helped a lot mainly with the performance issues we
had/have, but also with other problems or questions.
 - Leper for the review.
 - Historic_bruno for implementing the build scripts on Mac OS X and
testing on the Mac.
 - The people from the #jsapi channel and from
mozilla.dev.tech.js-engine who answered a lot of questions and helped
solving problems.
 - All the other people who helped

Refs #1886
Fixes #2442
Fixes #2416

This was SVN commit r14877.
2014-03-28 20:26:32 +00:00
6f6b841af3 Upgraded ptoemaic quinquereme textures and made the model narrower.
This was SVN commit r14875.
2014-03-28 16:03:32 +00:00
0d9a7dab6b Works around infinite recursion problem.
This problems occurs with the new SpiderMonkey in debug mode, but it's
not a SpiderMonkey issue.
Unfortunately I couldn't find a clean solution, so I just documented the
problem in an extensive comment block and applied a workaround.
A clean solution would probably require changing the approach for
counting allocations completely.

This was SVN commit r14874.
2014-03-28 11:33:37 +00:00
0419f5500e another set of petra improvments, main one is a first try to place markets for trade (was random before)
This was SVN commit r14873.
2014-03-27 22:10:03 +00:00
0a32b2d687 Ptolemaic trireme commit.
Fixed some texture stretching in the bireme.

This was SVN commit r14872.
2014-03-27 18:13:07 +00:00
bc428e1649 some fixes (i.e.building placement) and cleanings of petra
This was SVN commit r14871.
2014-03-26 21:07:47 +00:00
52af5b29a1 Ptolemaic bireme commit.
Fixed error in sparten temple when destroyed found bi Sanderd17

This was SVN commit r14870.
2014-03-26 20:34:54 +00:00
7c0c294814 Move some resources to passable terrain
This was SVN commit r14869.
2014-03-26 18:28:00 +00:00
d5ff29d181 fix a flaw in UnitAI trade management
This was SVN commit r14868.
2014-03-26 09:11:06 +00:00
3dfa858229 remove some leftover warnings in petra
This was SVN commit r14867.
2014-03-25 19:26:45 +00:00
5de3b30742 fix previous tag
This was SVN commit r14866.
2014-03-24 22:51:15 +00:00
97afd25171 commit first version of new ai bot (named Petra)
This was SVN commit r14865.
2014-03-24 22:33:50 +00:00
b03e3644ac add a few usefull functions in ai/common-api
This was SVN commit r14864.
2014-03-24 22:15:40 +00:00
90b9926ca1 Fixes warning showing up with the new SpiderMonkey.
The changed return value isn't related but returning false makes more
sense there IMO.

Refs #2372

This was SVN commit r14863.
2014-03-22 23:31:40 +00:00
5372b27142 Silences some warnings that show up on the gamesetup screen with the new SpiderMonkey without changing any behaviour.
Refs #2372

This was SVN commit r14862.
2014-03-22 13:54:10 +00:00
3fb46640cc Fix civ for Ptol Military Colony.
This was SVN commit r14861.
2014-03-21 22:51:47 +00:00
907ef01322 Added starting units to Deccan Plateau.
Added some detail to Nile River.

Updated Syria a little bit.

Added Pureons new tech portraits to some techs.

Portrait for Ptol champ elephant.

Gave the Military Settlement system to the Ptolemies. We'll use their
merc camp for a developing merc camp system. Ptol heroes can found civic
centers just like the Sele heroes.

This was SVN commit r14860.
2014-03-21 00:47:23 +00:00
2eeb7c2ba1 Workaround to reduce the impact of AI performance problems when planning new bases.
When no free territory was left on the map, the AI tried to place a CC
every 10th AI turn.
That's about all 10 seconds and it freezed the game for about a second.
Now when you played against 4 players it freezed aobut 4 seconds every
10 seconds, which is very bad.
I wanted to solve this properly but realized that I'd have to change a
lot in the terrain analysis code that will probably be replaced anyway
when we have a new pathfinder with a proper interface.
Also removes an unused variable (creating a territory map and not using
it can't be good for performance either).

This was SVN commit r14859.
2014-03-20 14:26:15 +00:00
6eaad6cbb6 new tech portraits
This was SVN commit r14858.
2014-03-20 00:58:54 +00:00
1c81a96a50 fix bug in AI
This was SVN commit r14857.
2014-03-18 21:34:23 +00:00
63248bdc33 Fix issue with GUI reveal map status display.
This was SVN commit r14856.
2014-03-18 01:13:02 +00:00
209799aa4c fix 94c02ec33c for AI
This was SVN commit r14855.
2014-03-17 21:23:40 +00:00
5c4282a21c Fixes a small memory leak in the profiler shutdown code.
This was SVN commit r14854.
2014-03-17 21:16:38 +00:00
cde72788a2 * Add support for fallback fonts in the font builder.
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457.
(Now hope I included all needed files)

This was SVN commit r14853.
2014-03-17 10:13:49 +00:00
c1b839c21b Military Colony's territory weight reduced.
Updated icon for Syria map. Updated nisian war horses portrait from
Pureon.

Reduced the volume of the attack notification a little.

This was SVN commit r14852.
2014-03-17 00:10:13 +00:00
84ef2c1335 A test for Latin names for animals. Won't complete this until after next alpha.
This was SVN commit r14851.
2014-03-17 00:08:24 +00:00
883f307b40 Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69
This was SVN commit r14849.
2014-03-16 23:29:27 +00:00
94c02ec33c Revert gather limits to be global instead of per-player. Refs #1387
This was SVN commit r14848.
2014-03-16 20:35:23 +00:00
19724f7f41 "Syria" skirmish map.
This was SVN commit r14846.
2014-03-15 23:10:06 +00:00
ffe0faeca4 Move the skybox up per Mythos' ruler recommendation. This should probably be a map setting.
This was SVN commit r14844.
2014-03-15 21:07:02 +00:00
caeaf62723 Adjust widths in the lobby to make the map size dropdown fit.
This was SVN commit r14843.
2014-03-15 20:58:59 +00:00
722ad7264d Some updated maps. Acropolis Bay especially.
This was SVN commit r14842.
2014-03-15 19:56:51 +00:00
49b0e1ce42 Eliminates some duplication in build-osx-libs.sh and sets more useful variables
This was SVN commit r14841.
2014-03-14 05:18:40 +00:00
dfa4766dab Reverts [[SVN:14831]] - wasn't a valid fix.
Patches MiniUPnPc to explicitly export symbols for GCC/Clang, fixes
build when -fvisibility=hidden is used, refs #2304.
Fixes incorrect use of CPPFLAGS in build-osx-libs.sh, it should be
CXXFLAGS. CPPFLAGS get passed to the C/C++ preprocessor, CXXFLAGS get
passed to the C++ compiler.

This was SVN commit r14840.
2014-03-14 04:17:42 +00:00
b18a899287 Added Ptolemaic healer body and head textures. Fixes #2234
This was SVN commit r14839.
2014-03-13 19:46:15 +00:00
6ab578a6eb Fix out of date comments in Tex and ITexCodec, Fixes #2458.
This was SVN commit r14838.
2014-03-13 19:00:22 +00:00
e17dd1ac12 Applying the new improvements: Gulf of Bothnia.
This was SVN commit r14837.
2014-03-13 09:45:09 +00:00
ef888367aa Cleanup tex_codec, fixes #2456, patch by IronNerd.
This was SVN commit r14836.
2014-03-13 04:16:20 +00:00
a5639631ee Texture system refactoring and cleanup, fixes #2455, patch by IronNerd.
This was SVN commit r14835.
2014-03-13 02:37:05 +00:00
a068935789 Ptolemaic dock upgrade. Fixes #2217
This was SVN commit r14834.
2014-03-12 18:38:16 +00:00
180b44e565 let the AI know that a unit has no more orders
This was SVN commit r14832.
2014-03-11 22:42:41 +00:00
6274c7ffe8 Added ptolemaic quinquereme. Fixes #2232
This was SVN commit r14830.
2014-03-10 13:37:18 +00:00
9f1bcc2475 fix AI error
This was SVN commit r14829.
2014-03-09 22:26:41 +00:00
0e0cd65134 Some GUI alignment/sizing improvements.
This was SVN commit r14828.
2014-03-09 19:24:17 +00:00
0e7c92e1e6 Fixes behaviour change in Atlas' JSON serialization after the switch to JSON Spirit (#2434).
This caused problems setting the starting camera.

Refs #2434

This was SVN commit r14827.
2014-03-09 17:55:54 +00:00
8959e63a53 Add back unintentionally removed idle workers button tooltip.
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
e6f7ef78dc Removes legacy "technologies" folder.
This was SVN commit r14824.
2014-03-09 00:10:41 +00:00
7698e75962 Pyrrhus template.
This was SVN commit r14823.
2014-03-09 00:08:25 +00:00
0603392f03 Acropolis Bay.
This was SVN commit r14822.
2014-03-09 00:08:00 +00:00
119849defc Pyrrhus hero.
Some map stuff and actor changes (remove the elephants from Pericles).

This was SVN commit r14821.
2014-03-09 00:07:28 +00:00