gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
19,297 Commits 1 Branch 39 Tags
04047e4901dacd0e78f2fe32e048241d64bf5846
Commit Graph

19297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gallaecio 04047e4901 Rephrase the description of the wonder victory condition 
Patch By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D1550
This was SVN commit r22122.
 2019-03-17 14:13:12 +00:00
Gallaecio 91ff208e1d Do not generate duplicate biome strings for translation 
Patch By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D1579
This was SVN commit r22121.
 2019-03-17 14:07:56 +00:00
bb 2af6fa6d20 Change structure_defense to structure_defensive so it is consistent with the other structure types. Nuking the weird defense_defense_tower name while at it 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1788
This was SVN commit r22120.
 2019-03-17 13:05:27 +00:00
bb edc1b14ba4 Remove a misleading unit_fauna_decorative from the bird template 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1787
This was SVN commit r22118.
 2019-03-16 21:18:01 +00:00
Itms 7e2b318a1e Add particle support to the Actor Editor, fixes #1590. 
Patch By: shh
Differential Revision: https://code.wildfiregames.com/D1783
This was SVN commit r22117.
 2019-03-16 21:16:04 +00:00
bb d7e88622d8 Nuke the misleading Structure_Defence from the wallset template name 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1733
This was SVN commit r22116.
 2019-03-16 21:03:11 +00:00
bb 0287402eaa Move the fish template under template_gaia since fish is a resource like trees and mines. 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1774
This was SVN commit r22115.
 2019-03-16 20:56:53 +00:00
bb da3212c1ed Also align the chat, refs 9af3040b34 
This was SVN commit r22114.
 2019-03-16 16:07:39 +00:00
bb 9a73b7485d Fix a broken early return from a1ddf6114a 
Reported By: Imarok
This was SVN commit r22113.
 2019-03-16 14:39:51 +00:00
bb 702127b8df Add autostart conquest default description to readme.txt and add endless support for autostart in both readme.txt and GameSetup.cpp 
Reported By: elexis
Fixes: 6d54ab4c1f, 22903b09a6

This was SVN commit r22112.
 2019-03-16 14:20:28 +00:00
bb 9af3040b34 Align the settingspanel with its background, fixing te misalignment itroduced inrP20945 and made visible in 60092048e1. 
fixes: 60092048e1

Based on Patch by: nani
Differential Revision: https://code.wildfiregames.com/D1755
This was SVN commit r22111.
 2019-03-16 14:12:43 +00:00
Stan 5f78b3a0a1 Add the gaul assembly to the Sandbox - Gauls map 
This was SVN commit r22109.
 2019-03-11 22:54:47 +00:00
Stan 62a76eb136 Fix gaul assembly's template. The civ was incorrect and it was missing a specific name and a generic name. 
Reported by: @Nescio
This was SVN commit r22108.
 2019-03-11 22:40:35 +00:00
LordGood 8e2d11a69d Black Pines, Cattails, Atlas Cedars, and Saplings 
This was SVN commit r22107.
 2019-03-11 13:36:05 +00:00
Stan a36ff2e64e Add Gaul theatron (Unused for now) 
Reviewed by: @Lordgood @Sundiata @Genava55
Authored by: @Stan
Forum thread:
https://wildfiregames.com/forum/index.php?/topic/25299-committed-gaul-theatron/

This was SVN commit r22105.
 2019-03-10 00:03:51 +00:00
Stan 9dc6c46ab6 Clean ResourceSupply up. 
Add documentation
Reviewed by: @Imarok
Authored by: @Stan
Differential Revision: https://code.wildfiregames.com/D1771
This was SVN commit r22103.
 2019-03-06 16:44:24 +00:00
Imarok f9da484077 Linting: allow constant condition in loops 
Reviewed by: Itms
Differential Revision: https://code.wildfiregames.com/D1364
This was SVN commit r22101.
 2019-03-03 10:48:18 +00:00
LordGood 2dfa48fe1b Footpaths and papyrus files+actors 
This was SVN commit r22098.
 2019-02-25 07:23:06 +00:00
Alexandermb 899b67e664 Reduce Ships Update specular map texture size as conversed with Stan. 
Move rome_civic_center ao from structural folder to AO folder.
Committ Mistletoe headdres for celtic faction's Healer "Druid"

Thread:
https://wildfiregames.com/forum/index.php?/topic/25402-task-celtic-druid-re-texture/&tab=comments#comment-369730

