Commit Graph

7742 Commits

Author SHA1 Message Date
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
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
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
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
9780d7177d Adds some missing vars.
This was SVN commit r14742.
2014-02-09 16:04:30 +00:00
dea18ed318 4-player Greek Acropolis skirmish map
This was SVN commit r14741.
2014-02-09 13:07:33 +00:00
c5beeb7a02 rename Median Oasis maps, fixes #2425
This was SVN commit r14740.
2014-02-09 09:48:14 +00:00
df1221e9f5 Correct inverted sprites on modern tickbox and add a default modern tooltip style.
This was SVN commit r14739.
2014-02-09 05:31:25 +00:00
01611c1675 Fixes AI error when building a new base, and improves the AI's early game and tendency to grab terrain. Fixes incorrect release of some units by the defense manager.
This was SVN commit r14738.
2014-02-07 18:36:37 +00:00
05f13bb1d8 fix ai bug
This was SVN commit r14737.
2014-02-07 18:00:41 +00:00
563768363b clean useless formations
This was SVN commit r14736.
2014-02-07 17:01:01 +00:00
a0b0b6d74e Applying the new improvements: Gear, Guadalquivir River.
This was SVN commit r14735.
2014-02-07 09:23:14 +00:00
7277385891 fix typo
This was SVN commit r14734.
2014-02-07 07:52:10 +00:00
91be7d9bd1 New history blurb for Skiritai by forum contributor Thorfinn.
This was SVN commit r14729.
2014-02-03 16:25:08 +00:00
e408ac46b1 2 player skirmish Median Oasis.
This was SVN commit r14728.
2014-02-03 16:16:31 +00:00
e329a93978 Ghost commit for fields
This was SVN commit r14727.
2014-02-03 05:12:36 +00:00
9971e3cfab Add formation check
This was SVN commit r14726.
2014-02-02 09:15:34 +00:00
c9aeaa1612 Fix a "big typo" in the attack plans, thanks mimo.
This was SVN commit r14723.
2014-02-01 18:34:24 +00:00
ddf9d948cf Fix some more debug in the AI.
This was SVN commit r14722.
2014-02-01 18:05:39 +00:00
5b506ceee3 prevent AI to try to attack its allies, fix #2393
This was SVN commit r14721.
2014-02-01 17:59:29 +00:00
e21f052803 prevent error when an animal changes ownership
This was SVN commit r14720.
2014-02-01 17:55:27 +00:00
94a240737c Added more territory auras.
Fixed the Theatron for Hellenic civs. It now uses the Hellenization
effect correctly!

This was SVN commit r14719.
2014-02-01 12:09:06 +00:00
1f1a2ead44 Adding the missing cheats from [14712]. Refs #2072
This was SVN commit r14718.
2014-02-01 09:11:38 +00:00
e4e32c8cd7 Fixes a typo from 1d3ac14d35.
This was SVN commit r14717.
2014-02-01 03:55:24 +00:00
e6cf2f23c5 Fix AI debug mode.
This was SVN commit r14716.
2014-02-01 03:29:55 +00:00
c3cdf40f33 Somewhat experimental rewrite and simplification of the worker's logic to choose dropsites. Might behave unexpectedly now and then.
Error fixes here and there.

This was SVN commit r14715.
2014-02-01 00:44:12 +00:00
12aa170c58 Trying different territory weights.
This was SVN commit r14713.
2014-01-31 18:47:08 +00:00
60619dbf3f Add technologies cheat. Fixes #2072. Patch by boeseRaupe
This was SVN commit r14712.
2014-01-31 15:30:16 +00:00
1fad924411 Checking if cmpPlayer is valid.
This was SVN commit r14711.
2014-01-31 14:47:23 +00:00
9fe465884d Implements resource trickle. Allows decimal player resources. Fixes #2413.
This was SVN commit r14710.
2014-01-31 12:01:49 +00:00
c3d9769622 Fixed iberian corral cloth ao texture assigned
This was SVN commit r14708.
2014-01-30 19:36:38 +00:00
708f003df3 Applying the new improvements: English Channel, Fortress
More cleanup and tweaks.

