real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity
13,097 Commits 6 Branches 28 Tags 13 GiB
e05c8263c5
Commit Graph

13097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
scythetwirler
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
Mythos_Ruler
722ad7264d Some updated maps. Acropolis Bay especially. 
This was SVN commit r14842.
 2014-03-15 19:56:51 +00:00
historic_bruno
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
historic_bruno
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
Enrique
b18a899287 Added Ptolemaic healer body and head textures. Fixes #2234 
This was SVN commit r14839.
 2014-03-13 19:46:15 +00:00
wraitii
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
Spahbod
e17dd1ac12 Applying the new improvements: Gulf of Bothnia. 
This was SVN commit r14837.
 2014-03-13 09:45:09 +00:00
JoshuaJB
ef888367aa Cleanup tex_codec, fixes #2456, patch by IronNerd. 
This was SVN commit r14836.
 2014-03-13 04:16:20 +00:00
JoshuaJB
a5639631ee Texture system refactoring and cleanup, fixes #2455, patch by IronNerd. 
This was SVN commit r14835.
 2014-03-13 02:37:05 +00:00
Enrique
a068935789 Ptolemaic dock upgrade. Fixes #2217 
This was SVN commit r14834.
 2014-03-12 18:38:16 +00:00
mimo
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
Enrique
6274c7ffe8 Added ptolemaic quinquereme. Fixes #2232 
This was SVN commit r14830.
 2014-03-10 13:37:18 +00:00
mimo
9f1bcc2475 fix AI error 
This was SVN commit r14829.
 2014-03-09 22:26:41 +00:00
scythetwirler
0e0cd65134 Some GUI alignment/sizing improvements. 
This was SVN commit r14828.
 2014-03-09 19:24:17 +00:00
Yves
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
JoshuaJB
8959e63a53 Add back unintentionally removed idle workers button tooltip. 
This was SVN commit r14826.
 2014-03-09 02:42:42 +00:00
Mythos_Ruler
e6f7ef78dc Removes legacy "technologies" folder. 
This was SVN commit r14824.
 2014-03-09 00:10:41 +00:00
Mythos_Ruler
7698e75962 Pyrrhus template. 
This was SVN commit r14823.
 2014-03-09 00:08:25 +00:00
Mythos_Ruler
0603392f03 Acropolis Bay. 
This was SVN commit r14822.
 2014-03-09 00:08:00 +00:00
Mythos_Ruler
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
Mythos_Ruler
d214d8f61c Some map changes. 
This was SVN commit r14820.
 2014-03-09 00:02:33 +00:00
JoshuaJB
fb65288463 Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414 
This was SVN commit r14819.
 2014-03-07 22:43:57 +00:00
Yves
c8bdd993c0 Upgrades cxxtest. 
Switches to the already committed new cxxtest sources and deletes the
old sources.
Applies the changes from 6374080b60 and 4a57fed5a7 to the updated
sources.
Replaces the cxxtestgen.exe for Windows. This file was created from
cxxtest's python script using pywin32.
Modifies update-workspace.sh to force a rebuild when cxxtest options
could have been changed during the premake step.
Adds an additional option (--jenkins-tests) to
premake4.lua/update-workspaces.sh to use cxxtest's XmlPrinter which
generates output than can be used by Jenkins.

Fixes #2450

This was SVN commit r14818.
 2014-03-07 20:58:17 +00:00
feneur
a9368a4463 Updated tooltip to reflect the new max gatherer limit 
This was SVN commit r14816.
 2014-03-07 12:09:39 +00:00
sanderd17
66942c74fa Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings 
This was SVN commit r14815.
 2014-03-07 11:11:45 +00:00
sanderd17
32cf46f01c Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style. 
This was SVN commit r14814.
 2014-03-07 08:27:13 +00:00
JoshuaJB
29f94a759c Fix an issue with lobby registration and a minor wording tweak. 
This was SVN commit r14813.
 2014-03-07 01:52:06 +00:00
scythetwirler
abbd6efef1 Updates outdated/incorrect hotkeys. 
This was SVN commit r14812.
 2014-03-06 23:57:02 +00:00
