Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
11,162 Commits 1 Branch 28 Tags 13 GiB
116281f830
Commit Graph

11162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
historic_bruno
116281f830 Fixes Atlas and Collada dylib loading on OS X, for non-bundled binaries. Thanks to wraitii for the suggestion. 
This was SVN commit r12834.
 2012-11-08 01:57:50 +00:00
historic_bruno
fa56c11820 Removes JuBot AI which is no longer maintained and has been superseded by qBot. The latest code will remain on Trac for reference. 
This was SVN commit r12833.
 2012-11-07 21:11:50 +00:00
fcxSanya
7e21db08d5 Training limits. Limit heroes to one living per player. Allow heroes to be trained again. Closes #1432 
This was SVN commit r12832.
 2012-11-07 17:56:14 +00:00
wraitii
669b7e6e2c Fixes #1714. Also updates the Mediterranean Cove map water settings. 
This was SVN commit r12831.
 2012-11-07 15:40:34 +00:00
wraitii
c722fbd93f Change hwdetect to handle slightly more cases with the water detection. 
Updates a few more maps with new settings.

This was SVN commit r12830.
 2012-11-07 10:53:37 +00:00
leper
10752c798d Prevent attacking yourself (caused by splash damage). 
This was SVN commit r12829.
 2012-11-06 14:58:34 +00:00
leper
d57926fa5b Adjust diplomacy according to irc discussion. Refs #7. 
This was SVN commit r12828.
 2012-11-05 20:16:35 +00:00
leper
e969340b6c Fix diplomacy for atlas. 
This was SVN commit r12827.
 2012-11-05 19:34:21 +00:00
wraitii
c1da925786 Change some scenario water settings. Refs #1711. 
This was SVN commit r12825.
 2012-11-05 17:31:28 +00:00
Enrique
9ebdeff90e mauryan fortress small fix 
This was SVN commit r12824.
 2012-11-05 16:30:57 +00:00
Enrique
d52cac9c1a Mauryan fortress commited, second mauryan texture (maur_struct_b.png) commited. 
This was SVN commit r12823.
 2012-11-05 16:15:15 +00:00
wraitii
76676b1e38 Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ. 
This was SVN commit r12822.
 2012-11-05 12:14:04 +00:00
leper
1e3c885f45 Allow trading with neutral players. 
This was SVN commit r12821.
 2012-11-04 23:01:12 +00:00
wraitii
d8f22c860d Fix when not using shadows. 
This was SVN commit r12820.
 2012-11-04 20:39:01 +00:00
wraitii
e633196698 Updates the Belgian Bog settings. Changes the water shader to have refraction look more similar between different quality levels. 
This was SVN commit r12818.
 2012-11-04 18:07:41 +00:00
wraitii
ed7c66eb82 Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas. 
This was SVN commit r12817.
 2012-11-04 15:54:36 +00:00
historic_bruno
7848f4edef Fixes Roman Mars temple by dvangennip, adds garrison prop point and fixes collada warning (unknown polygons set input). Fixes #1708 
This was SVN commit r12816.
 2012-11-03 21:08:17 +00:00
Enrique
1048ab4a1d Fixed water color in Belgian_Bog_night.xml, fixed normals in maur_long_sword.dae 
This was SVN commit r12815.
 2012-11-03 14:00:06 +00:00
historic_bruno
b90a4ef776 Fixes some typos in civ json files, patch by grillaz. Fixes #1168 
This was SVN commit r12814.
 2012-11-02 23:07:42 +00:00
wraitii
21e284f8eb Adds the Belgian Uplands random map, and the Polynesia (Water Demo) demo scenario. 
This was SVN commit r12813.
 2012-11-02 21:18:46 +00:00
leper
a0e13d9625 Fix tests. BuildingAI now handles DiplomacyChanged messages. 
This was SVN commit r12812.
 2012-11-02 17:20:32 +00:00
wraitii
d75ae52f56 Particles now correctly update with the fog. Refs #276 . 
This was SVN commit r12811.
 2012-11-02 16:31:27 +00:00
leper
9930500661 Diplomacy is now mutual. Refs #7. 
This was SVN commit r12810.
 2012-11-02 13:44:35 +00:00
wraitii
a3ddd7b1b3 Fix for some problems when using shadows with the superfancywater. 
This was SVN commit r12809.
 2012-11-02 13:08:58 +00:00
wraitii
114593b9ad Fix the "Advanced water" box from being ticked when then it shouldn't be on loading. 
This was SVN commit r12808.
 2012-11-02 09:59:15 +00:00