This was SVN commit r14707.
2014-01-30 17:09:45 +00:00
ff4ed09b6f Backend for special formatting of moderaters in the lobby userlist.
This was SVN commit r14706.
2014-01-30 15:46:19 +00:00
b9eea330d0 Strip some whitespace and fix a warning in session.js
This was SVN commit r14704.
2014-01-29 19:00:47 +00:00
1d3ac14d35 Better summary screen. Fixes #686. Patch by Bajter and Kabzerek
This was SVN commit r14703.
2014-01-29 18:30:56 +00:00
459f13e72b Clean up the colorfade code. Patch by boeseRaupe, fixes #2395
This was SVN commit r14702.
2014-01-29 14:49:36 +00:00
7395d9c75a Applying the new improvements: Canyon, Continent, Corinthian Isthmus
Some cleanup and small tweaks.

This was SVN commit r14701.
2014-01-29 14:21:48 +00:00
639b583d31 Fix scatter formation
This was SVN commit r14700.
2014-01-29 14:01:21 +00:00
d6f8742f9b Change hawk and boar skeletons so that the root identifiers are unique. Fixes #2332.
Also adjust the DAEs to fit the new identifiers.

This was SVN commit r14699.
2014-01-29 04:14:24 +00:00
f097078d46 Send the move command directly instead of going through the FSM. That way, the failure can be catched earlier on. Should fix #2410
This was SVN commit r14698.
2014-01-28 20:40:38 +00:00
8953179e1a allow the possibility to define route with waypoints when doing trade, fixes #1207, #1821 and #1822
This was SVN commit r14697.
2014-01-28 18:56:39 +00:00
23777ba736 fix cbc1c9f0ab
This was SVN commit r14696.
2014-01-27 19:25:38 +00:00
325f9ca9a9 Sorry Brits. Changed "plough" (British spelling) to "plow" (American/Canadian spelling) after seeing more than one person on Youtube mispronounce the word.
Can only build 1 Juggernaut.

All champion cavalry now cost Food and Metal.

This was SVN commit r14695.
2014-01-27 16:16:32 +00:00
c751500907 Refactor some formation code to let it make use of the prototypes
This was SVN commit r14693.
2014-01-27 12:34:59 +00:00
cbc1c9f0ab fixes remaining town bell defects, closes #2353, patch by Itms
This was SVN commit r14689.
2014-01-26 20:37:39 +00:00
5e70bd3628 Fix and cleanup my recent changes.
This was SVN commit r14686.
2014-01-26 19:01:21 +00:00
cb3a8d868a fix bug when garrisoning under alert and garrisonHolder is full, patch by Itms, see #2353
This was SVN commit r14685.
2014-01-26 18:28:55 +00:00
3e1fc74add improve alert tooltip, see #2353
This was SVN commit r14684.
2014-01-26 18:17:13 +00:00
9ed11bc404 keep work orders when in alert, patch by Itms, addresses #2353
This was SVN commit r14683.
2014-01-26 18:01:29 +00:00
09a2729503 fix a fix
This was SVN commit r14682.
2014-01-26 09:40:54 +00:00
f1ab9b8e57 Check isInWorld before asking position
This was SVN commit r14681.
2014-01-26 09:24:32 +00:00
5ec0dc8ae8 Fix a bug with one of the lobby settings I added to the options window.
This was SVN commit r14680.
2014-01-26 05:51:48 +00:00
39fef5c299 Add the ability to display chat messages when joining the lobby and quickly mostly update the options window to the new UI style.
This was SVN commit r14679.
2014-01-26 05:39:55 +00:00
a8fbe4eedc Centralizes centering rating into one function.
This was SVN commit r14678.
2014-01-26 05:27:00 +00:00
041c6ab1b3 More lobby cleanup.
This was SVN commit r14677.
2014-01-26 04:25:35 +00:00
0db9a18d39 Fix issue where lobby spam was being sent to external clients.
This was SVN commit r14672.
2014-01-25 21:58:22 +00:00
851c05a038 Cleanup and spam blocker redesign in lobby.js.
This was SVN commit r14671.
2014-01-25 20:51:01 +00:00
28a707f98f small cleaning
This was SVN commit r14669.
2014-01-25 19:58:59 +00:00
2b407a03eb Added Stanislas69 iberian corral with several fixes.
Fixed iberian struct normal and specmap.

