Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity
23,089 Commits 9 Branches 28 Tags 13 GiB
d8b8128abb
Commit Graph

23089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wowgetoffyourcellphone
cce1005c81 [art - Alpha 26] 
Fix 2 Blemmye textures. Somehow during the moving and renaming process
the textures got screwed up.

This was SVN commit r26646.
 2022-03-14 06:02:21 +00:00
wowgetoffyourcellphone
36c7fff532 [Han Chinese - Alpha 26] 
Renamed the Han civ bonus filename to match the Persian and Mauryan
files of the same effect. Very minor change.

This was SVN commit r26644.
 2022-03-14 03:54:50 +00:00
Stan
91a1fddf9d Fix arctic biome bushes spawning too close to the CC. 
Patch by: @marder
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4543
This was SVN commit r26643.
 2022-03-14 00:15:43 +00:00
Angen
74ce45b93e Fix Macedonian bonus 
Differential revision: D4544
Patch by: @ValihrAnt
Missed rebase

This was SVN commit r26642.
 2022-03-13 19:14:44 +00:00
Angen
020a123ea1 [gameplay] Adjust Kushite Pyramids to be more used 
Differential revision: D4280
Patch by: @ValihrAnt
Reviewed by: @chrstgtr
Accepted by: @marder
Comments by: @wowgetoffyourcellphone @LetswaveaBook @wraitii @Freagarach
This was SVN commit r26641.
 2022-03-13 19:08:46 +00:00
Angen
4023b04895 [gameplay] increase attack of defensive structures slightly 
This increases their damage slightly from 10 to 11

Differential revision: D4510
Patch by: @marder
Reviewed by: @wowgetoffyourcellphone
Comments by: @chrstgtr
This was SVN commit r26640.
 2022-03-13 18:54:06 +00:00
Stan
87b04cc3f9 Add a word of caution to the empire map. 
Patch by: @Langbart
Fixes #6456
Differential Revision: https://code.wildfiregames.com/D4546
This was SVN commit r26639.
 2022-03-13 18:51:13 +00:00
Angen
8f7ee59f79 Fix 0 tech cost multiplier in session tooltips 
This was SVN commit r26638.
 2022-03-13 13:01:19 +00:00
vladislavbelov
376fe61df9 Adds missed shader program validation after 0456b09c3c. 
Reported By: Freagarach
This was SVN commit r26637.
 2022-03-13 11:01:32 +00:00
wowgetoffyourcellphone
272b4c1828 [Han Chinese - Alpha 26] 
Make the Imperial Court upgrade only applicable to 1 civic center.

This was SVN commit r26636.
 2022-03-13 04:54:57 +00:00
wowgetoffyourcellphone
ff4e30d672 [Han Chinese - Alpha 26] This retools the Imperial Court upgrade for the Civic Center. 
Discussion:
https://wildfiregames.com/forum/topic/71582-fixing-chinese-han/

This removes the Champion training aspect and reduces the GarrisonHolder
from 2x to a 1.5x bonus, the same as the health and capture points
bonus. 2x garrisoning caused there to be a prohibitive number of arrows.

Replaces the champions with faster batch training speed. Unlocked heroes
still remain.

This was SVN commit r26634.
 2022-03-13 04:53:40 +00:00
wowgetoffyourcellphone
2c9a6704e0 Forgot to commit the unlock tech changes for c4bdbe4dd9 
This was SVN commit r26633.
 2022-03-13 04:53:08 +00:00
wowgetoffyourcellphone
c4bdbe4dd9 [Han Chinese - Alpha 26] Champions trainable in captured Barracks and Stables now require Unlocking Techs 
Discussion:
https://wildfiregames.com/forum/topic/71582-fixing-chinese-han/

Previously, one could capture an enemy Barracks or Stable and train Han
champions there without researching the champion unlocking techs. This
rectifies this (in an admittedly hacky way) by creating duplicate Han
champion templates with suffix "_academy" and putting those in the Han
Academy with the RequiredTechnology of City Phase.

The original Han champion templates, which are what can be trained in
captured Barracks and Stables, are given the unlocking
RequiredTechnology respective to their class (as most of civs'
champions).

Both Templates have the same SelectionGroupName, so should be selectable
together with a double-click with no problem.

Please report problems in the above linked thread.

This was SVN commit r26632.
 2022-03-13 04:34:03 +00:00
wowgetoffyourcellphone
4eb65144fc [Han Chinese] Minister 
- Make his capture attack be 20% less than heroes, but 40% more than
champions (previously his capture attack was a whopping 20)
- Add an attack-move soundgroup
- Discussion:
https://wildfiregames.com/forum/topic/71582-fixing-chinese-han/

