8fc14655b5
Improve 524a942b52. Refs #2637 .
...
This was SVN commit r16140.
2015-01-11 19:14:03 +00:00
95fa46304f
Don't specify wxwidgets lib names in extern_libs4.lua
...
It works without specifying them and this way it builds with wxwidgets
2.8 and 3 on Windows
Refs #2891
This was SVN commit r16139.
2015-01-11 17:25:24 +00:00
524a942b52
Only print add_translation warning when translations do not match
...
FIXES 2637
This was SVN commit r16138.
2015-01-11 14:08:01 +00:00
873399b294
fix a typo, addresses #2998
...
This was SVN commit r16136.
2015-01-10 19:41:02 +00:00
731e3dd13c
Petra: continue rework of starting game to allow more game type
...
This was SVN commit r16135.
2015-01-10 14:34:26 +00:00
77dba7a8bb
Remove some duplication in the gui tooltip code.
...
This was SVN commit r16134.
2015-01-09 17:08:12 +00:00
539b4d8372
Remove an old, useless and possibly broken call.
...
This was SVN commit r16133.
2015-01-09 16:59:01 +00:00
c681174fad
Adds a notice about a known issue in premake4.lua with the icc compiler
...
Refs #2994
This was SVN commit r16132.
2015-01-09 12:48:42 +00:00
5cf2086a33
Fix the initial exploration of territories, which shouldn't be performed in Atlas.
...
Also clean up the code a bit.
Fixes #2969
This was SVN commit r16129.
2015-01-08 22:36:13 +00:00
006faaeaeb
Petra: tunings for 9b79b5b844
...
This was SVN commit r16128.
2015-01-08 22:01:38 +00:00
0f21151c4b
Some gui code cleanup/restructuring.
...
Moving some tooltip code that only needs templates to common/ to
allow to use that for the structree mod.
This was SVN commit r16127.
2015-01-08 21:37:59 +00:00
57033850a8
Check for unsaved changes in Atlas. Patch by trompetin17, fixes #2819 .
...
This was SVN commit r16126.
2015-01-08 21:29:27 +00:00
57ecf88ac2
Move some technology template and template information retrieval code
...
to globalscripts, so that the gui is able to use it without needing the
simulation.
This helps remove code duplication in the structree mod.
This was SVN commit r16125.
2015-01-08 19:55:10 +00:00
e8fb23e940
Fix tests broken in bd31f83587.
...
This was SVN commit r16124.
2015-01-08 19:20:34 +00:00
bdb1145f63
remove some debug printout forgotten in 9b79b5b844
...
This was SVN commit r16123.
2015-01-07 21:55:21 +00:00
9b79b5b844
Petra: first step of base management rework needed for nomad maps
...
This was SVN commit r16122.
2015-01-07 21:40:10 +00:00
bb6003ea0c
rename civ specific player template following 4243433f94 convention
...
This was SVN commit r16121.
2015-01-07 21:18:59 +00:00
bd31f83587
Check if components exist before using them.
...
Remove EntityLimits and TechnologyManager from the gaia player template.
This was SVN commit r16120.
2015-01-07 20:48:36 +00:00
4243433f94
Use a gaia specific player entity.
...
Fix some code that assumed components exist instead of testing for them.
EntityLimits and TechnologyManager are not needed for gaia and will be
removed in the future.
This was SVN commit r16119.
2015-01-07 20:33:19 +00:00
c6bb3df43a
following #2877 , civilCentre must be disabled for this kind of scenario
...
This was SVN commit r16118.
2015-01-07 20:29:01 +00:00
01fb25fdab
Fix variable name.
...
This was SVN commit r16117.
2015-01-07 19:52:33 +00:00
a8c85035f8
Ignore gaia in PlayerData when loading maps.
...
This was SVN commit r16116.
2015-01-06 00:16:06 +00:00
b36c78b4c4
Fix build warning
...
This was SVN commit r16115.
2015-01-05 20:05:53 +00:00
d8b1549883
Seleucid farmstead
...
This was SVN commit r16114.
2015-01-04 12:46:57 +00:00
045fea23aa
Properly adjust Atlas for the init changes.
...
This was SVN commit r16112.
2015-01-03 17:42:42 +00:00
c21514b844
Do not include domestic animals in military selection. Patch by trompetin17. Fixes #2978 .
...
This was SVN commit r16111.
2015-01-03 15:44:28 +00:00
dadfcb06d2
Specify icons for base phase techs.
...
This was SVN commit r16110.
2015-01-03 15:15:55 +00:00
d13821fa7d
Village phase icon
...
This was SVN commit r16109.
2015-01-03 12:01:21 +00:00
0195cdb374
Seleucid storehouse
...
This was SVN commit r16108.
2015-01-03 04:03:22 +00:00
abb62b0662
fix a typo in petra, thanks to brian
...
This was SVN commit r16106.
2015-01-02 19:35:35 +00:00
21f525c966
Seleucid temple now has fully articulated stairs!
...
This was SVN commit r16105.
2015-01-02 14:43:07 +00:00
f0d7346b8f
Happy New Year! :D
...
This was SVN commit r16103.
2015-01-02 14:22:23 +00:00
5bad08d66b
Seleucid civ center placeholder
...
This was SVN commit r16102.
2015-01-02 13:21:40 +00:00
8441a3f8d6
Fix compilation failure with GCC and C++98/03.
...
Local types shall not be used as a template argument. So move it
to a higher scope. This restriction was lifted in C++11, so we
might want to change this back when we switch to that.
This was SVN commit r16101.
2015-01-01 23:57:04 +00:00
8097eeb8ab
Fix RMS library forgotten in the previous commit.
...
Changes some direct accesses to use the library function.
This was SVN commit r16100.
2015-01-01 23:57:00 +00:00
a472944689
Clean up LoadPlayerSettings.
...
Include gaia to make iteration easier.
Add TemplateExists() to the TemplateLoader. Refs #2877 .
This was SVN commit r16099.
2015-01-01 23:10:24 +00:00
8e30410109
Improve PickEntitiesAtPoint
...
First, do a ray intersection test with the bounding-sphere for all
entities on the map and then check the more detailed selection shape for
the remaining candidates. Do checks that require component lookups after
the ray intersection tests because these are relatively expensive.
The old method for figuring out which entities are below the mouse
cursor was incorrect because it does a 2D check to filter out the first
candidates which can lead to incorrect results with lower camera angles
and high buildings or buildings with a large footprint. Such problems
were avoided with quite a large radius for this 2D test and resulted in
a large number of candiate entities after this first test (200-500).
Also rename PickEntitiesAtPoint to PickEntityAtPoint and make it return
only one (the closest) match.
I've tested performance with the tracelogger by starting a map and then
moving the mouse in circles for one minute. The results were relatively
stable. I've compared the total time percentage of input.js:836, which
spends nearly all of the time in PickEntityAtPoint.
Ardennes Forest - Normal size: Original: 41.46% Patched: 31.6%
Ardennes Forest - Giant size: Original: 40.59% Patched: 51.55%
As we see, it's faster on normal map sizes but slower on giant maps with
a lot of entities.
This approach can be further improved with some kind of spatial
subdivision for the culling (like an octree), which would help the unit
renderer too. This way it should be possible to make it faster (and
still correct) on all map sizes and with a large total numbers of
entities.
This was SVN commit r16098.
2015-01-01 23:05:26 +00:00
7ac837fb90
allow the removal of entity limits when some requirements are satisfied. This allows to have starting games without cc
...
This was SVN commit r16097.
2015-01-01 18:28:21 +00:00
95e0763ac9
Seleucid temple commit! Minor edits to Sele_struct_2 texture file.
...
This was SVN commit r16096.
2015-01-01 16:28:32 +00:00
e8d1acfa41
preserve random civ in saved game settings, refs #2963
...
This was SVN commit r16095.
2014-12-31 15:34:48 +00:00
802320e753
some petra cleanings
...
This was SVN commit r16094.
2014-12-31 09:59:47 +00:00
9329506e0d
add support for civ specific player template, see #2877
...
This was SVN commit r16092.
2014-12-31 09:31:41 +00:00
f984ba40ee
Seleucid house commit
...
This was SVN commit r16091.
2014-12-31 07:27:07 +00:00
913674a202
Remove useless call.
...
This was SVN commit r16090.
2014-12-31 00:21:41 +00:00
2c20936ce3
Save map settings. Patch by @aBothe. Fixes #2963 .
...
This was SVN commit r16089.
2014-12-31 00:21:24 +00:00
8f387e0044
Remove code duplication and some cleanup.
...
This was SVN commit r16088.
2014-12-30 18:21:02 +00:00
992169c3ab
Fix indentation in daaddaf433.
...
This was SVN commit r16087.
2014-12-30 17:27:18 +00:00
555601fe51
Petra: avoid creating unused entitycollections
...
This was SVN commit r16085.
2014-12-29 23:56:37 +00:00
daaddaf433
Stop music in Atlas when reloading a map, patch by trompetin17, fixes #1712 .
...
This was SVN commit r16084.
2014-12-29 21:01:54 +00:00
f337905f14
Actually focus the group instead of following it. Patch by trompetin17. Fixes #2972 .
...
This was SVN commit r16083.
2014-12-29 20:40:37 +00:00
leper