234f2003a3
Fix inconsistent line endings and add svn:eol-style property
...
This was SVN commit r14800.
2014-03-03 21:13:36 +00:00
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
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
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
05225a66ac
Horned helmet to Thracian cavalry.
...
This was SVN commit r14794.
2014-03-01 10:37:45 +00:00
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
4e5eeba27b
Fix the skybox.
...
This was SVN commit r14792.
2014-02-28 18:23:24 +00:00
999490bbf5
Added playercolor to ptolemaic romanized crest helmet.
...
This was SVN commit r14791.
2014-02-28 11:46:23 +00:00
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
02860690eb
fix unused parameter warning.
...
This was SVN commit r14789.
2014-02-26 19:16:44 +00:00
3f78042f45
Fix tests and C++11 build.
...
This was SVN commit r14788.
2014-02-26 19:08:03 +00:00
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
6b94ae9f59
Added two ptolemaic howdah variations for the champion elephant.
...
This was SVN commit r14786.
2014-02-26 13:53:36 +00:00
d8903c0c6f
fix AI error
...
This was SVN commit r14785.
2014-02-25 22:43:03 +00:00
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
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
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
50d93b4332
Was messed up by b3201acd93
...
This was SVN commit r14778.
2014-02-24 12:10:38 +00:00
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
3eaa9ac4d3
fix AI error
...
This was SVN commit r14776.
2014-02-23 09:51:07 +00:00
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
e38fc5f861
Increased Fanatic armor.
...
This was SVN commit r14774.
2014-02-22 13:10:54 +00:00
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
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
8c21ec4dfd
Quilted helms for Egyptian pikemen, based on work by Enrique.
...
This was SVN commit r14771.
2014-02-21 14:38:09 +00:00
42d31da1bb
ptolemaic quilted helmet commit.
...
This was SVN commit r14770.
2014-02-21 14:13:46 +00:00
c44b48bd59
Fix Atlas lag due to Position component that listens to the territoriesChanged message
...
This was SVN commit r14768.
2014-02-21 13:42:46 +00:00
0ea3b7b7dd
Adds the moderator prefix to the playerlist in the lobby.
...
This was SVN commit r14767.
2014-02-20 23:26:36 +00:00
a725266337
Slightly better options menu.
...
This was SVN commit r14766.
2014-02-20 22:45:43 +00:00
e182b4ddd2
Fix a valgrind warning about uninitilized variables in the scrollbar code and some comment/style fixes.
...
This was SVN commit r14764.
2014-02-19 21:59:07 +00:00
facf119241
Farm fields back to 5 workers.
...
This was SVN commit r14763.
2014-02-19 17:54:34 +00:00
2429f1e93c
Displays ratings on the gamesetup page and formats ratings less than 1000 correctly.
...
This was SVN commit r14762.
2014-02-19 00:40:35 +00:00
a4ec034bb5
fixes some AI errors
...
This was SVN commit r14761.
2014-02-18 18:19:33 +00:00
039b06e012
Enable selection of dogs when selecting idle warriors. Patch by tau. Fixes #2436
...
This was SVN commit r14760.
2014-02-17 21:40:47 +00:00
b5c8faa367
Aura tooltip for Ptolemaic heroes. Auras themselves are not complete.
...
This was SVN commit r14759.
2014-02-17 15:54:17 +00:00
41534b1eda
Arrow shooting buildings only increase arrows when ranged infantry are garrisoned inside.
...
Removing some unused textures.
This was SVN commit r14758.
2014-02-17 15:11:47 +00:00
c3dd79aa22
Ptolemaic mercenary camp commit.
...
This was SVN commit r14757.
2014-02-17 13:13:25 +00:00
322d78b9a5
remove debug warning
...
This was SVN commit r14755.
2014-02-16 15:23:50 +00:00
19965ce37a
Fix missing territory decay when moving out of territory without changing the actual territory. Add possibility to check movement over territory boders in the JS simulation part. Based on patch by niektb
...
This was SVN commit r14754.
2014-02-16 15:22:11 +00:00
f92a46330d
Anti-disconnect addition to the gamesetup screen. Also fixes typo in the lobby bot README.
...
This was SVN commit r14753.
2014-02-16 06:22:16 +00:00
be881dc420
Reformat the database to accept the additional summary counters as well as adding a couple summary counters. Also deletes unnecessary welcome message and deletes whitespace. Refs #686 .
...
This was SVN commit r14752.
2014-02-16 06:06:16 +00:00
ab9a6b6303
Stanislas69' iberian tower modification commit.
...
This was SVN commit r14751.
2014-02-14 21:46:37 +00:00
05bfe7dca0
Ptolemaic market commit
...
This was SVN commit r14750.
2014-02-14 17:18:29 +00:00
35f3dd03d9
improve ship behaviour when picking units
...
This was SVN commit r14749.
2014-02-13 20:21:27 +00:00
581c7635e1
Makes our favourite example of escaping even more awesome.
...
Codeblocks 12.11 requires an additional $ sign. This will break 10.05
and I haven't tested it with 13.12 or on other systems than Ubuntu.
This was SVN commit r14748.
2014-02-13 15:21:14 +00:00
a921c5c2fb
Portrait for Egyptian Pikeman.
...
Fixed a thing with the Ptolemies sandbox map.
Tweaked the elite Egyptian pikeman shield.
This was SVN commit r14747.
2014-02-13 15:08:01 +00:00
14a7e60bd5
Elite Egyptian Pikeman.
...
This was SVN commit r14746.
2014-02-11 17:51:01 +00:00
e49b1e1ceb
fix AI error
...
This was SVN commit r14745.
2014-02-09 19:54:50 +00:00
d8152f1eda
exchange if order otherwise we can't make a trade route with a damaged market
...
This was SVN commit r14744.
2014-02-09 18:42:06 +00:00
44eb336dfe
Added 4 stall variations as eyecandy with different cloth textures.
...
Added material for barley/wheat props.
Modified spec and normal maps of ptolemaic struct (for matching last
edit adding carpets)
This was SVN commit r14743.
2014-02-09 16:51:33 +00:00
Yves