This was SVN commit r26631.
 2022-03-13 04:25:10 +00:00
vladislavbelov
e89e55539e Removes custom vertex attribute locations for GLSL. Refs ce215cace3. 
This was SVN commit r26630.
 2022-03-12 23:25:23 +00:00
vladislavbelov
992c18aabb Enables ARB shaders only once since we should not mix different backends. 
This was SVN commit r26629.
 2022-03-12 22:10:47 +00:00
vladislavbelov
0456b09c3c Moves shader dependent XML parsing from shader manager to shader program. 
This was SVN commit r26628.
 2022-03-12 22:02:21 +00:00
Stan
325176fa55 [gameplay] Macedonian bonus - Instant storehouse technology research time. 
Patch by: @ValihrAnt
Accepted by: @chrstgtr
Differential Revision: https://code.wildfiregames.com/D4234
This was SVN commit r26627.
 2022-03-12 21:52:23 +00:00
Stan
d9ccc5c499 [gameplay] Nerf Han hero Han Xin 
Patch by: @ValihrAnt
Accepted by: @marder, @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4525
This was SVN commit r26626.
 2022-03-12 21:22:16 +00:00
Stan
50234ba533 Slighty offset the stone mine on the tutorial map to prevent overlap. 
Patch by: @Langbart
Accepted by: @marder
Thread:
https://wildfiregames.com/forum/topic/73619-tutorial-map-woman-overlapping-stone-mine

Differential Revision: https://code.wildfiregames.com/D4540
This was SVN commit r26625.
 2022-03-12 19:29:18 +00:00
vladislavbelov
518a1421ab Clears the color attachment of the main framebuffer only if needed. 
Differential Revision: https://code.wildfiregames.com/D4539
This was SVN commit r26623.
 2022-03-11 22:26:49 +00:00
Stan
61ef7fc1d1 Adjusted walking speed and animation speed for a number of animals: 
- camel, cow, sanga cattle, zebu: decreased animation speed
- deer and gazelle: decreased animation speed and walking speed.

Patch by @pszemsza
Fixes #5680
Differential Revision: https://code.wildfiregames.com/D3891
This was SVN commit r26622.
 2022-03-11 13:51:43 +00:00
wowgetoffyourcellphone
4f028b0771 [art] Resize the minimap icons from 32x32 to 16x16 
This was SVN commit r26621.
 2022-03-11 08:18:25 +00:00
Freagarach
dff79a388b Fix obstructed entities being able to drop off resources. 
Introduced in 7ba4b1ffc8 by not checking the range anymore.
Reported by @FFFF at
https://wildfiregames.com/forum/topic/72985-stuck-units-delivering-resourses/.

Differential revision: https://code.wildfiregames.com/D4531
Tested by: @Langbart
Fixes #6446

This was SVN commit r26619.
 2022-03-11 06:39:25 +00:00
Freagarach
41033d951e Fix stances of healers. 
They fled whilst healing and not when idle. That is the other way around
than expected.
Introduced in healing introduction (c56f96040e); #999 specifically made
them flee, but it left quite undefined behaviour.
Reported by @BreakfastBurrito_007 on the forums somewhere.

Differential revision: https://code.wildfiregames.com/D4532
This was SVN commit r26618.
 2022-03-11 06:37:03 +00:00
Stan
9c22f9f123 Fix the loading of subfiles for LODS. It currently failed because el_actor and el_quality levels have different ids depending on the loaded file. e.g for an actor with qualitylevels el_actor will be 18 and el_qualitylevels will be 0 while for a standard actor el_actor will be 0 and el_qualitylevels will be -1, hence failing for all the files since the code assumed wrong. XeroActor.Load() takes care of all the other cases, e.g. trying to load a variant which means the only valid check is for qualitylevels. 
Fixes 76acc4e146

This was SVN commit r26616.
 2022-03-10 21:32:36 +00:00
vladislavbelov
5390143b66 Fixes rendering reflections even they are disabled, broken in 9ce51f4357. Fixes #6454 
Reported By: Langbart
This was SVN commit r26615.
 2022-03-10 16:36:16 +00:00
vladislavbelov
1ce999a52d Creates water backend textures and framebuffers only if needed. 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D4536
This was SVN commit r26613.
 2022-03-09 21:40:24 +00:00
wowgetoffyourcellphone
ca3c3714a7 [art] Han Chinese 
New portrait for Wei Qing, by kul

This was SVN commit r26612.
 2022-03-09 17:50:14 +00:00
vladislavbelov
cb1f0807c5 Removes FALLTHROUGH in VertexArray after 12c304e494. Fixes #6453 
This was SVN commit r26611.
 2022-03-09 07:07:02 +00:00
