mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-24 16:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,350 Commits 1 Branch 39 Tags
dca572fbcd3cdcf3c151bebb07b766e035dbf3ce
Commit Graph

17350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fatherbushido dc1835bb1d Add missing history entries to Macedonian units and set their slinger as mercenary in agreement of design doc. 
This was SVN commit r19133.
 2017-01-10 20:41:07 +00:00
Enrique 4f7b4e97d8 Improved slinger attack animation. 
fixed build animation mallet placement.
fixed iberian helmet to fit new head meshes.
fixed mauryan turbans to fit new head meshes.
fixed persian camel trader prop placement
fixed female carry meat prop placement
fixed tool prop gather grain placement

This was SVN commit r19132.
 2017-01-10 19:26:02 +00:00
Enrique ef7fcd4674 Batch of patches from Stanislas69 
Fixes #3813
Refs #2524 and #4440

-Fixes stoyas foundations
-Fixes walls foundations
-Fixes carth superdock foundation
-Fixes cape_chariot variant
-Fixes missing referenced files in #2524

This was SVN commit r19131.
 2017-01-10 19:22:54 +00:00
Enrique 0a68ace52d Upgraded Carthaginian market from Stanislas69. Thanks! 
This was SVN commit r19130.
 2017-01-10 19:17:17 +00:00
Enrique 004c8679d4 Updated unit portraits from wowgetoffyourcellphone. Thanks! 
This was SVN commit r19129.
 2017-01-10 19:13:47 +00:00
fatherbushido d51ad4fbdf Remove useless empty specific name and history entries in templates. Refs fd4e899f11. Fix #4445. 
This was SVN commit r19128.
 2017-01-10 15:39:19 +00:00
fatherbushido 8229ca499c Handle case where diminishing returns equal to 1. Accepted by mimo. 
Differential Revision: https://code.wildfiregames.com/D57
This was SVN commit r19127.
 2017-01-10 14:05:43 +00:00
mimo 2e636af9bc fix missing semicolons 
This was SVN commit r19126.
 2017-01-09 19:03:24 +00:00
Gallaecio b096728618 “an huge army” → “a huge army” 
Differential Revision: https://code.wildfiregames.com/D55
This was SVN commit r19124.
 2017-01-08 22:22:31 +00:00
Gallaecio 449ea2b6ed “setting a game” → “setting up a game” 
Differential Revision: https://code.wildfiregames.com/D54
This was SVN commit r19123.
 2017-01-08 22:19:24 +00:00
fatherbushido 0e77bdd911 Add some missing auras and remove some tooltip. Accepted by elexis. 
Differential Revision: https://code.wildfiregames.com/D37
This was SVN commit r19122.
 2017-01-08 16:06:20 +00:00
fatherbushido 4ad6890cad Add a simulation test to the previous commit of s0600204's patch. Refs #4263. 
This was SVN commit r19121.
 2017-01-08 14:04:23 +00:00
fatherbushido 6c97d8118b Merge different logics of technology requirements and fix the related bugs. Create a global script which derive the technology requirements objects in a form usable for structure tree, gui, simulation and AI. Reviewed by mimo (for AI) and fatherbushido. Fixes #3993, #1646, #4263, #4217. Refs #4108. 
This was SVN commit r19120.
 2017-01-08 14:00:20 +00:00
leper b5991e188b TemplateLoader cleanup. 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D26
This was SVN commit r19119.
 2017-01-07 17:52:32 +00:00
mimo a859f3cd91 Fix double-click on hero button when the hero is garrisoned in a ram garrisoned somewhere, refs #4291 
Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D46
This was SVN commit r19118.
 2017-01-07 10:33:30 +00:00
fatherbushido d73d656cc5 Adress a Todo in auras code. Add player type aura. Improve tests. Accepted by mimo. 
Differential Revision: https://code.wildfiregames.com/D41
This was SVN commit r19117.
 2017-01-06 20:14:39 +00:00
mimo 32d2375e55 petra: start implementing responses to alliance requests, patch by sandarac, refs #4431 
This was SVN commit r19116.
 2017-01-06 19:24:15 +00:00
wraitii 2bae30c454 Fix [19027] by using generic code for conversions and fixing a few other issues. Refs #3403. Reviewed by leper. 
Also fix some of the warnings that jenkins showed.

Differential Revision: https://code.wildfiregames.com/D24
This was SVN commit r19115.
 2017-01-06 11:14:03 +00:00
mimo 1a038b1735 fixes a typo in 3c56638e8b, spotted by sandarac 
This was SVN commit r19113.
 2017-01-05 18:00:53 +00:00
elexis 3c8fc4f263 Return "local" from GetPlayerGUID to avoid duplicate checks and allow AIs to send private messages to the single player. Refs #4431. 
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D38
This was SVN commit r19112.
 2017-01-05 10:22:39 +00:00
Itms 4068f2e14a Fix warning with GCC in our lowlevel PNG texture code. 
Ensure a variable is not clobbered by libpng's use of longjmp. Make code
more consistent.

Differential Revision: https://code.wildfiregames.com/D35
This was SVN commit r19111.
 2017-01-04 21:05:08 +00:00
Itms 81eb74163e Happy New Year *cough*(Years)*cough*! 
Also fix some whitespace.

This was SVN commit r19110.
 2017-01-04 21:00:16 +00:00
mimo 3c56638e8b petra: cleanup of chat messages based on patch by bb, refs #4326 
This was SVN commit r19109.
 2017-01-04 20:02:56 +00:00
mimo 92ea4af49e Trade with neutral should be allowed in the gui 
Reviewed By: leper
Differential Revision: https://code.wildfiregames.com/D34
This was SVN commit r19108.
 2017-01-04 18:28:50 +00:00
