Commit Graph

12553 Commits

Author SHA1 Message Date
0ba25e9968 Cache UPnP root URL to try to avoid searching each time. Also make searching asyncronous with the GUI to avoid hanging.
This was SVN commit r14370.
2013-12-17 14:21:49 +00:00
60bbb50625 Ptolemaic dock draft commit
This was SVN commit r14369.
2013-12-17 03:17:35 +00:00
fa03aadaa5 Updated fixed unit icons
This was SVN commit r14368.
2013-12-16 04:09:35 +00:00
8c5f583845 Ptolemaic blacksmith draft commit
This was SVN commit r14367.
2013-12-16 02:05:43 +00:00
678d338670 Change bot name.
This was SVN commit r14366.
2013-12-15 21:02:58 +00:00
2cdef4023c Fixes OS X libs build script
This was SVN commit r14365.
2013-12-15 20:56:58 +00:00
d2e671392b Fix bug in ipstamp module.
Sync with server. Refs #2307.

This was SVN commit r14363.
2013-12-15 18:33:01 +00:00
79252043ae fix the fish gatherer from b91ec9b449
This was SVN commit r14362.
2013-12-15 17:32:20 +00:00
b91ec9b449 Added new Ptolemies track to the Ptolemies civ json.
Removed fishing from land units. However, they still try to go fish
after building a dock. Looks like it needs a deeper fix.

Portrait for Ptol camel archer.

This was SVN commit r14361.
2013-12-15 15:33:35 +00:00
OmriLahav
542861ba36 This was SVN commit r14359. 2013-12-15 14:14:22 +00:00
bcba922893 fix switching between column and other formations
This was SVN commit r14358.
2013-12-15 09:51:13 +00:00
e7d57136ef Updates license files for gloox, MiniUPnPc, and pkcs5_pbkdf2. Refs #2308
This was SVN commit r14357.
2013-12-15 02:49:11 +00:00
2c3c8737e0 OS X libs build script improvements:
* fixes failed build when using --force-rebuild
* cleans up old build output before starting new builds
* improves separation of libogg and vorbis
* updates wxWidgets to 3.0.0

This was SVN commit r14356.
2013-12-15 02:14:45 +00:00
99f44ff7a0 Reorganizes extern libs in alphabetical order
This was SVN commit r14355.
2013-12-15 01:34:16 +00:00
99f90dd6de Adds MiniUPnPc to build-osx-libs.sh
This was SVN commit r14354.
2013-12-15 01:26:55 +00:00
c2c2177be4 forgot the death particles
This was SVN commit r14353.
2013-12-15 01:10:39 +00:00
62a10ab938 Fixes Windows build.
Fixes UPnP error handling to be more correct and conventional, refs
#2305

This was SVN commit r14352.
2013-12-15 01:02:26 +00:00
b1a73d3c0e Ptolemaic market draft commit
This was SVN commit r14351.
2013-12-14 22:14:24 +00:00
f890856c6d Seperate differently licenced portions of sha.cpp/h into pkcs5_pdkdf2.cpp/h and remove some extra std includes in sha.cpp. Refs #2308
This was SVN commit r14350.
2013-12-14 16:58:21 +00:00
bf97148ddc Add proper licence header and remove tyedefs in sha.cpp/h. Refs #2308
This was SVN commit r14349.
2013-12-14 16:22:48 +00:00
5876ec38d1 Make sure we properly free some UPnP-related variables.
This was SVN commit r14348.
2013-12-14 03:21:21 +00:00
551eb3919d Change UPnP lease duration to 0 (permanent) and update comments.
This was SVN commit r14347.
2013-12-14 03:03:22 +00:00
63622a85d7 Fixed missing elephants in some maps, thanks mimo for catching it.
This was SVN commit r14345.
2013-12-13 19:10:04 +00:00
44587963e6 Reduced armor for palisade fort.
Tweaked ptolemies sandbox, Alpine Valleys (removed player command of
some deer), and added a Greek Acropolis "Night" map for fun.

