Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
18,893 Commits 8 Branches 28 Tags 13 GiB
cb048b4738
Commit Graph

6735 Commits

Author SHA1 Message Date
vladislavbelov
cb048b4738 A little cleanup of the PatchRData.cpp. 
This was SVN commit r21612.
 2018-03-24 11:20:57 +00:00
elexis
7d249181de Update simulation replay profiling comments and remove unused, nonexisting reference. 
This was SVN commit r21608.
 2018-03-23 14:31:00 +00:00
Imarok
d6ae354158 Fix mod check of non-visual replays and allow conversion of a vector of vectors of strings via ScriptConversions 
Reviewed by: elexis
Fixes #5044
Differential Revision: https://code.wildfiregames.com/D1316
This was SVN commit r21603.
 2018-03-22 15:26:27 +00:00
elexis
ee9e677084 Simulation replay profiling graph overhaul. 
Support multiple graphs with different scales, units, rounding and
descriptions and use it for memory allocation and number of garbage
collections.
Have the X axis in number of turns (instead of that divided by 20).
Don't have the legend hide part of the graph.
Add references to that hardcoded 20.
Move graph JS to a separate JS file.
Use JSON instead of JS.
Add legal html structure.

Comments By: Vladislav in irc yesterday
This was SVN commit r21602.
 2018-03-22 13:53:04 +00:00
elexis
29492badb7 Delete sheep corpses when starting to build a foundation, 
so that units don't try to gather forever while not being able to reach
it and
so that the sheep corpse can't be selected and seen anymore.

Differential Revision: https://code.wildfiregames.com/D21
Fixes #4268
Based On Patch By: wraitii
Reviewed By: temple
Previously Reviewed By: Itms
This was SVN commit r21597.
 2018-03-21 01:44:15 +00:00
bb
7127186b70 Add a ceasire autostart option, silences a javascript warning on autostart games 
fixes #4606

This was SVN commit r21561.
 2018-03-16 00:12:58 +00:00
bb
648cd44576 Set a relicCount from autostart, so the triggerscripts actually will spawn relics 
Should fix the concern in 6d54ab4c1f
Reported By: mimo
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1393
This was SVN commit r21560.
 2018-03-15 23:46:29 +00:00
Stan
6d93be0f58 Fix the display of light broken by cc67d54aeb 
Reviewed by: Elexis, vladislav
Differential Revisions : https://code.wildfiregames.com/D1389
Refs: https://code.wildfiregames.com/D1262
https://code.wildfiregames.com/D1372

This was SVN commit r21557.
 2018-03-15 18:19:12 +00:00
s0600204
afd69a58b3 Stop new-line characters making lines longer than they should be. 
Reviewed By: Imarok
Fixes: #3351
Differential Revision: https://code.wildfiregames.com/D1299
This was SVN commit r21546.
 2018-03-13 23:06:21 +00:00
vladislavbelov
2bbdd145ab Little cleanup for the 9f202500ea 
This was SVN commit r21541.
 2018-03-13 20:26:30 +00:00
vladislavbelov
9f202500ea Adds maps paths and a tutorial maps tab in Atlas 
Original Patch By: Phormio
Comments By: elexis
Reviewed By: s0600204
Differential Revision: https://code.wildfiregames.com/D614
This was SVN commit r21540.
 2018-03-13 20:20:45 +00:00
Imarok
0c522edef3 Fixed swapped names in 0fd8aa2a77 
Noticed by elexis

This was SVN commit r21534.
 2018-03-13 14:55:55 +00:00
Imarok
0fd8aa2a77 Secure lobby authentication - prevent joins as a different player 
Reviewed by: Dunedan, elexis, Itms
Fixes #3549
Differential Revision: https://code.wildfiregames.com/D897
This was SVN commit r21520.
 2018-03-12 00:23:40 +00:00
Imarok
3e964b813a Address concerns of 5f0a0fbbef 
Patch by: Dunedan
Differential Revision: https://code.wildfiregames.com/D1378
This was SVN commit r21508.
 2018-03-11 18:32:17 +00:00
Itms
7d077ad71b Do not rely on undefined behavior in an unsupported part of the glooxwrapper, and make the code consistent with other unsupported parts. 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D422
This was SVN commit r21503.
 2018-03-11 17:07:13 +00:00
Stan
d7220c3ebb Remove debug lines 
This was SVN commit r21499.
 2018-03-10 22:45:31 +00:00
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