This was SVN commit r22097.
 2019-02-25 06:03:07 +00:00
Stan 0cc034fa6f Improve and fix checkrefs.pl, add a readme for usage, add mod support, add command line arguments. 
Reviewed by: @Itms
Comments by: @elexis
Differential Revision: https://code.wildfiregames.com/D1381
This was SVN commit r22096.
 2019-02-24 21:19:20 +00:00
Alexandermb 9f2b761478 Ships update 
Authored by Stan

This was SVN commit r22095.
 2019-02-23 21:43:22 +00:00
Stan 5a5e498672 Fix a missed file in the previous commit. 
This was SVN commit r22092.
 2019-02-17 20:48:16 +00:00
Alexandermb 35264cba30 Fix double slash on phrygian mask's 
Add helmets to ptol celtic infantry_swordsman_e.xml

This was SVN commit r22091.
 2019-02-17 18:05:37 +00:00
Alexandermb 50852f6e46 Assign helmets to celtc infantry. 
This was SVN commit r22090.
 2019-02-17 16:34:25 +00:00
Stan 3be6a3a5b5 Fix a typo revealed by checkrefs.pl 
See D1381

This was SVN commit r22089.
 2019-02-17 16:01:20 +00:00
Imarok 6fb7479109 Acoustic notification when people join a hosted game 
Patch by Polakrity.
Sound by Samulis.
Reviewed by: Imarok
Fixes: #4101
Differential Revision: https://code.wildfiregames.com/D932
This was SVN commit r22088.
 2019-02-15 18:55:38 +00:00
Stan 3480608625 Fix two comments by @elexis on 700baef3b4 
This was SVN commit r22084.
 2019-02-07 15:51:03 +00:00
Stan ccd88ec5c8 Group civ bonuses into a single folder 
Patch by: @Nescio
Reviewed by: @wraitii, @elexis, @Stan
Differential Revision: https://code.wildfiregames.com/D1472
This was SVN commit r22083.
 2019-02-07 15:37:21 +00:00
Alexandermb 25d37cc632 Rome helmets (Also reverting a deleted song in rome civ template): 
Reviewed by Stan

This was SVN commit r22082.
 2019-02-06 19:22:29 +00:00
Alexandermb 06e01ef944 Rome Testudo & Anti-Cavalry formations animations: 
Reviewed by Stan

This was SVN commit r22081.
 2019-02-06 14:57:43 +00:00
Alexandermb 6ba5307655 Fix a typo in last commit 
This was SVN commit r22080.
 2019-02-05 19:18:40 +00:00
Alexandermb c60b20a17a Remove old naming schema of Celtic helmets. 
This was SVN commit r22079.
 2019-02-05 19:09:04 +00:00
Alexandermb cdf7d0fc8c Celtic helmets/celt_alesia_base_01.xml 
Thread:
https://wildfiregames.com/forum/index.php?/topic/24465-committed-celtic-unit-helmets/&page=5

Fix to inconsistencies in celtic helmets pointed by user Genava55

This was SVN commit r22078.
 2019-02-05 19:05:19 +00:00
Stan 700baef3b4 Health.js cleanup. Fixes Vulkan complaints 
- Var → let
- Simplify some lines
- add break to

Reviewed by: @elexis
Differential Revision: https://code.wildfiregames.com/D1770
This was SVN commit r22075.
 2019-01-31 13:34:13 +00:00
Imarok 111f850927 Don't let the duplicateplayernames setting break lobbied games (0fd8aa2a77) 
Looked at by: elexis
Differential Revision: https://code.wildfiregames.com/D1748
This was SVN commit r22072.
 2019-01-28 12:09:42 +00:00
Stan 040b367bc4 Fix wallsets throwing annoying errors when loaded in Atlas. 
Refs: b05879e151, 490182ddd0, #786

This was SVN commit r22070.
 2019-01-26 11:10:27 +00:00
Stan 5453adf7dd Improved pig animations and textures. 
Thread:
https://wildfiregames.com/forum/index.php?/topic/21005-committed-pig/

This was SVN commit r22067.
 2019-01-24 22:35:36 +00:00
vladislavbelov ac1a56e0cc Fix cell text wrapping inside COList. 
Patch By: gentz
Tested By: vladislavbelov
Commented By: elexis
Differential Revision: https://code.wildfiregames.com/D1717
This was SVN commit r22066.
 2019-01-24 20:00:31 +00:00
