real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity
12,566 Commits 6 Branches 28 Tags 13 GiB
42bc5165ab
Commit Graph

12566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leper
42bc5165ab Add compile time flag to disable use of miniupnpc. 
This was SVN commit r14384.
 2013-12-18 16:08:56 +00:00
sanderd17
7f5c2c4b83 enlarge the units demo map, so all units can be checked out again 
This was SVN commit r14383.
 2013-12-18 15:46:09 +00:00
Mythos_Ruler
eb7215ecaf This was SVN commit r14381. 2013-12-18 14:14:37 +00:00
Mythos_Ruler
3d9fe04ab5 Added Egyptian names for Ptolemaic buildings. 
Deleted a bunch of maps. Added Lorraine Plain skirmish map.

This was SVN commit r14380.
 2013-12-18 13:54:30 +00:00
sanderd17
1b17ac50cc remove the aura visualisation from the actors, as it causes selection problems 
This was SVN commit r14379.
 2013-12-18 10:43:32 +00:00
sanderd17
63f2f85b01 make sure the non-garrisoned variant of the persian models is always picked while constructing 
This was SVN commit r14378.
 2013-12-18 10:28:32 +00:00
LordGood
6bc5e3f3a5 Ptolemies corral draft commit 
This was SVN commit r14377.
 2013-12-18 05:29:54 +00:00
alpha123
0b80cbe3ec Hide the password field by default on the lobby login box if there is a remembered password. Since we only store hashed passwords, this avoids potential confusing from seeing a password much longer than the user’s in the field. 
This was SVN commit r14376.
 2013-12-18 00:56:59 +00:00
alpha123
3c248e7501 Change the "Away" color in the lobby to be much easier to read on the dark background. 
This was SVN commit r14375.
 2013-12-17 23:58:53 +00:00
alpha123
c8fb750e43 Balance fix for CCs. Decrease build time from 600 to 500 and increase foundation armor from 3h/10p/3c to 5h/15p/3c. 
This was SVN commit r14374.
 2013-12-17 21:20:31 +00:00
leper
c6d454ff2d Make ConfigDB threadsafe. 
This was SVN commit r14373.
 2013-12-17 19:58:39 +00:00
leper
e83f24e3a6 Move UPnP port forwarding to a thread. 
Fix some typos.
Do not return the result, as we would need to allocate it, but we never
use it.

This was SVN commit r14372.
 2013-12-17 17:03:49 +00:00
JoshuaJB
4df4c0dec0 Try to actually do the threading my previous commit said it did. 
This was SVN commit r14371.
 2013-12-17 14:57:26 +00:00
JoshuaJB
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
LordGood
60bbb50625 Ptolemaic dock draft commit 
This was SVN commit r14369.
 2013-12-17 03:17:35 +00:00
LordGood
fa03aadaa5 Updated fixed unit icons 
This was SVN commit r14368.
 2013-12-16 04:09:35 +00:00
LordGood
8c5f583845 Ptolemaic blacksmith draft commit 
This was SVN commit r14367.
 2013-12-16 02:05:43 +00:00
leper
678d338670 Change bot name. 
This was SVN commit r14366.
 2013-12-15 21:02:58 +00:00
historic_bruno
2cdef4023c Fixes OS X libs build script 
This was SVN commit r14365.
 2013-12-15 20:56:58 +00:00
leper
d2e671392b Fix bug in ipstamp module. 
Sync with server. Refs #2307.

This was SVN commit r14363.
 2013-12-15 18:33:01 +00:00
mimo
79252043ae fix the fish gatherer from b91ec9b449 
This was SVN commit r14362.
 2013-12-15 17:32:20 +00:00
Mythos_Ruler
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
sanderd17
bcba922893 fix switching between column and other formations 
This was SVN commit r14358.
 2013-12-15 09:51:13 +00:00
historic_bruno
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
historic_bruno
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
historic_bruno
99f44ff7a0 Reorganizes extern libs in alphabetical order 
This was SVN commit r14355.
 2013-12-15 01:34:16 +00:00
historic_bruno
99f90dd6de Adds MiniUPnPc to build-osx-libs.sh 
This was SVN commit r14354.
 2013-12-15 01:26:55 +00:00
LordGood
c2c2177be4 forgot the death particles 
This was SVN commit r14353.
 2013-12-15 01:10:39 +00:00
historic_bruno
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
LordGood
b1a73d3c0e Ptolemaic market draft commit 
This was SVN commit r14351.
 2013-12-14 22:14:24 +00:00
JoshuaJB
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
JoshuaJB
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
JoshuaJB
5876ec38d1 Make sure we properly free some UPnP-related variables. 
This was SVN commit r14348.
 2013-12-14 03:21:21 +00:00
JoshuaJB
551eb3919d Change UPnP lease duration to 0 (permanent) and update comments. 
This was SVN commit r14347.
 2013-12-14 03:03:22 +00:00
Mythos_Ruler
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
Mythos_Ruler
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
Mythos_Ruler
685d37ddfa New Roman emblem. 
This was SVN commit r14342.
 2013-12-13 14:18:46 +00:00
leper
fd47e6caee Name. 
This was SVN commit r14341.
 2013-12-13 13:30:59 +00:00
leper
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
Mythos_Ruler
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
JoshuaJB
8dab478691 Bundle miniUPnPc with 0AD. 
This was SVN commit r14333.
 2013-12-13 02:59:35 +00:00
JoshuaJB
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
Enrique
b508fe848a Fixed celtic embassy textures in its actor 
This was SVN commit r14331.
 2013-12-12 10:09:14 +00:00
wraitii
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
Enrique
1c890d64ee Fixed persian gate messed up in previous commit 
This was SVN commit r14328.
 2013-12-11 15:59:11 +00:00
sanderd17
c6cf074e7a Fix unitAI warning when member left the formation 
This was SVN commit r14327.
 2013-12-11 15:17:43 +00:00
Enrique
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
historic_bruno
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
Mythos_Ruler
c661bb01c3 Temp fix for Nubian archer. 
This was SVN commit r14324.
 2013-12-10 01:27:09 +00:00