Enrique
f63b795906 Fixed Mauryan shields origin and thickness, fixed mauryan club and spiked mace 
This was SVN commit r12807.
 2012-11-01 15:31:01 +00:00
wraitii
cf23990192 Updates random maps with new settings for the new water shader. Type ambiguity tweaks in WaterManager. 
This was SVN commit r12806.
 2012-11-01 10:17:54 +00:00
historic_bruno
79f2fc1ac1 Fixes build error on MSVC, use of sqrt was ambiguous. Refs #1572 
This was SVN commit r12804.
 2012-10-31 20:59:43 +00:00
wraitii
f3984a6c0e Forgot the waves shader. 
This was SVN commit r12803.
 2012-10-31 18:54:10 +00:00
wraitii
fb035d08e3 fixes #1572 and fixes #932 
Changes the water rendering in game to support higher quality effects
and to look nicer.

This was SVN commit r12802.
 2012-10-31 18:42:17 +00:00
myconid
97b46d402c Removing GL3 dependency from GPU skinning code. 
This was SVN commit r12801.
 2012-10-30 21:57:00 +00:00
Mythos_Ruler
608e01a5b2 Iberian walls and Roman gate use normal/parallax mapping now. 
This was SVN commit r12800.
 2012-10-30 18:31:05 +00:00
Mythos_Ruler
c5fae74ac7 Normal mapping for Craterus. 
This was SVN commit r12799.
 2012-10-30 17:34:40 +00:00
historic_bruno
7c1b03d031 Fixes MSVC warnings of truncation from double to float 
This was SVN commit r12797.
 2012-10-30 02:03:40 +00:00
historic_bruno
5b7564da37 Adds moved mikktspace source files to premake4.lua. 
Mentions mikktspace licensing in LICENSE.txt

This was SVN commit r12796.
 2012-10-30 00:56:24 +00:00
myconid
367c67d6ad GPU-skinned tangent-space effects for non-instanced units, plus a bit of cleanup. 
This was SVN commit r12795.
 2012-10-29 13:20:21 +00:00
Mythos_Ruler
ae4b3cc9b6 Fixed player color for Mauryan shields. 
Made a "Boudicca swordswoman" for fun.

This was SVN commit r12794.
 2012-10-29 00:46:33 +00:00
Mythos_Ruler
0353177a94 This was SVN commit r12793. 2012-10-28 23:19:19 +00:00
Mythos_Ruler
37d3adcf23 Females now have an attack animation. 
"Short hair" female head texture, ready for a turban prop.

This was SVN commit r12792.
 2012-10-28 22:08:45 +00:00
Mythos_Ruler
8f573c9aae New Mauryan shields. 
New Mauryan weapons.

Mauryan champion infantry is now a mace man.

Resized Mauryan swordsman textures.

This was SVN commit r12791.
 2012-10-28 00:34:03 +00:00
leper
22b2343192 Fix name/color in diplomacy messages. 
This was SVN commit r12790.
 2012-10-27 23:31:16 +00:00
Mythos_Ruler
cb8123ffc9 Maiden Guard Archer, until we can combine them into one unit. 
This was SVN commit r12789.
 2012-10-27 22:52:08 +00:00
Mythos_Ruler
5d960a136a Bactrian archer cav. 
Tweaked HQDOF settings.

This was SVN commit r12788.
 2012-10-27 22:18:29 +00:00
gregory
cd79b8e57b Changed DOF size and position. 
This was SVN commit r12787.
 2012-10-27 21:26:33 +00:00
Spahbod
5ef6d1f92b Adds "English Channel" random map. 
This was SVN commit r12786.
 2012-10-27 13:03:34 +00:00
gregory
97554bd726 Made sampling code remove blurring from around fully-focused foreground objects and cleaned up some of the code a bit. 
This was SVN commit r12785.
 2012-10-26 05:25:50 +00:00
Mythos_Ruler
7bd5872dd7 Fixed info in Rome civ json 
This was SVN commit r12784.
 2012-10-25 16:28:13 +00:00
Mythos_Ruler
749b685c64 Mauryans selectable in random map. 
Fixed animations for Mauryan sword dudes.

Added placeholder Mauryan heroes.

This was SVN commit r12783.
 2012-10-25 07:42:31 +00:00
Mythos_Ruler
9dc1724e57 Mauryan Maiden Guard. 
This was SVN commit r12782.
 2012-10-24 18:32:50 +00:00
stwf
402ea61581 don't set location info by default, music and sounds should not have it set 
This was SVN commit r12781.
 2012-10-24 13:12:55 +00:00