Stan 86cfe554b4 Celtic structures' specific names update 
Thread:
https://wildfiregames.com/forum/index.php?/topic/25268-specific-name-review-structures/&page=2&tab=comments#comment-367917
Patch by: @Nescio
Reviewed by: @Stan, @Genava55
Differential Revision: https://code.wildfiregames.com/D1757
This was SVN commit r22065.
 2019-01-23 22:46:57 +00:00
Stan 9229ed6c42 Fix a little bug with the boar, remove the old files. 
This was SVN commit r22064.
 2019-01-21 22:05:04 +00:00
Alexandermb 74be5f03c8 Hele Phrygian Helmet commit 
Updated sele_hero_seleucus_nikator helmet texture.

Thread:
https://wildfiregames.com/forum/index.php?/topic/25179-task-phrygian-helmet/

Reviewed by Stan

This was SVN commit r22062.
 2019-01-19 20:39:24 +00:00
Stan 0d00866c8f Merge entity templates, removing two templates with non descriptive names. 
Patch by: @Nescio
Discussed with: @elexis

Differential Revision: https://code.wildfiregames.com/D1734
This was SVN commit r22061.
 2019-01-19 12:47:39 +00:00
Stan 14810ca5bf manual/intro.txt corrections 
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D1744
This was SVN commit r22060.
 2019-01-19 12:43:43 +00:00
wraitii 8bab09d37c Fix UnitAI infinite loop following a16e7c0a56 
As reported by Angen and Gurken Khan on the forums, there is a crash
following a16e7c0a56 caused by an infinite loop in UnitAI. The reason is
that IDLE.enter can order us to attack, which can fail, switching us
right away back to idle.

FinishOrder's behaviour allows us to have IDLE as a default state and
lets us not lose a turn when becoming idle, so to keep this behaviour
explicitely check that we are not already in IDLE before switching
states.

Reported by: Angen, Gurken Khan
Commented by: elexis, Itms
Differential Revision: https://code.wildfiregames.com/D1743
This was SVN commit r22059.
 2019-01-19 07:44:40 +00:00
Alexandermb 3e66aa093b Resize celtic/hellenic helmet textures from 512 to 256. 
Tweaks to some celtic helmets actors.
Invert battersea shield Mesh for proper AO as mentioned by Wow

Approved by Stan

This was SVN commit r22058.
 2019-01-18 18:41:35 +00:00
Imarok 79a41098c3 Update AI difficulty level description. 
Reviewed by: Stan, Imarok
Differential Revision: https://code.wildfiregames.com/D1749
This was SVN commit r22056.
 2019-01-17 23:02:11 +00:00
Stan 2b3c829e74 Update Kushite stable, range, workshop, and elephant stable's specific names. 
Patch by: @Nescio
Names by: @Sundiata
Differential Revision: https://code.wildfiregames.com/D1750
This was SVN commit r22055.
 2019-01-15 20:35:49 +00:00
Itms db5d4bb5f1 SpiderMonkey-related changes in preparation for the upgrade to SpiderMonkey 45, refs #4893. 
- Remove JSVAL_ZERO and JSVAL_NULL
https://bugzilla.mozilla.org/show_bug.cgi?id=1177825
- Remove *_TO_JSVAL https://bugzilla.mozilla.org/show_bug.cgi?id=1177892
- Drop support for parent object in the deserializer
https://bugzilla.mozilla.org/show_bug.cgi?id=1136345,
https://bugzilla.mozilla.org/show_bug.cgi?id=805052
- Correctly use boolean values in JS::RuntimeOptionsRef
- Use JS_FN instead of JS_FS: in future versions, JS_FS is not public
because it isn't supposed to be used in JSAPI code
- Allow to select flags for global objects, and correctly mark progress
bars in the loading screen as not readonly+permanent
- Remove empty JSI_props in IGUIObject

Reviewed By: wraitii, elexis
Differential Revision: https://code.wildfiregames.com/D1716
This was SVN commit r22052.
 2019-01-13 16:37:41 +00:00
vladislavbelov 651cf8b364 Split CColor from Shapes. 
Reviewed By: wraitii
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D1515
This was SVN commit r22051.
 2019-01-13 15:38:41 +00:00
vladislavbelov 43a291a071 Simple refactoring of Singleton. Make it non-copyable. 
Reviewed By: wraitii
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D1564
This was SVN commit r22050.
 2019-01-13 15:11:40 +00:00