This was SVN commit r14666.
2014-01-25 16:50:21 +00:00
9eb26c2622 Fix infinite loop when attacking a formation without valid targets
This was SVN commit r14665.
2014-01-25 16:27:55 +00:00
0f5e5fddd6 This was SVN commit r14664. 2014-01-25 14:45:58 +00:00
3f00d0cc9c Fix some broken maps. Delete some others.
This was SVN commit r14660.
2014-01-24 20:23:11 +00:00
ecaded076f Improve the Vector prototype with static functions. Replace the usage of the Math vector functions with functions from the Vector class.
This was SVN commit r14659.
2014-01-24 19:51:00 +00:00
5d4f509810 Update existing minimap idle button, add minimap idle button highlight and disabled, and some style fixes in session.xml. Refs #823 and refs #2357
This was SVN commit r14658.
2014-01-24 18:40:01 +00:00
2f145b1578 Iron Spearheads tech now affects all spear units (not just infantry spearmen).
Javelin Thong tech now affects all javelin units (not just infantry
javelinists).

Some shield tweaking.

Some more portraits.

This was SVN commit r14657.
2014-01-24 18:28:26 +00:00
b46a6de335 Allow using the XMPP room subject to display lobby information to user, make the lobby GUI code more readable, and cleanup the modern styles.
This was SVN commit r14656.
2014-01-24 18:20:15 +00:00
d5609e33a6 Fixed elephant african bush actor and mesh
This was SVN commit r14654.
2014-01-24 15:04:58 +00:00
609e789cea Fixing the bug with the ramp in Cantabrian Highlands.
Applying the new improvements: Archipelago, Atlas Mountains, Cantabrian
Highlands.

This was SVN commit r14653.
2014-01-24 12:28:30 +00:00
f94a1aeac0 Checks for game end after toggling diplomacy. Also adds a comment for clarification to the lobby bot. Refs #2402.
This was SVN commit r14652.
2014-01-24 00:38:08 +00:00
e5e634f768 Displays ratings in the userlist. Fixes #2371.
This was SVN commit r14650.
2014-01-23 23:13:13 +00:00
d82282e358 Added animations for african bush elephant.
This was SVN commit r14649.
2014-01-23 21:41:58 +00:00
cf851a7789 A bunch of naming stuff.
This was SVN commit r14648.
2014-01-23 18:32:21 +00:00
35517f2cd6 commited basic_glow.xml material for self-illumination objects.
This was SVN commit r14647.
2014-01-23 17:50:00 +00:00
fd187f466f Add vector prototype to vector-like return values from C++ to JS. Fixes #2394.
This was SVN commit r14645.
2014-01-23 11:32:08 +00:00
d677033c4c Serialise Cost component since the population bonus is tech-modifiable. Fixes #2399
This was SVN commit r14644.
2014-01-23 08:56:22 +00:00
df0cdf8561 Fix typo in the Lake random map script.
This was SVN commit r14643.
2014-01-23 04:48:52 +00:00
8d5c02091a Added greek, arabic and big tents as eyecandy, they will be used in the ptolemaic mercenary camp.
Added Stanislas69's new gaul farmstead with some fixes. (Thanks
Stanislas69!)
Added carpet texture fragments to the ptolemaic struct texture

This was SVN commit r14642.
2014-01-22 22:59:06 +00:00
ef79e8305b An addition to bd3f5a8085, also refs #1964
This was SVN commit r14641.
2014-01-22 20:56:14 +00:00
bd3f5a8085 Removing the AI check for producing un-allowed units. Should be fixed in the AI side with ad8fa37f17. Refs #1964.
This was SVN commit r14640.
2014-01-22 20:47:51 +00:00