scythetwirler
8a98bca9b2 Fixes the last z order (hopefully) and a style inconsistency. 
This was SVN commit r14811.
 2014-03-06 22:45:13 +00:00
scythetwirler
ec26f1de83 Reduces z order to fix ai dialog. 
This was SVN commit r14810.
 2014-03-06 22:34:15 +00:00
JoshuaJB
8f30e722ab Some inconsequential style adjustments. 
This was SVN commit r14809.
 2014-03-06 02:24:06 +00:00
scythetwirler
ef76d24e66 Fixes z order and a capitalization error. 
This was SVN commit r14808.
 2014-03-06 02:00:12 +00:00
scythetwirler
5f5cfb10ee Fixes a typo and makes naming of the fading consistent with other sprites. 
This was SVN commit r14807.
 2014-03-05 21:24:48 +00:00
sanderd17
f3714a7075 Fix invalid count for entityMaps 
Improve error reporting on failed deserializations
Fixes #2328

This was SVN commit r14806.
 2014-03-05 14:58:17 +00:00
JoshuaJB
02024370d8 Fix a warning in Visual Studio 2010 related to some of my recent changes. 
This was SVN commit r14805.
 2014-03-05 01:06:13 +00:00
scythetwirler
5582409973 Converts most parts of the game to use Pureon's new UI 
This was SVN commit r14804.
 2014-03-04 02:23:01 +00:00
Yves
1a2f889bb9 7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now. 
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).

Refs 2372

This was SVN commit r14803.
 2014-03-03 23:01:49 +00:00
Yves
7cba43c9db Fixes warnings printed by the new SpiderMonkey. 
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.

Refs #2372

This was SVN commit r14802.
 2014-03-03 21:58:15 +00:00
Yves
df43e32a59 Second try fixing the eol-styles 
This was SVN commit r14801.
 2014-03-03 21:36:24 +00:00
Yves
234f2003a3 Fix inconsistent line endings and add svn:eol-style property 
This was SVN commit r14800.
 2014-03-03 21:13:36 +00:00
Enrique
2d0e996725 Added modified Stanislas69 Pyrrhus helmet with textures. 
Added an extra variation for brass and iron textures variations of
ptolemaic_romanized and thracian horned helmets.
Added playercolor to the thracian horned helmet crest.

This was SVN commit r14799.
 2014-03-02 10:59:36 +00:00
Yves
e290abc40f Should fix the Atlas build issues with the autobuilder. 
For some reason the autobuilder does not know uint32_t but my Windows
system with VC2010 and my Linux system both do.

Refs #2434

This was SVN commit r14797.
 2014-03-01 14:41:32 +00:00
mimo
c2c172271f fix AI error, not reseting all units after a successful attack 
This was SVN commit r14796.
 2014-03-01 14:36:35 +00:00
Mythos_Ruler
05225a66ac Horned helmet to Thracian cavalry. 
This was SVN commit r14794.
 2014-03-01 10:37:45 +00:00
mimo
57e995e618 fix AI error, the freeze of this collection prevented promoted and packed units to be updated during attack 
This was SVN commit r14793.
 2014-03-01 09:35:30 +00:00
wraitii
4e5eeba27b Fix the skybox. 
This was SVN commit r14792.
 2014-02-28 18:23:24 +00:00
Enrique
999490bbf5 Added playercolor to ptolemaic romanized crest helmet. 
This was SVN commit r14791.
 2014-02-28 11:46:23 +00:00
Enrique
162a4c42f3 Stan's helmets ptolemaic romanized with and without crest, thracian horned cavalry and perseus hero. Heavily modified. 
playercolor in crests still pending. Added brass and iron variations,
more subtle variations to come.

This was SVN commit r14790.
 2014-02-28 11:32:23 +00:00
wraitii
02860690eb fix unused parameter warning. 
This was SVN commit r14789.
 2014-02-26 19:16:44 +00:00
wraitii
3f78042f45 Fix tests and C++11 build. 
This was SVN commit r14788.
 2014-02-26 19:08:03 +00:00