Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity
18,786 Commits 9 Branches 28 Tags 13 GiB
c9fe940401
Commit Graph

6719 Commits

Author SHA1 Message Date
Stan
c9fe940401 Fix an oversight in cc67d54aeb 
Reviewed by: Itms,
Tested by: Angen,
Differential: https://code.wildfiregames.com/D1372

This was SVN commit r21498.
 2018-03-10 22:42:01 +00:00
Itms
cc67d54aeb Fix compiler warnings on VS 2015, refs #3439, refs #5069. 
Patch By: Stan
Reviewed By: Itms, vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1262
This was SVN commit r21480.
 2018-03-10 09:58:53 +00:00
vladislavbelov
0e710d716d Fixes the Alt + Tab crash in the fullscreen mode. Refs #4181. 
Patch By: Angen
Comments By: echotangoecho, Imarok, Stan
Reviewed By: vladislavbelov
Trac Tickets: #4181
Differential Revision: https://code.wildfiregames.com/D1212
This was SVN commit r21476.
 2018-03-09 22:23:03 +00:00
bb
6d54ab4c1f Implement combine victory conditions 
Excluding the changes to scenario and skirmisch maps
Transform gameType string to victoryCondition array in load/replaymenu
Adapt the gamesetup to use checkboxes for every victory condition and an
array for storing them
Allow multiple queries in conquestCommon
Remove conquest from regicide, wonder and capture the relic
Move the endless gamedescription from settings to gamedescription
Fixing wrong tabulation from a8a29271ce

This commit will break all scenario and skirmisch maps, their "Gametype"
string needs to be transformed in a "VictoryCondition" array as is done
in the tutorial map (counting endless as an empty array). This counts
for mods too!
Old svn replays and savegame will throw warnings/errors as they are
incompatible after this commit. So svn users will need to delete all
those.

Comments on ai and autostart games By: mimo
Comments on Atlas By: Vladislav
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1240
fixes: #4014

This was SVN commit r21474.
 2018-03-09 21:51:18 +00:00
vladislavbelov
a1c4c23ce4 Adds axes to the CChart and the summary screen. 
Comments By: elexis, Imarok
Reviewed By: s0600204
Trac Tickets: #4892
Differential Revision: https://code.wildfiregames.com/D474
This was SVN commit r21429.
 2018-03-04 12:42:35 +00:00
temple
f72e7bd626 Increase MaxSpawnDistance for ships 
Differential Revision: https://code.wildfiregames.com/D1345
Reviewed by: elexis
This was SVN commit r21417.
 2018-03-02 18:10:54 +00:00
elexis
2be4293dff Complain if an RMS tries to revert the loading progress. 
Also increase estimated mapgen time, refs 942a45372c, 0e0ed94926.

Differential Revision: https://code.wildfiregames.com/D1341
Proposed By: Vladislav in D1340
This was SVN commit r21400.
 2018-03-01 12:06:55 +00:00
bb
3698c134b5 Make sure dropdowns fit in the screen by allowing the list to be above when there is not enough space 
Reviewed By: Vladislav
Differential Revision: D1061
fixes #4857

This was SVN commit r21379.
 2018-02-25 22:26:31 +00:00
Stan
a4bdd943c1 Check for m_Unit before using it as it is done below. 
That would break autostart beacause m_Unit is not set.
Noticed by: Mimo
Fix af2abb8cbf

This was SVN commit r21375.
 2018-02-25 14:58:31 +00:00
bb
d470995bcb Fix nomad checbox scrolling wrongly, fixes 70172519b7 
This was SVN commit r21360.
 2018-02-24 20:19:59 +00:00
Stan
af2abb8cbf Fix units not being able to play sounds when walking and running 
This currently disabled by variants, and will be reenabled when sounds
have been chosen.
Reviewed by: Vladislav,
Comments by: Itms, elexis
Differential Revision: ​https://code.wildfiregames.com/1257
This was SVN commit r21359.
 2018-02-24 18:13:03 +00:00
bb
70172519b7 Use a macro for creating checkboxes in the Atlas map panel (other panels code checkboxes in a different way) 
Agreed With: elexis

This was SVN commit r21338.
 2018-02-23 20:47:46 +00:00
Imarok
c894eeb856 Fix debug mode after d5807cd59f 
Reviewed by: temple
Differential Revision: https://code.wildfiregames.com/D1315
This was SVN commit r21336.
 2018-02-23 20:17:47 +00:00
bb
c0349931c0 Update the animation immediately after a varaint is changed, so we don't have sliding issues when we do so. 
Differential Revision: https://code.wildfiregames.com/D1322
Reviewed By: temple
This was SVN commit r21335.
 2018-02-23 20:11:16 +00:00
