wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
13,233 Commits 3 Branches 28 Tags 13 GiB
2eb2845c29
Commit Graph

8189 Commits

Author SHA1 Message Date
sanderd17
2eb2845c29 Extra check on the existance of a replacement, be more forgiving in the skirmish replacer. 
This was SVN commit r15104.
 2014-05-03 17:53:37 +00:00
sanderd17
dd13e01ac6 Extra check on existance of template, to be more forgiving if some template in the productionqueue doesn't exist. 
This was SVN commit r15103.
 2014-05-03 17:29:22 +00:00
Enrique
e70eccf0ca Added Stan's contributor ptol_corral details in Lordgood's model 
Added Stan's Cleopatra texture

This was SVN commit r15102.
 2014-05-03 13:05:34 +00:00
sanderd17
575cdd7979 A spearman isn't ranged 
This was SVN commit r15101.
 2014-05-03 13:04:08 +00:00
sanderd17
b09925b27e switch the game setup confirmation buttons and move the welcome screen buttons 
This was SVN commit r15100.
 2014-05-03 09:21:05 +00:00
sanderd17
542bc1b273 Further fix switched buttons 
This was SVN commit r15099.
 2014-05-03 09:07:31 +00:00
Yves
c1d5f6882c Also switch the button name to disable the correct one. 
4e0a588456 only switched the label and the action.

This was SVN commit r15098.
 2014-05-03 08:59:31 +00:00
sanderd17
12ec51783d Fix in-game manual display 
This was SVN commit r15097.
 2014-05-03 08:53:06 +00:00
sanderd17
4e0a588456 Switch more buttons, see 911be4e860 
This was SVN commit r15096.
 2014-05-03 08:45:19 +00:00
scythetwirler
f066549523 Makes the other players default to unassigned instead of Default AI in a sandbox map. 
This was SVN commit r15095.
 2014-05-03 04:00:14 +00:00
Yves
122dae799b Don't allow returning an invalid locale from the advanced language menu. 
This was SVN commit r15094.
 2014-05-02 21:14:28 +00:00
sanderd17
99486ed7ab Add camera to the second player, somehow avoids strange errors. 
This was SVN commit r15093.
 2014-05-02 20:08:48 +00:00
mimo
b8e9bae75e fixes Petra trying to keep going with a canceled attack 
This was SVN commit r15092.
 2014-05-02 11:03:24 +00:00
sanderd17
15f56cd984 Fix armour and attack display of heroes 
This was SVN commit r15091.
 2014-05-02 10:32:21 +00:00
sanderd17
ace3269768 Fix problem with sprintf errors being thrown when the AI places structures on the wrong places, make the code more uniform. Fixes #2485 
This was SVN commit r15090.
 2014-05-02 10:09:53 +00:00
sanderd17
a36a0bbd87 Improve my previous fix by throwing error objects instead of strings 
This was SVN commit r15089.
 2014-05-02 07:34:05 +00:00
sanderd17
aaf92409c9 Fix sprintf error reporting by printing the stack trace, and not trying to translate the calls 
This was SVN commit r15088.
 2014-05-02 07:27:44 +00:00
mimo
5658bb391b fix delete selection no more working after #15074 
This was SVN commit r15087.
 2014-05-01 21:06:43 +00:00
Yves
210374d86d Fixes Aegis not training additional units when no starting units are around. 
Patch by Teiresias.

Fixes #2460

This was SVN commit r15086.
 2014-05-01 13:13:38 +00:00
sanderd17
b9af0ac0e4 Enlarge various elements of the lobby login page to fit other languages. 
This was SVN commit r15085.
 2014-05-01 12:59:50 +00:00
sanderd17
a64456e6d8 Fix small space issue in the lobby (still some work to do there) 
This was SVN commit r15084.
 2014-05-01 11:38:53 +00:00
Gallaecio
47fc05d696 String freeze? Who said that? 
Fix typo: avalible → available.

This was SVN commit r15082.
 2014-05-01 01:22:59 +00:00
Gallaecio
d51f2a0c35 Version bump and regeneration of translation templates accordingly. 
This was SVN commit r15081.
 2014-05-01 00:44:47 +00:00
leper
c7b0261860 Fix the numbering in the Terms of Use for the lobby. Reverts 813db55b08. 
This was SVN commit r15079.
 2014-04-30 23:24:24 +00:00
leper
62f5476dec Add support for adding translation context to XML elements. Patch by Gallaecio. 
Add translation context to some lobby headers.

This was SVN commit r15078.
 2014-04-30 22:33:08 +00:00
