mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-18 01:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,982 Commits 1 Branch 39 Tags
8959e63a53426fdbdca6499af67fe951d8a334ac
Commit Graph

12982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mythos_Ruler 3573a6e9a8 Updated some portraits. 
Added a Mercenary Thracian Swordsman.

Tweaked some textures.

Added a "gray skin" variation to the Ptolemaic elephant.

Added Saharan Oases skirm map.

This was SVN commit r14787.
 2014-02-26 14:29:42 +00:00
Enrique 6b94ae9f59 Added two ptolemaic howdah variations for the champion elephant. 
This was SVN commit r14786.
 2014-02-26 13:53:36 +00:00
mimo d8903c0c6f fix AI error 
This was SVN commit r14785.
 2014-02-25 22:43:03 +00:00
wraitii e2f4379e9a Fix an issue with corruption of water data when the actor editor opened in Atlas. 
Potential marginal optimizations to the water data creation code.

This was SVN commit r14784.
 2014-02-25 06:27:15 +00:00
Yves 17f8f09399 Removes the ScriptInterface and SpiderMonkey dependencies from Atlas. 
Replaces the code for JSON parsing and writing with an implementation
using the JSON Spirit library.

Fixes #2434
Refs #1886

This was SVN commit r14783.
 2014-02-24 20:22:02 +00:00
mimo 33918a5c41 Fix AI error (with 3eaa9ac4d3) preventing promoted units to stay idle 
This was SVN commit r14779.
 2014-02-24 14:03:13 +00:00
sanderd17 50d93b4332 Was messed up by b3201acd93 
This was SVN commit r14778.
 2014-02-24 12:10:38 +00:00
Enrique c5f15a13d0 Modified Stanislas69 Seleucid romanized helmet and thracian helmet with several texture variations and organized in actors with variations. 
Applied the romanized brass helmet with crest to the Seleucid heavy
swordman infantry.

This was SVN commit r14777.
 2014-02-23 16:51:10 +00:00
mimo 3eaa9ac4d3 fix AI error 
This was SVN commit r14776.
 2014-02-23 09:51:07 +00:00
Yves 43377fdc5e Fixes an assertion when DEBUG_SERIALIZER_ANNOTATE is set to 1 and you click on "Host Game" from the main menu. 
The reason was that CSimulationMessage uses the CBufferBinarySerializer
which did not add debugging annotations and deserialized the created
data with the CStdDeserializer which expects these annotations.
I did not fix the tests which remain broken as before this patch when
annotation is enabled.

This was SVN commit r14775.
 2014-02-22 14:30:29 +00:00
Mythos_Ruler e38fc5f861 Increased Fanatic armor. 
This was SVN commit r14774.
 2014-02-22 13:10:54 +00:00
Mythos_Ruler 554cd510f2 Basic and Advanced Egyptian Pikemen textures. 
Spec and norm maps for Mediterranean forest floor terrain.

This was SVN commit r14773.
 2014-02-22 12:16:20 +00:00
JoshuaJB a3e1c68b9a Fix #2373. Have player resign if not returning to a networked game. Also notify host of networked game that by leaving all other players will be disconnected. Based off patch by boeseRaupe 
This was SVN commit r14772.
 2014-02-21 20:02:23 +00:00
Mythos_Ruler 8c21ec4dfd Quilted helms for Egyptian pikemen, based on work by Enrique. 
This was SVN commit r14771.
 2014-02-21 14:38:09 +00:00
Enrique 42d31da1bb ptolemaic quilted helmet commit. 
This was SVN commit r14770.
 2014-02-21 14:13:46 +00:00