temple
de9427a291 Bump year 
This was SVN commit r21316.
 2018-02-21 23:42:18 +00:00
Imarok
02ed411e6f Fix comments and year in d5807cd59f and 01f581e813 
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1314
This was SVN commit r21313.
 2018-02-21 22:53:01 +00:00
temple
4fc87ced78 Grid bounds and SinkRate debug version fixes 
Differential Revision: https://code.wildfiregames.com/D1209
Patch by: Angen
Reviewed by: wraitii
Comments by: Itms, Stan
This was SVN commit r21312.
 2018-02-21 22:30:54 +00:00
elexis
e497672a9c Bump copyright header year numbers. 
This was SVN commit r21305.
 2018-02-21 18:44:52 +00:00
Imarok
eca956a513 Check lobby games for incompatible mods 
Reviewed by: elexis
Fixes #3370
Differential Revision: https://code.wildfiregames.com/D931
This was SVN commit r21301.
 2018-02-21 17:27:33 +00:00
vladislavbelov
b8c488b63a Added multiples UVs to animated model 
Reviewed By: wraitii, Stan
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D448
This was SVN commit r21291.
 2018-02-20 21:33:02 +00:00
elexis
75c24843b2 Add Nomad checkbox for Atlas, refs #4824, #3591. 
Differential Revision: https://code.wildfiregames.com/D1310
This was SVN commit r21274.
 2018-02-19 22:30:09 +00:00
temple
bbd24685fd Only test spawn against entities that block movement 
Differential Revision: https://code.wildfiregames.com/D1308
Reviewed by: elexis
This was SVN commit r21267.
 2018-02-19 18:34:06 +00:00
elexis
8fbc095a88 Stop the random map generation upon quit request (Alt+F4), refs #4822. 
Differential Revision: https://code.wildfiregames.com/D1304
Discussed with: Yves

This was SVN commit r21264.
 2018-02-19 15:46:25 +00:00
Imarok
01f581e813 Move GetEngineInfo to Mod.[h|cpp] 
Suggested by: elexis
refs d5807cd59f

This was SVN commit r21242.
 2018-02-17 17:36:43 +00:00
temple
7c8c4ac2f7 Fix selection rings while garrisoning 
Differential Revision: https://code.wildfiregames.com/D1158
Reviewed by: elexis, Itms
Refs: #2627

This was SVN commit r21241.
 2018-02-17 16:56:12 +00:00
Imarok
d5807cd59f Check for and save mod version for savegames and replays 
Reviewed by: elexis
Fixes: #4887
Differential Revision: https://code.wildfiregames.com/D955
This was SVN commit r21239.
 2018-02-17 16:53:14 +00:00
temple
470d3eb129 Replace a territory texture hack 
Differential Revision: https://code.wildfiregames.com/D1293
This was SVN commit r21233.
 2018-02-17 01:37:52 +00:00
elexis
c91fd9c2c3 Atlas should only list map JSON files as maps. 
Differential Revision: https://code.wildfiregames.com/D1301
This was SVN commit r21223.
 2018-02-16 16:42:46 +00:00
temple
b28b50ef63 Fix a typo and use better variable names in Footprint 
Differential Revision: https://code.wildfiregames.com/D1287
Reviewed by: bb
Comments by: elexis, Stan
This was SVN commit r21216.
 2018-02-15 18:40:18 +00:00
s0600204
72fa750a0c Fix margin/padding issue in tooltips 
Reviewed By: bb
Refs: D836, d01cb88ac4
Differential Revision: https://code.wildfiregames.com/D1298
This was SVN commit r21215.
 2018-02-15 18:16:45 +00:00
s0600204
c13bc83aed Load and Initialise PlayerData in Atlas' ActorViewer 
Reviewed By: elexis
Fixes: #4900
Differential Revision: https://code.wildfiregames.com/D1276
This was SVN commit r21167.
 2018-02-09 21:49:46 +00:00
s0600204
262b27d770 Remove unnecessary argument from CSimulation2::InitGame 
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1289
This was SVN commit r21166.
 2018-02-09 19:50:01 +00:00
temple
8babdeba04 Spawn units in rally point direction 
Differential Revision: https://code.wildfiregames.com/D1041
Reviewed by: bb
Comments by: elexis, wraitii
Fixes: #4735

This was SVN commit r21144.
 2018-02-07 20:58:07 +00:00
s0600204
d01cb88ac4 Calculate and return correct width in CGUI::GenerateText 
Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D836
This was SVN commit r21142.
 2018-02-07 20:47:10 +00:00
elexis
2180862d40 Implement random map script backend to read terrain PMP files created with Atlas, fixes #4816. 
Allows developers to set elevation and terrain textures in the map
editor and use that for a random map.