sanderd17
057fa79bdb Revert db6c3f86f2. Changing something like that right before release is dangerous. 
This was SVN commit r15077.
 2014-04-30 17:53:51 +00:00
JoshuaJB
11865a8865 Revert a hack that snuck into an earlier commit of mine. 
This was SVN commit r15076.
 2014-04-30 17:22:38 +00:00
JoshuaJB
db6c3f86f2 Missing file 
This was SVN commit r15075.
 2014-04-30 06:29:42 +00:00
JoshuaJB
911be4e860 The convention is confirm button on right, decline button on left (updates some in-game dialogs). Also enables GLSL. 
This was SVN commit r15074.
 2014-04-30 06:28:57 +00:00
JoshuaJB
90581f366c This was SVN commit r15073. 2014-04-30 05:36:50 +00:00
JoshuaJB
e7b4c8b92a Make game automatically resume after closing the options menu. Refs #2507 
This was SVN commit r15072.
 2014-04-30 05:31:44 +00:00
JoshuaJB
a88f1222c0 Update AI descriptions, closes #2500. Also correct some capitalization and developer overlay transparency for #2507. 
This was SVN commit r15071.
 2014-04-30 05:04:12 +00:00
JoshuaJB
748ebdfdb0 Various GUI fixes and cleanup. 
This was SVN commit r15070.
 2014-04-30 04:38:53 +00:00
JoshuaJB
dfacf5358c New lobby connect/registration page. Not perfect but fixes most of the outstanding issues. Refs #2312 
This was SVN commit r15069.
 2014-04-30 00:46:57 +00:00
scythetwirler
15e9ffa21b Converts the save dialog to the modern UI. Refs #2507. 
This was SVN commit r15068.
 2014-04-29 21:45:00 +00:00
leper
29cab5f5ed Also change reveal map to revealed map. 
Fix typo in tutorial map. Remove message refering to finite fields.

This was SVN commit r15066.
 2014-04-29 14:51:21 +00:00
leper
b246017f9f Explore_d_ map. 
This was SVN commit r15065.
 2014-04-29 13:10:56 +00:00
sanderd17
b3ab49bb30 Really remove the minimum damage of 1, what 37c8e77d8e was supposed to do 
This was SVN commit r15064.
 2014-04-29 07:15:10 +00:00
JoshuaJB
1e6614918b Initial modern buttons. Lobby/prelobby now only rely on the modern common files. 
This was SVN commit r15063.
 2014-04-29 00:07:27 +00:00
leper
c77826e9aa Translate some message boxes when opening websites. 
Fix a typo. Refs #2501.

This was SVN commit r15062.
 2014-04-28 22:30:40 +00:00
leper
683170ea19 Enable/disable GenTangents when enabling/disabling PreferGLSL. Fixes #2505. 
This was SVN commit r15061.
 2014-04-28 22:30:27 +00:00
sanderd17
876d0e4e66 Forgot to fix some strings 
This was SVN commit r15060.
 2014-04-28 20:19:32 +00:00
sanderd17
e6e5b9f11f Add a link in the main menu to for translators. Patch by Stan, fixes #2501 
This was SVN commit r15059.
 2014-04-28 20:17:39 +00:00
leper
64d3d0b4b2 Remove falsely attributed quote. 
This was SVN commit r15058.
 2014-04-28 17:59:02 +00:00
sanderd17
4695f3425b Add the possibility to show the welcome screen on every update, next to the possibility to disable it completely. Patch by Itms, fixes #2116 
This was SVN commit r15057.
 2014-04-28 17:18:46 +00:00
Gallaecio
f26a2917d3 Translate map name in the summary page 
This was SVN commit r15056.
 2014-04-28 15:54:47 +00:00
sanderd17
b8245da606 Improve disabled technology tooltip. Fixes #2497 
This was SVN commit r15055.
 2014-04-28 15:17:26 +00:00
sanderd17
a49b359748 Fix formations attacking by adding a combat.approaching state. Fixes #2496 
This was SVN commit r15054.
 2014-04-28 13:05:47 +00:00
Gallaecio
b5dfacbf18 Translated map name in the loading screen, regenerated translation templates and updated translations from Transifex 
This was SVN commit r15053.
 2014-04-28 12:31:28 +00:00
Gallaecio
fb80e29d41 Changes to English tooltips for consistency 
Reported by an Italian translator, Fabio, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/13718374
https://www.transifex.com/projects/p/0ad/translate/#it/public/24494405

The periods were added in the main menu (only 2 tooltips without them)
and removed from the options menu (only 1 tooltip with it). In the
future, we might want to be consistent with tooltips through all the
GUI.

This was SVN commit r15052.
 2014-04-28 10:11:11 +00:00