This was SVN commit r14344.
2013-12-13 16:26:26 +00:00
685d37ddfa New Roman emblem.
This was SVN commit r14342.
2013-12-13 14:18:46 +00:00
fd47e6caee Name.
This was SVN commit r14341.
2013-12-13 13:30:59 +00:00
619c59fd3f Read the default MUC room from the config file and set it to arena15. Fixes #2306.
Change the jid of xpartamupp to WFGbot to make it work on the new
server. Refs #2307.

This was SVN commit r14339.
2013-12-13 12:14:17 +00:00
5b9dfaef8f Tweaked Gallic Fields.
Made the palisade spikes not lose health when outside territory.

Changed ptol military settlement actor from Athenian barracks to
Macedonian barracks.

Lowered the height of the farm field status bar slightly.

This was SVN commit r14338.
2013-12-13 11:34:19 +00:00
8dab478691 Bundle miniUPnPc with 0AD.
This was SVN commit r14333.
2013-12-13 02:59:35 +00:00
667537ee49 UPnP-based automatic port-forwarding using miniupnpc. Breaks windows build at the moment. Refs #2305
This was SVN commit r14332.
2013-12-13 02:23:02 +00:00
b508fe848a Fixed celtic embassy textures in its actor
This was SVN commit r14331.
2013-12-12 10:09:14 +00:00
1efd47c1ad Fix errors when loading a saved game with Aegis by making sure the AI re-inits properly. Still no real saved game support.
This was SVN commit r14329.
2013-12-11 17:10:14 +00:00
1c890d64ee Fixed persian gate messed up in previous commit
This was SVN commit r14328.
2013-12-11 15:59:11 +00:00
c6cf074e7a Fix unitAI warning when member left the formation
This was SVN commit r14327.
2013-12-11 15:17:43 +00:00
2a824acae6 Made ptolemaic walls thinner. Added door to the gate (no animations yet) fixed some stretched UVs
This was SVN commit r14326.
2013-12-11 01:53:10 +00:00
8db3ada87f Improves debugging output to help troubleshoot some WSDL bugs, refs #2146, #1733
This was SVN commit r14325.
2013-12-10 18:54:18 +00:00
c661bb01c3 Temp fix for Nubian archer.
This was SVN commit r14324.
2013-12-10 01:27:09 +00:00
f3e53bfb7c Reduce splash radius of catapults from the rather ridiculous 20m to 10m.
This was SVN commit r14322.
2013-12-09 19:22:45 +00:00
683349333b tune the guard behaviour
This was SVN commit r14321.
2013-12-09 18:15:24 +00:00
a44e88fa42 Check for "Destroy" messages beforehand in the base manager to avoid a rare error.
This was SVN commit r14320.
2013-12-09 16:35:06 +00:00
ed93cebd28 garrison flag fixing in ptolemaic civic centre, edfu wonder and macedonian temple.
Centered athenian temple, selection and obstruction adjusted.

This was SVN commit r14319.
2013-12-09 14:46:35 +00:00
c3ef9b3685 Forgot I had renamed a file…
This was SVN commit r14318.
2013-12-09 14:23:56 +00:00
f9bee5d3ec Slight de-obfuscation of the AI code.
This was SVN commit r14317.
2013-12-09 14:20:11 +00:00
9339e658a5 Two new head models for ptolemaic support females. Fixes #2235
This was SVN commit r14316.
2013-12-09 12:38:46 +00:00
8351e794fa Added different textures for each ptolemaic camel rank
This was SVN commit r14315.
2013-12-09 02:01:21 +00:00
a04dfcf836 Camel rider tweaking
This was SVN commit r14314.
2013-12-09 00:33:33 +00:00
3c70f25ca4 Final edfu temple normal and spec.
Ptolemaic camel rider fix

This was SVN commit r14313.
2013-12-09 00:21:45 +00:00
208200db28 fix querying unitAI of non-existing members
This was SVN commit r14312.
2013-12-08 19:57:34 +00:00
966f7c7145 Removes some duplicated code.
This was SVN commit r14311.
2013-12-08 19:23:09 +00:00
36334a6fa7 Fix the AI incorrectly trying to place Civil Centres too close to each other.
This was SVN commit r14310.
2013-12-08 16:24:09 +00:00