This was SVN commit r21131.
 2018-02-06 23:05:58 +00:00
bb
6b88ca6a11 Fix the autostart victoryDuration support, which was broken by 63ca7ad672 
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D1285
This was SVN commit r21122.
 2018-02-06 19:44:05 +00:00
elexis
204b04f2d4 Allow random map scripts to load heightmap image files, fixes #5018. 
Move the atlas heightmap import code to MapIO.cpp and reuse it.
Implements what 33e3e6c2ab and 69b7f39bf1 wanted to be.

This was SVN commit r21113.
 2018-02-05 16:02:00 +00:00
elexis
c95901515e Stop claiming that JPEG files are supported for heightmap import following c9cecab0be, refs #2828. 
This was SVN commit r21112.
 2018-02-05 14:22:16 +00:00
elexis
98ebb3bb77 When importing a heightmap image in atlas, don't omit the last vertex of each side of the heightmap! Fixes #5021, refs c9abf6f68c. 
(Since there are 4 vertices per tile, there is one more vertex per side
than there are tiles / pixels per side.)

This was SVN commit r21111.
 2018-02-05 14:08:46 +00:00
mimo
22903b09a6 Set victory conditions for autostart games. 
Reviewed By: elexis
Trac Tickets: #5016

Differential Revision: https://code.wildfiregames.com/D1278
This was SVN commit r21108.
 2018-02-03 19:39:33 +00:00
temple
7819ea434e Diplomacy Colors 
Add a button to toggle between normal and "diplomacy" colors.
Reviewed by: elexis
Comments by: leper, ffffffff, Stan
Fixes: #4747

This was SVN commit r21107.
 2018-02-03 14:17:31 +00:00
Itms
4fe59c141d Fix crash at start in snd_detect(), fixes #4786. 
Reviewed By: s0600204, echotangoecho
Differential Revision: https://code.wildfiregames.com/D1254
This was SVN commit r21097.
 2018-02-01 18:12:53 +00:00
Itms
2bfb580415 Fix non-PCH build by adding an explicit include. 
This used to build so the include of CStr.h disappeared from the include
chain at some point. PCH builds kept working because this file is
included in precompiled.h for the engine project.

Differential Revision: https://code.wildfiregames.com/D1273
Reviewed By: Imarok
This was SVN commit r21075.
 2018-01-30 07:20:49 +00:00
elexis
751edb43fc Fix wrong type in 8aaff7fc62 / D1232. 
Differential Revision: https://code.wildfiregames.com/D1266
Patch By: Angen
This was SVN commit r21047.
 2018-01-28 17:37:55 +00:00
elexis
95179c5e46 Don't trigger a NetServerTurnManager debug breakpoint if a modified or unmodified client sends a non-sequential turnnumber. 
Disconnect that client.

Refs #3643
Differential Revision: https://code.wildfiregames.com/D1256
Reviewed By: echotangoecho
This was SVN commit r21023.
 2018-01-26 23:02:13 +00:00
temple
b0b24a472b Move minimap color deserialization fix out of the gui 
Differential Revision: https://code.wildfiregames.com/D1250
Reviewed by: elexis
This was SVN commit r21005.
 2018-01-24 19:12:19 +00:00
elexis
034124e8d8 Fix range overlay color after deserialization following 5fbb224dc0 / D555, refs #3915. 
Since the component initialization order is the alphabetic filename
order and
since the RangeOverlayRenderer < Player < Selectable, the new file in
that commit introduced the issue.
Similar to 36b315ca32, refs #4632.

UpdateColor function taken from temple's D754

This was SVN commit r20963.
 2018-01-22 06:50:35 +00:00
elexis
36fba76a74 Revert unintentional function rename in 40cc3aaa09. 
Don't troll OOS-debugging developers with aura ranges rendered in an
invisible color, refs 5fbb224dc0 / D555.

This was SVN commit r20961.
 2018-01-22 06:02:52 +00:00
elexis
8aaff7fc62 Implement an auto-scroll setting for GUI lists. 
Patch By: fpre / ffffffff
Fixes #4987, refs #4254

This allows the replay menu and lobby to focus the selected element if,
but only if it is expected by the user.
Replaces 3f5648767d which scrolled the selected player into view every
single time a new playerlist was received by the lobby server.

This was SVN commit r20958.
 2018-01-22 04:45:27 +00:00
temple
340cda5d57 Use obstruction rather than footprint in dock placement 
Differential Revision: https://code.wildfiregames.com/D1163
Reviewed by: wraitii
Comments by: mimo, s0600204
Fixes: #4843

This was SVN commit r20954.
 2018-01-22 02:34:46 +00:00