fatherbushido 0664c5f868 Fix a typo in a comment. Accepted by leper. 
Differential Revision: https://code.wildfiregames.com/D28
This was SVN commit r19107.
 2017-01-04 13:22:17 +00:00
fatherbushido d68cfb508a Fix alphabetical order in simulation templates. Accepted by elexis. 
Differential Revision: https://code.wildfiregames.com/D33
This was SVN commit r19106.
 2017-01-04 13:19:18 +00:00
leper dedbdc384c Stop marking the player as won on endless games. Patch by Vladislav. Fixes #4323. 
This was SVN commit r19105.
 2017-01-03 23:12:52 +00:00
mimo 947e087820 petra cleanup, taken from sandarac, refs #4431 
This was SVN commit r19104.
 2017-01-03 20:30:03 +00:00
fatherbushido aa6ba459d8 Fix identation issues, line endings and remove a not working entry in templates. Refs 83680b0dee. Refs #4440. 
This was SVN commit r19103.
 2017-01-03 16:24:52 +00:00
fatherbushido f8aec9214a Add Persian and Carthaginian team bonus. Reviewed by mimo. 
Differential Revision: https://code.wildfiregames.com/D32
This was SVN commit r19102.
 2017-01-03 14:03:15 +00:00
mimo faa2090146 cleanup 
This was SVN commit r19101.
 2017-01-02 19:18:06 +00:00
wraitii ffb157dae7 Fixes an issue with miraging. Fixes #4297. Reviewed by leper and Itms. 
Differential Revision: https://code.wildfiregames.com/D10
-This line, and those below, will be ignored--

M    binaries/data/mods/public/simulation/components/Fogging.js

This was SVN commit r19100.
 2017-01-02 12:32:16 +00:00
mimo ccf4972bc5 petra cleanup (remove some capitalization) 
This was SVN commit r19099.
 2017-01-02 10:28:41 +00:00
fatherbushido 3a92b322b5 Replace tab with spaces. Refs 9a4fcd55a8. 
This was SVN commit r19098.
 2017-01-02 09:08:08 +00:00
Enrique 7c295704be Fix an error message when units with capes used props. 
This was SVN commit r19096.
 2017-01-01 21:08:50 +00:00
Enrique 83680b0dee Let's start the year with the right foot. 
Implemented new unit meshes with animations. (thanks
wowgetoffyourcellphone for helping out with actors)
Added Tobi95's capitoline jupiter building as roman wonder
Added Stanislas69's Stupa upgrade, terrain textures, and kausia cap
helmet.
Several updated textures from wowgetoffyourcellphone Delenda Est mod,
improved smoke and rain particles, and tech icons & portraits (some not
used yet)
Added new death screams from opengameart.org

This was SVN commit r19095.
 2017-01-01 18:10:09 +00:00
fatherbushido 553ab4f961 Fix messy identation in my previous commit. Noticed by leper. Refs 6d318d0869. 
This was SVN commit r19094.
 2017-01-01 17:39:18 +00:00
fatherbushido 6d318d0869 Remove team bonus when the source player is defeated. Reviewed by wraitii. 
Differential Revision: https://code.wildfiregames.com/D12
This was SVN commit r19093.
 2017-01-01 17:23:29 +00:00
fatherbushido feb22d7626 Don't use range queries for global auras. Fix related team bonus. Add Mauryan team bonus. Based on a sanderd17 patch. Reviewed by wraitti. 
Differential Revision: https://code.wildfiregames.com/D19
This was SVN commit r19092.
 2017-01-01 16:52:24 +00:00
leper 852221f595 Commands.js cleanup. 
Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D29
This was SVN commit r19091.
 2016-12-31 21:28:28 +00:00
Enrique d8f87e1ec1 female healer animations, syntagma mid row animation and celt chariot rider animations 
staff props for new female healers and new trader.

This was SVN commit r19090.
 2016-12-31 20:27:18 +00:00
mimo 3c3e2b4c65 petra: add healer guards in regicide mode, patch by Sandarac, refs #4142 
This was SVN commit r19089.
 2016-12-31 12:18:01 +00:00
mimo 86cf621def petra: prevent UnitAI to give a useless capture attack 
This was SVN commit r19088.
 2016-12-31 11:22:48 +00:00
leper 11ce52f8c5 Fix a few mistakes in the lobby readme. 
Differential Revision: https://code.wildfiregames.com/D27
This was SVN commit r19087.
 2016-12-31 00:11:30 +00:00
mimo 78a3734716 Petra: improve regicide support, patch by Sandarac, refs #4142 
add a gametypeManager and improve garrisoning of hurt hero

This was SVN commit r19085.
 2016-12-29 15:08:50 +00:00
Imarok 29367a9d98 Fix translation comment typo. refs #4410 
This was SVN commit r19084.
 2016-12-29 12:59:18 +00:00
fatherbushido 9e3dcb6f89 Add tooltip and icon to some autoresearched techs to allow displaying them in the structure tree. Patch by sanderd17. Refs #3801. 
This was SVN commit r19083.
 2016-12-29 11:27:17 +00:00
Imarok d4b893c15c Don't say late observers are rejoining. fixes #4410 
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D5
This was SVN commit r19082.
 2016-12-28 16:31:21 +00:00
mimo 93105bf933 This was SVN commit r19081. 2016-12-28 09:25:40 +00:00
mimo 75dc300c78 petra: fixes typos introduced in 1dd7f6d32a 
This was SVN commit r19080.
 2016-12-28 09:18:42 +00:00