40d407e8c6
use ptol fortress in random maps with the wall builder
...
This was SVN commit r14385.
2013-12-18 18:32:25 +00:00
42bc5165ab
Add compile time flag to disable use of miniupnpc.
...
This was SVN commit r14384.
2013-12-18 16:08:56 +00:00
7f5c2c4b83
enlarge the units demo map, so all units can be checked out again
...
This was SVN commit r14383.
2013-12-18 15:46:09 +00:00
eb7215ecaf
This was SVN commit r14381.
2013-12-18 14:14:37 +00:00
3d9fe04ab5
Added Egyptian names for Ptolemaic buildings.
...
Deleted a bunch of maps. Added Lorraine Plain skirmish map.
This was SVN commit r14380.
2013-12-18 13:54:30 +00:00
1b17ac50cc
remove the aura visualisation from the actors, as it causes selection problems
...
This was SVN commit r14379.
2013-12-18 10:43:32 +00:00
63f2f85b01
make sure the non-garrisoned variant of the persian models is always picked while constructing
...
This was SVN commit r14378.
2013-12-18 10:28:32 +00:00
6bc5e3f3a5
Ptolemies corral draft commit
...
This was SVN commit r14377.
2013-12-18 05:29:54 +00:00
0b80cbe3ec
Hide the password field by default on the lobby login box if there is a remembered password. Since we only store hashed passwords, this avoids potential confusing from seeing a password much longer than the user’s in the field.
...
This was SVN commit r14376.
2013-12-18 00:56:59 +00:00
3c248e7501
Change the "Away" color in the lobby to be much easier to read on the dark background.
...
This was SVN commit r14375.
2013-12-17 23:58:53 +00:00
c8fb750e43
Balance fix for CCs. Decrease build time from 600 to 500 and increase foundation armor from 3h/10p/3c to 5h/15p/3c.
...
This was SVN commit r14374.
2013-12-17 21:20:31 +00:00
c6d454ff2d
Make ConfigDB threadsafe.
...
This was SVN commit r14373.
2013-12-17 19:58:39 +00:00
e83f24e3a6
Move UPnP port forwarding to a thread.
...
Fix some typos.
Do not return the result, as we would need to allocate it, but we never
use it.
This was SVN commit r14372.
2013-12-17 17:03:49 +00:00
4df4c0dec0
Try to actually do the threading my previous commit said it did.
...
This was SVN commit r14371.
2013-12-17 14:57:26 +00:00
0ba25e9968
Cache UPnP root URL to try to avoid searching each time. Also make searching asyncronous with the GUI to avoid hanging.
...
This was SVN commit r14370.
2013-12-17 14:21:49 +00:00
60bbb50625
Ptolemaic dock draft commit
...
This was SVN commit r14369.
2013-12-17 03:17:35 +00:00
fa03aadaa5
Updated fixed unit icons
...
This was SVN commit r14368.
2013-12-16 04:09:35 +00:00
8c5f583845
Ptolemaic blacksmith draft commit
...
This was SVN commit r14367.
2013-12-16 02:05:43 +00:00
678d338670
Change bot name.
...
This was SVN commit r14366.
2013-12-15 21:02:58 +00:00
2cdef4023c
Fixes OS X libs build script
...
This was SVN commit r14365.
2013-12-15 20:56:58 +00:00
d2e671392b
Fix bug in ipstamp module.
...
Sync with server. Refs #2307 .
This was SVN commit r14363.
2013-12-15 18:33:01 +00:00
79252043ae
fix the fish gatherer from b91ec9b449
...
This was SVN commit r14362.
2013-12-15 17:32:20 +00:00
b91ec9b449
Added new Ptolemies track to the Ptolemies civ json.
...
Removed fishing from land units. However, they still try to go fish
after building a dock. Looks like it needs a deeper fix.
Portrait for Ptol camel archer.
This was SVN commit r14361.
2013-12-15 15:33:35 +00:00
542861ba36
This was SVN commit r14359.
2013-12-15 14:14:22 +00:00
bcba922893
fix switching between column and other formations
...
This was SVN commit r14358.
2013-12-15 09:51:13 +00:00
e7d57136ef
Updates license files for gloox, MiniUPnPc, and pkcs5_pbkdf2. Refs #2308
...
This was SVN commit r14357.
2013-12-15 02:49:11 +00:00
2c3c8737e0
OS X libs build script improvements:
...
* fixes failed build when using --force-rebuild
* cleans up old build output before starting new builds
* improves separation of libogg and vorbis
* updates wxWidgets to 3.0.0
This was SVN commit r14356.
2013-12-15 02:14:45 +00:00
99f44ff7a0
Reorganizes extern libs in alphabetical order
...
This was SVN commit r14355.
2013-12-15 01:34:16 +00:00
99f90dd6de
Adds MiniUPnPc to build-osx-libs.sh
...
This was SVN commit r14354.
2013-12-15 01:26:55 +00:00
c2c2177be4
forgot the death particles
...
This was SVN commit r14353.
2013-12-15 01:10:39 +00:00
62a10ab938
Fixes Windows build.
...
Fixes UPnP error handling to be more correct and conventional, refs
#2305
This was SVN commit r14352.
2013-12-15 01:02:26 +00:00
b1a73d3c0e
Ptolemaic market draft commit
...
This was SVN commit r14351.
2013-12-14 22:14:24 +00:00
f890856c6d
Seperate differently licenced portions of sha.cpp/h into pkcs5_pdkdf2.cpp/h and remove some extra std includes in sha.cpp. Refs #2308
...
This was SVN commit r14350.
2013-12-14 16:58:21 +00:00
bf97148ddc
Add proper licence header and remove tyedefs in sha.cpp/h. Refs #2308
...
This was SVN commit r14349.
2013-12-14 16:22:48 +00:00
5876ec38d1
Make sure we properly free some UPnP-related variables.
...
This was SVN commit r14348.
2013-12-14 03:21:21 +00:00
551eb3919d
Change UPnP lease duration to 0 (permanent) and update comments.
...
This was SVN commit r14347.
2013-12-14 03:03:22 +00:00
63622a85d7
Fixed missing elephants in some maps, thanks mimo for catching it.
...
This was SVN commit r14345.
2013-12-13 19:10:04 +00:00
44587963e6
Reduced armor for palisade fort.
...
Tweaked ptolemies sandbox, Alpine Valleys (removed player command of
some deer), and added a Greek Acropolis "Night" map for fun.
This was SVN commit r14344.
2013-12-13 16:26:26 +00:00
685d37ddfa
New Roman emblem.
...
This was SVN commit r14342.
2013-12-13 14:18:46 +00:00
fd47e6caee
Name.
...
This was SVN commit r14341.
2013-12-13 13:30:59 +00:00
619c59fd3f
Read the default MUC room from the config file and set it to arena15. Fixes #2306 .
...
Change the jid of xpartamupp to WFGbot to make it work on the new
server. Refs #2307 .
This was SVN commit r14339.
2013-12-13 12:14:17 +00:00
5b9dfaef8f
Tweaked Gallic Fields.
...
Made the palisade spikes not lose health when outside territory.
Changed ptol military settlement actor from Athenian barracks to
Macedonian barracks.
Lowered the height of the farm field status bar slightly.
This was SVN commit r14338.
2013-12-13 11:34:19 +00:00
8dab478691
Bundle miniUPnPc with 0AD.
...
This was SVN commit r14333.
2013-12-13 02:59:35 +00:00
667537ee49
UPnP-based automatic port-forwarding using miniupnpc. Breaks windows build at the moment. Refs #2305
...
This was SVN commit r14332.
2013-12-13 02:23:02 +00:00
b508fe848a
Fixed celtic embassy textures in its actor
...
This was SVN commit r14331.
2013-12-12 10:09:14 +00:00
1efd47c1ad
Fix errors when loading a saved game with Aegis by making sure the AI re-inits properly. Still no real saved game support.
...
This was SVN commit r14329.
2013-12-11 17:10:14 +00:00
1c890d64ee
Fixed persian gate messed up in previous commit
...
This was SVN commit r14328.
2013-12-11 15:59:11 +00:00
c6cf074e7a
Fix unitAI warning when member left the formation
...
This was SVN commit r14327.
2013-12-11 15:17:43 +00:00
2a824acae6
Made ptolemaic walls thinner. Added door to the gate (no animations yet) fixed some stretched UVs
...
This was SVN commit r14326.
2013-12-11 01:53:10 +00:00
8db3ada87f
Improves debugging output to help troubleshoot some WSDL bugs, refs #2146 , #1733
...
This was SVN commit r14325.
2013-12-10 18:54:18 +00:00
c661bb01c3
Temp fix for Nubian archer.
...
This was SVN commit r14324.
2013-12-10 01:27:09 +00:00
f3e53bfb7c
Reduce splash radius of catapults from the rather ridiculous 20m to 10m.
...
This was SVN commit r14322.
2013-12-09 19:22:45 +00:00
683349333b
tune the guard behaviour
...
This was SVN commit r14321.
2013-12-09 18:15:24 +00:00
a44e88fa42
Check for "Destroy" messages beforehand in the base manager to avoid a rare error.
...
This was SVN commit r14320.
2013-12-09 16:35:06 +00:00
ed93cebd28
garrison flag fixing in ptolemaic civic centre, edfu wonder and macedonian temple.
...
Centered athenian temple, selection and obstruction adjusted.
This was SVN commit r14319.
2013-12-09 14:46:35 +00:00
c3ef9b3685
Forgot I had renamed a file…
...
This was SVN commit r14318.
2013-12-09 14:23:56 +00:00
f9bee5d3ec
Slight de-obfuscation of the AI code.
...
This was SVN commit r14317.
2013-12-09 14:20:11 +00:00
9339e658a5
Two new head models for ptolemaic support females. Fixes #2235
...
This was SVN commit r14316.
2013-12-09 12:38:46 +00:00
8351e794fa
Added different textures for each ptolemaic camel rank
...
This was SVN commit r14315.
2013-12-09 02:01:21 +00:00
a04dfcf836
Camel rider tweaking
...
This was SVN commit r14314.
2013-12-09 00:33:33 +00:00
3c70f25ca4
Final edfu temple normal and spec.
...
Ptolemaic camel rider fix
This was SVN commit r14313.
2013-12-09 00:21:45 +00:00
208200db28
fix querying unitAI of non-existing members
...
This was SVN commit r14312.
2013-12-08 19:57:34 +00:00
966f7c7145
Removes some duplicated code.
...
This was SVN commit r14311.
2013-12-08 19:23:09 +00:00
36334a6fa7
Fix the AI incorrectly trying to place Civil Centres too close to each other.
...
This was SVN commit r14310.
2013-12-08 16:24:09 +00:00
ad157ad325
fix test broken by #14306
...
This was SVN commit r14309.
2013-12-08 13:01:59 +00:00
71d378b7a5
A bunch of stuff.
...
This was SVN commit r14308.
2013-12-08 13:01:14 +00:00
332e23ee9c
Edfu temple commit. Needs normal and spec map tweaking (coming soon). Fixes #2220
...
This was SVN commit r14307.
2013-12-08 11:21:19 +00:00
e173493621
separate gui entityState in two parts to improve gui timing, adresses #2179
...
This was SVN commit r14306.
2013-12-08 10:02:19 +00:00
1f7019f8e6
Might fix an issue on Acropolis where Aegis tried to build a CC too close to his main one.
...
This was SVN commit r14305.
2013-12-08 09:07:33 +00:00
3182d6c8ee
Reverts 4c9cd2921d fundraiser splash screen now that the fundraiser has ended
...
This was SVN commit r14304.
2013-12-08 01:35:06 +00:00
f0fe2acdcb
Disables JIT compiling of a loop to work around OOS errors in multiplayer games with AI players.
...
Fixes #2000
This was SVN commit r14303.
2013-12-07 11:49:11 +00:00
ca3f697f9d
add iberian monument aura
...
This was SVN commit r14301.
2013-12-06 18:14:22 +00:00
783907264f
cache the offset positions for formations, and only recalculate if the rotation towards a new target is big enough
...
This was SVN commit r14300.
2013-12-06 10:21:07 +00:00
b1c081e36d
Set svn:eol-style=native, fix some inconsistent line endings
...
This was SVN commit r14299.
2013-12-06 00:42:50 +00:00
8d56504778
fix switching between line and column formation
...
This was SVN commit r14298.
2013-12-05 20:26:51 +00:00
d3f7da1e27
Let formation attack from the moment the first unit is in range
...
This was SVN commit r14297.
2013-12-05 19:26:55 +00:00
9678cf547a
cache quantities depending only on the selection, adresses #2179
...
This was SVN commit r14296.
2013-12-05 18:50:29 +00:00
2f3ce82dc3
Fix Aegis no longer building dropsites after the skirmish fix.
...
This was SVN commit r14295.
2013-12-05 17:34:24 +00:00
56c805ae93
Texture stuff.
...
This was SVN commit r14294.
2013-12-05 13:23:22 +00:00
7b82fba8d0
remove distance sorting for formation place assignment, as it made the center of the formation run + remove debug warning in AI code
...
This was SVN commit r14292.
2013-12-05 12:31:04 +00:00
03d9db0bb7
fix comment
...
This was SVN commit r14291.
2013-12-05 10:44:39 +00:00
7a1dbca390
make the movement of formations and ships more natural
...
This was SVN commit r14290.
2013-12-05 10:38:39 +00:00
cf88da5829
improve formations a bit more
...
* Take obstruction size into account, so bigger units have more space in
formations
* Minimize the maximum walk distance to get in formation by letting the
units far away from the centre pick their positions first
This was SVN commit r14289.
2013-12-05 10:23:49 +00:00
4062e2011f
fix tests
...
This was SVN commit r14288.
2013-12-05 08:53:40 +00:00
0ef6397545
Optimize the "Move()" function by removing unnecessary message broadcast. Fixes #2094
...
This was SVN commit r14287.
2013-12-04 17:38:46 +00:00
5f8b6be833
Some additions to the particle system:
...
This was SVN commit r14286.
2013-12-04 17:21:59 +00:00
189ef85538
Fix AI errors on skirmish maps.
...
This was SVN commit r14285.
2013-12-04 16:52:44 +00:00
60c986c135
* Add method to rangemanager to query around a position instead of an entity
...
* Use that method in the splash damage calculation
Fixes #2285
This was SVN commit r14283.
2013-12-04 15:30:01 +00:00
367614343b
add two files that were deleted by accident in 3afd8e9d9e
...
This was SVN commit r14282.
2013-12-04 13:15:43 +00:00
3afd8e9d9e
better formation place assignments (units run around less)
...
This was SVN commit r14281.
2013-12-04 13:14:31 +00:00
3c6045308a
Fixing some cursor issues.
...
This was SVN commit r14280.
2013-12-04 01:56:40 +00:00
a549d5a08b
Fixed aura rays actor
...
This was SVN commit r14279.
2013-12-04 00:38:09 +00:00
cd32fafd63
Fixed shader in aura material
...
This was SVN commit r14278.
2013-12-04 00:35:05 +00:00
e268c059e5
Healing aura effect placeholder, applied only in athenian temple
...
This was SVN commit r14277.
2013-12-04 00:25:03 +00:00
bddcd57dea
- Fixed a prop typo in the Athenian temple.xml
...
- Added the first Egyptian music track to the Ptolemies.
- Adjusted the Sacred Band tip text. New pic coming soon.
- Still trying to figure out what to do with "Wasteland" map.
This was SVN commit r14276.
2013-12-04 00:18:52 +00:00
a96a333b47
Small cleanup.
...
This was SVN commit r14274.
2013-12-03 01:01:12 +00:00
68880ca5d5
Make atlas player assignment apply to all of the currently selected units
...
This was SVN commit r14273.
2013-12-02 22:46:33 +00:00
f09d56fb28
This was SVN commit r14271.
2013-12-02 20:46:25 +00:00
7c3c78f6c9
make sure target has health before taking damage
...
This was SVN commit r14270.
2013-12-01 20:55:54 +00:00
3fea8d7c1e
Some tips tweaks and new tips.
...
This was SVN commit r14269.
2013-12-01 18:22:28 +00:00
168f92e1e9
"Equine Transports" tech for the Persians.
...
Updated tip images.
This was SVN commit r14268.
2013-12-01 02:49:26 +00:00
d2fccef696
New 4-player skirmish map for Scythetwirler: Watering Holes.
...
This was SVN commit r14267.
2013-11-30 22:49:54 +00:00
cb7a4fe39c
Minor things.
...
This was SVN commit r14266.
2013-11-30 21:53:56 +00:00
c134108154
remove duplicated code
...
This was SVN commit r14264.
2013-11-30 18:23:32 +00:00
e88d05e0e4
allow units to guard/escort buildings or units, fixes #2034
...
This was SVN commit r14263.
2013-11-30 17:30:08 +00:00
1d914c4613
testing visualisation of auras (the elephants need to be replaced with some iconic meshes)
...
This was SVN commit r14262.
2013-11-30 12:36:48 +00:00
495716b3ed
Reduced the size of a bunch of massive specular maps.
...
Tweaked some maps.
A new map called "Wasteland". Don't know what to do with it yet.
Dust storm and other particles changes and tweaks.
Tweaks to some maps.
Spec and Norm maps for the Great Pyramid.
New Mace shield prop textures for buildings.
This was SVN commit r14261.
2013-11-30 07:57:29 +00:00
d8362700f0
4 new Successor/Hellenistic shield designs by Enrique. Each has a bronze, silver, bronze player color, and silver player color variation.
...
Added final Seleucid unit, the Thracian Mercenary Swordsman.
Added spec and normal mapping to the Spartiate shields.
New Seleucid emblem.
This was SVN commit r14260.
2013-11-30 02:58:43 +00:00
61c9df2847
Increased ptolemaic barracks size
...
This was SVN commit r14259.
2013-11-30 01:34:15 +00:00
44c134e03f
Cavalry Archer templates for Seleucids.
...
This was SVN commit r14258.
2013-11-29 22:24:11 +00:00
15d87b9ad1
Garrison and Waypoint flags for Seleucids.
...
Cavalry Archer actors for Seleucids.
This was SVN commit r14257.
2013-11-29 22:23:32 +00:00
2e2b1b04ff
Fix #2285 by using the original design with additional checks.
...
This was SVN commit r14256.
2013-11-29 20:34:56 +00:00
5ce3880d53
Some more Seleucid units.
...
Tweaked maps.
This was SVN commit r14255.
2013-11-29 19:04:07 +00:00
860875c835
Triage #2285 . Not the most efficiant, but it works.
...
This was SVN commit r14254.
2013-11-29 17:46:24 +00:00
25b92ec652
implement spart auras + female boost for males
...
This was SVN commit r14253.
2013-11-29 13:06:58 +00:00
d18444344c
implement pers auras
...
This was SVN commit r14252.
2013-11-29 12:56:44 +00:00
7bab5421c6
implement mace auras
...
This was SVN commit r14251.
2013-11-29 12:47:39 +00:00
bb5515a9ee
implement hele auras + fix vircengetorix (part 2)
...
This was SVN commit r14250.
2013-11-29 12:36:18 +00:00
53f376cdc2
implement hele auras + fix vircengetorix
...
This was SVN commit r14249.
2013-11-29 12:35:58 +00:00
b0f00d4836
Improved Ptolemaic flag emblem with retouched LionKranzen's eagle
...
This was SVN commit r14248.
2013-11-29 12:16:15 +00:00
d672c6cf7d
make loot tech aware + implement celt and gaul hero auras
...
This was SVN commit r14247.
2013-11-29 12:13:37 +00:00
ca9944b09c
brit + cart hero auras + small code fixes
...
This was SVN commit r14246.
2013-11-29 10:57:44 +00:00
d403545620
implement all athen auras + add missing files from previous commit
...
This was SVN commit r14245.
2013-11-29 09:02:41 +00:00
1784e6b9b1
fix some aura typos + implement iphicrates aura
...
This was SVN commit r14244.
2013-11-29 08:37:15 +00:00
6c81f23cc8
This was SVN commit r14243.
2013-11-29 04:10:57 +00:00
7ea031964c
A /bunch/ more Seleucid entities and actors. They still need tons of props, textures, and models. Also, not all unit templates are there yet.
...
Updated the Seleucid civ json.
Tweaked some tooltips to show their unit classes better.
Balancing: Slingers are now 1.5x vs. ranged infantry and 1.25x vs. melee
infantry.
This was SVN commit r14242.
2013-11-29 04:04:10 +00:00
f54fe9a7d2
Fixed persian and carthaginian camel trader prop position.
...
Scaled down several AO textures bigger than 1024
Ptolemaic barracks commited
This was SVN commit r14241.
2013-11-29 02:25:47 +00:00
351468dbe5
fix initialisation of developper overlay for saved games
...
This was SVN commit r14240.
2013-11-28 18:08:41 +00:00
65f5fffd9e
Partial commit of Seleucid entities and actors.
...
Testing cost balance for cav skirms.
Reduce Town Phase cost to 800/800.
A bunch of other minor things.
This was SVN commit r14239.
2013-11-28 15:52:18 +00:00
a6ec62c85d
fix ptol cav archer upgrade. Fixes #2282
...
This was SVN commit r14238.
2013-11-28 12:54:28 +00:00
64c9f84f10
Tweaked Alpine Valleys.
...
This was SVN commit r14237.
2013-11-28 01:30:18 +00:00
acf1c420c1
Moves management of GL viewports to CRenderer, letting it store the current viewport; calling code can retrieve and restore it later (instead of using deprecated glPush/PopAttrib, previously removed for GLES compatibility by 7dec618898)
...
This was SVN commit r14235.
2013-11-28 00:57:39 +00:00
8b0f1c3f1f
cleaning
...
This was SVN commit r14234.
2013-11-27 16:30:14 +00:00
43c2219b22
Fix my fix.
...
This was SVN commit r14233.
2013-11-26 21:38:48 +00:00
10b9ace654
Add missing line.
...
This was SVN commit r14232.
2013-11-26 20:01:09 +00:00
4b7ab63172
Fix #1496 with a revised version of my patch. Also moves damage-related functions from Attack.js to a seperate file in the global namespace.
...
This was SVN commit r14231.
2013-11-26 18:33:42 +00:00
7345d27c84
Summon planes back from the emptyness
...
This was SVN commit r14230.
2013-11-26 15:12:16 +00:00
433b32bdcd
Various XpartaMuPP cleanup.
...
This was SVN commit r14229.
2013-11-25 04:05:41 +00:00
c3ebb50711
Fix ratings and print rating changes in the lobby.
...
Fix game listings.
Fix non-hosts unregistering games.
Patch by scythetwirler.
This was SVN commit r14228.
2013-11-25 02:55:47 +00:00
d6a9489ccb
Ptolemaic walls commit
...
This was SVN commit r14227.
2013-11-25 00:34:31 +00:00
2db4f3fe40
A few new portraits from Pureon.
...
This was SVN commit r14226.
2013-11-24 23:53:29 +00:00
ff0eb70f4a
Portrait tweaks for NAF Ele and Tiger.
...
Added tigers to these maps.
This was SVN commit r14225.
2013-11-24 23:19:41 +00:00
b08b478403
tweaked tiger animations ratio
...
This was SVN commit r14224.
2013-11-24 23:07:11 +00:00
dc8cea3fa4
New tiger mesh, texture and animations
...
This was SVN commit r14223.
2013-11-24 21:38:36 +00:00
9fc30533d4
This was SVN commit r14222.
2013-11-24 15:29:23 +00:00
7109c34297
Observer Hack attempt.
...
Tweaks to Alpine Valleys and Greek Acropolis.
This was SVN commit r14221.
2013-11-24 15:27:03 +00:00
6a58044cc6
add missing protection to previous fix, fixes #1052
...
This was SVN commit r14220.
2013-11-24 10:37:23 +00:00
b7c3efac50
Ptol camel archer a little faster.
...
Brand new Alpine Valleys skirm map. My take on it anyway. 1v1.
This was SVN commit r14219.
2013-11-23 21:34:03 +00:00
d930244f02
update RallyPoint targets when renamed, fixes #1052
...
This was SVN commit r14218.
2013-11-23 19:32:59 +00:00
26c2ded9c5
New specific name for "Hellenization" = Exellinismós
...
More accurate names for Spartiate and Spartan Woman.
Tweaked some maps.
This was SVN commit r14217.
2013-11-23 15:50:15 +00:00
3d75d4e69c
do not show carrying resources animation in attack-move
...
This was SVN commit r14216.
2013-11-22 17:43:26 +00:00
5da63764e0
Fix compilation with wxWidgets 3.0.
...
This was SVN commit r14215.
2013-11-20 19:29:10 +00:00
09d5507ecb
clean some useless code
...
This was SVN commit r14214.
2013-11-19 21:27:23 +00:00
e8d8673734
let non-fighting units flee when attacked even if the attacker is not visible
...
This was SVN commit r14213.
2013-11-19 21:20:25 +00:00
95d5a25be1
Fixed carry_meat animations for mauryan elephant archers and ptolemaic camel rider
...
This was SVN commit r14212.
2013-11-18 03:43:36 +00:00
5ce8de1f0a
Removes unused var from JS debugger, from patch by Markus. Fixes #1852
...
This was SVN commit r14211.
2013-11-17 23:41:19 +00:00
d672d9625d
Changes update-workspaces.bat to not generate a vc2013 workspace by default, since the game won't successfully build yet, refs #2271
...
This was SVN commit r14210.
2013-11-17 23:11:56 +00:00
c1609697d7
camel armature rider fix.
...
This was SVN commit r14209.
2013-11-17 22:48:03 +00:00
e397993dae
Deleting a bunch of scenarios.
...
Made peacock easier to hunt.
Fixed elite Ptolemaic slinger promotion.
Reduced the health of basic ranged citizen soldiers slightly.
Updated Deccan Plateau with moar forestry.
Fixed Athenian Marine specific name.
This was SVN commit r14207.
2013-11-17 20:16:57 +00:00
e881099d43
Use functions to change variables. Remove broken branding of cheating player.
...
This was SVN commit r14206.
2013-11-17 18:24:09 +00:00
3a24eab0f0
Cache technology modifiers based on original value. Patch from sanderd17 based on work by Spahbod. Fixes #2045 .
...
This was SVN commit r14205.
2013-11-17 18:24:04 +00:00
0d876adc13
add some var
...
This was SVN commit r14204.
2013-11-17 12:28:26 +00:00
294aa142d8
Fixes compiling with the flag "--without-lobby".
...
Refs #2267
This was SVN commit r14203.
2013-11-17 11:52:11 +00:00
7595ea4534
2 player Badlands skirmish.
...
This was SVN commit r14202.
2013-11-17 01:40:39 +00:00
d5e7c1c44a
Fixed Ptolemies and Macedonians death variations in these actors. They were previously throwing an error.
...
Champion spearmen -> 80 metal instead of 80 wood.
This was SVN commit r14201.
2013-11-16 23:30:34 +00:00
6fba293088
In #2241 I'm going to change the GUI to have one ScriptInterface for each GUI page because that will be required for the Spidermonkey upgrade ( #1886 ).
...
The Multiplayer lobby needs some changes to avoid compartment
mismatches. Instead of initializing it with a ScriptInterface and
storing script values at different locations, it takes a ScriptInterface
argument in the functions that really need to read or write some script
values and avoids storing values as script values with an associated
compartment where possible.
The scripting interface of the lobby is also adjusted to use
JSInterface_Lobby.h/cpp files as other components instead of adding all
functions to ScriptFunctions.cpp. This makes it a bit more clearly
arranged IMO.
Fixes #2267
Refs #2241
Refs #1886
This was SVN commit r14199.
2013-11-16 18:38:40 +00:00
451e801f6a
Minor things.
...
This was SVN commit r14198.
2013-11-16 18:36:35 +00:00
1f677c17b1
Fixed deccan plateau.
...
This was SVN commit r14197.
2013-11-16 17:37:13 +00:00
30c2abd529
Hannibal now rides an Asian elephant.
...
This was SVN commit r14196.
2013-11-16 17:26:30 +00:00
6794bc5258
Made tropic forest floor darker.
...
Tweaked Deccan Plateau skirmish map.
Tweaked Sahel skim map.
This was SVN commit r14195.
2013-11-16 17:24:28 +00:00
bde9d19b7a
Adding wbg to more maps.
...
This was SVN commit r14194.
2013-11-16 16:11:43 +00:00
d7ef47959d
Sahel random map.
...
This was SVN commit r14193.
2013-11-16 15:17:18 +00:00
7ab15cb721
Building animation for mauryan support elephant
...
This was SVN commit r14192.
2013-11-16 15:05:55 +00:00
b8e9f74070
Added animations to gaia asian elephant male.
...
Maur support elephant is now asian, it has new texture.
Added normal texture for the skin of all asian elephants. (only armors
before)
This was SVN commit r14191.
2013-11-16 13:03:58 +00:00
19bd71af5d
fixed unecessary prop point
...
This was SVN commit r14190.
2013-11-15 23:52:28 +00:00
51b1de2dee
Carthaginian Fortress commit!
...
This was SVN commit r14189.
2013-11-15 23:44:02 +00:00
3ab983f8a1
Some "varfare" again plus a call to initMusic because that will be needed for the Spidermonkey upgrade.
...
This was SVN commit r14188.
2013-11-15 18:35:19 +00:00
54fcb3b4ca
Updated (and completed) Sahel skirmish map.
...
This was SVN commit r14187.
2013-11-15 16:41:05 +00:00
1cd4e6ffdd
Round footprint for lighthouse.
...
Some spec and normal maps for some shields.
Updated some skirmish maps.
This was SVN commit r14186.
2013-11-15 15:26:57 +00:00
9dbd8dbb26
Fixing the broken water on gulf of bothnia.
...
This was SVN commit r14185.
2013-11-15 14:42:18 +00:00
5dc7d8dc9f
missing lighthouse files
...
This was SVN commit r14184.
2013-11-15 13:52:57 +00:00
ca0575e422
Increasing thIncreasing the generation speed of the maps: Phoenician Levant
...
This was SVN commit r14183.
2013-11-15 08:57:32 +00:00
98638a2d2f
Ptolemaic lighthouse and LordGood's new carthaginian defense tower.
...
Fixed ptolemaic fortress garrison flag
This was SVN commit r14182.
2013-11-15 02:52:04 +00:00
47b26e56d3
Remove unused VideoRecorder from Atlas.
...
This was SVN commit r14181.
2013-11-14 23:05:07 +00:00
d459e97d33
Remove unnecessary Territory element from the fortress and defense tower templates.
...
This was SVN commit r14180.
2013-11-14 21:58:49 +00:00
9266d30e17
Build on cf4f7d18a7 based on discussion on IRC. Allow fortresses, towers, and wall towers to attack siege again, but debonus them 0.5x against it. Bonus catapults 1.25x vs fortresses, but reduce their attack vs buildings slightly in order to make them effective against all buildings but slightly better against fortresses' huge HP. They still have far less DPS than rams, even against fortresses, but are more flexible and are ranged. Enforce a minimum distance of 60 between fortresses, meaning that fewer can fire on siege weapons at once, and turtling is slightly less effective in general. Minor stat changes dealing with range of towers, fortresses, and catapults. Increase catapult splash radius and decrease splash damage, to make catapults more effective as semi-static defense against large numbers of infantry.
...
This was SVN commit r14179.
2013-11-14 21:49:02 +00:00
a3a7f1cd22
Adjust siege ram.
...
- Decrease attack from 50c with 2x vs buildings (3x vs gates) to 80c
with 1.5x vs gates.
- Increase charge attack from 40c with 2x vs buildings (3x vs gates) to
100c with 1.5x vs gates.
This was SVN commit r14178.
2013-11-14 21:15:51 +00:00
8ecfbd0899
Remove unused includes of tr1/unordered_map etc.
...
They cause build errors with libc++, and we always use
boost::unordered_map instead.
This was SVN commit r14177.
2013-11-14 20:47:59 +00:00
cfba68f8d2
Increase Advanced Siege tech from +3 crush to +5 crush.
...
This was SVN commit r14176.
2013-11-14 20:36:05 +00:00
cf4f7d18a7
Buff catapults slightly.
...
- Add 'Siege' to the RestrictedClasses of towers, wall towers, and
fortresses. A fortress by itself should not be able to shoot down a
catapult, it should require some defense. This also nerfs building a ton
of towers and fortresses, which was previously very difficult to
penetrate and led to long, boring wars of attrition.
- Increase armor from 2h/10p/5c to 2h/30p/10c (matches siege rams).
- Increase attack from 30h/0p/30c to 0h/20p/35c. Would like to add techs
to increase damage further.
- Reduce splash damage to 0h/15p/30c from 40h/0p/40c.
- Increase maximum range from 68 to 75. May increase this more or add
techs.
Motivation is that siege catapults are relatively weak late-game, as
they have great difficulting penetrating fortified positions, leading to
both sides turtling. Additionally, this makes them roughly as strong as
siege rams, having less damage output than rams but having the ability
to attack from a distance. This balances out the civs without rams and
gives the ones with both rams and catapults an additional choice to
make.
This was SVN commit r14174.
2013-11-14 20:30:00 +00:00
a04cc9f01b
Increasing the generation speed of the maps: Northern Lights, Rhine Marshlands
...
This was SVN commit r14173.
2013-11-14 18:58:55 +00:00
8dedf7bc3d
Fixes a graphics issue on Linux (probably a driver bug) by scaling the images from 1x1024 px to 4x1024 px.
...
Fixes #2265
This was SVN commit r14172.
2013-11-14 17:19:49 +00:00
b4174664c6
hellenic walltower door fixed
...
This was SVN commit r14171.
2013-11-14 16:26:46 +00:00
0170db4a53
Adding advanced graphical features into random maps. Fixes #2262 .
...
This was SVN commit r14170.
2013-11-14 14:33:55 +00:00
11c471273c
Committing the fix for undefined civs in atlas, and the problem with ptolemics in Fortress map by FeXoR. Fixes #2258 .
...
This was SVN commit r14169.
2013-11-14 12:27:56 +00:00
321e61617b
Improve MoveToTarget when the target is moving, fixes #2253
...
This was SVN commit r14168.
2013-11-14 07:25:56 +00:00
4915116ccc
Fix glooxwrapper build on gcc 4.2 and warning on clang.
...
This was SVN commit r14167.
2013-11-14 00:32:28 +00:00
4c395f4bf2
Remove Trigger and Cinematic sections from Atlas.
...
This was SVN commit r14166.
2013-11-14 00:10:04 +00:00
bd900362ea
Rebuild premake4.exe with VC++ 2008 again, so that it works on WinXP/2003
...
This was SVN commit r14164.
2013-11-13 21:16:06 +00:00
e58fa107cc
Fix skeleton caching.
...
This was SVN commit r14163.
2013-11-13 20:05:57 +00:00
49721cff33
Increasing the generation speed of the maps: Unknown Land
...
This was SVN commit r14162.
2013-11-13 14:30:27 +00:00
62551be685
New Random Map: Mainland. A simple map without any body of water. Also the space between the forests is increased. Optimizing the map for relatively lag-free games.
...
This was SVN commit r14161.
2013-11-13 13:36:47 +00:00
0d323c020b
Increasing the generation speed of the maps: Archipelago, Gulf of Bothnia, Lorraine Plain
...
This was SVN commit r14160.
2013-11-13 13:17:22 +00:00
5dac329c78
Increasing the generation speed of the maps: Aegean Sea
...
This was SVN commit r14159.
2013-11-13 10:20:22 +00:00
65bd13ac1e
Increasing the generation speed of the maps: Syria
...
This was SVN commit r14158.
2013-11-13 08:07:05 +00:00
4acbf86ffb
Trying to fix crazy elephant armature
...
This was SVN commit r14157.
2013-11-12 21:30:25 +00:00
2f0d6ee1e8
Upgraded asian elephant animations.
...
This was SVN commit r14156.
2013-11-12 19:13:45 +00:00
17fdb515f4
fix error when selecting multiple elephants
...
This was SVN commit r14155.
2013-11-12 19:03:12 +00:00
7cb4c0dcfc
Partial fix of minimap rendering for GLES.
...
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
modifies shaders as needed.
This was SVN commit r14153.
2013-11-12 01:31:52 +00:00
7dec618898
Some attempts to fix GLES build in smooth LOS and post proc manager.
...
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
replaces glPush/PopAttrib by resetting the viewport manually.
Adjusts GLSL shaders for these changes.
This was SVN commit r14152.
2013-11-12 01:30:17 +00:00
f1613a3c90
Fixes fancy waves build on GLES (replaces GL_QUADS with GL_TRIANGLES)
...
This was SVN commit r14151.
2013-11-12 01:25:32 +00:00
81eabfc934
Fixes basic water rendering on GLES (replaces GL_QUADS with GL_TRIANGLES).
...
Sets SDL2 to use correct profile for GLES.
Cleans up some old SDL 1.3 version checks.
This was SVN commit r14150.
2013-11-12 01:24:04 +00:00
5771bee032
First pass at fixing GLES build - more to come
...
This was SVN commit r14149.
2013-11-12 01:17:16 +00:00
0682c23fe3
Replaces BGRA textures with RGBA textures supported by GLES
...
This was SVN commit r14148.
2013-11-12 01:11:08 +00:00
54abce1a3c
hellenic walltower rotated 180 to match the droppoint with the wall RMS
...
This was SVN commit r14147.
2013-11-12 00:05:26 +00:00
df1d5d2260
fix tag 2102648f7c which had unwanted changes
...
This was SVN commit r14146.
2013-11-11 16:29:44 +00:00
0e74e3a521
Removed Ostorius.
...
This was SVN commit r14145.
2013-11-11 16:09:00 +00:00
2102648f7c
Allows autogarrison of newly trained units, fixes #1044
...
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
fad8f7fce0
adds some needed protection
...
This was SVN commit r14143.
2013-11-11 15:03:22 +00:00
3d8865f10b
Adds gloox to OS X libs build script, with patch to fix build (fixed upstream in 5de9ed7444).
...
Fixes lobby build on OS X.
Fixes zlib not building as static lib.
This was SVN commit r14142.
2013-11-11 04:41:44 +00:00
29ef5f3ce9
Adds patch for SDL 1.2 build on OS X 10.9 (Mavericks), CGDirectPaletteRef was deprecated and has now been removed. See https://bugzilla.libsdl.org/show_bug.cgi?id=2085
...
This was SVN commit r14141.
2013-11-11 01:19:55 +00:00
45a7f577d3
A bunch of OS X SDK-related fixes.
...
Adds runtime support for 10.5 APIs: display modes, bundle paths, system
paths, pasteboards. Previously this was compile-time support only, which
prevented building on later SDKs while targeting earlier APIs.
Adds hardcoded version for pre-10.6 builds, to avoid messing with
deprecated Gestalt or having to add a 10.5 non-dispatch singleton (Grand
Central Dispatch didn't exist in 10.5)
This was SVN commit r14140.
2013-11-11 00:11:25 +00:00
011cbb5725
Fixes OS X STL incompatibilities when building against later SDKs and targeting 10.5 (fixes stringstream build errors in these conditions)
...
This was SVN commit r14139.
2013-11-11 00:09:16 +00:00
5c2c7248b1
Adds zlib, curl, iconv and libxml2 to OS X libs build script, to avoid using the non-backward-compatible versions provided by Apple.
...
Adds patch for zlib configure to pick up CFLAGS/LDFLAGS, to better
support SDK builds.
Cleans up OS X libs build script, hides some extraneous output.
This was SVN commit r14138.
2013-11-11 00:04:07 +00:00
4406be3a69
Fix crash when trying to join the lobby again if the host disconnected in the game setup screen.
...
This was SVN commit r14137.
2013-11-10 22:42:48 +00:00
f070bf9d1e
Prohibit the user from picking the 'system' lobby name, as that's reserved for special messages.
...
This was SVN commit r14136.
2013-11-10 21:52:38 +00:00
e01445818a
Nerf/rebalance siege towers.
...
- Armor changed from 2h/20p/10c to 5h/20p/2c
- Attack changed from 25p to 10p/5c
- Bonus added: 2x vs structures
- Ranged reduced from 65 to 55
- Elevation bonus of 10 added
- PreferredClasses is now 'Structure'
- Ungarrisoned arrow count decreased to 0 from 2
- Build time increased to 60 from 50
- BuffHeal is now 0 (decreased from 1)
- Health reduced from 800 to 500
- Walking speed reduced to 5 from 6
The idea is for siege towers to be useful for siege, but also for
cleaning out large numbers of units. Previously they were very good at
the latter and useless for the former. They should still be very
powerful units, but not uncounterable and massing siege towers
(previously unbeatable if enough were acquired) should no longer be
feasible.
This was SVN commit r14135.
2013-11-10 20:21:50 +00:00
2811d4c367
Fixed this map.
...
This was SVN commit r14134.
2013-11-10 19:22:24 +00:00
912e485a64
Elephant changes and tweaks.
...
This was SVN commit r14133.
2013-11-10 19:08:38 +00:00
85e9a2b0ce
Added 3 idle animations and attack, death and walk animations for all asian elephants.
...
Maurya hero howdah added with normal and specular maps
This was SVN commit r14132.
2013-11-10 17:39:04 +00:00
a2477f9d40
Increasing the generation speed of the maps: Alpine Lakes
...
This was SVN commit r14131.
2013-11-10 17:29:40 +00:00
a96ed190a5
Add GLX_MESA_query_renderer support to hwdetect
...
This was SVN commit r14130.
2013-11-10 16:24:03 +00:00
d178f32698
Fix Unicode in JS print() on Linux
...
This was SVN commit r14129.
2013-11-10 16:13:40 +00:00
c27c663697
Print a traceback after an exception in the bot.
...
This was SVN commit r14128.
2013-11-10 04:28:18 +00:00
59da5fad2a
Fix some spidermonkey lobby complaints when run in strict mode.
...
This was SVN commit r14127.
2013-11-10 04:09:03 +00:00
174f636fd2
Fixes tests
...
This was SVN commit r14126.
2013-11-10 03:24:29 +00:00
37cedb8133
Make filters work and add a skirmish map filter.
...
This was SVN commit r14125.
2013-11-10 00:45:19 +00:00
4fb6896fd8
Fix warning when the hosted game is a random rms.
...
This was SVN commit r14124.
2013-11-09 23:57:31 +00:00
d7ec8c47a6
Fix Unicode support in lobby.
...
Fix EncryptPassword being called with the wrong argument order, and
encrypting username instead of password. (This will break all existing
lobby accounts.)
Fix EncryptPassword not using all of salt_base.
This was SVN commit r14123.
2013-11-09 23:26:17 +00:00
35d48d2fe8
...and increase HDATA_USER_SIZE so OglTex actually fits
...
This was SVN commit r14122.
2013-11-09 18:49:35 +00:00
1ad9d5424a
Fix error at startup on 64-bit builds.
...
OglTex had a size_t added, which pushed it over HDATA_USER_SIZE.
Use u32 instead to minimise the difference between platforms.
This was SVN commit r14121.
2013-11-09 18:39:45 +00:00
dcb3c0ad7a
Increasing the generation speed of the maps: Continent
...
This was SVN commit r14120.
2013-11-09 16:00:01 +00:00
d3fade285b
Basic Nubian archer textures.
...
Map preview for Corsica and Sardinia.
This was SVN commit r14119.
2013-11-09 14:42:32 +00:00
2d2853dd6f
Fix problems with EndGameManager in Atlas by waiting for the first turn
...
This was SVN commit r14118.
2013-11-09 10:09:28 +00:00
9cc172b164
Fixes --without-lobby for MSVC and clang, refs #2249 .
...
Cleans up some whitespace.
Removes obsolete PCH files.
This was SVN commit r14117.
2013-11-09 02:57:10 +00:00
3c47b12cbe
Display texture memory usage in profiler's renderer stats
...
This was SVN commit r14116.
2013-11-09 01:03:23 +00:00
3a278df3f7
Move ship to shoreline when tasking units to garrison inside, fixes #1391
...
This was SVN commit r14115.
2013-11-08 23:22:59 +00:00
5dfc3746e3
Remove old and unused archive stats.
...
This was SVN commit r14114.
2013-11-08 17:27:21 +00:00
81cf02cc13
Fix building with --without-lobby. Fixes #2249 .
...
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
0f8d3e23db
;
...
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
1a32a10f52
Updated premake to support VS2013. Also changed platform toolsets to vc110_xp and vc120_xp for VS2012 and VS2013 respectively. This way the builds will also work on WinXP.
...
This was SVN commit r14111.
2013-11-08 14:08:16 +00:00
da6abe630a
Fix error message on starting game due to missing global variable.
...
This was SVN commit r14110.
2013-11-08 09:52:48 +00:00
7547dae0e2
Fixing the revert by the previous commit.
...
This was SVN commit r14109.
2013-11-08 08:04:35 +00:00
f88b5be079
Increasing the generation speed of the maps: Islands, Lake.
...
This was SVN commit r14108.
2013-11-08 08:02:32 +00:00
bb28e0eb70
Fix some system message/spam filter bugs in the lobby.
...
This was SVN commit r14107.
2013-11-08 00:57:58 +00:00
1138419017
Remove broken build script
...
This was SVN commit r14106.
2013-11-07 22:20:38 +00:00
62b92af925
Fix lobby registration errors.
...
This was SVN commit r14105.
2013-11-07 22:07:26 +00:00
f53bd8974c
Add autobuilder support for glooxwrapper
...
This was SVN commit r14103.
2013-11-07 21:45:59 +00:00
93cffe9deb
Remove the old and no longer used archive builder that rebuilt the archive while the game is running.
...
This approach isn't used anymore. Now we start the archive building with
parameters to pyrogeneis.
Refs #2241 (the code used g_ScriptingHost which is going to be removed)
This was SVN commit r14102.
2013-11-07 21:06:18 +00:00
87e9c5694e
Change the LOGWARNING when a config setting doesn't exist to a LOGMESSAGE.
...
This was SVN commit r14101.
2013-11-07 21:02:22 +00:00
8d5d66e57b
Fix error that slipped into the lobby commit.
...
This was SVN commit r14099.
2013-11-07 20:10:59 +00:00
bffe917914
Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby.
...
This was SVN commit r14098.
2013-11-07 20:07:24 +00:00
d7121f4f55
glooxwrapper by Philip to support building gloox on Windows.
...
This was SVN commit r14097.
2013-11-07 19:38:09 +00:00
10e23c173d
Add gloox library files.
...
This was SVN commit r14096.
2013-11-07 19:04:30 +00:00
fe0510c079
Again increasing the generation speed of Islands random map by using the new chain placer. As a side effect, the map is more beautiful.
...
This was SVN commit r14095.
2013-11-07 19:02:09 +00:00
b416de9b7c
Remove the unused crypto++ library files.
...
This was SVN commit r14094.
2013-11-07 18:50:52 +00:00
3298dce158
Remove the unused crypto++ library.
...
This was SVN commit r14093.
2013-11-07 18:49:43 +00:00
3743e58f9a
allow enabling the game clock as a persistent setting
...
This was SVN commit r14092.
2013-11-07 18:06:52 +00:00
6d62b3bf40
Added a new "placer" function for the rmgen library.
...
This new placer generates terrain features that are less "predictable".
It also increases the map generation time considerably.
Currently it is only implemented on Persian Highlands random map.
This was SVN commit r14091.
2013-11-07 14:50:16 +00:00
b7751a277c
Cleanup
...
This was SVN commit r14090.
2013-11-07 12:38:41 +00:00
5ec4962184
Decreasing the generation time of Islands random map to about 2/3 of the original.
...
This was SVN commit r14089.
2013-11-07 12:00:04 +00:00
9b98585275
Remember the last market for back-to-order trading, fixes #2248
...
This was SVN commit r14088.
2013-11-06 21:07:19 +00:00
9ffe235b2f
Clean up EndGameManager. Fixes #2130
...
This was SVN commit r14087.
2013-11-05 19:40:50 +00:00
68fa9f4631
Fix building contstruction, but still don't allow positive regenrate for unhealable entities
...
This was SVN commit r14086.
2013-11-05 17:45:39 +00:00
24bc451852
Corsica and Sardinia skirmish map. Needs Iberian circuit wall.
...
This was SVN commit r14085.
2013-11-05 16:12:58 +00:00
8540740b35
disallow healing of unhealable entities via all ways
...
This was SVN commit r14084.
2013-11-05 07:07:10 +00:00
6fae05b5f6
fix
...
This was SVN commit r14083.
2013-11-03 17:41:59 +00:00
0362453035
test some components before use, adresses #2206
...
This was SVN commit r14082.
2013-11-03 17:18:43 +00:00
53a270347a
Map preview for Zagros Mtns.
...
Changed preview for Greek acrpolis.
Fixed quote attribution. Thanks anfialro.
This was SVN commit r14081.
2013-11-03 16:39:28 +00:00
f1100f10c1
Standardized Cav Spearmen animations.
...
This was SVN commit r14080.
2013-11-03 14:17:33 +00:00
c62cc3ee44
rename technology modifier 'multiplier' to 'multiply' for consistency with auras, and it looks better next to the existing 'add'
...
This was SVN commit r14079.
2013-11-03 14:09:32 +00:00
e4f2ddb738
Renamed a bunch of maps.
...
This was SVN commit r14078.
2013-11-03 14:06:49 +00:00
5dc553bf91
More shield changes.
...
Tweaked number of 5-pop houses on Sicilia skirmish map.
New "Sahel" Skirmish map.
This was SVN commit r14077.
2013-11-03 14:01:45 +00:00
34e09220a4
Normal and spec maps for a bunch of shields.
...
This was SVN commit r14076.
2013-11-03 13:36:16 +00:00
e0161bd355
small code style fix
...
This was SVN commit r14075.
2013-11-03 13:15:44 +00:00
6dca6910c3
Recursively count garrisoned units to avoid overcapacity
...
This was SVN commit r14074.
2013-11-03 13:13:30 +00:00
72e11a2dea
Fix VS2013 build errors, warnings
...
This was SVN commit r14073.
2013-11-03 12:46:07 +00:00
37f5aa5351
Standardized animations for cavalry swordsmen. Will do the same for cavalry spearmen. This is to help the player differentiate the unit types better.
...
This was SVN commit r14072.
2013-11-03 10:31:57 +00:00
768c821f13
Acropolis 7 scenario renamed to "Acropolis Night."
...
Cycladic Archipelago 06 and Deccan Plateau 01 scenarios deleted.
Gambia River skirmish map (still needs 2 out of 3 Iberian wall
circuits).
This was SVN commit r14071.
2013-11-03 10:14:43 +00:00
096fc43f9e
Three new skirmish maps. 2 need Iberians walls though.
...
Deleted a couple of scenarios.
This was SVN commit r14070.
2013-11-03 09:51:16 +00:00
f4bd08427c
Trader speed tech!
...
This was SVN commit r14069.
2013-11-03 05:40:43 +00:00
29e4b1a17c
Update Android support
...
This was SVN commit r14068.
2013-11-02 23:05:38 +00:00
8aa6485d78
Fix shader errors with OpenGL ES
...
This was SVN commit r14067.
2013-11-02 22:58:38 +00:00
ba5b572ccc
Iberian walls for Caspian Sea skirmish map.
...
Rubble for these houses.
This was SVN commit r14066.
2013-11-02 16:54:15 +00:00
c1c45bd7c8
Caspian Sea skirmish map.
...
Clouds.
This was SVN commit r14065.
2013-11-02 15:28:33 +00:00
1fa2fc9739
CClientArea parsing test
...
This was SVN commit r14064.
2013-11-02 14:39:08 +00:00
ce7c97b79f
Improve back to work behaviour (queues taken into account), fix #2206 , patch from Itms
...
This was SVN commit r14063.
2013-11-01 22:00:06 +00:00
358e8f5992
Remove ResourceGatherer for animals
...
This was SVN commit r14062.
2013-10-31 19:37:42 +00:00
552a4527ca
Iberian walls for Deccan Plateau skirmish map.
...
Specific Name for Mauryan maiden guards (Visha Kanya).
Clarified the Iberian json a bit.
Some tooltip tweaking.
This was SVN commit r14060.
2013-10-31 17:21:10 +00:00
543ec3a8c7
Fix launching skirmish maps without selecting a civ
...
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
60fb5ed1c3
- Fix garisson and formation aura types
...
- Implement tech mods for UnitMotion speeds, Fixes #1958 , based on patch
by wraitii
- Implement athen_hero_themistocles ship speed aura as a test
This was SVN commit r14058.
2013-10-30 16:12:53 +00:00
2d1be3d47e
Improve correctness of hotkeys at low framerates.
...
SDL queues up all the input events received in a frame. When the hotkey
system saw a key up/down event, it immediately updated its
HotkeyIsPressed state and then pushed a hotkey event onto the end of the
queue.
If the initial queue was e.g. [key-down shift, key-press Z, key-up
shift], the hotkey event triggered by Z would be processed after the
key-up shift had updated the HotkeyIsPressed state, so the handler of
the Z hotkey would not think the shift hotkey was pressed.
If the initial queue was e.g. [key-press Z, mouse-click], the hotkey
triggered by Z would be processed after the mouse-click event, so it
could apply to the wrong building selection.
Fix by pushing the hotkey events onto a special queue that gets
processed before any subsequent SDL input events.
Also update the HotkeyIsPressed status when the HOTKEYDOWN/HOTKEYUP
events are processed, not when they are generated, to guarantee they are
consistent with the DOWN/UP events.
Fixes #1869 .
This was SVN commit r14057.
2013-10-30 01:38:32 +00:00
11c7c44a0b
Fixed typos reported in Transifex by qwertz and Loki.
...
This was SVN commit r14056.
2013-10-29 23:22:09 +00:00
b67c411b33
Fix typos in template files. Refs #2185 .
...
This was SVN commit r14055.
2013-10-28 20:26:35 +00:00
15f09f7005
Fix typos in civilization files. Refs #2185 .
...
This was SVN commit r14054.
2013-10-28 20:21:27 +00:00
538c250d67
Fix typos in descriptions of random maps. Refs #2185 .
...
This was SVN commit r14053.
2013-10-28 20:19:09 +00:00
dd7445262c
Typo: enemey → enemy.
...
This was SVN commit r14052.
2013-10-28 20:01:51 +00:00
fcde137b30
Viriato.
...
This was SVN commit r14051.
2013-10-28 14:35:25 +00:00
e2f475b86a
Make the *nix ARM support a little sturdier, Fixes #2121
...
This was SVN commit r14050.
2013-10-27 21:06:15 +00:00
3173722099
Copy this.entites in GarrisonHolder before passing and modifying it. Patch by mimo. Fixes #2238 .
...
This was SVN commit r14049.
2013-10-27 16:37:51 +00:00
31e79e6709
Reorders the game setup drop list for maps.
...
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
30af350e31
New Neareastern Badlands skirmish map and it's awesome with Whizbang Graphics (WBG) enabled.
...
Tweaked some stuff on a few maps.
Fixed Iberian Walls for Nile River skirmish.
Changed names for Ptolemaic warships.
A couple of technology portraits for Advanced and Elite upgrades (these
techs are not implemented, but planned).
This was SVN commit r14047.
2013-10-26 15:10:15 +00:00
597da2ff9d
Alpha 14 remake
...
This was SVN commit r14045.
2013-10-26 11:10:21 +00:00
a45b074b07
Renamed the Arabian Oasis maps to Libyan Oasis, because the Egyptian eye candy assets insinuate the Libyan Desert instead of the Arabian Desert.
...
Changed Nile River maps to "naval" maps because the AI gets stuck trying
to cross the river.
Renamed the "ptol" statue ruins to "egyptian" statue ruins. Makes them
more generically "Egyptian".
Ensured siege engines can only be built in City Phase.
This was SVN commit r14044.
2013-10-26 10:31:52 +00:00
64dc783a18
Simplified the Spartan population penalty.
...
Changed costs on a few units.
New tooltips and hero auras for Carthaginian heroes Hannibal, Hamilcar,
and Maharbal. (see: wiki civ profile)
Fixed specificname for some Carthaginian units.
Added a field entity for "skirmish" maps.
This was SVN commit r14043.
2013-10-26 09:40:21 +00:00
fe6d508a82
Punjab skirmish map.
...
Some map tweaks.
This was SVN commit r14042.
2013-10-26 03:07:03 +00:00
1ee4c52779
All 4 players on Nile River skirmish map now have Iberian walls.
...
This was SVN commit r14041.
2013-10-25 09:00:46 +00:00
10ddc2aed6
Fixed starting unit for Ptolemies.
...
Nile River skirmish map (still needs Iberian walls for 2 of the
players).
New map preview for Arabian Oasis.
Moved Civic Center back to Town Phase, but made it take twice as long to
build.
Fixed elephant template.
Fixed up Persian Highlands skirmish map based on some notes from
Alpha123.
This was SVN commit r14040.
2013-10-25 08:02:55 +00:00
14166af0ac
This was SVN commit r14038.
2013-10-24 09:46:26 +00:00
4e86b00a05
Remove inconsistencies in the manual. Refs #2185 .
...
Fix player name.
Make log messages when saving games use quotes around paths.
This was SVN commit r14037.
2013-10-23 22:18:40 +00:00
20ed5b118c
Unify script conversions and remove JSInterface_Vector3D.
...
Because it was historically grown, we have some duplicated code for
converting script types to native types.
This patch removes the file JSConversions.cpp and moves some code to
ScriptConversions.cpp.
The places using JSConversions.cpp are changed to use the
ScriptInterface's conversion functions in ScriptConversions.cpp.
I also removed JSInterface_Vector3D because it had additional
requirements to the conversion code that no other code has and because
it's currently not used. I think it doesn't make sense to maintain code
just because it could possibly be used again later.
Closes #2213
Refs #1886
This was SVN commit r14036.
2013-10-20 17:13:53 +00:00
a4cd90ddfc
Avoid non-ASCII characters in source code, since tools don't decode them consistently.
...
Fixes #2198 .
This was SVN commit r14035.
2013-10-20 09:27:44 +00:00
d6f6d2b145
Remove useless error messages.
...
This was SVN commit r14034.
2013-10-20 01:47:16 +00:00
2117f77812
Fixed some resource placement.
...
This was SVN commit r14033.
2013-10-20 01:18:59 +00:00
50a2bddf77
Fixed some goats.
...
This was SVN commit r14032.
2013-10-20 01:10:02 +00:00
34d927f25c
These two skirmish maps are now complete with walls for Iberians.
...
This was SVN commit r14031.
2013-10-19 23:52:28 +00:00
15f565f316
Corinthian Isthmus and Persian Highlands skirmish maps (wip).
...
This was SVN commit r14030.
2013-10-19 20:54:41 +00:00
742c489353
Fix typos, remove BOMs and add newlines before EOF. Refs #2185 . Patch by Gallaecio.
...
This was SVN commit r14029.
2013-10-19 20:13:48 +00:00
71a41ba401
Line endings. Refs #2185 .
...
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
45d4e92782
Fixed building requirements for Town Phase.
...
Changed Brit Wonder to the new Stonehenge model. :)
Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092
This was SVN commit r14027.
2013-10-19 18:20:25 +00:00
b9892bc73a
Remove ScriptableObject/CJSObject
...
Since all remaining uses of ScriptableObject/CJSObject have been
removed, the related files can now also be removed.
Closes #2212
Refs #2126
Refs #2137
Refs #1886
This was SVN commit r14026.
2013-10-19 10:14:08 +00:00
024dd82209
Fix non-PCH build
...
This was SVN commit r14024.
2013-10-19 01:11:20 +00:00
ac335f37c8
Fix some Clang warnings about unused private members
...
This was SVN commit r14023.
2013-10-19 00:53:58 +00:00
c0b628bcac
Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210 , #2211 .
...
This was SVN commit r14022.
2013-10-18 20:33:08 +00:00
701508922f
Use CStrIntern for font names to reduce lookup cost
...
This was SVN commit r14020.
2013-10-18 16:15:42 +00:00
91169c82c7
Optimise rendering of scrollable text boxes by clipping
...
Add optional clipping rectangle to CTextRenderer. Strings that are
printed
outside the vertical extent of the clipping rectangle will be
immediately
skipped. This greatly reduces the cost of large scrollable text boxes.
This was SVN commit r14019.
2013-10-18 16:05:02 +00:00
751558d894
Optimise text rendering by batching
...
When CTextRenderer is given multiple strings with no differences other
than position, render them in a single glDrawElements call to reduce
driver overhead.
Also avoid some unnecessary copies of std::wstrings.
This helps performance a bit with large GUI text boxes.
This was SVN commit r14018.
2013-10-18 16:02:48 +00:00
b6c7c0d799
Optimise glyph lookup in text renderer
...
std::map lookup was a major cost when rendering large amounts of text.
Replace it with a more efficient 2-level array.
This was SVN commit r14017.
2013-10-18 15:56:12 +00:00
5778484a77
Refactor text renderer
...
Replace unifont with CFont and CFontManager, since the h_mgr interface
was
needlessly inconvenient.
Load the font textures through CTextureManager, to support dynamic
reloading (e.g. when resetting GL state - see #741 ).
Add CFontMetrics as a convenient wrapper for code that just wants to
measure text.
Fixes #1117 .
This was SVN commit r14016.
2013-10-18 15:53:07 +00:00
8799bd98b0
Support 8bpp textures
...
When textures.xml specifies format="alpha", the input is expected to be
an
8-bit greyscale PNG, and the output will be an 8-bit uncompressed
alpha-only DDS.
Add format override to CTextureProperties, to select between e.g.
GL_ALPHA
and GL_LUMINANCE for 8-bit textures.
This is needed so fonts can use the new texture system.
This was SVN commit r14015.
2013-10-18 15:36:31 +00:00
6a2fac7a58
Add hotkeys for JSDebugger commands. Patch by sathyam. Fixes #2208 .
...
This was SVN commit r14014.
2013-10-18 14:41:08 +00:00
9802adf92f
celt_stonehenge with normal and spec maps. Fixes #2053
...
This was SVN commit r14013.
2013-10-18 14:29:10 +00:00
f3968c0d4c
fix some flaws in the preferred classes. Patch by Jammus, Fixes #1985
...
This was SVN commit r14011.
2013-10-16 19:08:01 +00:00
e6d9094c98
Remove InitSavedGame, but keep the rallypoint problem it solved. Fixes #1762 , Patch by mimo.
...
This was SVN commit r14010.
2013-10-16 17:58:12 +00:00
6c3c6cfd3a
This was SVN commit r14009.
2013-10-16 14:08:47 +00:00
a2f836c393
Prevent bogus -Wmaybe-uninitialized warnings in GCC
...
This was SVN commit r14008.
2013-10-16 12:22:50 +00:00
eb33d0fd61
New unit for Romans: "Italian Allied Cavalry" which can help counter archers.
...
Persians and Mauryans still have uber archers, but must first pay for
them by researching "Archery Tradition" at the Barracks for 200F 300W.
This technology adds +10 meters to the range of all bow-using units,
plus makes archer units train faster (but have less health).
This was SVN commit r14007.
2013-10-16 01:04:55 +00:00
8456d50015
Found a couple more. (removing stonewall attack restriction).
...
This was SVN commit r14006.
2013-10-15 22:43:59 +00:00
8053cbd474
Remove the attack restriction for units against stone walls. May add it back for ranged units like archers and javelinists, after some discussion. I also feel it would be kind of weird to "charge" a stone wall (except for battering rams and elephants). So, we'll have to talk about it some more. But for now, let's test this out.
...
This was SVN commit r14005.
2013-10-15 22:43:06 +00:00
40db79df33
greek docks do not show warships in the foundation until construction is finished.
...
Different actor variations of the building can be displayed while
construction naming their variation to "scaffold"
This was SVN commit r14004.
2013-10-15 21:24:20 +00:00
2bbbcff811
fix tests, breaking caused by renaming files.
...
This was SVN commit r14003.
2013-10-15 16:10:06 +00:00
5f5eedc513
Rename technology related files, methods and messages so their names represent the shared data flow between technologies and auras (and maybe future components). Implement the C++ part of auras through these generalised files. Fixes #2154
...
This was SVN commit r14001.
2013-10-15 10:05:08 +00:00
a4ce8dac34
fix technologies broken by 379a7b208f
...
This was SVN commit r14000.
2013-10-14 20:36:57 +00:00
379a7b208f
Implement the js side of auras. Refs #2048 . Patch with the help of Alpha123. Only the temple aura is added as example, all other aura components are removed from the templates to be created from scratch again.
...
This was SVN commit r13998.
2013-10-14 15:51:21 +00:00
57d47f23c9
This was SVN commit r13997.
2013-10-13 18:11:54 +00:00
417e2455a0
Added ptolemaic ptolemaic storehouse and Lordgood's new cart temple and ptolemaic defense tower with little fixes.
...
This was SVN commit r13996.
2013-10-13 15:26:43 +00:00
ce5c43fe03
Fix typo
...
This was SVN commit r13995.
2013-10-13 11:41:30 +00:00
3a28caed03
Rebuilt premake4.exe with VC++ 2008 to avoid VC++ 2012 issues targeting XP
...
This was SVN commit r13994.
2013-10-12 23:47:09 +00:00
41de5440e0
Added and applied normal and spec maps for ptolemaic struct, paintings and statues, added ptolemaic temple and farmstead. Fixed ptolemaic CC footprint + little fixes
...
This was SVN commit r13993.
2013-10-12 21:33:21 +00:00
7335c32c7e
Some updated sounds from LAVS.
...
This was SVN commit r13992.
2013-10-12 01:27:10 +00:00
9b8667a9aa
Really add special starting unit.
...
This was SVN commit r13991.
2013-10-11 23:37:04 +00:00
4f03550adf
Create a special starting unit entity for skimish maps.
...
This was SVN commit r13990.
2013-10-11 23:36:02 +00:00
396bd844dd
Remove duplication between getActionInfo and determineAction. Allow setting rally points if not all selected buildings can do so. Patch by mimo. Fixes #2189 .
...
This was SVN commit r13989.
2013-10-11 22:43:22 +00:00
801cac87dd
Properly queue rally points when setting them via the minimap. Patch by mimo. Fixes #2203 .
...
This was SVN commit r13988.
2013-10-11 21:50:45 +00:00
c5669e2c4e
Add a back to work button. Patch by Itms. Fixes #799
...
This was SVN commit r13987.
2013-10-11 19:11:07 +00:00
e2d28c8894
Add AppData file, for use by some Linux package installers.
...
Fixes #2202 .
This was SVN commit r13986.
2013-10-11 18:55:46 +00:00
7791c4c61d
This was SVN commit r13985.
2013-10-11 11:01:55 +00:00
f22e47a743
This was SVN commit r13984.
2013-10-11 11:01:06 +00:00
644135b9f3
Fixes variable name conflict in session UI, patch by Itms, fixes #2199
...
This was SVN commit r13982.
2013-10-11 00:22:27 +00:00
f5eeed9cf7
Clears selections when loading saved game, patch by RefinedCode (fixes buggy selection behavior when using quicksave/quickload), fixes #2178
...
This was SVN commit r13981.
2013-10-10 23:58:29 +00:00
a00e57df72
Fixes hypothetical mem leak in network code (and an error in Cppcheck), patch by Riemer, fixes #2122
...
This was SVN commit r13980.
2013-10-10 23:46:42 +00:00
f6c9db33d6
Focus on the building a hero is garrisoned in when the hero button is double-clicked. Patch by mimo. Fixes #2131
...
This was SVN commit r13978.
2013-10-10 21:23:19 +00:00
c7e3c1499f
Fixed typo.
...
This was SVN commit r13977.
2013-10-09 20:07:36 +00:00
cd5a2aa527
Ptolemy IV.
...
Ptolemaic heroes added to Ptolemaic Fortress.
Seleucid Romanized Infantry Champion.
This was SVN commit r13976.
2013-10-09 13:42:34 +00:00
5c3ff86219
add different skirmish structures + skirmish demo map containing all skirmish templates so far
...
This was SVN commit r13975.
2013-10-08 18:02:35 +00:00
f3d83e0616
add skirmish defense tower and houses
...
This was SVN commit r13974.
2013-10-08 09:13:55 +00:00
f3d088dd5c
Fixes JS debugger, fixes VS 2013 build error, re-fixes #2127 , #2175
...
This was SVN commit r13973.
2013-10-07 22:55:30 +00:00
8464777759
Fixed premake4 build incorrectly ignoring vs2010 action.
...
fixes #2191
This was SVN commit r13972.
2013-10-07 22:45:08 +00:00
a97cd73cf8
Adds EnableSSE2 for Visual Studio builds on windows.
...
Adds optional "--with-c++11" flag for GCC/ICC builds. For possible
future C++11 migration.
refs #2191
This was SVN commit r13971.
2013-10-07 22:39:13 +00:00
055ea57468
ref #2191
...
Adds VS2012 support for premake4. Also adds
update-workspace-with-atlas.bat for VS2012 builds that need to compile
AtlasUI.dll, too.
This was SVN commit r13970.
2013-10-07 22:10:16 +00:00
79af6fb17f
Newly updated Ptolemaic champion cavalry.
...
This was SVN commit r13969.
2013-10-07 20:47:06 +00:00
b9268fbdcd
Fixes error logging in the JS debugger, based on patch by RefinedCode. Fixes #2175
...
This was SVN commit r13967.
2013-10-07 02:10:41 +00:00
d3e0fb4f84
Fixes crannóc spelling, thanks to GunChleoc
...
This was SVN commit r13966.
2013-10-07 00:46:58 +00:00
1408a0be83
This was SVN commit r13965.
2013-10-06 23:29:03 +00:00
74216a5825
Reverts field limits from f4abcd2ef9 until we can fix AI and UI problems, refs #2187
...
This was SVN commit r13964.
2013-10-06 23:25:55 +00:00
6d67957db2
Prevents buildings from getting attack-move orders and implements attack-move rally points, patch by mimo. Fixes #2171
...
This was SVN commit r13963.
2013-10-06 22:50:30 +00:00
35fa527814
Adds attacking player's name to attack notification messages.
...
Cleans up some duplicate username/color code in messages.js
This was SVN commit r13962.
2013-10-06 22:07:55 +00:00
7d92b3459b
Turns on Attack notification text.
...
This was SVN commit r13961.
2013-10-06 21:17:56 +00:00
573215dad8
Fixed the player names on this map.
...
This was SVN commit r13960.
2013-10-06 20:51:30 +00:00
4cfee05c31
New skirmish templates for Brit war dog and Maur Worker Elephant. Added to current Skirmish maps.
...
This was SVN commit r13959.
2013-10-06 20:23:21 +00:00
efc84a9cce
Adjusting time costs for these Ptol buildings.
...
This was SVN commit r13958.
2013-10-06 19:13:20 +00:00
5fc888fdcf
Some more player names for Carthage.
...
Player names for Seleucids.
Fixed names for Celtic docks and merchant ships.
Fixed cavalry health for a few units.
Name stuff for ships, specifically Carthage. Fixes #2106 .
Started work on some Ptolemaic units, specifically the Cav Spearman.
Added LordGood's Sacred Band Cavalry portrait.
This was SVN commit r13957.
2013-10-06 18:28:10 +00:00
b9b923be11
Fixes #2149
...
This was SVN commit r13956.
2013-10-06 14:58:26 +00:00
14b51afc39
Fixes #2152
...
This was SVN commit r13955.
2013-10-06 06:57:50 +00:00
f4e4247f06
Fixed Gallic Outpost name. Fixes #2167 .
...
Fix Ptol civ center footprint.
This was SVN commit r13954.
2013-10-06 06:53:32 +00:00
50782c1c1c
Fixes non-PCH build
...
This was SVN commit r13953.
2013-10-06 05:15:54 +00:00
754e794f9b
Implements attack notifications based on patch by madmax and zoot, fixes #1719
...
This was SVN commit r13951.
2013-10-06 04:49:38 +00:00
2418ae190d
Fixes some erroneous documentation in EntityLimits.
...
Removes previously implemented LimitsPerCivCentre from AI states.
Removes hardcoded categories from TrainingRestrictions
This was SVN commit r13950.
2013-10-06 03:13:46 +00:00
c21953b434
Added some Iberian walls to a couple of skirmish maps.
...
Rethought the naming scheme of the skirmish maps.
This was SVN commit r13949.
2013-10-05 21:58:42 +00:00
a1ceda4012
Polishing the Random Maps: The last batch...
...
This was SVN commit r13948.
2013-10-05 18:29:44 +00:00
fecfda29f6
Remove civ code hardcoding from SkirmishReplacer component. Refs #1198 .
...
This was SVN commit r13947.
2013-10-05 17:54:41 +00:00
3624c591bd
Fix compilation failure without PCH.
...
This was SVN commit r13946.
2013-10-05 16:22:51 +00:00
85253ca3c8
Let corpses cast shadows again. Refs #1771 .
...
This was SVN commit r13945.
2013-10-05 16:22:46 +00:00
ff6b80305c
Rearrange hotkeys a bit. Queue the 8th unit is now Comma, and select idle warrior is forward slash (replacing camera-follows-mouse, which is available by holding middle mouse anyway). Fix #2181 .
...
This was SVN commit r13944.
2013-10-04 23:31:24 +00:00
433b29d6dc
Fix description of Belgian Bog skirmish map.
...
This was SVN commit r13943.
2013-10-04 23:14:52 +00:00
76d9893123
New skirmish maps.
...
Fixed some things.
This was SVN commit r13942.
2013-10-04 18:11:13 +00:00
2283aedc3c
The first Skirmish maps.
...
Temporary selection and complete sounds for Theater, Elephant Stables,
Cavalry Stables, Blacksmith, and Wonder. Sounds by LAVS. He is working
on improving them.
This was SVN commit r13941.
2013-10-04 13:17:21 +00:00
939898c47d
Nerf Iberian champion cavalry a bit.
...
This was SVN commit r13940.
2013-10-04 04:01:58 +00:00
7901ed51d4
Implements skirmish maps, based on patch by sanderd17, fixes #1198 . Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type.
...
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631 , #889 .
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872 . Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745 .
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.
This was SVN commit r13938.
2013-10-04 02:29:16 +00:00
5c35690309
Fixes broken statue ruins template and replaces old statue treasures with ruins
...
This was SVN commit r13937.
2013-10-04 01:15:16 +00:00
6a97bbd4c3
Fixes dropdowns opening with empty list, caused assertion failure about vector subscript range in MSVC debug build
...
This was SVN commit r13936.
2013-10-04 00:31:36 +00:00
b0e2f6b368
Added obelisks to ptol_cc
...
This was SVN commit r13935.
2013-10-03 18:41:07 +00:00
e700937fd3
Fix non-SSE x86 builds
...
This was SVN commit r13934.
2013-10-03 18:22:10 +00:00
398a32a6ff
Added ptolemiac civic centre with ao and custom decal dirt_7x5
...
This was SVN commit r13933.
2013-10-03 17:18:57 +00:00
739ed00b5e
Added ptolemaic fortress with ao. Updated ptolemaic struct texture
...
This was SVN commit r13932.
2013-10-02 21:29:44 +00:00
e382967e34
Updated a bunch of things.
...
New waypoint and garrison flags for Ptolemies. New texture for Ptolemies
woman. Fixed footprint for statues ruin. etc.
This was SVN commit r13931.
2013-10-02 18:51:49 +00:00
bb78b4c931
Replacing these statue "treasures" with "ruins." Instead of getting the resources immediately, ruins allow the player to "mine" the resources at a fast rate.
...
This was SVN commit r13930.
2013-10-02 16:54:13 +00:00
e0d50b6137
added seleucid thureos texture by request
...
This was SVN commit r13929.
2013-10-02 14:53:59 +00:00
60200f8dbb
fixed ptolemaic statues base.
...
This was SVN commit r13928.
2013-10-02 13:41:53 +00:00
2e24c9f2b7
ptolemaic houses and statues with ao. Added ptolemaic struct texture and 4 ptolemaic round shields variations
...
This was SVN commit r13927.
2013-10-02 12:18:10 +00:00
26af70ec7b
Fixed ptolemaic thureos mesh shape
...
This was SVN commit r13926.
2013-10-01 15:15:39 +00:00
9f5635085e
Fix #1833 : animals spin around needlessly while roaming.
...
Patch from mimo.
This was SVN commit r13924.
2013-09-30 23:52:22 +00:00
e449364408
Recompute system shader defines immediately when the relevant inputs change, instead of delaying until ReloadShaders.
...
This fixes an error with autostart and smoothlos=true, where the system
defines were being accessed before the first rendered frame.
This was SVN commit r13923.
2013-09-30 22:39:06 +00:00
8cf5f61885
Avoids ugly layering of GUI pages when entering match setup
...
This was SVN commit r13922.
2013-09-30 20:51:19 +00:00
cbe103bdfe
ptolemaic galatian shields for basic, advanced and elite with specular maps.
...
This was SVN commit r13921.
2013-09-30 19:03:09 +00:00
1f032b7c59
Added Lordgood's new britons barracks and defense tower with minimal tweaking
...
This was SVN commit r13917.
2013-09-30 08:14:10 +00:00
e24ce51029
Adds DynamicArena allocator that grows by fixed chunk size, fixes #2142 .
...
Changes fixed size arenas to new dynamic arenas with reasonable chunk
sizes (may require tuning), refs #1842
This was SVN commit r13916.
2013-09-30 01:22:44 +00:00
fbee618ac8
Fixes memory leak in sound manager
...
This was SVN commit r13915.
2013-09-30 01:09:16 +00:00
238b7f84d8
Changes the ConfigDB to expose global functions to scripts instead of properties and custom objects.
...
Fixes #2172
Refs #1886
This was SVN commit r13914.
2013-09-29 18:56:50 +00:00
2ea0620abb
Reduce the health drain of the Nubian Archer.
...
Fixed the Lighthouse to not have the Library special tech.
Ptol Military Settlement has better sounds and a different portrait.
Increased defense tower limit since they now have a min distance limit.
Tweaked Ptolemies demo map.
This was SVN commit r13913.
2013-09-29 16:29:38 +00:00
022393a0c6
Spelling fixes from the translation work by Gallaecio and Loki72. Fixes #2150 , #2170 .
...
This was SVN commit r13912.
2013-09-29 16:14:40 +00:00
c2583e42da
Reduce memory allocations in the renderer
...
Use an arena allocator in ShaderModelRenderer::Render, to reduce
the allocation cost in STL containers.
Avoid unnecessary copying of std::vectors.
This was SVN commit r13911.
2013-09-29 14:48:11 +00:00
6b0a0e83eb
Fix profiler malloc count in debug mode on Windows
...
wdbg_heap_NumberOfAllocations doesn't work without the wdbg_heap
leak detector, which is disabled since it's slow and broken.
Use a simple hook via _CrtSetAllocHook instead to count allocations.
This was SVN commit r13910.
2013-09-29 14:43:14 +00:00
f4abcd2ef9
Gauls get: Tavern and Naked Fanatic.
...
Britons get: Rotary Mill.
So, now all Celts get Rotary Mill, but also a unique unit-producing
building.
Britons now have a better demo "sandbox" map.
Ptolemies now play like they are intended. Just need tons of new
artwork. ;) Try them out on the demo map: Sandbox - The Ptolemaic
Egyptians.
Some highlights: Their Nubian Archers train very fast, but have a finite
life. The Lighthouse can be built on the shoreline (but looks like a
library). Their Military Settlement works as intended (can be built in
neutral territory, but min distance of 80 meters).
Testing out: Farm field limits (+8 per Farmstead, +2 per civ center).
This was SVN commit r13909.
2013-09-29 14:37:26 +00:00
eceae8be5c
Fix crash when setting rally point
...
This was SVN commit r13908.
2013-09-29 14:02:47 +00:00
d663dae2d8
New version of Aegis. Huge rewrite for WIP naval support (still very, very buggy at this point.) Features a few bugfixes and might be more efficient than the former version.
...
NEEDS TESTING.
This was SVN commit r13907.
2013-09-29 13:32:52 +00:00
994ebd9836
Add a list of statically-constructed CStrIntern strings
...
Switch all the constant strings in graphics code to use the new
variables.
This avoids the cost of instantiating CStrInterns at runtime every
frame.
This was SVN commit r13906.
2013-09-29 13:19:52 +00:00
08f431fa0d
Ptolemaic entity templates for Enrique.
...
This was SVN commit r13905.
2013-09-29 03:08:59 +00:00
4e9570cd0f
Fix unnecessary CShaderConditionalDefines copy, and inline some functions
...
This was SVN commit r13904.
2013-09-29 02:05:02 +00:00
f075571502
Fix slightly expensive GetSystemShaderDefines()
...
Only recompute when any relevant parameters have changed, then return
the cached value.
This was SVN commit r13903.
2013-09-29 01:00:11 +00:00
555deea136
Fix conditional defines to not construct new CShaderDefines frequently
...
CShaderDefines is designed to be efficient to copy and compare, but not
to construct. Conditional defines were constructing new CShaderDefines
for many models every frame.
Precompute all the possible conditional combinations of CShaderDefines
when a material is first loaded, so they can be looked up at no cost
when rendering.
This was SVN commit r13902.
2013-09-29 00:30:58 +00:00
22f0f2b232
Set _NO_DEBUG_HEAP=1 in VS2010 projects
...
The debug heap has a high performance cost, even in release mode,
when running inside a debugger, which is surprising to people trying
to measure performance. It doesn't seem very useful at finding bugs
either.
Add a NoDebugHeap flag to Premake, to set that environment variable
when running in the VS2010 debugger.
This was SVN commit r13901.
2013-09-28 14:35:28 +00:00
2d1b7914a6
This was SVN commit r13900.
2013-09-28 11:58:05 +00:00
b8a5acfd9e
Preview image for The Gauls demo map.
...
This was SVN commit r13899.
2013-09-26 18:44:45 +00:00
28ce5f3458
It might be better to issue a LOGWARNING when Spatial queries are too large. Opening the crash window seems a bit too much for something that can be recovered from.
...
This was SVN commit r13898.
2013-09-24 21:50:46 +00:00
e370af8d4e
Fix rally point rendering on saved games. Fixes #1762 . Patch by mimo
...
This was SVN commit r13897.
2013-09-24 20:27:18 +00:00
6880fd214f
Fixed name of this map.
...
This was SVN commit r13896.
2013-09-24 18:41:19 +00:00
895f927ff0
Celts corral props missing fix
...
This was SVN commit r13895.
2013-09-24 16:26:26 +00:00
59c8e9e6dc
Big gameplay experiment: Moved Civic Centers from Town Phase to City Phase to see what it does to multiplayer match ups.
...
New "sandbox" demo map for the Gauls.
Renamed "Night's Watch" to "Sentries."
This was SVN commit r13894.
2013-09-24 15:55:35 +00:00
cd51540725
This was SVN commit r13892.
2013-09-22 18:13:19 +00:00
2a613f8236
Removes mostly useless video memory detection, fixes another crash with Nvidia Optimus on Windows, fixes #2145 , #2138
...
This was SVN commit r13891.
2013-09-22 18:07:33 +00:00
e488ed09f5
This was SVN commit r13890.
2013-09-22 11:30:24 +00:00
ae4ccfe050
3D farm fields for all factions.
...
Fixed tooltips for a bunch of units.
Increases pierce armor for elephants.
This was SVN commit r13889.
2013-09-22 08:07:29 +00:00
5287af8967
Increased SpatialQueryArray max results from 1024 to 2048. This is a temporary fix until the Search and Prune solution is implemented.
...
This was SVN commit r13888.
2013-09-22 04:37:46 +00:00
5afb18dda4
fix units ejecting on destroying structure
...
This was SVN commit r13887.
2013-09-21 19:41:13 +00:00
4f6ddfe894
fix theatron build limit
...
This was SVN commit r13886.
2013-09-21 19:05:59 +00:00
636f09053b
celt tavern update
...
This was SVN commit r13885.
2013-09-21 15:24:56 +00:00
9781b67cf4
Changes the Console to expose global functions to scripts instead of properties.
...
Fixes #2140
Refs #1886
This was SVN commit r13884.
2013-09-21 14:48:19 +00:00
bb506fb578
Spec maps and new player color texture for Greek females.
...
This was SVN commit r13883.
2013-09-21 12:41:05 +00:00
21639ce5ea
Normal map and Specular map for warship sails.
...
Fixed Cav Sword tooltip.
Updated the product logo a little bit.
This was SVN commit r13881.
2013-09-21 11:50:04 +00:00
0233bb4877
Temporary Ptolemies emblem.
...
This was SVN commit r13880.
2013-09-21 09:23:21 +00:00
ccc873d9d5
Tech complete sound slightly louder.
...
This was SVN commit r13879.
2013-09-21 09:22:31 +00:00
ec66e59150
Fixed some civ json stuff. Fixed Ptolemaic json.
...
This was SVN commit r13878.
2013-09-21 09:21:48 +00:00
12e2428495
Changes the Renderer to expose global functions to scripts instead of using CJSObject.
...
Fixes #2137
Refs #1886
This was SVN commit r13877.
2013-09-21 08:24:45 +00:00
c0b84fb41f
Added build limits for Theater, Council Chamber, and Library.
...
Added Ptolemies civ json file. I am getting a javascript error in-game
though. Need help trouble shooting it.
This was SVN commit r13876.
2013-09-21 07:33:22 +00:00
9d2f59e80a
Tweaking the Athenian field.
...
Tweaking 0 A.D. logo.
Fixed tooltip for Slinger.
Fixed name for Carthaginian wonder.
This was SVN commit r13874.
2013-09-21 03:58:54 +00:00
d252e245ef
Optimise fixed multiplies on MSVC x86
...
On MSVC, casting i32 to i64 then multiplying gets compiled into a call
to __allmul, which is slow. Use the __emul intrinsic instead.
GCC 4.6+ appears optimise this case automatically and doesn't need any
special handling.
This reduces the cost of ComputeShortPath by about 50% (testing AI vs AI
on Oasis 01).
This was SVN commit r13873.
2013-09-20 20:17:54 +00:00
5a8cfb738b
Commited experimental field for athenians (propped farm field)
...
This was SVN commit r13872.
2013-09-19 15:29:01 +00:00
4b7c1a915d
Celtic corral upgraded. Added more playercolor to gaullic civic centre.
...
This was SVN commit r13871.
2013-09-19 13:58:48 +00:00
bfe0b79b91
Better fix of Grid memory leak, refs #1842
...
This was SVN commit r13869.
2013-09-18 01:21:36 +00:00
e10c4ebaae
Amend 553875ea83: Forgot to include new hotkey in the config.
...
This was SVN commit r13868.
2013-09-17 00:31:18 +00:00
553875ea83
Allow the use of Enter in addition to the OK button in the Join Game dialog.
...
This was SVN commit r13867.
2013-09-17 00:30:11 +00:00
9f2a850a95
Fixes buggy operators and memory leak in Grid class, refs #1842
...
This was SVN commit r13866.
2013-09-17 00:28:22 +00:00
5d9b2b95b0
Ticket #2127 - Performance and style improvements in scriptinterface.
...
No real behavior changes, only code maintenance.
Fixed signed/unsigned mismatch in EntityMap.h
This was SVN commit r13865.
2013-09-16 19:10:06 +00:00
97912dd545
This was SVN commit r13864.
2013-09-16 16:56:26 +00:00
16b615db79
Celt walls upgraded
...
This was SVN commit r13863.
2013-09-16 12:25:03 +00:00
a770ad9467
small code style fixes
...
This was SVN commit r13862.
2013-09-16 09:14:16 +00:00
1b6a5fa802
This was SVN commit r13861.
2013-09-15 21:37:05 +00:00
2a5ec404d1
Further reverted RangeManager sorting to stable_sort, since possibly with different STL implementations, the order of entities might change and cause OOS.
...
Overflowing elements in SpatialQueryArray are now reported with
debug_warn, but can be ignored and the program will continue working,
but further entities will be truncated.
This was SVN commit r13860.
2013-09-15 21:11:20 +00:00
bb799bdd53
upgraded gaul defense towers and celtic storehouse
...
This was SVN commit r13859.
2013-09-15 21:11:14 +00:00
5fe43a0f21
removed non-used duplicated meshes
...
This was SVN commit r13858.
2013-09-15 19:56:13 +00:00
9eedd22b9a
fix garrisoned units count for some special cases. Refs #2096 . Patch by mimo
...
This was SVN commit r13857.
2013-09-15 16:47:40 +00:00
65bddb7fa5
Celtic docks, kennel, farmstead and temple upgrades
...
This was SVN commit r13856.
2013-09-15 16:09:23 +00:00
bdeb358c44
Upgraded britons market and added new gaul market
...
This was SVN commit r13855.
2013-09-15 14:09:25 +00:00
9694eec8b8
As per ticket #1707 . Some minor improvements to spatial subdivision. Makes way for future changes in RangeManager.
...
Right now merely improves memory usage.
This was SVN commit r13854.
2013-09-15 14:03:53 +00:00
6644f224cd
remove warn messages. Now really fixes #2102
...
This was SVN commit r13853.
2013-09-15 09:33:45 +00:00
b16b52492d
change build distance restrictions to work with classes. Fixes #2012 .
...
This was SVN commit r13852.
2013-09-15 09:29:16 +00:00
3016765766
All new techs for the blacksmith.
...
This was SVN commit r13851.
2013-09-15 08:55:28 +00:00
f213761912
let entities change entity limits. Fixes #2076
...
This was SVN commit r13850.
2013-09-15 08:19:50 +00:00
de68973191
Changed the phase up sound.
...
Added a new "tech complete" sound for ALL techs.
Added some new armor techs for infantry and spearmen.
This was SVN commit r13849.
2013-09-15 07:53:01 +00:00
466900b898
Minor template stuff.
...
This was SVN commit r13848.
2013-09-15 05:55:16 +00:00
db39fd059c
Some tooltip tweaks.
...
Further attempts to balance archers. (ongoing)
This was SVN commit r13847.
2013-09-15 04:57:58 +00:00
08849ae6f6
Balance changes after playtesting with Alpha123.
...
This was SVN commit r13846.
2013-09-15 00:28:07 +00:00
4f138eaa12
Made the time icon slightly smaller.
...
Archers have less attack and cost slightly more.
Defense Towers now have a minimum build distance and are weaker.
This was SVN commit r13845.
2013-09-14 23:19:36 +00:00
729e744c2f
Removes yucky hard-coded categories from BuildRestrictions
...
This was SVN commit r13844.
2013-09-14 22:31:41 +00:00
dd60c3a3e2
Restore textures.xml to make grid_subdiv terrain less ugly
...
This was SVN commit r13843.
2013-09-14 18:36:40 +00:00
a9cb79b108
celtic fortresses actor and barracks actor errors fixing reported by Sanderd
...
This was SVN commit r13842.
2013-09-14 13:59:43 +00:00
126e550d68
Delete bogus file
...
This was SVN commit r13841.
2013-09-14 12:19:22 +00:00
ea75cda095
Special case getEntityNamesFormatted to avoid messing with getEntityNames
...
This was SVN commit r13838.
2013-09-14 00:32:50 +00:00
e7fa9a58de
Remove the Costs: prefix from tooltips entirely.
...
This was SVN commit r13837.
2013-09-14 00:07:08 +00:00
e646cf19bf
Fix bug due to some technologies not having separate generic/specific names.
...
This was SVN commit r13836.
2013-09-14 00:00:47 +00:00
c28151c1c1
Put tooltips on a diet.
...
This was SVN commit r13835.
2013-09-13 23:49:46 +00:00
04b4e6af4b
gaul fortress fix
...
This was SVN commit r13834.
2013-09-13 21:44:49 +00:00
014acac9ed
Upgraded britons and gaullic fortresses.
...
This was SVN commit r13833.
2013-09-13 21:41:24 +00:00
532c9dce3e
brit_civic_centre, celt_barracks and brit_crannog upgrade
...
added non-transparency with AO material and non-transparency-parallax-ao
material
This was SVN commit r13832.
2013-09-13 18:46:33 +00:00
5023ff449e
Gaul_civic_centre updated.
...
This was SVN commit r13831.
2013-09-13 14:18:27 +00:00
8b9a0e3919
Added gaul houses, fixed brit houses and added a new variation. New effects applied.
...
Added Ludo's new stonehenge model.
This was SVN commit r13830.
2013-09-13 13:50:19 +00:00
77ca745637
Updated the logo.
...
Updated some Roman words.
This was SVN commit r13829.
2013-09-13 12:07:39 +00:00
82fb0ce6be
Improve game setup GUI performance by switching from main menu instead of pushing the page on top of the stsck
...
This was SVN commit r13828.
2013-09-12 15:12:08 +00:00
176cc55547
Fixing some Roman names. Thanks Robbob (on the forum).
...
Added Organic "preferredClass" to Fortresses, Wall Towers, and Defense
Towers, so that they prefer to shoot at enemy units rather than enemy
structures.
This was SVN commit r13827.
2013-09-12 13:53:00 +00:00
5304bc9d6a
Changes GameView to expose global functions to scripts instead of using CJSObject.
...
Fixes #2126
Refs #1886
This was SVN commit r13826.
2013-09-12 12:40:05 +00:00
05422ad545
Avoid slightly-expensive QueryInterface() calls
...
Add CEntityHandle which wraps an entity_id_t and also has a pointer to a
per-entity array of IComponents. QueryInterface/CmpPtr on a handle just
involve a couple of pointer dereferences instead of a map lookup.
This requires sizeof(void*) per registered interface type per entity,
which is currently ~0.5KB per entity, which shouldn't be a problem.
This was SVN commit r13825.
2013-09-11 20:41:53 +00:00
87753bf3fd
forgot to commit extra change for 508cc0d4c7
...
This was SVN commit r13824.
2013-09-11 18:59:51 +00:00
508cc0d4c7
Add preferred classes to BuildingAI. Patch by jammus. Fixes #1985
...
This was SVN commit r13823.
2013-09-11 17:50:49 +00:00
43df87e56f
This was SVN commit r13822.
2013-09-10 22:05:12 +00:00
b1bd61938e
add file notification to Mac ticket 514, also change name of class FileInfo to CFileInfo to ease Mac development
...
This was SVN commit r13821.
2013-09-10 14:17:04 +00:00
d037d97d55
disable querying of local entities with a component. Avoids OOS problems. Patch thanks to historicbruno. Fixes #2119
...
This was SVN commit r13820.
2013-09-10 12:27:59 +00:00
d51217f718
Fix gazelle in deep water starting position on Oasis 9. Fixes #2123
...
This was SVN commit r13819.
2013-09-10 09:36:27 +00:00
04ed87bf28
Display error messages instead of breaking into the debugger when we don't have rights to save a map in Atlas. Fixes #1941 .
...
This was SVN commit r13818.
2013-09-09 23:31:22 +00:00
b2862f14da
Avoid continual libxml2 memory leak in simulation-test mode
...
This was SVN commit r13817.
2013-09-09 20:22:42 +00:00
3c29c2dccf
Tweaked farm decal color.
...
This was SVN commit r13816.
2013-09-09 18:46:45 +00:00
c3f7a929e0
better garrison flag handling. Refs #2096 .
...
This was SVN commit r13815.
2013-09-09 18:27:20 +00:00
e7ccc28cbc
Enable sound notifications with technology upgrades. Based on patch by mpmoreti. Fixes #2021
...
This was SVN commit r13814.
2013-09-09 12:50:05 +00:00
a406863e0e
fix bridge edge obstruction size and rotation of hele bridge edge
...
This was SVN commit r13813.
2013-09-09 12:11:34 +00:00
f051426a76
fix garrisonHolder flags when units are ejected
...
This was SVN commit r13812.
2013-09-08 19:51:16 +00:00
08514f68be
small clean up of GarrisonHolder code
...
This was SVN commit r13811.
2013-09-08 18:46:29 +00:00
d1a376fd06
fix ejection of garrisoned units on resign. Fix ejection or killing on ownership and deplomacy changes. Patch by mimo. Fixes #2096
...
This was SVN commit r13810.
2013-09-08 16:02:41 +00:00
bc40534777
fix spread technology modifications. Fixes #2110
...
This was SVN commit r13809.
2013-09-08 15:20:54 +00:00
7a0e91ab23
Fixes undefined behavior in Atlas error display, fixes #2115
...
This was SVN commit r13808.
2013-09-08 03:35:05 +00:00
ca1665dde1
Fix some typos in the civ json files. Patch by Gallaecio.
...
This was SVN commit r13807.
2013-09-07 17:40:50 +00:00
f588181004
use better technology script in guiInterface
...
This was SVN commit r13805.
2013-09-07 15:23:03 +00:00
24a4ceb89a
fix carthagian technology. Fixes #2107
...
This was SVN commit r13804.
2013-09-07 09:26:56 +00:00
819a1e7823
Save initial herd position and update the last known position of the hunted animal when hunting. Patch by mimo. Fixes #2047 .
...
This was SVN commit r13803.
2013-09-06 19:47:48 +00:00
16c9724c24
Fix release build scripts
...
Exclude dev.cfg from the Windows installer.
Use the correct filename for the Windows installer.
Update some paths to match the new EC2 build process.
This was SVN commit r13802.
2013-09-06 19:43:45 +00:00
63f28f1a43
Increased build limit of Embassies to 2. This means you can build 2 of the same entity or 2 different out of the 3 available.
...
This was SVN commit r13801.
2013-09-06 19:26:49 +00:00
d6ec0f6dbd
Updated installer image.
...
This was SVN commit r13800.
2013-09-06 19:16:33 +00:00
e19b470a42
fix music glitchyness when game loses focus trac #2090
...
This was SVN commit r13799.
2013-09-06 02:46:13 +00:00
a7132dc66a
Updated Macedonians sandbox demo map.
...
Fixed Carthaginians special tech "Colonization."
Fixed Carthage json file.
This was SVN commit r13797.
2013-09-02 16:26:19 +00:00
4c9cd2921d
Replaces splash screen with fundraiser message
...
This was SVN commit r13796.
2013-09-01 23:56:50 +00:00
53a5781c66
Increase simulation script runtime size again. Refs #1436 , #1966 and #2035 .
...
This was SVN commit r13794.
2013-09-01 23:29:21 +00:00
6070cd01fa
Reduced "grazing" time for whales.
...
This was SVN commit r13793.
2013-09-01 22:06:23 +00:00
c3dcde7e34
Alpha version number.
...
This was SVN commit r13792.
2013-09-01 20:47:02 +00:00
3774b2051d
This was SVN commit r13790.
2013-09-01 04:22:28 +00:00
4ac19dff05
fixed maur_struct
...
This was SVN commit r13789.
2013-08-31 22:08:48 +00:00
4dd1397e15
Mauryans and Britons now start with a cav skirm in addition to their special starting unit (Worker Elephant and War Dog respectively).
...
Fixed a unit availability thing for Macedonians.
This was SVN commit r13788.
2013-08-31 19:27:37 +00:00
cc08c81faf
Tweaks to barracks and blacksmith tips.
...
This was SVN commit r13787.
2013-08-31 19:23:16 +00:00
0bd22649f0
Tweaked Army Camp tip text.
...
Adjusted max gatherers for pyramid ruins.
New 'Blacksmith' loading tip.
This was SVN commit r13786.
2013-08-31 12:26:17 +00:00
66ab19086a
Updated Stoa tip image.
...
Updated Persian Architecture tip text.
Adjusted upward the number of max gatherers for small mines and the
unfinished Greek temple ruin.
Tweaked Cycladic Archipelago 6 (fixed fish and treasure positions).
Tweaked Gold Oasis 1 (made it possible to build a civic center in the
middle of the "Gold Patches."
Adjusted the Spartan House history entry, based on text by contributor
Thorfinn the Shallow Minded.
This was SVN commit r13785.
2013-08-30 22:35:15 +00:00
df190cbbd1
fix issues with menu mode and playlist, harden code and clear out ambient noises at game end, fixes #2066
...
This was SVN commit r13784.
2013-08-29 13:20:55 +00:00
3047470858
Reduced volume for fishing boat movement sound and construction hammering sounds.
...
This was SVN commit r13783.
2013-08-29 12:46:48 +00:00
de85408e3b
Fix fishing boats not being able to gather from whales. Reported on the forums by Gildas.
...
This was SVN commit r13782.
2013-08-29 11:26:02 +00:00
24ff1371b8
Upgraded greek temples an assigned one variation per civ.
...
This was SVN commit r13780.
2013-08-27 23:48:22 +00:00
15586778bb
Disables frame-pointer omission in VC++ 2008 projects, fixes stack dump in release build, fixes #2078
...
This was SVN commit r13779.
2013-08-27 02:42:56 +00:00
56d535b7c5
Effects added to hellenic stoas. Only temples to go yay!
...
This was SVN commit r13778.
2013-08-27 00:04:05 +00:00
c6d361a76f
added effects and upgraded greek docks for each greek civ
...
This was SVN commit r13777.
2013-08-26 23:19:35 +00:00
89e69af987
let maurian elephant corpse sink fast, temporary fix until there is a real corpse
...
This was SVN commit r13776.
2013-08-26 17:42:09 +00:00
e79c2aa953
make all Iberian buildings available in the sandbox map (add walls, blacksmith and fire ship)
...
This was SVN commit r13775.
2013-08-26 11:38:41 +00:00
0b670f88af
Updated spart syssiton, mace lybrary and helenic market with effects and little fixes
...
This was SVN commit r13774.
2013-08-26 08:29:18 +00:00
89430de468
Okay, do what f5ab6255d0 was supposed to do.
...
This was SVN commit r13773.
2013-08-26 04:17:26 +00:00
b10a01645f
Revert f5ab6255d0. I accidentally somehow committed my whole working tree on this computer....
...
This was SVN commit r13772.
2013-08-26 04:15:36 +00:00
f5ab6255d0
General scrollbar improvements. Patch by Josh. Fixes #2080 .
...
- Don't show the scrollbar when the contents aren't overflowing the
visible area.
- Fix bugs in minimum bar sizing.
- Add capability to set a maximum bar size.
- Correct outdated/incorrect comments.
This was SVN commit r13771.
2013-08-26 03:06:08 +00:00
2dc0c40ff0
Fix some errors.
...
This was SVN commit r13770.
2013-08-26 01:26:35 +00:00
e75765faae
Fixed some Greek corral prop problems.
...
Fixed Storehouses tip.
Fixed the names for ALL Iberian units and buildings.
Added a build restriction for the Iberian Monument.
This was SVN commit r13769.
2013-08-25 22:20:09 +00:00
ff6b3e5725
Properly fix #2079 .
...
This was SVN commit r13768.
2013-08-25 22:05:41 +00:00
7a96a3161b
fix whale altitude (no floating whales). See aa95f3420d.
...
This was SVN commit r13767.
2013-08-25 18:59:36 +00:00
035d33dc33
'Crop Rotation' tech for the Gallic Rotary Mill.
...
This was SVN commit r13766.
2013-08-25 17:57:20 +00:00
7c0dfc0d82
Fixed a couple tips.
...
This was SVN commit r13765.
2013-08-25 17:36:55 +00:00
acf899bb47
Fixed some Corral errors.
...
Fixed some Persian building stuff.
This was SVN commit r13764.
2013-08-25 17:36:34 +00:00
292ce925c6
Cast Shadow flag enabled on this actor.
...
This was SVN commit r13763.
2013-08-25 11:04:14 +00:00
2c66383461
Added effects to athen_prytaneion
...
This was SVN commit r13762.
2013-08-25 10:24:34 +00:00
52f947fd77
Check that we still have build orders for our attack plan. Temporarily fixes #2082 for A14.
...
This was SVN commit r13761.
2013-08-25 08:20:40 +00:00
589e8d2ae8
Updated and added effects to greek gymnasion, storehouse, corral and epic temple (athenian wonder parthenon)
...
This was SVN commit r13760.
2013-08-25 01:02:22 +00:00
ce9432bf3d
Proper selection ring for whales.
...
Edited Mauryan civ info.
Added preview image for Cycladic Archipelago 6.
This was SVN commit r13759.
2013-08-24 22:30:28 +00:00
d49476ac8d
Increased armor for promoted Skirmish Cavalry. Previously this was neglected or missed.
...
This was SVN commit r13758.
2013-08-24 21:11:59 +00:00
247e45a6b5
fix quinquereme splash damage
...
This was SVN commit r13757.
2013-08-24 16:07:03 +00:00
11f663d761
fix history description to match with in-game numbers. Reported by scythetwirerler. Part 2
...
This was SVN commit r13756.
2013-08-24 15:33:59 +00:00
087e5f9c3e
fix history description to match with in-game numbers. Reported by scythetwirerler
...
This was SVN commit r13755.
2013-08-24 15:30:52 +00:00
14a73204dd
Disable distance-sorting for most transparent objects
...
Distance-sorting of the alpha-blend pass of objects like trees and grass
is quite expensive (partly the cost of sorting, partly the cost of being
unable to batch efficiently), and the effect on visual quality is
typically very hard to see (the alpha-test pass does most of the work
for
objects that aren't fully translucent). That's not a good tradeoff, so
turn it off.
Leave distance sorting enabled for e.g. waterfalls since it might make a
more noticeable difference for them.
This was SVN commit r13753.
2013-08-24 14:48:02 +00:00
f106d7714a
Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results.
...
Allows to oversaturate in Atlas' HDR settings.
This was SVN commit r13752.
2013-08-24 14:44:38 +00:00
9d933087b3
Fix #2079 .
...
This was SVN commit r13751.
2013-08-24 14:24:37 +00:00
957c51727b
Improve on-water shadows. Fix an issue with foam looking static. Add anisotropic filtering (x4) to the water normal texture for testing.
...
This was SVN commit r13750.
2013-08-24 14:12:39 +00:00
aa95f3420d
Cleaned up and fixed the whale templates. Still need a custom selection ring.
...
Made Carthaginian Sacred Band Infantry and Cavalry cost metal instead of
wood.
Updated Cycladic Archipelago 6.
This was SVN commit r13749.
2013-08-24 13:31:25 +00:00
40af0917ca
let gaul and brit healers upgrade to their local templates instead of the generic celtic templates. Fix double-click to select all healers after one of the healers upgraded.
...
This was SVN commit r13748.
2013-08-24 13:09:53 +00:00
630301918c
Fix the command line -autostart-aidiff to default to 2 (new medium)
...
This was SVN commit r13746.
2013-08-24 09:55:06 +00:00
ced59bcfa1
Updated hellenic defense tower with new effects.
...
This was SVN commit r13745.
2013-08-24 00:19:52 +00:00
6963f8c067
Adjust cavaly swordsmen advanced and elite stats. Change attack from 21 -> 12 and 22 -> 14 (since the basic rank's attack is 10), and change armor from 4 -> 6 and 6 -> 7 (since the basic rank's armor is 5).
...
This was SVN commit r13744.
2013-08-23 18:46:18 +00:00
1544bad62a
Updated greek theatron for all greek civs. (AO + normal + spec)
...
This was SVN commit r13743.
2013-08-23 18:05:56 +00:00
efda9d5e33
Updated greek farmstead
...
This was SVN commit r13742.
2013-08-23 12:36:04 +00:00
c1dcbe4176
update TLB table
...
refs #2074
This was SVN commit r13741.
2013-08-23 06:42:48 +00:00
e19bffa88f
hele fortress gate textures
...
This was SVN commit r13740.
2013-08-22 14:57:14 +00:00
5050dcf261
Upgraded and cleaned up hellenic fortress. Shield props now displays depending on faction. (AO + normal + spec)
...
This was SVN commit r13739.
2013-08-22 14:56:11 +00:00
18c0b17126
Fixes #2069 .
...
This was SVN commit r13738.
2013-08-22 13:10:38 +00:00
0a0bd83cf0
Adds L4 cache detection for some new Haswell CPUs, fixes #2074
...
This was SVN commit r13736.
2013-08-21 23:18:35 +00:00
3174d16256
Updated greek civs barracks, added ao, spec and normals
...
This was SVN commit r13735.
2013-08-21 22:58:31 +00:00
deb64d36fc
Fix rendering artifacts with novbo=true gentangents=true
...
glDrawRangeElements needs to know the range of vertexs that are used
by the index array. With VBOs it doesn't really matter if the range
is wrong (all the vertexes are in GPU memory anyway), but with CPU
vertex arrays the driver has to memcpy the given range of data, so
incorrect bounds will result in garbage data being rendered.
With gentangents, the rendered mesh can have more vertexes than the
original CModelDef, but was rendered with the CModelDef's vertex count.
Use the correct vertex count instead.
Refs #2050 .
This was SVN commit r13734.
2013-08-21 21:01:32 +00:00
9c4801e107
add splash damage to quinquereme
...
This was SVN commit r13733.
2013-08-21 19:52:50 +00:00
73773e61d0
Spart CC small fix
...
This was SVN commit r13732.
2013-08-21 17:48:59 +00:00
827ec20b1f
Made the Cart trade ship avail in Village phase as a kind of "sea trade" bonus for them.
...
This was SVN commit r13731.
2013-08-21 17:27:28 +00:00
d94e1d8ed3
Spartan CC modified. Doric columns adjusted
...
This was SVN commit r13730.
2013-08-21 17:03:47 +00:00
70dfd1f803
Cavalry Swordsmen stats rebalanced.
...
This was SVN commit r13729.
2013-08-21 15:55:13 +00:00
081707039a
Updated Cycladic Archipelago 6. Both sides now playable.
...
This was SVN commit r13728.
2013-08-21 15:20:27 +00:00
035542e76c
revert wrong changes to support and female_citizen template
...
This was SVN commit r13727.
2013-08-21 09:55:42 +00:00
605852fccf
Fix function that decides which units can have which formations, and remove formations for animals and the maurian worker elephant
...
This was SVN commit r13726.
2013-08-21 09:53:59 +00:00
52d6a8036d
This was SVN commit r13725.
2013-08-21 05:37:28 +00:00
f947fa6afe
Fixes stack overflow in stack dump logic, by special-casing boost::unordered types, fixes #1813 .
...
Adds INIT_HAVE_DISPLAY_ERROR init flag to correctly override
ah_display_error in Atlas (InitVfs was overriding it again), but don't
use it because it's ugly and broken, refs #1729
This was SVN commit r13724.
2013-08-20 21:07:42 +00:00
3843ae6bb0
Greek houses upgrade. (eyecandy, ao, normal, spec)
...
This was SVN commit r13723.
2013-08-20 16:41:10 +00:00
c5296b9246
Fix maurian elephants being unable to build stuff. Caused by enlarging the elephant obstruction radius.
...
This was SVN commit r13721.
2013-08-20 09:39:01 +00:00
ee877a46c7
Switch X and Z loops in the foam generation, possible speed improvement.
...
This was SVN commit r13720.
2013-08-20 08:55:33 +00:00
e3b9f17c19
Removes useless "old maps" filter from match setup, refs #2071
...
This was SVN commit r13719.
2013-08-20 02:28:49 +00:00
68822e3418
Adds more information to construction command debugging
...
This was SVN commit r13717.
2013-08-19 23:18:18 +00:00
54bbbb9797
Boost 1.54 deprecates Boost.Signal. Use Boost.Signal2 for >= 1.54.
...
This was SVN commit r13716.
2013-08-19 22:11:54 +00:00
0b4fe2ef94
Tweaks game speed dropdown more, refs #2046
...
This was SVN commit r13715.
2013-08-19 20:00:26 +00:00
1739a381c1
Fix crash when editing terrain near map edges.
...
The values in CMessageTerrainChanged can be overestimates that exceed
the normal map boundaries, and should be clamped before looping over
them.
This was SVN commit r13714.
2013-08-19 19:19:34 +00:00
0ca841b92b
Suppress unused local typedef warnings when including SpiderMonkey headers.
...
This was SVN commit r13713.
2013-08-19 18:26:44 +00:00
4d9b81f40e
This was SVN commit r13712.
2013-08-19 18:09:09 +00:00
30c194a804
Starting units re-adjusted.
...
This was SVN commit r13711.
2013-08-19 15:42:46 +00:00
3783d0e14c
Fix flying unit not crashing in water when they should. Patch by scythewirler. refs #2067
...
This was SVN commit r13710.
2013-08-19 14:44:15 +00:00
0c16980408
Fix tests.
...
This was SVN commit r13709.
2013-08-19 10:55:35 +00:00
03bf727d9a
Fix deactivation of HQ waviness causing the specular effect to go crazy.
...
This was SVN commit r13708.
2013-08-19 10:19:21 +00:00
b770c41f0b
Removes shadow casting and receiving on preview entities, patch started by ericb, fixes #1771
...
This was SVN commit r13706.
2013-08-18 22:17:57 +00:00
63a0b4ae98
projectile point for mauryan elephant archer
...
This was SVN commit r13705.
2013-08-18 20:42:42 +00:00
2637540ce2
Spart CC centre upgrade with doric capitels +AO and effects
...
This was SVN commit r13704.
2013-08-18 18:02:18 +00:00
ab6d15c414
Macedonian CC mesh and AO fix
...
This was SVN commit r13703.
2013-08-18 16:16:53 +00:00
0888cf6c23
Fix Linux build
...
This was SVN commit r13701.
2013-08-18 11:28:52 +00:00
bf7cd1fcbd
Undo-d the commit due to general panic about GLSL.
...
This was SVN commit r13700.
2013-08-18 11:15:29 +00:00
29b5021f97
Fix my previous commit because obviously I had forgotten something.
...
This was SVN commit r13699.
2013-08-18 09:42:02 +00:00
a4707bcc16
Change the water manager so incremental updates to the water information is possible. Streamline a few things (and removes a not-really-used calculation to speed things up further). Fixes #2063 , refs #1743 .
...
This was SVN commit r13698.
2013-08-18 09:27:11 +00:00
557c1fc067
fix (dis)allowing of garrisoning by other components. Refs #2067
...
This was SVN commit r13697.
2013-08-18 08:23:36 +00:00
92f4391f51
Adds tech template support to checkrefs.pl
...
This was SVN commit r13696.
2013-08-18 02:52:05 +00:00
791d392797
Fixes and improves terrain scanning of checkrefs.pl.
...
Removes some useless old actors.
This was SVN commit r13695.
2013-08-18 01:57:37 +00:00
a18262e7b1
Make planes about 20% cooler. Fixes #2067 .
...
This was SVN commit r13694.
2013-08-17 22:55:16 +00:00
abce308281
Renames confusing grass1_spring.png terrain texture, used for fancy grass effect, refs #2069
...
This was SVN commit r13693.
2013-08-17 22:16:01 +00:00
f25bbda672
fix typo for garrisoned archer classes. Reported by scythetwirler.
...
This was SVN commit r13692.
2013-08-17 20:34:28 +00:00
90b75c95ea
Macedonians CC upgraded with corinthian capitel + AO and normals
...
This was SVN commit r13691.
2013-08-17 18:32:41 +00:00
a6c28ae461
Altered footprint of some elephant units.
...
This was SVN commit r13690.
2013-08-17 16:16:37 +00:00
fdc1f3a043
increased mauryan blacksmith size
...
This was SVN commit r13689.
2013-08-17 14:47:44 +00:00
3a2eec841c
Adjusted max gatherers for these trees.
...
This was SVN commit r13688.
2013-08-17 14:26:43 +00:00
998dc21676
Removed old Aegis folder.
...
This was SVN commit r13687.
2013-08-17 14:12:25 +00:00
42d77129cc
rome blacksmith fix
...
This was SVN commit r13686.
2013-08-17 14:07:48 +00:00
9763b9076c
Upgraded roman blacksmith
...
This was SVN commit r13685.
2013-08-17 14:04:08 +00:00
a9c71e39a4
make new elevation tool more drastic + add RMB action
...
This was SVN commit r13684.
2013-08-17 14:02:18 +00:00
bcf7115b5c
Fix Aegis to work properly for A14, also rename the folder from "qbot-wc" to "aegis" (thus apparent huge number of changes). Adds a "sandbox" difficulty setting that will never attack, collect resources 50% slower, and is pop-capped at 70 for beginners.
...
This was SVN commit r13683.
2013-08-17 13:59:53 +00:00
38b52f9ff0
Fixed a broken texture link.
...
This was SVN commit r13682.
2013-08-17 12:51:11 +00:00
723a3ec8b5
Fixed kart_embassy_italiote.dae
...
This was SVN commit r13681.
2013-08-17 12:41:37 +00:00
2d4c3d72c6
Removed the old dds file from these actors.
...
This was SVN commit r13680.
2013-08-17 12:18:50 +00:00
cdd2c74d44
Superfluous textures deleted.
...
This was SVN commit r13679.
2013-08-17 11:38:49 +00:00
960615aa53
PreferGLSL = true as long as GenTangents = true.
...
This is for GLSL migration in the long run.
This was SVN commit r13678.
2013-08-17 11:13:36 +00:00
b818a54b06
Tweaked some maps.
...
Updated some "tips" images.
Tweaked civ center radius and town phase radius boost.
Added some clarification language to the Farm Field tooltip.
This was SVN commit r13677.
2013-08-17 10:15:38 +00:00
b5888f4e45
generalise kill vs eject garrisoned entities on death of garrisonHolder
...
This was SVN commit r13676.
2013-08-17 09:26:17 +00:00
d37d3be5d0
Fixes Attack component schema
...
This was SVN commit r13674.
2013-08-17 06:02:31 +00:00
b820f6e6ae
Add a pike elevation tool to make sharp pointed mountains. Fixes #2059
...
This was SVN commit r13672.
2013-08-16 14:46:54 +00:00
fe0ec1c720
fix coding style for buildingAI. Refs #2010
...
This was SVN commit r13671.
2013-08-16 12:17:18 +00:00
fd2245c53c
Improved building AI. Refs #2010
...
This was SVN commit r13670.
2013-08-16 11:17:36 +00:00
cc0ba8e246
Missing maur blacksmith struct_b
...
This was SVN commit r13669.
2013-08-16 04:50:44 +00:00
d66edf5958
fix a bug that ignored resetting XZ rotation to zero, reported by sythetwirler
...
This was SVN commit r13668.
2013-08-15 22:16:51 +00:00
81b29bf18d
fix line wrapping when big number of gatherers on one resource
...
This was SVN commit r13667.
2013-08-15 20:00:55 +00:00
675b3c40be
fix bouncing projectiles, patch by Markus. Fixes #769
...
This was SVN commit r13664.
2013-08-15 19:01:10 +00:00
7ff167e7de
Removes more unused variables, based on patch by Markus, refs #1852 .
...
Adds TODOs to use POT textures in fancy water rendering.
This was SVN commit r13663.
2013-08-15 18:25:32 +00:00
6d3901faf7
Added mauryan blacksmith with AO. Updated mauryan struct textures
...
This was SVN commit r13662.
2013-08-15 17:17:25 +00:00
6b316f6ce1
fix tests breaking caused by 4421787281. Refs #2062
...
This was SVN commit r13661.
2013-08-15 08:56:14 +00:00
4421787281
interpollate y offset for smooth climbing and landing of flying objects. refs #2062
...
This was SVN commit r13660.
2013-08-15 08:44:06 +00:00
1712b0f42d
Increases simulation script runtime to 32 MB to reduce OOM errors, refs #1436 , #1966 , #2035
...
This was SVN commit r13659.
2013-08-15 05:15:54 +00:00
4e709f2c9c
Implement landing and go-around for UnitMotionFlying. Patch by scythetwirler. Fixes #2062 .
...
This was SVN commit r13658.
2013-08-15 03:10:04 +00:00
b6fe589ae3
fix health regeneration for negative values (reported by Mythos_Ruler)
...
This was SVN commit r13657.
2013-08-14 08:33:29 +00:00
2307509088
Remove the old diminishing returns formula (I accidentally left it as a comment). Also, I forgot to credit scythetwirler (who came up with the new formula) in the previous commit.
...
This was SVN commit r13656.
2013-08-14 05:16:09 +00:00
cc02eabdd0
Change the formula for diminishing returns to something less flawed. Also add a lot of comments explaining how it works.
...
This was SVN commit r13655.
2013-08-14 05:14:20 +00:00
598c05e056
clean UnitAI move to attack range code + fix possible bug
...
This was SVN commit r13654.
2013-08-13 15:11:17 +00:00
ba244b509c
Fixed the portrait for this tech.
...
Adjusted water a little bit for these scenarios.
This was SVN commit r13653.
2013-08-13 00:55:47 +00:00
c709105355
Clarifies control group HotKeys
...
This was SVN commit r13652.
2013-08-12 23:50:18 +00:00
6925d493fe
This was SVN commit r13651.
2013-08-12 23:40:24 +00:00
d74ed3f1ae
Increase farming speed by 46% for females and 42% for males. Combined with diminishing returns it was waaay too slow prior to this commit.
...
This was SVN commit r13650.
2013-08-12 23:17:30 +00:00
3d1e693148
Enable diminishing returns for farms.
...
(Yeah yeah, somehow I forgot this when I committed the actual
functionality.)
This was SVN commit r13649.
2013-08-12 23:11:39 +00:00
c44efe6c8c
Spartan tech "Agoge" altered. Moved to Syssiton from Civ Center.
...
Unit tooltips cleaned up a bit. Made to look neater in-game.
This was SVN commit r13648.
2013-08-12 21:53:53 +00:00
1aaca7e6e3
health regeneration
...
This was SVN commit r13647.
2013-08-12 17:45:18 +00:00
96cef624e3
Fix compiling tests on ARM. Patch by Josh.
...
This was SVN commit r13646.
2013-08-12 03:12:57 +00:00
1ffb74b336
Adjusts session game speed dropdown, fixes #2046
...
This was SVN commit r13645.
2013-08-11 20:49:41 +00:00
066c542e36
Template tweaks to palace
...
This was SVN commit r13644.
2013-08-11 12:09:10 +00:00
a552a3cb8b
Persian Palace structure
...
This was SVN commit r13643.
2013-08-11 12:02:36 +00:00
b8fb2e1697
Added helle_struct_b parallax/normal map and specular. Applied on greek blacksmith. Improved helle_struct specular map
...
This was SVN commit r13642.
2013-08-11 08:49:15 +00:00
46f091a154
Added the Athenian civ bonus "Silver Owls" which gives them +10% metal gathering rates when upgrading phases.
...
Made "Delian League" (faster building ships) a team bonus. Need some new
code to make it apply to allies too.
Made farming slower.
This was SVN commit r13641.
2013-08-09 22:37:05 +00:00
3f0354943f
Polishing thePolishing the Random Maps: Archipelago, English Channel, Islands, Lake, Lorraine Plain, Migration, Neareastern Badlands, Northern Lights, Oasis, Persian Highlands.
...
This was SVN commit r13640.
2013-08-09 12:30:59 +00:00
c8b8dd24e6
This was SVN commit r13639.
2013-08-09 00:03:51 +00:00
b0ceef39b9
Hellenic building bonus deleted from templates and moved to a tech.
...
Some updated portraits.
This was SVN commit r13638.
2013-08-08 23:55:13 +00:00
93abbae435
Fix build issues on ARM. Patch by Josh. Fixes #2049 .
...
This was SVN commit r13634.
2013-08-07 05:00:46 +00:00
dc722d76f3
Fix tests. Refs #1960 .
...
This was SVN commit r13632.
2013-08-06 22:32:46 +00:00
bff070c6cb
Polishing the Random Maps: Gulf of Bothnia, Hyrcanian Shores, Islands, Kerala, Lake, Latium.
...
This was SVN commit r13630.
2013-08-04 12:31:43 +00:00
4a805fb05c
Updates keys.txt with new keynames, refs #2043
...
This was SVN commit r13628.
2013-08-03 20:39:15 +00:00
5a1ddd7cf9
Improves hotkey support for non-QWERTY keyboards, patch by lsdh, fixes #2043
...
This was SVN commit r13627.
2013-08-03 20:09:29 +00:00
8c74df2acd
Give an elevation advantage to ranged units. Patch by sanderd17. Fix #1960 .
...
This was SVN commit r13626.
2013-08-03 19:20:20 +00:00
3b294d3ad4
Revised Persian names.
...
This was SVN commit r13625.
2013-08-03 16:14:17 +00:00
4f7ba84fd6
Modified athens CC to have Ionic columns and AO map.
...
Added normal and spec maps for several greek struct and props textures.
This was SVN commit r13624.
2013-08-02 23:03:55 +00:00
c8830ea769
Specific Name for Mauryan blacksmith.
...
This was SVN commit r13623.
2013-08-01 22:00:20 +00:00
17fd4fab94
Polishing the Random Maps: Fortress, Gear, Guadalquivir River
...
This was SVN commit r13622.
2013-08-01 17:58:51 +00:00
70d072577b
;
...
This was SVN commit r13621.
2013-07-31 22:25:24 +00:00
f6e0c4c5a4
Split up cheats into multiple files. Patch by lsdh/ldsh. Fixes #2019 .
...
Replace buggy hasAllies with the inlined check if we have a team at all.
Fix setting of starting resources (broken in 58fa0c7c58
2013-07-31 22:22:12 +00:00
c438a1eb82
Polishing the Random Maps: Alpine Valley, Archipelago, Cantabrian Highlands, Canyon, Continent, Corinthian Isthmus, English Channel
...
This was SVN commit r13619.
2013-07-31 10:05:48 +00:00
f3823847b0
Polishing the Random Maps: Archipelago, Ardennes Forest, Atlas Mountains, Cantabrian Highlands
...
This was SVN commit r13618.
2013-07-30 11:09:40 +00:00
477855fbf5
Polishing the Random Maps: Alpine Valley, Anatolian Plateau, Archipelago
...
This was SVN commit r13617.
2013-07-30 07:56:09 +00:00
344a149a66
Infinite farms with diminishing returns (but no farmland). Refs #1318 .
...
This was SVN commit r13616.
2013-07-30 06:04:53 +00:00
857ae2dd3e
- Fix a bug from 20e7d2224a where the player ID would always be set to 1.
...
- Make the developer overlay a tad taller.
This was SVN commit r13614.
2013-07-29 20:01:09 +00:00
70e67af87f
Polishing the Random Maps: Alpine Valley
...
This was SVN commit r13613.
2013-07-29 14:22:54 +00:00
4dfe1d6df9
Polishing the Random Maps: Alpine Valley
...
This was SVN commit r13612.
2013-07-29 13:50:20 +00:00
992a8ee0b8
Polishing the Random Maps: Aegean Sea and Alpine Valley
...
This was SVN commit r13611.
2013-07-29 12:52:31 +00:00
629492625f
Some touching up.
...
This was SVN commit r13610.
2013-07-29 12:35:05 +00:00
f3b0417aac
Don't try to interpret Enter as a mouse click in message boxes (makes it really annoying to chat at the end of a game).
...
This was SVN commit r13608.
2013-07-29 05:04:28 +00:00
e3c42a204e
Fixing a bug
...
This was SVN commit r13607.
2013-07-29 04:30:03 +00:00
20e7d2224a
Implement a developer overlay command to change the current player ID (very useful for AI development).
...
This was SVN commit r13606.
2013-07-29 00:53:44 +00:00
53074c7715
Polishing the random maps: Aegean Sea, Alpine Lakes
...
This was SVN commit r13605.
2013-07-28 16:58:09 +00:00
63f766bb2a
Nerfed Hellenization a bit.
...
Changed the portraits of the Cart merc techs.
This was SVN commit r13604.
2013-07-28 16:21:43 +00:00
0774730e2f
-Made starting units start at Elite rank (just for fun and testing).
...
-Some new tech portraits for Divine Offerings and Agoge.
-Fertility Festival technology increased cost.
-New special technology for all Hellenic factions: Hellenization,
researched at the Theatron, increases territory influence for all
buildings +50%. This is a temporary technology until the real
Hellenization effect can be implemented.
-New special technology for the Mauryan and Iberian blacksmiths: Woot
Steel and Toledo Steel respectively.
This was SVN commit r13603.
2013-07-28 13:38:04 +00:00
28db824982
iberian, hellene, roman and celtic blacksmiths with AO maps added.
...
This was SVN commit r13602.
2013-07-28 13:14:42 +00:00
f0310cce58
Reduced Food cost of cavalry from 100 to 80.
...
Reduced Food cost of elephants from 200 to 150.
Reduced Metal cost of elephants from 200 to 150.
Reduced Stone cost of Mauryan elephant stables from 300 to 200.
Reduced Metal cost of Persian chariot archers from 100 to 0.
This was SVN commit r13601.
2013-07-28 10:20:07 +00:00
a146a8ad3b
Fixed some things.
...
This was SVN commit r13600.
2013-07-27 18:52:28 +00:00
fd428cf45b
Fix bug when randomly picking a unit to attack for AI's. Fix from bmwiedemann.
...
This was SVN commit r13599.
2013-07-27 15:08:45 +00:00
0263f17bcc
Polishing the random maps: Aegean Sea
...
This was SVN commit r13598.
2013-07-27 12:13:46 +00:00
a684f7646b
Fixes crash when hotloading main menu while splash screen shown (don't alter GUI page stack in init functions), refs #2042
...
This was SVN commit r13597.
2013-07-26 01:35:01 +00:00
db5c54c7c6
Persian dock update
...
This was SVN commit r13596.
2013-07-25 23:02:51 +00:00
70a3c6c8b4
Supremely blue water on Cycladic Archipelago 2. Enable high graphics and take a look at the depth rendering and specular effect.
...
This was SVN commit r13595.
2013-07-25 17:45:40 +00:00
5bfff54bcb
Unit promotion animation and invulnerability reduced from 4 seconds to 2.8 seconds.
...
This was SVN commit r13594.
2013-07-25 13:57:54 +00:00
e5a9b0eab4
And of course I forgot a file.
...
This was SVN commit r13593.
2013-07-25 08:58:15 +00:00
1f55280fa2
AI-related changes to the AI interface and Command.js, to facilitate debugging of upcoming new version of Aegis.
...
This was SVN commit r13592.
2013-07-25 08:57:07 +00:00
0d8b9b15e1
All animals now visible in Fog of War (FOW). Should help a lot with hunting.
...
Hack armor increased for most buildings.
This was SVN commit r13591.
2013-07-24 18:11:03 +00:00
697b88562c
Game Speeds adjusted.
...
This was SVN commit r13590.
2013-07-24 13:08:45 +00:00
6ed814354e
Fix the fix of the fix. Refs #1914 .
...
This was SVN commit r13589.
2013-07-23 18:48:25 +00:00
9681606d05
Non civ center units that are available at the village phase barracks are now not available until Town phase.
...
House-trained females take 30 seconds to train now.
This was SVN commit r13588.
2013-07-23 15:39:24 +00:00
efc1a678ed
Change my fix from revision [13586] to use something faster. Still Refs #1914
...
This was SVN commit r13587.
2013-07-23 10:37:43 +00:00
dc3c39fd93
Fix a rare issue where units could get stuck in Individual.Gather.Gathering state forever because of worker limits. Refs #1914 (might even fix it).
...
This was SVN commit r13586.
2013-07-23 09:46:49 +00:00
d01d58f70f
Fake randomization of the ship sinking animation to make it look better with ship formations. Refs #1921
...
This was SVN commit r13584.
2013-07-22 10:17:00 +00:00
86a8dd7e6f
Small cleanup.
...
This was SVN commit r13583.
2013-07-21 23:25:15 +00:00
bff7c53a14
Some new hero portraits.
...
This was SVN commit r13582.
2013-07-21 05:53:53 +00:00
3aa9e2f6e0
Technology research time tweaks, and fixes.
...
This was SVN commit r13581.
2013-07-21 02:16:45 +00:00
e0ea53a8ee
Adds saved game descriptions and in-game save dialog, based on patch by Crynux, fixes #2030
...
This was SVN commit r13579.
2013-07-21 00:23:57 +00:00
311403d5ef
Barracks buildable in Village Phase.
...
Fish can now be seen through the fog of war (but not in shroud of
darkness, of course).
This was SVN commit r13578.
2013-07-20 12:01:56 +00:00
9f7a0348bd
New portraiture by LordGood.
...
This was SVN commit r13577.
2013-07-20 07:35:54 +00:00
f5e60157bf
Optimizes GetPercentMapExplored by caching explored vertices per player, patch by scroogie, fixes #2012
...
This was SVN commit r13576.
2013-07-20 00:50:40 +00:00
fc9b19ab47
Pers corral and storehouse updates
...
This was SVN commit r13575.
2013-07-18 22:59:14 +00:00
439603e3fd
Persion civic ao update
...
This was SVN commit r13574.
2013-07-17 23:45:24 +00:00
1a20d47cfb
Updates to the Persian civ centre model
...
This was SVN commit r13573.
2013-07-17 23:26:40 +00:00
38cdc38bba
Fixes a build error with SDL2, refs #2041
...
This was SVN commit r13572.
2013-07-17 06:33:11 +00:00
39c0498811
Changes terrain anchoring to use faster CalcExactNormal instead of CalcNormalFixed, refs #1988 , #2039
...
This was SVN commit r13571.
2013-07-17 05:42:16 +00:00
1cca648b6d
Persian blacksmith building
...
This was SVN commit r13570.
2013-07-16 21:57:49 +00:00
2ea7fb18ea
Backport c011875c5a to the older APIs and allow for empty buildable entites token list.
...
This was SVN commit r13569.
2013-07-16 21:22:05 +00:00
df2458aa39
Allow setting of prop min/max height in the actor Edit. By sanderd17.
...
This was SVN commit r13568.
2013-07-16 13:13:41 +00:00
da4d1916dc
Implements shared trade gain with allies, patch by mimo, fixes #1691
...
This was SVN commit r13567.
2013-07-16 05:59:48 +00:00
f302faf8e4
Implements entity terrain anchoring as a visual effect, based on patch by sanderd17, fixes #1988 .
...
Sets cavalry and quadrupedal animals to 'pitch' anchoring. Cleans up
mine templates.
This was SVN commit r13565.
2013-07-16 03:46:30 +00:00
9a0ab14cf3
Carthaginian blacksmith building
...
This was SVN commit r13564.
2013-07-16 00:00:57 +00:00
c011875c5a
Fixes an issue with Aegis and the iberians
...
This was SVN commit r13563.
2013-07-15 19:47:59 +00:00
de5b584cbf
Fixes #2037
...
This was SVN commit r13562.
2013-07-15 05:54:46 +00:00
047992e61a
Fixes possible memory leaks by only allocating wave vertex buffers once and only when needed, and releasing them before re-allocating (in case CreateSuperfancyInfo is called multiple times).
...
Checks if wave vertex buffers were allocated before rendering, fixes
#2017
This was SVN commit r13561.
2013-07-15 03:26:48 +00:00
6d284e4e56
Applying stwf's sound attribute to ballista + pers fortress decals added
...
This was SVN commit r13560.
2013-07-14 15:41:49 +00:00
c9193b0302
Fix a few templates and techs.
...
This was SVN commit r13559.
2013-07-14 15:01:22 +00:00
5eb670ef82
Med Cove and Persian sandbox map tweaks
...
This was SVN commit r13558.
2013-07-14 13:58:36 +00:00
595c964d77
Make water specular more visible and fixes a few cases where it would actually hardly appear when it should.
...
Adds the ability to access an element in a dropdown box by typing the
first letters (Refs #1532 ).
This was SVN commit r13556.
2013-07-14 12:17:07 +00:00
408c30e061
Probably fixes #2021 . Optimization for foam generation while I'm at it (it's faster now, but there's a new temporary array of the size of the map)
...
This was SVN commit r13555.
2013-07-14 08:06:07 +00:00
071c976693
Sahel. wide open 2v2 scenario.
...
This was SVN commit r13554.
2013-07-13 01:50:46 +00:00
63c19af5dc
Fixes assignment operator warning on MSVC by making CObjectEntry NONCOPYABLE, refs #2033
...
This was SVN commit r13552.
2013-07-12 03:46:40 +00:00
5fb89ac6bc
Fixes prop bugs due to uninitialized variables on MSVC build, refs #2033
...
This was SVN commit r13551.
2013-07-12 03:32:14 +00:00
91effd1ad1
...
...
This was SVN commit r13550.
2013-07-11 23:58:54 +00:00
d5897854be
Allow terrain aligned props. Patch by sanderd17. Fixes #2033 .
...
This was SVN commit r13549.
2013-07-11 22:53:31 +00:00
6cffdacb40
Small cleanup.
...
This was SVN commit r13547.
2013-07-10 00:08:05 +00:00
d1af7ea0ef
Include mod path in the cache path.
...
This was SVN commit r13546.
2013-07-10 00:08:01 +00:00
fb0c1e6cc6
Update to the Carthaginian wonder/mausoleum
...
This was SVN commit r13545.
2013-07-09 23:51:23 +00:00
27086be9c3
Split skeleton definitions into multiple files, adds hotloading support for skeleton files. Fixes #190 .
...
This was SVN commit r13544.
2013-07-08 20:25:06 +00:00
041855e547
Allow building walls along the shore. Patch by sanderd17. Fix #1610 .
...
This was SVN commit r13542.
2013-07-07 22:44:47 +00:00
d479f373aa
Display current/max gatherers or builders when a resource or foundation is selected. Based on a patch by mimo. Fix #1871 .
...
This was SVN commit r13541.
2013-07-07 22:13:58 +00:00
ed3afce81e
- Round attack numbers in the GUI. Patch by scythetwirler. Fix #1997 .
...
- Adjust the siege attack tech to add an integer instead of multiply by
a percentage.
- Fix the siege armor tech so the tooltip and the added value match up.
This was SVN commit r13540.
2013-07-07 21:04:36 +00:00
93e8ccda64
Fix crash in VC++11 debug builds. Fixes #2028 . Patch by RedFox.
...
This was SVN commit r13539.
2013-07-07 20:02:20 +00:00
efc6263cc4
Tech icon tweaks
...
This was SVN commit r13538.
2013-07-07 15:55:35 +00:00
41f1485997
Fixing some missing texture links caused by 80b0106502
...
This was SVN commit r13537.
2013-07-07 15:36:27 +00:00
8aa016a884
Changes graphics card name detection on Windows to use OpenGL, as a workaround for certain WMI related crashes on Nvidia Optimus and netbook systems. Fixes #1952 , #1575
...
This was SVN commit r13536.
2013-07-06 18:30:29 +00:00
30f8d6dae2
Tweaks to some templates and tech portraits.
...
This was SVN commit r13534.
2013-07-06 03:35:03 +00:00
3824b3f89d
Silver shield tech icon
...
This was SVN commit r13533.
2013-07-05 22:26:34 +00:00
4ab38f81f7
Remove player owned sheep when committing the foundation.
...
This was SVN commit r13531.
2013-07-05 15:33:39 +00:00
453389b53a
Generic shield icons
...
This was SVN commit r13530.
2013-07-04 22:40:02 +00:00
485bd75abe
apply patch from ticket 1944 added sound attribute to animations to optionally differentiate sound starting point
...
This was SVN commit r13529.
2013-07-02 11:44:46 +00:00
377cae15f8
Technology to unlock female training at the house.
...
Sacred Band infantry is now a spearman instead of pikeman.
This was SVN commit r13528.
2013-07-02 07:11:01 +00:00
cd7b56faa4
Updated the name of "Porus" on Punjab 1.
...
Updated some Blacksmith templates with histories.
Made a new "pikeman" template to use with pike units. Made pikemen have
extra high armor, but pretty low attack. Basically they'd be used as the
ultimate meat-shield.
Cleaned up some stuff.
Made us of Pureon's new technology portraits.
This was SVN commit r13527.
2013-07-02 00:04:05 +00:00
24b6fb7c3e
Clean up cheat handling a bit. Use setter and getter for cheatTimeMultiplier.
...
This was SVN commit r13526.
2013-07-01 23:46:03 +00:00
78d4a24fba
Hero tech icon
...
This was SVN commit r13525.
2013-07-01 23:42:51 +00:00
40660606aa
Corinthian crest helmet tech icon
...
This was SVN commit r13524.
2013-07-01 21:46:24 +00:00
9565c60a14
Adds UI sounds for buttons, dropdowns, lists, and checkboxes, fixes #948
...
This was SVN commit r13521.
2013-07-01 04:15:09 +00:00
ef66f73a84
Recalculate trader gain when garrisoned entities change. Patch by mimo. Fixes #2018 .
...
This was SVN commit r13520.
2013-06-30 22:19:41 +00:00
c04f887676
Mauryan civ uses Omri's track. Cart sandbox map update
...
This was SVN commit r13519.
2013-06-30 11:06:35 +00:00
2a2daf84e0
Small boats move around quieter than large ships
...
This was SVN commit r13518.
2013-06-30 10:40:59 +00:00
d213f2ba91
This was SVN commit r13516.
2013-06-30 09:24:43 +00:00
0933925d49
Adds JS implementations of Math.pow, exp, and log, by sanderd17, refs #1193 .
...
Fixes #1990 (OOS caused by Math.pow).
Adds tests and documentation for Math functions.
This was SVN commit r13515.
2013-06-30 05:16:20 +00:00
d79ba004da
Fixes OS X build failing to find Boost libs, refs #1938
...
This was SVN commit r13514.
2013-06-30 00:48:34 +00:00
8bccecdb8d
Updates Premake Windows binary
...
This was SVN commit r13513.
2013-06-29 23:36:56 +00:00
bbcfa93dc4
Use os.findlib to find boost. Patch by Markus. Fixes #1938 . Refs #1518 .
...
This was SVN commit r13512.
2013-06-29 22:25:50 +00:00
c6348538ea
Show combined costs in the gate conversion tooltip. Based on patch by Jgwman. Fixes #1591 .
...
This was SVN commit r13511.
2013-06-29 20:55:53 +00:00
123d08eb82
This was SVN commit r13510.
2013-06-29 04:12:17 +00:00
4c22d4631a
Carthaginians can now only build 1 embassy at a time.
...
Each embassy comes with new technology pairs. Metal Costs vs. Training
Time.
Structure pierce armor adjusted upward.
This was SVN commit r13509.
2013-06-29 02:17:33 +00:00
2b02f983a6
Replace decimal with nonNegativeDecimal. Refs #1633
...
This was SVN commit r13508.
2013-06-29 01:59:46 +00:00
37c8e77d8e
Use floats for health. Fix #1633
...
This was SVN commit r13507.
2013-06-29 00:43:08 +00:00
4b3f4c0a1d
This was SVN commit r13506.
2013-06-27 12:00:23 +00:00
623f5d9a9f
Small garrison code clean-up
...
This was SVN commit r13505.
2013-06-26 19:24:56 +00:00
6cbdc13e08
Clarify usage of CheckPlacement. Check if the losRangeQuery exists before disabling it.
...
This was SVN commit r13504.
2013-06-26 18:41:06 +00:00
5e289f51c2
Make attack type a property of the order.
...
This was SVN commit r13503.
2013-06-26 14:15:03 +00:00
d5e081d55f
Fix inconsitency between AttackEntityInZone and ShouldAbandonChase for units in defensive stance. Patch by mimo. Fixes #1866 .
...
This was SVN commit r13502.
2013-06-26 13:24:03 +00:00
2fcd52b657
Let states execute their leave handlers on OnDestroy. Fixes #1999 . Patch by mimo.
...
This was SVN commit r13501.
2013-06-25 21:49:54 +00:00
49b3b0ee9a
Reverts interpolation changes from a7bc7ab50c, 71ae5a19d8, 1778e685ac, c6043779f6, 8777f68aa0, 21f13f9683. Refs #1846 , #1858 , #1865 , #1906
...
This was SVN commit r13500.
2013-06-25 01:09:43 +00:00
699d5c5d79
Fixes possible overflow in terrain position/normal calculation, based on patch by sanderd17. Fixes #1986
...
This was SVN commit r13499.
2013-06-25 00:57:42 +00:00
a981890ab9
Fixes PSA converter to detect broken animations/skeletons.xml slightly better, based on patch by Markus. Fixes #1478
...
This was SVN commit r13498.
2013-06-23 22:58:17 +00:00
ce8457e195
Fixes map name in pathfinder performance test
...
This was SVN commit r13497.
2013-06-23 00:50:24 +00:00
4fc15a9b08
Renames mill to storehouse
...
This was SVN commit r13496.
2013-06-22 02:28:54 +00:00
e5c35beefe
Blacksmith smoke.
...
Persian and Carth blacksmith actors.
This was SVN commit r13495.
2013-06-21 00:16:52 +00:00
5f78bb7318
For most civs, made it so that Champions are unlocked by default in the Fortress at City Phase, but then also available for training at the Barracks, but after they are unlocked with a tech.
...
Removed the minrange for all ranged units until minimum range bugs are
fixed. To fix it will require a multi-pronged approach that will need
discussed and Trac tickets created.
This was SVN commit r13494.
2013-06-21 00:14:00 +00:00
14990ea390
Fixes another possible NaN when invulnerable units are attacked, refs #1881
...
This was SVN commit r13493.
2013-06-18 20:20:37 +00:00
fca1f4c3a7
Persians and Carthaginians receive blacksmiths.
...
This was SVN commit r13492.
2013-06-18 14:20:15 +00:00
1a5d5eb808
Sets remaining unit trained and building completed sounds to HeardBy owner only, refs #1965
...
This was SVN commit r13490.
2013-06-18 05:06:22 +00:00
a7bc7ab50c
Fixes units not rotating correctly during e.g. attacks, patch by sbte, fixes #1906
...
This was SVN commit r13489.
2013-06-18 03:42:06 +00:00
95b51188fa
Fixes possible undefined value returned by CmpHealth, leading to a NaN and serialization test failure. Refs #1881
...
This was SVN commit r13488.
2013-06-18 03:26:08 +00:00
00e21a9898
change 'restricted' flag to 'heardby' in SoundGroup xml files
...
This was SVN commit r13487.
2013-06-17 15:46:28 +00:00
36dec0e789
add restricted flag to SoundGroup xml for sounds thatonly the owning player should hear
...
This was SVN commit r13486.
2013-06-17 02:30:40 +00:00
02b98f3acd
Fixes build with x11 and SDL2
...
This was SVN commit r13485.
2013-06-17 01:43:57 +00:00
f918c9b074
Prevent formation controllers from showing up in range queries. Fixes #1796 .
...
This was SVN commit r13484.
2013-06-16 23:10:01 +00:00
5f90371a1c
Cleans up some float constants and math from #1921
...
This was SVN commit r13482.
2013-06-15 00:42:07 +00:00
9d27cccbcd
Fix Visual Studio build issues.
...
This was SVN commit r13481.
2013-06-15 00:20:40 +00:00
e75877b52f
Adds comment about xorg-x11's glXGetProcAddress not returning NULL for unsupported functions, closes #171
...
This was SVN commit r13480.
2013-06-14 23:49:20 +00:00
c01c8fb2fc
Stop generating VS2005 project files. Refs #1951 .
...
This was SVN commit r13479.
2013-06-14 23:46:12 +00:00
98cac1a10f
Improve ship sinking. Patch by wraitii. Fix #1921
...
This was SVN commit r13478.
2013-06-14 19:19:13 +00:00
9ea830c855
Handle empty token list gracefully.
...
This was SVN commit r13477.
2013-06-14 16:13:59 +00:00
bcf99e2a13
make sound code return faster, code cleaner
...
This was SVN commit r13476.
2013-06-14 16:05:57 +00:00
da17e4329b
cleanup SOundManaer component
...
This was SVN commit r13475.
2013-06-14 00:24:51 +00:00
26dbac8d57
fixes to SoundManager external interface, clean up ifdef situation, and SoundGroup playin
...
This was SVN commit r13474.
2013-06-13 12:12:44 +00:00
b3653cfe16
Updates bundled Valgrind headers to 3.8.1 and fixes test build, patch by Markus, fixes #1971
...
This was SVN commit r13473.
2013-06-12 03:38:37 +00:00
2567fee329
Write mod data correctly. Fixes #1940 .
...
This was SVN commit r13472.
2013-06-11 20:50:09 +00:00
15e75cdfbd
Updated some building tooltips.
...
Removed wall techs from Iberians for balance.
This was SVN commit r13471.
2013-06-11 16:28:42 +00:00
facd447d0f
Hopefully fixes GCC warning about narrowing conversion in C++11, fixes #1851
...
This was SVN commit r13470.
2013-06-11 02:40:49 +00:00
b3391ebe39
Fix build warnings. Patch by Markus. Refs #1851 .
...
This was SVN commit r13469.
2013-06-11 00:05:57 +00:00
2ed10ec033
Changed names and histories for Roman civ center and market.
...
Fixed elephant heroes.
This was SVN commit r13468.
2013-06-10 15:33:18 +00:00
ada7702bec
add UI sound channel, clean up external interface and javascript calls
...
This was SVN commit r13467.
2013-06-10 13:58:43 +00:00
29549561e1
Add flag to VisualActor for entities that should only be visible in Atlas. Patch by KareemErgawy. Fixes #1411 .
...
This was SVN commit r13465.
2013-06-09 23:18:21 +00:00
5246e9a576
Update description of ESC key in the manual. Refs #1928 .
...
This was SVN commit r13464.
2013-06-09 20:38:57 +00:00
6f3a0e1378
Implement location hotkeys. Fix #1882 .
...
This was SVN commit r13463.
2013-06-09 20:21:19 +00:00
356adb1216
Nicer looking particles for Roman Temple. Fixes #1498 .
...
More shield and helmet stuff.
This was SVN commit r13462.
2013-06-09 17:28:46 +00:00
80b0106502
Brand new Macedonian/Ptolemaic shield patterns by Enrique.
...
This was SVN commit r13461.
2013-06-09 15:57:29 +00:00
b40a738c87
Adds Omnipresent flag to more alarm sounds
...
This was SVN commit r13460.
2013-06-08 22:46:26 +00:00
d151a6a304
Fixed war elephants. They can attack walls now.
...
This was SVN commit r13459.
2013-06-08 13:42:49 +00:00
8eae65be2b
Fixed elephants. Can now attack walls.
...
This was SVN commit r13458.
2013-06-08 12:51:15 +00:00
633eab6080
Median Oasis 6 & 7.
...
Updated blowing sand texture.
This was SVN commit r13457.
2013-06-06 14:47:50 +00:00
71b25d5bd4
big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references
...
This was SVN commit r13455.
2013-06-06 11:13:57 +00:00
1341b88468
Adds VBO support to minimap entity rendering to improve performance, patch by kuranes. Refs #1923
...
This was SVN commit r13454.
2013-06-06 00:10:58 +00:00
d20849d1c4
Add some checks for the sound manager. Fixes the segfault when using -quickstart.
...
This was SVN commit r13453.
2013-06-05 22:10:11 +00:00
5b1f5dd2c1
Display expected trading gain (GainMultiplier = 1) for market foundations when setting rally points. Fixes #1963 .
...
This was SVN commit r13452.
2013-06-05 21:35:31 +00:00
b2f6a1260e
Sets Distanceless flag on most selection sound groups.
...
Adds new sound groups for gates.
This was SVN commit r13451.
2013-06-04 03:17:46 +00:00
43d2c8be8c
Converts a bunch of stereo sound effects to mono, to fix sounds ignoring entity position, fixes #1956 , refs #1929 .
...
Will require sound group XML updates in some cases.
This was SVN commit r13450.
2013-06-03 21:42:48 +00:00
4d5187bf40
Building completion and unit training sounds are now ubiquitous, meaning you'll hear them even if they are off-screen.
...
This was SVN commit r13449.
2013-06-03 02:50:10 +00:00
8026685a06
Don't display the rally point tooltip for trading for enemy markets.
...
This was SVN commit r13448.
2013-06-02 20:17:44 +00:00
2ef6ec3f73
Rounds trader gain to avoid fractions with garrisoned traders in a merchant ship, patch by Markus, fixes #1954
...
This was SVN commit r13447.
2013-06-01 21:28:31 +00:00
eebe7972df
Lighting tweaks to Mauryan emblem
...
This was SVN commit r13446.
2013-06-01 12:09:34 +00:00
5af503405f
last bunch of ogg files not converted from wav correctly
...
This was SVN commit r13445.
2013-06-01 02:56:31 +00:00
b6e0661b8f
New BRASIDAS Spartan hero.
...
"The Agoge" tech for Spartans.
Fixed Leonidas' selection ring.
This was SVN commit r13444.
2013-06-01 02:33:58 +00:00
67b42210aa
mono ogg sounds rendered from original wav files recommitted
...
This was SVN commit r13443.
2013-06-01 02:30:05 +00:00
004eaf9e75
log warning when stereo sounds are played at position
...
This was SVN commit r13442.
2013-06-01 01:52:05 +00:00
4882aac409
New techs for Carthage: Mercenary Captains, reduce metal costs for merc units, based on ethnicity.
...
Melee cav more starting pierce armor.
This was SVN commit r13441.
2013-05-31 02:52:06 +00:00
690619ce5e
many fauna sounds in stereo converted to mono so the OpenAL can locate them
...
This was SVN commit r13440.
2013-05-31 02:50:47 +00:00
b21de66e40
address issue 1929 Ubiquitous Sound Effects, fixes a bug in determining which units are onscreen, also plays distant items softly if at all
...
This was SVN commit r13439.
2013-05-31 01:03:07 +00:00
d3e40792ff
Added a "wooden structures" civ bonus for the Celtic civs. Their buildings are 20% weaker, but they construct 20% faster than other cultures.
...
Fixed health for "Greek" walls.
Adjusted "preferredclasses" stuff on some templates.
This was SVN commit r13438.
2013-05-30 00:58:07 +00:00
085e9c620d
Tweaked armor stats for battering ram and siege tower.
...
Fixed "rollover" tag to "history".
This was SVN commit r13437.
2013-05-29 23:39:13 +00:00
7a8c8e439b
Fixes warning in VC2012 build (C4706: assignment within conditional expression)
...
This was SVN commit r13434.
2013-05-28 01:23:43 +00:00
d2b0d25457
Fixes macro redefinition of FACILITY_VISUALCPP in VC2012 (it's defined in winerror.h).
...
Removes obsolete hack for old Boost and VC2005 (broke VC2005 build with
modern Boost).
This was SVN commit r13433.
2013-05-28 01:14:41 +00:00
4a8c7e72b5
Lowered crush armor for these buildings.
...
This was SVN commit r13431.
2013-05-27 18:21:57 +00:00
93d0084266
incorporate patch from ticket 1937, fix memory leak in SoundManager
...
This was SVN commit r13430.
2013-05-27 13:36:17 +00:00
88c4e5bdd0
Extends binary serializer to support some standard JS classes: Number, String, Boolean. Fixes #406 .
...
Extends binary serializer to support typed arrays.
Extends binary serializer to support custom JS prototype objects in AIs,
fixes #407 .
Allows full serialization of AIs (not yet implemented). Refs #1089 ,
#1886
Increases binary serializer script backref arena from 8 MB to 16 MB,
refs #1842
This was SVN commit r13429.
2013-05-26 21:57:24 +00:00
e58fe92892
Tweaked Walls stats and costs.
...
Carthaginians' 'Triple Walls' civ bonus moved from wall templates to
auto-researching (free) tech. It just cleans things up quite a bit.
Changed sound groups for "special buildings."
This was SVN commit r13428.
2013-05-25 23:10:16 +00:00
97b28e7343
Some sound file changes to hopefully add more aural variation.
...
Cavalry blacksmith techs moved from City to Town.
Trying to give the female citizen the order_build soundgroup, but it
doesn't seem to work. The game seems to use order_repair for both
repairing and building. These are two different actions so should
support two different sound groups.
This was SVN commit r13427.
2013-05-25 18:07:29 +00:00
2c52099ddd
Fix previous commit because of course there was test code in there. Make Aegis build more farms because of recent changes.
...
This was SVN commit r13426.
2013-05-25 16:24:05 +00:00
f372f9184c
Fix Aegis breaking the profiler after some time ( Fixes #1945 . Fix typo ( Fixes #1947 ). Patches by Markus.
...
Also one other fix for something attack related (probably, code is old
and I can't recall).
This was SVN commit r13425.
2013-05-25 15:56:11 +00:00
17bb997e0e
Fixes memory leak in CVertexBuffer::Release, patch by Markus, fixes #1933
...
This was SVN commit r13423.
2013-05-23 23:16:36 +00:00
bc8d461b81
Display rally point lines when setting rally points using the minimap. Patch by TrinityDeath. Fixes #1848 .
...
This was SVN commit r13422.
2013-05-23 20:34:15 +00:00
a8a968d32c
Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
...
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
72a8b88b7d
Fixes some unconventional assignment operators, patch by Markus, refs #1852 .
...
Fixes typo in test_ShaderManager
This was SVN commit r13420.
2013-05-22 22:04:58 +00:00
94c57085e9
Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
...
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
d7dcd3b26c
Use prefix increment operator for iterators (for consistency), refs #1852 , #1064
...
This was SVN commit r13418.
2013-05-22 18:41:13 +00:00
3ce14e3f4b
fix memory leak in SoundManager, patch taken from ticket #1934
...
This was SVN commit r13417.
2013-05-22 12:13:21 +00:00
56a4d6417c
Small cleanup.
...
This was SVN commit r13416.
2013-05-21 23:50:42 +00:00
e5523754b3
Check if a building is already at full health when trying to repair it. Fixes #1930 .
...
This was SVN commit r13415.
2013-05-21 23:45:20 +00:00
4356badfa9
Pause production if the producing entity is garrisoned. Fixes #1931 .
...
This was SVN commit r13414.
2013-05-21 23:01:53 +00:00
3f00d4d997
Change some size() > 0 to Based on patches by kuranes and Markus. Refs #1852 , #1923 .
...
This was SVN commit r13413.
2013-05-21 22:11:47 +00:00
013fc9558a
Fix typo. Fixes #1935 .
...
This was SVN commit r13412.
2013-05-21 22:11:15 +00:00
136f1891c1
Fixes a fix about a fix on the waterManager. Fixes #1891
...
This was SVN commit r13411.
2013-05-21 08:55:49 +00:00
346df43a43
Persian Apadana build limit.
...
This was SVN commit r13410.
2013-05-19 08:24:36 +00:00
67d072108b
Bloody dead camel.
...
New wall technologies (research at Wall Tower, since for now techs can't
be researched at wall segments).
Adjusted default BatchTrainModifier from 0.7 to 0.8 in all buildings
since the new training techs were making unit batches train insanely
fast.
Added 'Naval Architects' batch training tech to the Dock (and Carth
Super Dock).
Attempting to add "Apadana" build limit, with no success. Need help
here. I thought BuildRestrictions.js and EntityLimits.js were the files
I needed to change, but it's not working (there should be a build limit
of 1 for the Persian Apadana).
Tweaked the levy techs.
Fixed Hero elephant unit RequiredTechnology.
This was SVN commit r13409.
2013-05-19 08:19:16 +00:00
09108e6a97
Some more vars
...
This was SVN commit r13408.
2013-05-16 16:17:37 +00:00
1ea0bac280
New train time techs. For most factions, you choose either faster training infantry or faster training cavalry (either one unlocks Conscription, which boosts batch training considerably). For Persians, you get to research both at the barracks and stables, which unlocks conscription techs for both buildings. For Persians, I also moved the champion unlock tech to their Palace (Apadana), which now unlocks the "Immortals" technology (the tech that makes the Anusiya train twice as fast).
...
This was SVN commit r13407.
2013-05-15 08:11:20 +00:00
ccb4ecc9f2
Renamed this tech.
...
This was SVN commit r13406.
2013-05-15 04:07:07 +00:00
9ceab639f3
Bloody dead sheep.
...
Unlocking tech for champions.
Champions trainable in barracks (after unlocking tech).
Farm Field yield increased from 2000 food to 5000 food. Max gatherers: 5
per field.
This was SVN commit r13405.
2013-05-14 09:48:37 +00:00
de5d4491ab
var-fare
...
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
f5f0bc701a
Completely changed the "Stockbreeding" tech.
...
Fixed the 'Conscription' tech. It should work as advertised now.
Added some classes to the structures.
Reduced archer bonus vs. cav spears by 50%.
Moves Iphicratean Reforms from the Athenian Trireme to the Athenian
Dock.
This was SVN commit r13403.
2013-05-12 21:30:01 +00:00
2aa3ab8b03
conscription tech fix
...
This was SVN commit r13402.
2013-05-12 16:59:54 +00:00
3bec6ced85
Fix hero button for heroes without attack
...
This was SVN commit r13401.
2013-05-12 16:02:53 +00:00
daf572eb43
Temporary Blacksmith structures for prototyping and playtesting.
...
Lots of new techs. Healing techs. Vision for outpost. "Conscription"
tech boosts batch training speed. Implemented Macedonian "Hellenistic
Metropolis" special tech.
Testing placing Champions in the barracks (unlocked with a tech). Try
this out with the Macedonians.
Reduced archer attack damage. Reduced cost of healer.
Lots of other stuff.
This was SVN commit r13400.
2013-05-12 07:23:05 +00:00
209d8c4fd4
Made death screams slightly quieter. We actually need new male death/battle sounds.
...
This was SVN commit r13399.
2013-05-09 16:36:49 +00:00
eae28bad5a
Gold Oasis 3. Iberians vs. Mauryans.
...
This was SVN commit r13398.
2013-05-06 00:40:40 +00:00
57644fba50
Some art stuff: Scaffolds to other foundations, tweaking some Mauryan animations, new turban for maiden guards, etc.
...
This was SVN commit r13397.
2013-05-05 21:07:40 +00:00
d49cc6fc8b
Some armor changes. Also adds hero training restriction to hero elephant template. Fixes #1927 .
...
This was SVN commit r13396.
2013-05-05 19:25:33 +00:00
47e9431d29
Check if one of the technologies in a pair is already in progress. Fixes #1820 .
...
This was SVN commit r13395.
2013-05-05 13:54:00 +00:00
cb7964a1db
Make some gather techs work.
...
This was SVN commit r13394.
2013-05-05 13:13:38 +00:00
56fa123718
Fix error when constructing with the first selected entity being a building.
...
This was SVN commit r13392.
2013-05-04 21:44:32 +00:00
fc5e2d27c7
Cancel building placement or reset selection on Esc. Patch by Josh. Fixes #1928 .
...
This was SVN commit r13391.
2013-05-04 21:02:11 +00:00
0d09f290d9
Allow setting rally points for foundations. Patch by Josh. Fixes #902 .
...
This was SVN commit r13390.
2013-05-02 20:29:22 +00:00
bf959e1c46
fix build when using --without-audio
...
This was SVN commit r13389.
2013-05-02 13:58:28 +00:00
683f22cdb1
Display entity limits for buildings. Patch by Josh. Fixes #1924 .
...
This was SVN commit r13388.
2013-05-01 19:25:55 +00:00
f42b77919d
Future-proof the code for civ specific non-peace tracks.
...
This was SVN commit r13387.
2013-05-01 16:48:55 +00:00
9a0749f3c9
Make sure to actually prevent Atlas from trying to render coastal waves. Fixes #1925
...
This was SVN commit r13386.
2013-05-01 06:47:49 +00:00
ac3e9d8bc7
clear peace tracks before reloading music from civ files
...
This was SVN commit r13385.
2013-05-01 01:51:30 +00:00
67ff52a07f
More armor adjustments.
...
This was SVN commit r13384.
2013-04-30 08:36:47 +00:00
181db44ab5
Enforce technology restrictions when training units.
...
This was SVN commit r13383.
2013-04-29 21:51:14 +00:00
35daf00336
Snuck through without armor changes. Fixed now.
...
This was SVN commit r13382.
2013-04-29 18:33:03 +00:00
e0a2e5790d
Exponential Armor patch by Alpha123, with new updated armor values.
...
Needs a ton of testing.
This was SVN commit r13381.
2013-04-29 07:51:51 +00:00
4493f2986f
Wonder support for civs currently with Wonders.
...
This was SVN commit r13380.
2013-04-29 02:46:13 +00:00
0686c6a553
Resetting 'default' maps.
...
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
5a88f0fce0
Fix entity limits for buildings.
...
This was SVN commit r13378.
2013-04-29 00:36:21 +00:00
f4e0007733
Cavalry are a bit faster.
...
Attempting to add Wonders, but no success (need help). Adding files here
to see if someone can fix what I've started.
This was SVN commit r13377.
2013-04-28 22:51:08 +00:00
d9540ad7f6
Fixes MSVC build error and warning
...
This was SVN commit r13375.
2013-04-27 22:43:22 +00:00
4233acfa36
Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support.
...
This was SVN commit r13374.
2013-04-27 12:20:42 +00:00
092108b304
Must notify sound manager sources are now available
...
This was SVN commit r13372.
2013-04-26 23:13:11 +00:00
c30f7a40e0
no need to check errors after destroying context, clean up some OpenAL interface calls
...
This was SVN commit r13371.
2013-04-25 10:48:34 +00:00
8324e0f665
add missing music list files
...
This was SVN commit r13369.
2013-04-24 19:27:16 +00:00
71486bd57d
SoundManager supports playlists
...
This was SVN commit r13368.
2013-04-24 12:03:42 +00:00
6115c3fc13
Remove some duplication from ProcessCommand.
...
This was SVN commit r13367.
2013-04-22 17:50:25 +00:00
62f24af68d
Some new portraits by LordGood.
...
This was SVN commit r13366.
2013-04-21 18:47:11 +00:00
3758b64916
Remove hardcoding of path from desktop file and launcher script. Patch by vincent. Fixes #1424 .
...
This was SVN commit r13365.
2013-04-21 16:47:36 +00:00
75f332ce20
Stop hotkey. Patch by alpha123. Fixes #1870 .
...
This was SVN commit r13364.
2013-04-18 19:20:29 +00:00
cd6a76bcaa
Gates now handle allies made using diplomacy.
...
This was SVN commit r13363.
2013-04-18 18:18:34 +00:00
18a2b7d093
Fix roman merchant ship trading distance. Fixes #1874 .
...
This was SVN commit r13362.
2013-04-18 18:18:31 +00:00
dc9889c190
Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915 .
...
This was SVN commit r13361.
2013-04-18 18:18:29 +00:00
a362b41029
Fix grouping of garrisoned units. Patch by mimo. Fixes #1918 .
...
This was SVN commit r13360.
2013-04-18 18:18:24 +00:00
503b481468
handle initialization errors cleanly, clean stuff up
...
This was SVN commit r13359.
2013-04-18 03:24:20 +00:00
b22320a85f
Fix tests. Refs #1807 .
...
This was SVN commit r13358.
2013-04-14 00:52:00 +00:00
d0a695f7fb
Allow mutual allies to garrison in each others buildings. Patch by mimo. Fixes #1807 .
...
This was SVN commit r13357.
2013-04-14 00:34:14 +00:00
2a3f1cb412
eliminate most warnings produced by Cppcheck
...
This was SVN commit r13356.
2013-04-12 03:10:54 +00:00
7562c79e89
Change target for all orders on EntityRenamed. Patch by mimo. Fixes #1903 .
...
This was SVN commit r13355.
2013-04-10 22:48:02 +00:00
95a10e7f42
Reduce duplicate GuiInterfaceCalls some more. Patch by sbte. Fixes #1878 .
...
This was SVN commit r13354.
2013-04-10 21:05:46 +00:00
0cad19ecec
double check that the sound manager has been created before using
...
This was SVN commit r13353.
2013-04-10 12:03:17 +00:00
b301d5c84d
fades music in and out when switching to background, also honors g_PauseOnFocusLoss
...
This was SVN commit r13352.
2013-04-10 11:51:42 +00:00
19ce9657bc
This was SVN commit r13351.
2013-04-10 09:11:08 +00:00
3074b930cc
Tech.
...
This was SVN commit r13350.
2013-04-08 08:27:30 +00:00
789991c5d2
New food gathering tech for village phase.
...
Adjusted some food gather rates.
Adjusted some tech costs.
This was SVN commit r13349.
2013-04-08 07:59:57 +00:00
5429052b06
Lots of normal maps and spec maps. Ongoing project.
...
Added camel death scream (lol) to camel units.
Added sheep sounds to sheep.
Changed over the Mauryan elephant unit actors.
This was SVN commit r13348.
2013-04-07 22:28:36 +00:00
c9a5d5cee5
pause music and ambient sounds when game pauses
...
This was SVN commit r13347.
2013-04-07 04:13:15 +00:00
555f06acbe
Fix errors when the hero is garrisoned. Patch by alpha123. Refs #1802 .
...
This was SVN commit r13346.
2013-04-06 19:32:07 +00:00
c71ddae359
Adds forgotten OpenLogsFolder.vbs to Windows uninstaller
...
This was SVN commit r13345.
2013-04-05 21:40:49 +00:00
2af37c3590
Adds player color to rubble entities, thanks to ericb for the patch, fixes #1887
...
This was SVN commit r13344.
2013-04-05 02:52:01 +00:00
161d6c1ba7
Improves SDL 2.0 support
...
This was SVN commit r13343.
2013-04-05 02:39:30 +00:00
7f9b486a48
This was SVN commit r13341.
2013-04-03 23:28:29 +00:00
16de5c75ac
Adds game speed option to match setup, adds in-game control for single player games, fixes #785 .
...
Refactors some GUI utility functions.
This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
62dc594a71
Hero button. Based on patch by Malcom and edits to that by alpha123. Fixes 1802.
...
This was SVN commit r13339.
2013-04-03 17:27:55 +00:00
f2da77ff72
"Oh myyyyy" -- George Takei. Lots of stuff:
...
- Town Phase cost increased to 1000 Food, 1000 Wood (from 500 of each).
This makes Village Phase longer and more interesting. Still need to
test.
- Lots of new normal maps and spec maps (for a bunch of desert terrains
and cretan date palms). This is an ongoing project.
- Fixed some spec maps for being too 'bright.'
- Changed the attack of melee spear units from a combo of pierce and
hack to just hack. Per discussion with Quantumstate. Needs testing.
- Changed the Median Oasis 1 scenario to include Mauryans and
Carthaginians.
This was SVN commit r13338.
2013-04-03 06:48:38 +00:00
a317cd9cba
Fixes memory leak and removes unused code in WaterManager, fixes #1891 , refs #1852
...
This was SVN commit r13337.
2013-04-03 03:30:10 +00:00
f82adf3ef3
Don't call GetSimulationState too often. Patch by sbte. Fixes #1878 .
...
This was SVN commit r13336.
2013-04-02 21:06:20 +00:00
3c693245bd
Portraits for the Mauryan healer and Chanakya.
...
This was SVN commit r13335.
2013-04-02 17:06:15 +00:00
edea5d04e7
Portraits for Mauryan healer and Chanakya.
...
This was SVN commit r13334.
2013-04-02 17:05:51 +00:00
74df28f952
Fix --without-pch build
...
This was SVN commit r13333.
2013-04-02 15:44:42 +00:00
sanderd17