vladislavbelov
12c304e494 Removes duplication of backend format in VertexArray usages, optimizes vertex color attribute of quad overlay. 
This was SVN commit r26609.
 2022-03-08 23:28:31 +00:00
wowgetoffyourcellphone
6a09087225 [art] Han Chinese 
- Liu Bang portrait by @kul

This was SVN commit r26608.
 2022-03-08 09:21:07 +00:00
wowgetoffyourcellphone
059fbf25d1 [Fix - Alpha 26] Remove minimap icons from Stone and Metal mines for this release, as some maps have more than the max number of 128. 
Refs diff: ​https://code.wildfiregames.com/D4513
Refs changeset: 9e6e6e7535

This was SVN commit r26607.
 2022-03-08 07:03:58 +00:00
vladislavbelov
41f2ab87ed Fixes macOS warnings after adding final keyword to simulation classes in 3eee3a444d. 
Also fixes GLES.

Differential Revision: https://code.wildfiregames.com/D4528
This was SVN commit r26605.
 2022-03-07 23:04:11 +00:00
Stan
687174e5d9 Fix crash when creating JSON file that do not exist. 
Tested by: @Langbart
Refs: #6450
Differential Revision: https://code.wildfiregames.com/D4529
This was SVN commit r26604.
 2022-03-07 15:46:28 +00:00
wowgetoffyourcellphone
3417669e97 [art] Improve the look of the loading screen parchment. From a cc0 source. 
This was SVN commit r26602.
 2022-03-07 07:28:48 +00:00
wowgetoffyourcellphone
2d598c34f3 [Fix] Han Minister attack soundgroup 
This was SVN commit r26601.
 2022-03-07 06:56:21 +00:00
wowgetoffyourcellphone
9e6e6e7535 [Minimap] Finish off the minimap feature with the rest of the icons 
Refs diff: https://code.wildfiregames.com/D4513
Refs #26592

This was SVN commit r26600.
 2022-03-07 06:49:08 +00:00
wowgetoffyourcellphone
839d38386c [gameplay - Alpha 26] Han Chinese 
- Remove the bolt shooter tech from the Han arsenal, since they no
longer have a bolt shooter

This was SVN commit r26598.
 2022-03-07 05:04:22 +00:00
wowgetoffyourcellphone
c62cc86477 [art] Improve the Ptolemy merc cav actors. 
This was SVN commit r26597.
 2022-03-07 05:03:05 +00:00
wowgetoffyourcellphone
1fd263520c [art] Create a new material player_trans_ao_norm_spec.xml 
This was SVN commit r26596.
 2022-03-07 05:02:07 +00:00
wowgetoffyourcellphone
475e1a02ae [art] Allow the Spartan Syssition model to use Spartan hoplite shields instead of the ugly low res bronze disks used previously. 
This was SVN commit r26595.
 2022-03-07 04:59:51 +00:00
vladislavbelov
647fccd410 Replaces native GL types by backend format in vertex attributes in CShaderProgram. 
This was SVN commit r26594.
 2022-03-07 02:21:05 +00:00
wowgetoffyourcellphone
36faf3bb4f This was SVN commit r26593. 2022-03-07 01:59:41 +00:00
vladislavbelov
ce18f297d5 Adds icons to minimap. 
Tested By: Langbart, Stan
Differential Revision: https://code.wildfiregames.com/D4513
This was SVN commit r26592.
 2022-03-07 01:22:06 +00:00
wowgetoffyourcellphone
ddf88a2640 [gameplay - Alpha 26] Han Chinese 
- Remove GarrisonHolder from the Han Dock, as it messed up the trade
route waypoint feature.
- Maybe investigate a way to get around this.

This was SVN commit r26591.
 2022-03-06 23:25:46 +00:00
wowgetoffyourcellphone
ff3b6d5ac4 [Jenkins Log] 
- Fixing Thespian Melanochitones and Theban Sacred Band errors
introduced in 8c8d765c06
- Fixing some shield errors introduced in f2346b6796

This was SVN commit r26589.
 2022-03-06 22:32:41 +00:00
vladislavbelov
3399791677 Adds renderer backend vertex formats and normalizes texture formats. 
This was SVN commit r26588.
 2022-03-06 22:14:57 +00:00
bb
15ed402a12 [A26 Gameplay] Tweak the formation turning threshold 
Reviewed By: marder
Differential Revision: D4517
This was SVN commit r26587.
 2022-03-06 21:32:19 +00:00
bb
6a9a17606c further optimizations for map Unknown: Passes 
Patch By: elexis
Transferred By: marder
aids 50fefd0605
Differential Revision: D4526
This was SVN commit r26586.
 2022-03-06 21:30:19 +00:00