1
0
forked from 0ad/0ad
Commit Graph

13166 Commits

Author SHA1 Message Date
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
7bcdb9f46d Remove two un-needed string initilizations from my earlier changes.
This was SVN commit r14692.
2014-01-27 05:46:21 +00:00
78ff9a8480 Fix compilation failures with wxWidgets 3.0. Fixes #2375.
This was SVN commit r14691.
2014-01-27 00:02:03 +00:00
0406c89908 Implements GetMonitorSize for OS X, patch by Echelon9, fixes #2390
This was SVN commit r14690.
2014-01-26 23:03:45 +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
c61badb04c Fix typo.
This was SVN commit r14688.
2014-01-26 19:29:21 +00:00
2a1240008c Make my previous changes < C++11 compatible.
This was SVN commit r14687.
2014-01-26 19:23:50 +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
58a44bfbcb Adds missing comment in build-osx-libs.sh
This was SVN commit r14676.
2014-01-26 03:40:54 +00:00
5187c6e4a5 Explicitly disables SDL X video driver in build-osx-libs.sh, to fix SDL_VIDEO_DRIVER_X11 definition used in HWDetect.cpp
This was SVN commit r14675.
2014-01-26 03:12:05 +00:00
937ee8f77c Fixes clang "hidden overloaded virtual function" warning, patch by Echelon9, fixes #2388
This was SVN commit r14674.
2014-01-26 01:20:34 +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
41a7c78e62 Fix some stuff in XmppClient.cpp on leper's recommendation.
This was SVN commit r14670.
2014-01-25 20:49:48 +00:00
28a707f98f small cleaning
This was SVN commit r14669.
2014-01-25 19:58:59 +00:00
69991cd110 Deletes extra whitespace from last commit.
This was SVN commit r14668.
2014-01-25 19:00:22 +00:00
e183e87333 Adds a message that is triggered whenever the bot's name is mentioned when a user doesn't recognize the bot isn't human (which happens quite a lot)
This was SVN commit r14667.
2014-01-25 18:57:28 +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
12a691edc2 Make my previous changes support < C++11 and Windows.
This was SVN commit r14661.
2014-01-24 20:31:39 +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
dd274113bc Fix #2403
This was SVN commit r14655.
2014-01-24 18:15:42 +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
53900c082b Added some criteria for rated games. Fixes #2402.
This was SVN commit r14651.
2014-01-24 00:22:50 +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