1f38526444
Fix test failures on Windows
...
This was SVN commit r10802.
2011-12-23 13:37:11 +00:00
4f6f0b7baf
Fix tests, and warnings, and non-PCH build
...
This was SVN commit r10801.
2011-12-23 13:01:29 +00:00
779278d376
Added check that a resource is not in enemy territory before trying to gather from it and increased field priority.
...
This was SVN commit r10800.
2011-12-23 10:22:07 +00:00
587487811b
Fixes typo in pool allocator stats, based on patch from Echelon9. Fixes #1061 .
...
This was SVN commit r10799.
2011-12-23 03:54:36 +00:00
d4fea62800
Regenerate font textures
...
This was SVN commit r10797.
2011-12-22 22:47:47 +00:00
9f0e357f09
Add a hack for a-macron-acute characters (see #1039 )
...
This was SVN commit r10796.
2011-12-22 22:44:57 +00:00
4e52b2cceb
Removed territory decay.
...
This was SVN commit r10795.
2011-12-22 22:00:07 +00:00
9f9569cdec
Removed territory decay for these structures.
...
This was SVN commit r10794.
2011-12-22 21:59:44 +00:00
8256d00c3c
This was SVN commit r10793.
2011-12-22 17:55:00 +00:00
3bd371ae64
Persian menu-background, updated structure for background functions.
...
This was SVN commit r10792.
2011-12-22 17:54:33 +00:00
3c1dc9ec32
Tidy some whitespace
...
This was SVN commit r10791.
2011-12-22 17:05:34 +00:00
c989f52c46
Use heap-based queue in pathfinder to improve worst-case performance (in exchange for terrible VS2008 debug-mode performance)
...
This was SVN commit r10790.
2011-12-22 16:58:03 +00:00
c270f2a375
Made qBot call the deserialize function from BaseAi and then delete the metadata so any future chanegs won't be overidden
...
This was SVN commit r10789.
2011-12-22 16:01:20 +00:00
c472c07e7a
Added override for Deserialize
...
This was SVN commit r10788.
2011-12-22 15:49:23 +00:00
6399ec0cd2
# Partial support for saved games with AI.
...
Support cancelling loads while inside a loader callback.
Fix use of ArchiveReader/Writer since their API changed.
Improve error-detection in deserializer to avoid crashes.
Report deserializer errors to users.
Expand load-error message box to fit message about invalid saved games.
This was SVN commit r10787.
2011-12-22 14:04:32 +00:00
5f0d5e4137
Tidy some whitespace
...
This was SVN commit r10786.
2011-12-22 13:50:11 +00:00
708e192d20
This was SVN commit r10785.
2011-12-22 07:54:11 +00:00
9120046f8e
This was SVN commit r10784.
2011-12-22 07:53:28 +00:00
a8423ac8e8
Adding more checks that the path found is valid to follow, also redisabled the debug messages
...
This was SVN commit r10783.
2011-12-21 15:39:18 +00:00
cb1e8c11a2
Fixed clearTimer() function, made coding style consistent with qBot and removed commented section of code since it would cause a bug if enabled.
...
The commented code would have put a new timer into the id of a limited
repeat timer after it had finished. Then two pieces of code would have
the same id for a timer causing problems.
This was SVN commit r10782.
2011-12-21 12:26:09 +00:00
0c84a6125b
Support larger profiler JSON output
...
This was SVN commit r10781.
2011-12-21 11:28:24 +00:00
fe80045024
This was SVN commit r10780.
2011-12-21 05:40:30 +00:00
90acc38ffc
Build-in Timer. now working.
...
This was SVN commit r10779.
2011-12-21 01:59:53 +00:00
12dc33ab5f
Build-in timer class. Not tested, might have bugs.
...
This was SVN commit r10778.
2011-12-21 00:34:17 +00:00
6e974e3a78
Haxamanis
...
This was SVN commit r10777.
2011-12-20 21:40:03 +00:00
2a61188356
Stopped qBot from trying to gather floating treasures
...
This was SVN commit r10776.
2011-12-20 10:23:55 +00:00
eb5b3bba10
Fixes broken UnitAI test.
...
This was SVN commit r10775.
2011-12-19 23:09:38 +00:00
1d8f136e80
whale animation updates
...
This was SVN commit r10774.
2011-12-19 19:43:55 +00:00
436163a60f
Made terrain analysis pick better starting points and increased the distance check in economy to match the changed distance measure using distance to dropsite.
...
Terrain analysis now only picks a start point if it is within a region
of size >10.
The economy code only does a distance check if there are >100 entities
of that resource on the map so rare resources are gathered.
Modified some debug output as well.
This was SVN commit r10773.
2011-12-19 19:41:36 +00:00
e56a0edc2c
This was SVN commit r10772.
2011-12-19 18:20:45 +00:00
51550814ce
new mediterranean fin whale model and animations
...
This was SVN commit r10771.
2011-12-19 15:04:42 +00:00
2bc2666e4e
sync with work - minor fixes
...
This was SVN commit r10770.
2011-12-19 11:55:30 +00:00
36f3d2f0de
Disables rally point on corrals, since goats don't respond to orders. Fixes #1049 .
...
This was SVN commit r10769.
2011-12-19 00:34:42 +00:00
4c76547187
This was SVN commit r10768.
2011-12-18 23:19:25 +00:00
79703558b8
This was SVN commit r10767.
2011-12-18 23:11:58 +00:00
500861d42f
Updated the formation buttons.
...
Portrait for Persian fishing boat.
This was SVN commit r10766.
2011-12-18 22:11:52 +00:00
2079339a73
Added more checks in case pathfinding found no routes to a destination
...
This was SVN commit r10765.
2011-12-18 22:05:11 +00:00
40c1c0010f
Added another check for whether a valid path is set in attackMoveToLocation
...
This was SVN commit r10764.
2011-12-18 13:15:15 +00:00
574c4135a3
Tweaked attack code and fixed building liimit checks
...
This was SVN commit r10763.
2011-12-18 13:05:53 +00:00
286ce58b1c
more restrictive permissions required by tightened vista/win7 security (still unable to launch services without admin - but could install them once)
...
This was SVN commit r10762.
2011-12-18 12:21:57 +00:00
00e7db4e57
This was SVN commit r10761.
2011-12-18 06:45:06 +00:00
bfca6f0b58
Fixes UnitAI attack test for domestic animals. Fixes #1048 .
...
This was SVN commit r10760.
2011-12-18 05:17:34 +00:00
dda706eeea
Marking naval maps as multiplayer only maps and removing AI defaults from them
...
This was SVN commit r10759.
2011-12-18 01:11:35 +00:00
c3902e7b76
adjustments to some animal movement speeds
...
This was SVN commit r10758.
2011-12-18 00:43:54 +00:00
937efa7245
Smooth fish
...
This was SVN commit r10757.
2011-12-18 00:15:33 +00:00
dd3a9b1915
Some more fish animations
...
This was SVN commit r10756.
2011-12-17 23:40:47 +00:00
c8243a50dc
Large qBot update.
...
Key changes are:
Support for Persians
Revamped defence system supoprting groups of attackers
Dynamic priorities based on enemy strength and number of workers
Better placement of towers and fortresses
Randomised raiding in early game
This was SVN commit r10755.
2011-12-17 21:59:27 +00:00
36ef0a376d
workaround hardware/BIOS craziness
...
fixes #1047
This was SVN commit r10754.
2011-12-17 20:41:32 +00:00
5ec89d68eb
This was SVN commit r10753.
2011-12-17 20:34:41 +00:00
b9351306b6
Fixed whale hunting thanks to philip.
...
This was SVN commit r10752.
2011-12-17 18:07:36 +00:00
12fa398bc1
Adjusting the fishes.
...
This was SVN commit r10751.
2011-12-17 16:57:24 +00:00
5db77b5dea
Animated fish shoal
...
This was SVN commit r10750.
2011-12-17 16:31:57 +00:00
4a42b6bf28
Solves/Works around some linking problems for ActorEditor, ArchiveViewer and FileConverter. Closes #1004
...
This was SVN commit r10749.
2011-12-17 12:59:29 +00:00
0ff9035cfa
This was SVN commit r10747.
2011-12-17 11:14:00 +00:00
c12215d65d
This was SVN commit r10745.
2011-12-17 03:37:10 +00:00
42f0aec84a
Allows setting rally points on resources and buildings. closes #745
...
This was SVN commit r10744.
2011-12-16 16:08:26 +00:00
e62b9b6d8f
Fixed rally point lines being displayed for entities with rally points no longer set. Closes #1043 .
...
This was SVN commit r10743.
2011-12-16 15:14:59 +00:00
78d50b4149
Added check for the existence of a resource somewhere on the map
...
This was SVN commit r10742.
2011-12-16 10:46:20 +00:00
81372522f3
Carthaginian and Persian trader sounds
...
This was SVN commit r10741.
2011-12-15 21:23:59 +00:00
c44964a7f5
Beefed up Iberian scout tower.
...
Enrique's Roman cc changes.
This was SVN commit r10740.
2011-12-15 20:26:58 +00:00
78dfb6e9f9
Fast Oasis map player giraffe fix
...
This was SVN commit r10739.
2011-12-15 11:04:45 +00:00
f45badecf6
Decal stuff.
...
This was SVN commit r10738.
2011-12-15 05:16:47 +00:00
806744cadb
A bunch more garrison flag stuff.
...
This was SVN commit r10737.
2011-12-15 04:24:24 +00:00
f9b2e34017
Moar garrison flag stuff.
...
This was SVN commit r10736.
2011-12-15 03:37:46 +00:00
7cd70f44d5
New garrison flag models UV mapped to new textures
...
This was SVN commit r10735.
2011-12-15 00:46:00 +00:00
0c06150086
updated garrison flag textures.
...
This was SVN commit r10734.
2011-12-14 23:56:56 +00:00
eed68cb924
This was SVN commit r10730.
2011-12-14 20:34:06 +00:00
d6050afc71
This was SVN commit r10729.
2011-12-14 20:32:58 +00:00
8f01e41850
Persian Fishing Ship
...
This was SVN commit r10728.
2011-12-14 20:28:02 +00:00
eaeaff3737
Garrison flags
...
This was SVN commit r10727.
2011-12-14 04:26:31 +00:00
0273398fe8
New Persian trader
...
This was SVN commit r10726.
2011-12-14 00:36:58 +00:00
03e65fe8d8
This was SVN commit r10725.
2011-12-13 23:56:35 +00:00
88da757641
Deleting useless files.
...
This was SVN commit r10724.
2011-12-13 23:31:43 +00:00
6b91c697a0
This was SVN commit r10723.
2011-12-13 21:28:47 +00:00
292ed1d9e0
Allocated rally point flag entity on-demand instead of at initialization time. Fixes #1042 .
...
This was SVN commit r10722.
2011-12-13 14:14:41 +00:00
df7d3afd64
Fixed bug where only a tiny accessible region was being found so qBot didn't build or gather due to the rest of the map being inaccessible.
...
This was SVN commit r10721.
2011-12-12 21:28:14 +00:00
1e46e1a195
This was SVN commit r10720.
2011-12-11 23:15:01 +00:00
aee3c1a572
Change of default AI for random maps
...
This was SVN commit r10719.
2011-12-11 21:30:17 +00:00
f739935e29
Adding garrisoned prop point to Persian barracks
...
This was SVN commit r10718.
2011-12-11 19:38:30 +00:00
e9153d0a66
Animated garrison flag
...
This was SVN commit r10717.
2011-12-11 19:29:55 +00:00
ec315b720b
Updating map files to use the same AI
...
This was SVN commit r10716.
2011-12-11 18:00:02 +00:00
035f398a36
This was SVN commit r10715.
2011-12-11 14:50:20 +00:00
ebf160a531
re-added deleted garrison flags
...
This was SVN commit r10714.
2011-12-11 14:40:14 +00:00
a2296c6000
Cleaning unused waypoint flag files and adding new animations
...
This was SVN commit r10713.
2011-12-11 13:58:37 +00:00
6156fa7c9a
Changed default idle animation speed to 1 so that waypoint flags will animate properly
...
This was SVN commit r10712.
2011-12-11 13:35:51 +00:00
6342cc8a00
This was SVN commit r10711.
2011-12-11 03:36:14 +00:00
46a09ced71
Fixed some compilation warnings
...
This was SVN commit r10710.
2011-12-11 02:11:05 +00:00
e4f69a2ffb
waypoint flag animation example
...
This was SVN commit r10709.
2011-12-10 22:51:03 +00:00
a55633068f
Persian sb2 building model redesign
...
This was SVN commit r10707.
2011-12-10 20:08:24 +00:00
0d58e77a92
Cleaned up Apadana model
...
This was SVN commit r10706.
2011-12-10 18:32:53 +00:00
427674f713
Fix for compilation failure of [10703] on 64-bit systems
...
This was SVN commit r10705.
2011-12-10 11:53:39 +00:00
db864f10c3
Rendering marker lines between buildings and rally points
...
Added command button to focus on rally point
(implements #524 )
This was SVN commit r10704.
2011-12-10 07:07:04 +00:00
fbb0e3995f
Added prop point axes markers to Atlas' Actor Viewer panel
...
This was SVN commit r10703.
2011-12-10 05:11:25 +00:00
8755eb0323
Persian scout tower prop variations
...
This was SVN commit r10702.
2011-12-09 23:54:07 +00:00
504922e280
Iberian Ram animations
...
This was SVN commit r10701.
2011-12-09 20:54:35 +00:00
201055a1aa
Iberian ram actor update
...
This was SVN commit r10700.
2011-12-09 19:06:49 +00:00
527190d0a5
Ram attack and attack order sound files
...
This was SVN commit r10699.
2011-12-09 18:38:35 +00:00
40f4fd1694
Updated Celt Ram model and new animations for it
...
This was SVN commit r10698.
2011-12-09 17:36:56 +00:00
4a6e945c00
New Persian gate structure model
...
This was SVN commit r10697.
2011-12-09 13:06:09 +00:00
1c19e905b1
Added prop points to Atlas' Actor Viewer
...
This was SVN commit r10696.
2011-12-09 10:49:08 +00:00
e04e19c561
This was SVN commit r10695.
2011-12-09 10:29:37 +00:00
b2e877282a
updated temple model
...
This was SVN commit r10694.
2011-12-09 00:43:20 +00:00
4b8bdc1b7d
New Persian Temple
...
This was SVN commit r10693.
2011-12-09 00:22:36 +00:00
6d7b7839c6
This was SVN commit r10692.
2011-12-08 22:40:30 +00:00
806e431c2e
This was SVN commit r10691.
2011-12-08 22:39:14 +00:00
d010b7019e
Persian Apadana sb1 new model
...
This was SVN commit r10690.
2011-12-08 19:37:47 +00:00
e52d0914ec
This was SVN commit r10689.
2011-12-08 10:51:11 +00:00
d19726a8bf
This was SVN commit r10688.
2011-12-08 08:31:05 +00:00
32703e6f12
garrisoned prop for the hele siege tower
...
This was SVN commit r10687.
2011-12-08 00:31:52 +00:00
dd9ba1e10a
Added check for if a position is defined in qBot. Fixes an unusual error.
...
This was SVN commit r10686.
2011-12-07 21:54:21 +00:00
da540aca77
trader prop model
...
This was SVN commit r10685.
2011-12-07 19:54:14 +00:00
a5c5f47427
Updated Persian chariot animations and models
...
This was SVN commit r10684.
2011-12-07 19:22:11 +00:00
a8b479b804
Persian horse/chariot stuff.
...
This was SVN commit r10683.
2011-12-07 14:56:26 +00:00
ae2725bcc1
Default maps for alpha 8 release
...
This was SVN commit r10682.
2011-12-07 14:27:41 +00:00
7f22118787
Testing some different barter values.
...
This was SVN commit r10681.
2011-12-06 18:25:40 +00:00
8424dfb75d
Oops. Fixed. ;)
...
This was SVN commit r10680.
2011-12-06 10:37:08 +00:00
18e0b374ee
More accurate <SpecificNames> for Greek entities.
...
This was SVN commit r10679.
2011-12-06 10:16:12 +00:00
f4e46d166d
sync with work; minor fixes (wsdl must report gfx memory in KB to match sdl)
...
This was SVN commit r10678.
2011-12-06 09:17:39 +00:00
7d77aa45f5
Persian wall tower prop
...
This was SVN commit r10677.
2011-12-05 22:49:45 +00:00
5d48c85e7b
New Persian wall, wall tower, and gate placeholder
...
This was SVN commit r10676.
2011-12-05 22:35:11 +00:00
eed62dc17c
Fix to celt homestead projectile error messages
...
This was SVN commit r10675.
2011-12-05 20:08:36 +00:00
3334868f8f
Added Darius to the Palace.
...
This was SVN commit r10674.
2011-12-05 17:16:22 +00:00
cb6f507aeb
#Darius The Great.
...
This was SVN commit r10673.
2011-12-05 17:10:30 +00:00
c5f8fefb96
Oodles of Persian stuff.
...
This was SVN commit r10672.
2011-12-05 16:34:48 +00:00
c1c740d359
#New Persian faction emblem.
...
This was SVN commit r10671.
2011-12-05 00:36:43 +00:00
cc23ea8f04
New Persian Farmstead.
...
Updated Oases maps.
This was SVN commit r10670.
2011-12-04 18:06:22 +00:00
592ae80021
Crown for Xerxes.
...
Pers ram edit.
This was SVN commit r10669.
2011-12-04 04:53:46 +00:00
9d238c3f4c
This was SVN commit r10668.
2011-12-03 15:28:07 +00:00
7805f70b6d
This was SVN commit r10667.
2011-12-03 15:06:50 +00:00
9388a0246c
This was SVN commit r10666.
2011-12-03 15:04:29 +00:00
3de6025d64
Persian stuff.
...
This was SVN commit r10665.
2011-12-03 14:29:22 +00:00
6ea3c49e37
Moved siege ram actor.
...
This was SVN commit r10664.
2011-12-03 13:10:20 +00:00
f4821d9230
# Assyrian Ram
...
This was SVN commit r10663.
2011-12-03 13:00:44 +00:00
fe91f37673
Xerxes work. Not complete yet.
...
This was SVN commit r10662.
2011-12-03 10:00:39 +00:00
6a2cf46a1b
Updates player assignment colors in game setup.
...
This was SVN commit r10660.
2011-12-02 22:26:53 +00:00
855f39f693
New "royal" (i.e. tall) Persian kidaris. Useful for Heroes and high ranking units.
...
This was SVN commit r10659.
2011-12-02 20:30:31 +00:00
ef58da1ba3
#Xerxes starting to take shape.
...
Adjusted some default AIs on a couple maps.
Moved training of Persian heroes to their palace.
This was SVN commit r10658.
2011-12-02 19:10:49 +00:00
1e7298c9b1
This was SVN commit r10657.
2011-12-02 14:53:38 +00:00
45d9ad2d25
This was SVN commit r10656.
2011-12-02 14:52:04 +00:00
218f1af68e
#Cyrus The Great (Kurush II)
...
Persian Healer
Tweaked Acropolis map.
This was SVN commit r10655.
2011-12-02 13:49:57 +00:00
b146f53d7b
This was SVN commit r10654.
2011-12-02 12:44:31 +00:00
8383f35eb8
Added queued as an optional parameter so that AI's can set waypoints
...
This was SVN commit r10653.
2011-12-02 00:25:20 +00:00
6599200a9e
# Added control group and idle unit hotkey's to the in-game manual
...
This was SVN commit r10652.
2011-12-01 23:39:46 +00:00
2d373d5353
Update to some maps.
...
Slightly touched up alpha channel in pers_struct.dds.
Tweaked territory radius for special buildings to look pretty.
Treasure templates.
This was SVN commit r10651.
2011-12-01 12:19:27 +00:00
e5eef18165
#New Persian Treasures.
...
This was SVN commit r10650.
2011-12-01 04:46:38 +00:00
68c88498e7
Fix to SB2
...
This was SVN commit r10649.
2011-11-30 16:19:31 +00:00
405ae7b4fc
Update to Zagros Mountains.xml
...
Persian siege ram placeholder.
This was SVN commit r10648.
2011-11-30 16:14:31 +00:00
afdfd51d31
Moving unused audio files from public to internal
...
This was SVN commit r10645.
2011-11-30 15:23:56 +00:00
0ad19f67cd
#New Persian Markets by Enrique!
...
Updates to Oasis 3, 4, and 5, which add the SB2 as the Persian starting
structure.
This was SVN commit r10644.
2011-11-30 15:01:09 +00:00
1c60aeca3c
Iberian portrait updates
...
This was SVN commit r10643.
2011-11-30 14:10:47 +00:00
81f550fdec
Changed fortress projectiles from flaming to non-flaming.
...
This was SVN commit r10642.
2011-11-30 12:17:33 +00:00
eed06c68a9
Large Persian chariot movement animations
...
This was SVN commit r10641.
2011-11-30 12:07:40 +00:00
759aa6c6bb
Persian medium chariot animations
...
This was SVN commit r10640.
2011-11-30 11:23:06 +00:00
613878da88
Spinning blade animations
...
This was SVN commit r10639.
2011-11-30 10:32:57 +00:00
e60f39f955
Rome civ centre
...
This was SVN commit r10638.
2011-11-30 05:32:53 +00:00
acb01541c3
Animations for the smaller Persian chariot
...
This was SVN commit r10637.
2011-11-29 23:44:34 +00:00
7236073877
# New camel animations by Athos
...
This was SVN commit r10636.
2011-11-29 21:32:02 +00:00
0ba908816f
Fix line endings
...
This was SVN commit r10635.
2011-11-29 21:04:38 +00:00
8492426a14
Rough support for profiling replay mode and scripts
...
This was SVN commit r10634.
2011-11-29 20:32:43 +00:00
4da8bf001f
Add pathfinders to new profiler
...
This was SVN commit r10633.
2011-11-29 20:29:50 +00:00
2d017698e1
Fix random maps in replay mode
...
This was SVN commit r10632.
2011-11-29 20:29:06 +00:00
24aa71b566
safely handle the case where an archive required for populating a directory cannot be opened (e.g. because it is open within 7-zip, which apparently wants exclusive access)
...
fixes #1021
This was SVN commit r10631.
2011-11-29 16:51:58 +00:00
b54ad51054
Fixed an error in the plumed conical helm.
...
Added Amish's bushy Persian hair helmet. ;)
Added Amish's new building portraits to their respective Persian
Buildings.js
Adjusted tooltips on some units.
Added an 8x8 foundation (for the Roman Civic Centre and anything else
that might need it).
This was SVN commit r10630.
2011-11-29 14:47:46 +00:00
2dab7a8180
This was SVN commit r10629.
2011-11-29 09:33:35 +00:00
1dc20b117f
Persian sb2 building placeholder
...
This was SVN commit r10628.
2011-11-29 00:41:07 +00:00
ee417e8fd0
Attempts to fix incorrect destructor order in random map generator. See #1037 , #1035 .
...
This was SVN commit r10627.
2011-11-29 00:14:34 +00:00
774c9e63e6
Oasis V
...
This was SVN commit r10626.
2011-11-28 13:11:25 +00:00
1941577abb
This was SVN commit r10625.
2011-11-28 03:53:47 +00:00
526e5b4c03
Adjusted obstructions and territory radii of these 5 buildings.
...
This was SVN commit r10624.
2011-11-28 02:14:23 +00:00
ede60520a0
Fixes Atlas and Actor Editor's wxMouseCaptureLostEvent handling, which caused assertion failures in Windows debug builds. Mouse capture events are currently wxMSW only.
...
This was SVN commit r10623.
2011-11-28 01:12:18 +00:00
e74d6707e4
Avoid calling glGenQueries while a timer query is active (hopefully fixes #1033 )
...
This was SVN commit r10622.
2011-11-27 22:24:05 +00:00
5a69860388
Adjusted Persian Civ Centre staircase texture to make usable for Apadana as well.
...
This was SVN commit r10621.
2011-11-27 18:06:18 +00:00
b1fa90b8ef
Use a deterministic order when loading multiple archive files from within a single mod
...
This was SVN commit r10620.
2011-11-27 17:33:42 +00:00
8712008ba8
missing horns
...
This was SVN commit r10619.
2011-11-27 17:30:39 +00:00
1acfcd4cb0
Persian Civ Centre update
...
This was SVN commit r10618.
2011-11-27 17:15:58 +00:00
810f4b264b
new Persian staircase texture.
...
This was SVN commit r10617.
2011-11-27 16:02:10 +00:00
e30b00e5fa
Updates to Persian Civ Centre - prop points, flags, etc.
...
This was SVN commit r10616.
2011-11-27 12:40:53 +00:00
c0d4b9c299
Adds Persians to random maps.
...
This was SVN commit r10615.
2011-11-27 04:06:27 +00:00
e2af05895e
Made Persian CC player color.
...
This was SVN commit r10614.
2011-11-27 02:21:23 +00:00
0afe4b1da8
Fixed some spacing in game setup screen. Found out that StoneScrollBars are broken (work, but don't display actual scrollbar) - using wheatScrollBars for now
...
This was SVN commit r10613.
2011-11-27 01:57:35 +00:00
3a240a5d92
Updated Zagros Mountains.
...
This was SVN commit r10612.
2011-11-27 01:41:37 +00:00
91965928d3
New Persian Civ Centre
...
This was SVN commit r10611.
2011-11-27 01:26:01 +00:00
301854702c
add support for removing individual files from VFS and a mechanism for automatically doing so (add filename.extension.DELETED to the same directory/archive), as discussed in meeting.
...
refactor: split up Invalidate into RemoveFile+RepopulateDirectory
GameSetup: fix: ensure the first mod always overrides game files,
irrespective of timestamp.
This was SVN commit r10610.
2011-11-26 18:37:53 +00:00
d82b85b8f3
Fix #1025 (add config option to toggle pause on window focus loss), based on patch by markcho.
...
This was SVN commit r10609.
2011-11-26 15:23:41 +00:00
565e9aa8a7
This was SVN commit r10608.
2011-11-26 12:54:37 +00:00
257a55e5e0
#Bartering resource buttons redone to look better.
...
This was SVN commit r10607.
2011-11-26 11:24:15 +00:00
4e62e0b59c
Updating the foundation actors and meshes, and dirt decals.
...
Added an "embassy" template.
This was SVN commit r10604.
2011-11-26 05:08:32 +00:00
2a44e8202e
Fixes tests after recent GuiInterface and UnitAI changes.
...
This was SVN commit r10603.
2011-11-26 01:58:39 +00:00
2b7657b855
Map tweaks.
...
This was SVN commit r10602.
2011-11-25 23:35:05 +00:00
dfdeb4ec4c
Make Victory / Defeat message more dramatic
...
This was SVN commit r10601.
2011-11-25 21:04:06 +00:00
8b41509b80
Hotfix for broken field selection boxes. Closes #1030 .
...
This was SVN commit r10598.
2011-11-25 17:01:19 +00:00
69d5b07bb4
Rearrange buttons in ingame menu
...
This was SVN commit r10597.
2011-11-25 16:04:30 +00:00
6ab2a62c3f
Dead tree entity.
...
This was SVN commit r10596.
2011-11-25 09:07:34 +00:00
151d6293c2
This was SVN commit r10595.
2011-11-25 08:08:17 +00:00
85186c98b2
Better selection boxes. Closes #914 , #295 , #810 .
...
This was SVN commit r10593.
2011-11-25 06:36:13 +00:00
9e97c73544
This was SVN commit r10592.
2011-11-25 03:25:19 +00:00
f1c227b7da
This was SVN commit r10590.
2011-11-24 23:34:27 +00:00
d417cb6ad1
Updated Zagros Mountains with eye candy.
...
This was SVN commit r10589.
2011-11-24 23:14:49 +00:00
8cbab40137
Barter. Closes #23 .
...
This was SVN commit r10588.
2011-11-24 15:43:32 +00:00
d81516defd
A bunch of "Persia" terrain textures.
...
This was SVN commit r10587.
2011-11-24 10:19:01 +00:00
8caef28726
This was SVN commit r10586.
2011-11-24 03:56:18 +00:00
9489076c51
Fixes logic error in 8d977e4818.
...
This was SVN commit r10585.
2011-11-24 01:16:30 +00:00
8d977e4818
Allows building in fog of war. Fixes #958 .
...
This was SVN commit r10584.
2011-11-24 00:58:34 +00:00
2878102ed7
Avoid some code duplication
...
This was SVN commit r10583.
2011-11-23 21:26:14 +00:00
ab88151ed0
Fix uninitialised value
...
This was SVN commit r10582.
2011-11-23 21:24:41 +00:00
c311e8abba
Improves Persian support.
...
This was SVN commit r10581.
2011-11-23 19:32:02 +00:00
3e23e2b621
This was SVN commit r10580.
2011-11-23 12:49:59 +00:00
f8303b51c5
Fixes gathering after dropsite construction.
...
This was SVN commit r10579.
2011-11-23 04:59:02 +00:00
b9373a9dd3
Tweaks to Death Canyon II.xml
...
Fixed Persian bireme template.
Added Persian bireme to Persian Dock.
This was SVN commit r10577.
2011-11-23 02:29:29 +00:00
37b8f8b0d0
Fixes missing template errors on combat demo.
...
This was SVN commit r10576.
2011-11-22 23:32:06 +00:00
c48216e055
Persian Bireme
...
This was SVN commit r10575.
2011-11-22 23:11:27 +00:00
ca8e0aa5f5
Reorganized the Sparabara shields a bit.
...
This was SVN commit r10574.
2011-11-22 12:24:29 +00:00
52c01aa311
2nd Kardakes texture.
...
Added War Elephants to Persian Fortress until the Assyrian Siege Ram is
complete.
This was SVN commit r10573.
2011-11-22 11:42:11 +00:00
235a107aa3
Kardakes Skirmisher.
...
This was SVN commit r10572.
2011-11-22 03:44:48 +00:00
3f7f7bf66f
Agrianian Peltasts.
...
New "Taka" shield meshes.
This was SVN commit r10571.
2011-11-22 03:14:27 +00:00
5cc856aedc
Re-enables build restrictions for AIs since they have basic compliance now.
...
Moves target ownership checks from Commands.js to UnitAI.
Adds more robust target checking in UnitAI by calling CanFoo functions
more frequently.
Adds optional debugging mode to Commands.js (useful for AI developers).
This was SVN commit r10570.
2011-11-22 00:16:35 +00:00
e9041a392b
Garrison flags for Celt Temple and Barracks.
...
This was SVN commit r10568.
2011-11-21 03:53:55 +00:00
4de8954798
#Fixed Celt temple prop point.
...
Tweaked some tooltips.
This was SVN commit r10567.
2011-11-21 01:55:44 +00:00
29df8546c0
Updated Persian mill
...
This was SVN commit r10566.
2011-11-20 21:00:29 +00:00
c556926e3a
New Persian Barracks
...
This was SVN commit r10565.
2011-11-20 14:24:52 +00:00
aad5437125
New Persian "taka" shield designs.
...
This was SVN commit r10564.
2011-11-20 05:09:06 +00:00
18eefc7303
Fixes simulation replay mode in Windows.
...
This was SVN commit r10563.
2011-11-20 02:00:54 +00:00
901a87af2e
Tweaked camera settings.
...
This was SVN commit r10562.
2011-11-19 20:37:16 +00:00
514b22a89e
Support for Persians, should all work properly. Also makes territory expansion proportionally lower priority.
...
This was SVN commit r10561.
2011-11-19 16:00:54 +00:00
f80f1fb86b
This patch adds territory support for JuBot, which is the main thing to get it up to date for the next alpha. More advanced features are in development but some will probably have to wait until Christmas/Early 2012.
...
This was SVN commit r10560.
2011-11-19 13:44:56 +00:00
20df816fbc
Resource building class
...
This was SVN commit r10559.
2011-11-19 13:42:43 +00:00
31bcb5c803
Fixes buggy selection behavior due to incorrect camera plane calculation.
...
This was SVN commit r10558.
2011-11-19 05:05:59 +00:00
8b6714a62d
Some minor tweaks to camera defaults.
...
This was SVN commit r10557.
2011-11-19 02:15:01 +00:00
7772192a69
Fixed smoke prop points on cart tophet
...
This was SVN commit r10556.
2011-11-18 22:52:15 +00:00
5fe97328a6
Fixed run animation.
...
This was SVN commit r10555.
2011-11-18 22:23:04 +00:00
9dec98e5e0
Actor updates trying to get Persian War elephant to use the running animation, with no success.
...
Entity template updates to tooltips.
This was SVN commit r10554.
2011-11-18 21:27:18 +00:00
fc325991a0
Added visionRange function to read this value from the templates for the AI to use.
...
This was SVN commit r10553.
2011-11-18 21:11:15 +00:00
7a164c6a7b
Map tweaks. New shield texture for Elite Persian spearman. Horse actors for the basic chariot.
...
This was SVN commit r10552.
2011-11-18 07:51:12 +00:00
06bd4352c2
Persian unit updates!
...
This was SVN commit r10550.
2011-11-18 01:54:03 +00:00
39d100c732
Moves camera projection settings to default.cfg.
...
Changes field of view (FOV) to 45 degrees per discussion. Fixes #941 .
Tweaks default camera zoom and rotation accordingly.
This was SVN commit r10548.
2011-11-17 23:34:01 +00:00
432a48c849
3rd advanced archer texture.
...
This was SVN commit r10546.
2011-11-17 05:17:31 +00:00
aae10116fe
Persian kidaris hat models and textures
...
This was SVN commit r10545.
2011-11-17 00:25:08 +00:00
6b1ce04aad
Fix VC2008 compatibility
...
This was SVN commit r10544.
2011-11-16 17:49:28 +00:00
56776aa971
Fixed Advanced Persian Archer's rank.
...
This was SVN commit r10543.
2011-11-16 09:01:07 +00:00
c21304900a
Persian stuff.
...
This was SVN commit r10542.
2011-11-16 08:35:52 +00:00
d9339b4497
Kidaris hats.
...
This was SVN commit r10541.
2011-11-16 03:48:02 +00:00
545ad5e8da
#Persian Kardakes hoplite.
...
This was SVN commit r10540.
2011-11-15 09:26:36 +00:00
e21eb8eec4
Prop and animation fixes.
...
This was SVN commit r10539.
2011-11-15 03:38:10 +00:00
afb77be687
#Changed up the Greek hoplite.
...
Tweaked some animation speeds and footprints.
Added a Roman Healer for the Roman Temple.
This was SVN commit r10538.
2011-11-15 03:06:14 +00:00
f66a3e726f
Avoid overflow identified by /RTCc warning
...
This was SVN commit r10537.
2011-11-14 22:22:38 +00:00
98b62d9733
New fortresses for the Persians
...
This was SVN commit r10536.
2011-11-14 22:04:27 +00:00
5bd7b74ec7
Fix ABI incompatibility with --with-system-mozjs185 in debug mode (see #990 ).
...
This was SVN commit r10535.
2011-11-14 18:18:04 +00:00
ed5a64aae4
Add --with-system-mozjs185 build flag. Fixes #990 , based on patch by infyquest.
...
This was SVN commit r10534.
2011-11-14 16:10:41 +00:00
b56692a2c7
#Roman Temple by Enrique.
...
Some stuff.
This was SVN commit r10533.
2011-11-14 04:19:32 +00:00
27847fb078
Fixes BuildLimits init so its data serializes correctly (they should be objects not arrays).
...
This was SVN commit r10532.
2011-11-14 00:02:54 +00:00
5ae93ddae7
Makes AIProxy keep the garrisoned units array up to date. Fixes #1019
...
This was SVN commit r10531.
2011-11-13 23:23:58 +00:00
ade841efdd
Avoid assertion failures on abnormal exit() (e.g. dumpSchema mode)
...
This was SVN commit r10530.
2011-11-13 21:37:12 +00:00
fbff0aa98d
Fix printf argument types
...
This was SVN commit r10529.
2011-11-13 18:31:06 +00:00
97d3f1cfc9
Added a squared vector function for A^2 + B^2 without the rooting, in case massively large nos of vector calculations are needed.
...
This was SVN commit r10528.
2011-11-13 15:56:37 +00:00
3a678a0c7c
Fix time elapsed counter briefly showing old value when toggled on
...
This was SVN commit r10527.
2011-11-13 13:23:54 +00:00
e7f0639054
Set Atlas canvas size before potentially rendering to it. Fixes #987 .
...
This was SVN commit r10526.
2011-11-13 12:57:34 +00:00
72237c32a2
Avoid release-mode warnings
...
This was SVN commit r10525.
2011-11-13 12:31:41 +00:00
c574a85dd3
Given the new Dropsite classes to mills and farmsteads - they'll need to be added to CCs and Docks at some point, but for the moment I'm dealing with CCs separately and the AI still doesn't build docks so that's lower priority.
...
This was SVN commit r10524.
2011-11-13 12:16:46 +00:00
f3c21d070e
Added some new classes, DropsiteFood/Wood/Stone/Metal, to help with building placement.
...
This was SVN commit r10523.
2011-11-13 12:12:33 +00:00
f0f81827f3
Fix build with old GCCs
...
This was SVN commit r10522.
2011-11-13 01:04:40 +00:00
fc9e89647b
Adds basic support for Code::Blocks on the Mac and Linux.
...
The Project structure is still a bit strange, but it builds successfully
now.
This was SVN commit r10521.
2011-11-12 23:58:35 +00:00
f865401136
Detect allocation failure
...
This was SVN commit r10520.
2011-11-12 23:57:33 +00:00
7fcc76b621
Fix XML formatting
...
This was SVN commit r10519.
2011-11-12 22:26:01 +00:00
ff064aca95
Adds useful stats to training and construction tooltips, based on patch from pejuko. Fixes #872 .
...
This was SVN commit r10518.
2011-11-12 22:23:08 +00:00
99e012ba56
Fix comments
...
This was SVN commit r10517.
2011-11-12 22:08:59 +00:00
95bd6f874e
Fix OS X build by using GL_TIME_ELAPSED consistently
...
This was SVN commit r10516.
2011-11-12 19:29:48 +00:00
70224e7940
Fix missing symbols in old glext
...
This was SVN commit r10515.
2011-11-11 11:56:51 +00:00
0192c24ebc
Fix warning in old GCCs
...
This was SVN commit r10514.
2011-11-11 11:55:27 +00:00
d267657ffe
Added garrison flag to these two barracks.
...
This was SVN commit r10513.
2011-11-11 02:49:18 +00:00
7dbef7c62e
Fixed some garrison flag prop points. Still a lot more to go.
...
This was SVN commit r10512.
2011-11-11 02:38:00 +00:00
3645620df6
Fixed prop points on Celt tower.
...
Other things.
This was SVN commit r10511.
2011-11-11 02:14:37 +00:00
29d61601f9
Persian cavalry actor work.
...
This was SVN commit r10510.
2011-11-11 02:07:49 +00:00
fdf9b6b802
This was SVN commit r10509.
2011-11-11 01:24:32 +00:00
5a008c6787
Switched Elite Hyrcanian look for the Elite Median look. The Hyrcanians had more Scythian influences than the Medians.
...
Added projectiles to Persian CC and Fortress to see if I can get rid of
those error messages in-game.
This was SVN commit r10508.
2011-11-11 01:04:35 +00:00
6be23a5894
Disable shaders on SiS Mirage 3 for compatibility. Fixes #964 .
...
This was SVN commit r10507.
2011-11-11 01:03:32 +00:00
0cb7f6ce02
Fixed Persian Stables prop points.
...
Added something extra to the actor. :)
This was SVN commit r10506.
2011-11-11 00:14:39 +00:00
91fd644982
New "sunny" sky box.
...
This was SVN commit r10505.
2011-11-10 23:59:46 +00:00
d60c87cfa8
Two new sky boxes and an updated Cumulus sky box.
...
This was SVN commit r10504.
2011-11-10 22:45:31 +00:00
56d634bf49
Fix invalid characters in entity templates. Add script to find unrecognised characters.
...
Fixes #960 .
This was SVN commit r10503.
2011-11-10 19:31:35 +00:00
77f8f95d20
Updated the names of the Persian units and structures. Removed Tachara and replaced with Apadana.
...
Took out some random flame and smoke actors from the Median Oasis map.
This was SVN commit r10502.
2011-11-10 00:49:54 +00:00
f2bbc9d4b5
Re-added Median Oasis, as a Greek vs. Persia map.
...
This was SVN commit r10501.
2011-11-09 23:58:07 +00:00
694c131a3a
Fix to Persian scout tower mesh. prop points aligned.
...
This was SVN commit r10500.
2011-11-09 23:28:51 +00:00
3916c25b84
Optimise vertex skinning code with SSE, based on patch by gruby.
...
Fixes #905 .
This was SVN commit r10499.
2011-11-09 23:11:28 +00:00
9545f783a1
Removing old cart props and actors
...
This was SVN commit r10498.
2011-11-09 23:04:54 +00:00
0514f97508
Fixing projectile and garrison points. Adding foundations.
...
This was SVN commit r10497.
2011-11-09 22:52:05 +00:00
87b3b0856f
Fix warning
...
This was SVN commit r10496.
2011-11-09 22:35:31 +00:00
8617dfd0e1
Avoid fatal error on printf overflow in profiler
...
This was SVN commit r10495.
2011-11-09 18:29:08 +00:00
f2ea307507
Moved warning and debug messages to below the top bar.
...
This stops them obscuring the useful inormation in the bar.
This was SVN commit r10494.
2011-11-09 17:01:57 +00:00
b090ec48ce
Add query counter bits to hwdetect
...
This was SVN commit r10493.
2011-11-09 13:10:34 +00:00
cfb79c3062
# Add GPU performance profiling support.
...
Add some profiler region attributes.
Render events in profile visualiser.
Change profiler from GPL to MIT.
This was SVN commit r10492.
2011-11-09 13:09:01 +00:00
8fba3f92b1
Allow better hwdetect debugging
...
This was SVN commit r10491.
2011-11-09 11:54:05 +00:00
7b12132650
New "sagaris" battle axe prop.
...
Tweaking Persian units.
Added Persians to "Oasis III."
This was SVN commit r10490.
2011-11-09 07:58:40 +00:00
f15360e673
Fixed prop points on Persian chariots.
...
This was SVN commit r10489.
2011-11-09 02:46:37 +00:00
8616e89429
Fixed a mistake.
...
This was SVN commit r10488.
2011-11-09 02:25:35 +00:00
7e0de56f1a
More work on Persian units.
...
Also tweaking walking speeds for other units as I run across them.
This was SVN commit r10487.
2011-11-09 02:23:19 +00:00
feb76f9d08
Moar unit tweaks.
...
This was SVN commit r10485.
2011-11-09 00:44:40 +00:00
ab347de754
Fixes PMD converter's handling of static prop points. Coordinate conversion was not performed correctly according to the model's up-axis orientation. Fixes #886 , #243 .
...
This was SVN commit r10484.
2011-11-09 00:10:14 +00:00
cb27a680bf
Fix profiler shutdown order
...
This was SVN commit r10483.
2011-11-09 00:09:19 +00:00
d9f3e329f0
#Tweaked unit walking speeds.
...
This was SVN commit r10482.
2011-11-08 22:14:28 +00:00
9dfe451ea6
skeletons.xml update adding 6 wheel vehicle
...
This was SVN commit r10481.
2011-11-08 20:46:03 +00:00
761ad58f1a
Unit work.
...
This was SVN commit r10480.
2011-11-08 19:28:29 +00:00
b073473d21
hele siege tower animations
...
This was SVN commit r10479.
2011-11-07 19:28:06 +00:00
ff9cc55162
New animation for hele fishing boat
...
This was SVN commit r10478.
2011-11-07 17:08:48 +00:00
5adaa6a095
tweak to fishing boat animation speeds
...
This was SVN commit r10477.
2011-11-07 16:23:49 +00:00
768baee2ca
Added 2nd Cart peace tune to the roster.
...
This was SVN commit r10476.
2011-11-07 08:17:20 +00:00
89be61033f
This was SVN commit r10475.
2011-11-07 08:04:03 +00:00
9f9834cac4
This was SVN commit r10474.
2011-11-07 08:03:13 +00:00
2bdf5d0440
#Big Persian unit update. Still need a lot of work.
...
This was SVN commit r10473.
2011-11-07 03:11:18 +00:00
26501fd8c2
Persian unit tweaks.
...
This was SVN commit r10472.
2011-11-07 00:44:38 +00:00
8f3255f9c8
Fix tests and Atlas with new profiler
...
This was SVN commit r10471.
2011-11-05 23:09:31 +00:00
b13f1cade5
# UI for new profiling tool
...
This was SVN commit r10467.
2011-11-04 01:43:46 +00:00
09a02c96d5
Add initial code annotations for the new profiling tool
...
This was SVN commit r10466.
2011-11-04 01:35:50 +00:00
9965f43067
# Engine support for new profiling tool
...
This was SVN commit r10465.
2011-11-04 01:33:07 +00:00
4ef66a6950
Provide JSON-compatible string escaping
...
This was SVN commit r10464.
2011-11-04 01:18:34 +00:00
9cbf587e59
Import Mongoose HTTP server library
...
This was SVN commit r10463.
2011-11-03 23:36:54 +00:00
05c42846ec
#Persian champion cavalry updates.
...
This was SVN commit r10462.
2011-11-03 04:48:02 +00:00
50d2379709
This was SVN commit r10461.
2011-11-03 01:58:56 +00:00
8f2048db49
Animated hele fishing boat.
...
This was SVN commit r10460.
2011-11-03 01:10:25 +00:00
e33ef0cb73
Iberian Ram animation fix to wheels
...
This was SVN commit r10459.
2011-11-03 00:06:12 +00:00
d1515214ab
Persian scout tower
...
This was SVN commit r10458.
2011-10-31 00:35:59 +00:00
0db6cfd2f7
Fixes crash in Atlas camera handlers, focus loss causes a scroll action, and seg fault if game not initialized. Fixes #988 .
...
Fixes particles lingering in actor viewer when switching actors, by
clearing unattached particle emitters.
This was SVN commit r10457.
2011-10-30 05:09:31 +00:00
cf7aab4425
Avoid errors on loading screen when there are no saved games
...
This was SVN commit r10455.
2011-10-30 00:37:00 +00:00
7064565ff6
# Allow saving and loading single-player games.
...
Support writing zip files based on in-memory data.
Fix menu sliding animations to be framerate independent.
This was SVN commit r10454.
2011-10-30 00:07:28 +00:00
21c6141cdc
Preserve player colours and animations when serializing models
...
This was SVN commit r10453.
2011-10-29 15:30:46 +00:00
b454ccca79
Fix GUI issues when reconnecting to multiplayer games
...
This was SVN commit r10452.
2011-10-29 14:53:13 +00:00
0a676171a5
This was SVN commit r10451.
2011-10-28 23:18:07 +00:00
7edf74c594
some small updates
...
This was SVN commit r10450.
2011-10-28 23:12:47 +00:00
23ae535a1e
Minor enhancements to serialization test mode
...
This was SVN commit r10449.
2011-10-28 13:18:16 +00:00
f31a8f7181
Fix warning
...
This was SVN commit r10448.
2011-10-28 13:16:53 +00:00
05d7742ec8
Increase trace cache size to cope slightly better with serialization test mode
...
This was SVN commit r10447.
2011-10-28 13:16:30 +00:00
959b5a505c
Fix bug in incremental LOS computation
...
This was SVN commit r10446.
2011-10-28 13:15:33 +00:00
69feade908
projectiles speeds.
...
Added pers trireme to pers dock.
This was SVN commit r10445.
2011-10-28 03:23:19 +00:00
9be68c42e1
Larger dock for the Persians
...
This was SVN commit r10444.
2011-10-27 22:23:56 +00:00
b59e27f678
Fix assertion failure in replay mode
...
This was SVN commit r10443.
2011-10-27 21:22:41 +00:00
d57bb00ece
Fix sparse array serialization
...
This was SVN commit r10442.
2011-10-27 20:56:32 +00:00
a739b8f309
Fix some saved-game OOS errors
...
This was SVN commit r10441.
2011-10-27 20:12:00 +00:00
4c561dc3f9
Improve debugging of binary serialization
...
This was SVN commit r10440.
2011-10-27 20:10:53 +00:00
2fa8124c61
Added variations to Persian stable horses
...
This was SVN commit r10439.
2011-10-27 19:50:08 +00:00
530d5216bf
Fix OOS error after saving/loading
...
This was SVN commit r10438.
2011-10-27 17:38:44 +00:00
bfe2126a17
# Support rejoining multiplayer games after disconnection.
...
This was SVN commit r10437.
2011-10-27 16:46:48 +00:00
6d071123cc
Add simple functions for zlib compression with embedded length headers
...
This was SVN commit r10436.
2011-10-27 14:21:58 +00:00
85e16f95b1
Use debug_printf for script print() function, so it's more visible on Windows
...
This was SVN commit r10435.
2011-10-27 14:19:37 +00:00
18e595a5a6
Fix OOS-log paths to work on Windows
...
This was SVN commit r10434.
2011-10-27 14:17:39 +00:00
dfc92de51b
Avoid outputting non-printable-ASCII characters in the network log
...
This was SVN commit r10433.
2011-10-27 14:16:28 +00:00
a2bba82b9d
Let CFsm actions override the default state transition
...
This was SVN commit r10432.
2011-10-27 14:10:55 +00:00
28d7f52578
Updates to Persian Stables
...
This was SVN commit r10431.
2011-10-26 23:09:28 +00:00
ab6863c484
This was SVN commit r10430.
2011-10-26 05:41:57 +00:00
c82ebd7ca9
Fixes Atlas build on OS X.
...
This was SVN commit r10429.
2011-10-26 05:27:03 +00:00
08e37f1a71
Avoid potential aliasing violation in endian functions
...
This was SVN commit r10428.
2011-10-25 14:02:50 +00:00
a3c03815c0
Experimental quicksave/quickload feature
...
This was SVN commit r10427.
2011-10-24 14:55:45 +00:00
29e4f633f1
Add initial serialization test mode.
...
Reduce some dependencies on CSimulation2 to provide more flexibility.
This was SVN commit r10426.
2011-10-24 14:31:05 +00:00
0f3119e36a
Fix deserialization of actor components
...
This was SVN commit r10425.
2011-10-24 12:24:04 +00:00
79faed2ee2
Added 'Naval Maps' scenario filter
...
This was SVN commit r10424.
2011-10-23 22:42:50 +00:00
336552e5fd
Tweak build limits to match what b48c35c512 attempted to set them to
...
This was SVN commit r10423.
2011-10-23 21:07:27 +00:00
3efb3949d3
Clean up unused argument
...
This was SVN commit r10422.
2011-10-23 21:00:59 +00:00
f4ed019c46
Avoid hypotf
...
This was SVN commit r10421.
2011-10-23 12:27:34 +00:00
83955072b6
Fix typos
...
This was SVN commit r10420.
2011-10-23 12:26:47 +00:00
bd73308d49
Avoid apparent bug in VirtualBox's GL implementation
...
This was SVN commit r10419.
2011-10-22 10:25:09 +00:00
017e8d66eb
Fixes GUIInterface tests.
...
This was SVN commit r10418.
2011-10-22 00:10:17 +00:00
5acf38c095
Randomizes player starting positions on random maps.
...
This was SVN commit r10417.
2011-10-21 01:15:02 +00:00
d966c5e10b
Fixes Atlas map saving to force PMP extension on all OSes. See #889 .
...
Fixes Atlas map loading to more gracefully handle missing files. Atlas
should no longer crash if a map was not found in VFS. Fixes #986 .
This was SVN commit r10416.
2011-10-20 23:45:27 +00:00
887b6633c2
Adds per-player BuildLimits data to GUIInterface.
...
Adds BuildLimits accessors to GameState for JuBot and Testbot.
This was SVN commit r10415.
2011-10-20 23:35:52 +00:00
ff256528f2
sync with work. faster PopulationCount; avoid invalid param handler when debug string length exceeded; return error instead of dialog box when waio_Preallocate fails
...
This was SVN commit r10414.
2011-10-19 10:58:02 +00:00
a41b0e30fe
Changes AI entity destroy events to maintain some data about the entity, based on patch by quantumstate. Fixes #983 .
...
This was SVN commit r10413.
2011-10-18 22:51:04 +00:00
686ffa9758
Fixes error in AI entity. Fixes #991 .
...
This was SVN commit r10412.
2011-10-16 17:21:37 +00:00
f3e081a122
Fix couple simulation templates.
...
This was SVN commit r10411.
2011-10-16 17:03:43 +00:00
8af8326563
replace old pool_allocator/RawPoolAllocator with ProxyAllocator that draws upon the new-style Arena (more efficient, avoids slow VirtualAlloc)
...
This was SVN commit r10410.
2011-10-16 10:37:21 +00:00
1c081135ad
Adds territory map to AI GameState, based on patch from quantumstate. Fixes #969 .
...
Updates testbot and Jubot to support basic build restrictions.
This was SVN commit r10408.
2011-10-16 02:55:58 +00:00
c73c0870f1
Adds attackTimes to AI entity templates. Fixes #991 .
...
This was SVN commit r10407.
2011-10-15 23:38:58 +00:00
20047ffe76
Remove old duplicate directory.
...
This was SVN commit r10406.
2011-10-15 23:26:15 +00:00
6c102ea712
add instrumentation to diagnose failed VM commit
...
This was SVN commit r10405.
2011-10-15 22:03:42 +00:00
3624f7c417
fix: pthread_self now returns a unique value in each thread (before, it was using the windows pseudo handle functionality)
...
This was SVN commit r10404.
2011-10-15 20:12:59 +00:00
581b4f7997
This was SVN commit r10403.
2011-10-14 05:32:11 +00:00
d9820fb0cb
Add optional time elapsed counter to session screen.
...
This was SVN commit r10402.
2011-10-13 23:20:34 +00:00
3e71b3e864
Removing old Persian files
...
This was SVN commit r10401.
2011-10-13 20:17:09 +00:00
9a7f09abe2
New Persian dock
...
This was SVN commit r10400.
2011-10-13 20:14:50 +00:00
f0df97d773
add support for retrieving all WMI class instances (required for detecting multiple graphics and sound cards)
...
fixes #998
This was SVN commit r10399.
2011-10-13 18:53:59 +00:00
9fdcc7a2fa
A couple of updated maps.
...
This was SVN commit r10398.
2011-10-13 13:25:18 +00:00
9bb22c91a1
A package of chariot updates.
...
This was SVN commit r10397.
2011-10-12 11:59:43 +00:00
d8e49c4ca8
Chariot portrait.
...
This was SVN commit r10396.
2011-10-12 08:13:09 +00:00
22d169f3c6
A bunch of Persian chariot stuff.
...
This was SVN commit r10395.
2011-10-12 07:16:55 +00:00
2a39ba2f91
Changes new AI GameState functions to accept Entity objects instead of raw entities.
...
This was SVN commit r10394.
2011-10-12 00:33:07 +00:00
b28ae93dc8
Adds armour and attack strengths to AI entity template, based on patch by infyquest. Fixes #991 .
...
This was SVN commit r10393.
2011-10-11 20:02:21 +00:00
81abd0342f
Made Greek prodromoi use knives to gather meats. Balanced hyps and thors.
...
This was SVN commit r10392.
2011-10-11 15:16:30 +00:00
c83a79f239
This was SVN commit r10391.
2011-10-11 15:12:07 +00:00
c1cd29f2f4
Tweaks to thorakites and thureophoros.
...
This was SVN commit r10390.
2011-10-11 14:28:54 +00:00
baf8028e4c
This was SVN commit r10389.
2011-10-11 14:20:51 +00:00
d05592e77f
#Miscellaneous units. Thanks SMST!
...
This was SVN commit r10388.
2011-10-11 14:05:14 +00:00
956e6b5f77
Persian texture updates and chariot updates.
...
This was SVN commit r10387.
2011-10-11 12:56:58 +00:00
0fa54bc56a
fix compile error due to GCC restriction.
...
thanks to daniel.santos for reporting and alex for creating the
ticket/notifying me.
fixes #992
[heh, the amount of comments are proportional to the trouble caused by
this code :S ran into VC++ compile errors when __declspec came after
void* return type *sigh*]
This was SVN commit r10385.
2011-10-10 20:08:04 +00:00
8ac994e4e6
sync with work: add and use NOTHROW; export file_system functions; throw Status from File ctor; add WARN_THROW equivalents of WARN_RETURN
...
This was SVN commit r10384.
2011-10-10 10:04:36 +00:00
6c6c374a11
This was SVN commit r10383.
2011-10-09 21:50:58 +00:00
470bff16c7
This was SVN commit r10382.
2011-10-09 21:34:43 +00:00
22c7346dbd
Persian stable actor and template
...
This was SVN commit r10381.
2011-10-09 19:57:29 +00:00
bb32cc9794
This was SVN commit r10379.
2011-10-09 12:18:25 +00:00
6ef517d3c4
Updating Persians. Added Persians to Oasis IV map.
...
This was SVN commit r10378.
2011-10-09 11:00:01 +00:00
45cd62fc93
#Persian infantry unit actor/animation work. They now use the proper animations and props when performing various tasks.
...
This was SVN commit r10377.
2011-10-09 10:13:48 +00:00
a240958de3
Removes Conquest Critical class from obelisks
...
This was SVN commit r10375.
2011-10-08 23:53:34 +00:00
a106b9da0b
apic: avoid warning message for ancient single-core, non-HT processors. fixes #985
...
wvm: improve diagnostics if allocation failed
This was SVN commit r10374.
2011-10-08 16:53:57 +00:00
39e5cb5dc9
proper fix for brain-dead Linux affinity API (that code was disabled in #547 )
...
refs #985
This was SVN commit r10373.
2011-10-08 16:42:30 +00:00
90cac1b7b0
Persian Scythed Chariot
...
This was SVN commit r10372.
2011-10-08 15:43:11 +00:00
8b88ae6302
Persian Corral building
...
This was SVN commit r10371.
2011-10-08 14:38:02 +00:00
7bbe2b3bab
Removing old unused Persian house assets
...
This was SVN commit r10370.
2011-10-08 14:26:55 +00:00
de7596a3a8
New Persian houses
...
This was SVN commit r10369.
2011-10-08 14:20:20 +00:00
706dea144f
This was SVN commit r10368.
2011-10-08 03:44:48 +00:00
45b8889479
Yeah there is.
...
This was SVN commit r10367.
2011-10-07 20:42:51 +00:00
1a81324e4e
Misc stuff:
...
-- Updated some Persian shield textures.
-- Made a portrait for the Persian merchant ship.
-- Created entity for Persian fishing boat.
This was SVN commit r10366.
2011-10-07 05:02:00 +00:00
e7cbe197a6
New sail design.
...
This was SVN commit r10365.
2011-10-06 05:51:25 +00:00
b0ad0d97be
Remove Premake3 files. Closes #934 .
...
This was SVN commit r10362.
2011-10-03 19:09:03 +00:00
c53c098fec
Fix to lion run speed
...
This was SVN commit r10361.
2011-10-02 19:36:42 +00:00
fce9b9a37e
Fix to skeleton unit crash in Atlas
...
This was SVN commit r10360.
2011-10-02 18:39:44 +00:00
9cc13a2b80
This was SVN commit r10359.
2011-10-02 04:16:55 +00:00
3f3b5ee3e5
Adds player ID to PlayerDefeated message for AI usage.
...
This was SVN commit r10358.
2011-10-01 17:38:43 +00:00
0028d1640d
Removes ConquestCritical class from certain non unit-producing structures.
...
This was SVN commit r10357.
2011-10-01 17:29:09 +00:00
5336ad0eea
This was SVN commit r10356.
2011-10-01 09:31:40 +00:00
88ee37d0f6
Oops. Revert market template changes.
...
This was SVN commit r10355.
2011-10-01 05:14:36 +00:00
48c7eab4e8
Add 'Not implemented yet' note to healer tooltips.
...
This was SVN commit r10354.
2011-10-01 05:03:23 +00:00
55e9ffe294
Adds the ForestPlant class.
...
This was SVN commit r10353.
2011-09-30 21:12:11 +00:00
3bb05d77a6
Adds a new class, ForestPlant
...
This was SVN commit r10352.
2011-09-30 21:11:50 +00:00
47c9f6ca2d
Changes IsSeaCreature to SeaCreature
...
This was SVN commit r10351.
2011-09-30 21:05:26 +00:00
df6cf0c5e8
Changes IsSeaCreature to SeaCreature, gives whales SeaCreature
...
This was SVN commit r10350.
2011-09-30 21:04:01 +00:00
667d016c83
Changes IsSeaCreature to SeaCreature
...
This was SVN commit r10349.
2011-09-30 21:00:49 +00:00
6dbd081219
Fixes AIs gathering enemy (non-gaia) resources, such as fields.
...
This was SVN commit r10348.
2011-09-30 19:54:04 +00:00
6594a527db
Another bugfix attempt
...
This was SVN commit r10347.
2011-09-30 17:54:04 +00:00
3a7fac7c4d
Bugfix #2
...
This was SVN commit r10346.
2011-09-30 17:11:01 +00:00
b3d5075408
Bugfix
...
This was SVN commit r10345.
2011-09-30 17:03:21 +00:00
64a0a5e58a
Now much more strictly restricts the game to 1 foundation at once.
...
This was SVN commit r10344.
2011-09-30 16:50:33 +00:00
a5a134fa87
CC building now emphasised over house building.
...
This was SVN commit r10343.
2011-09-30 16:43:12 +00:00
d271090bbd
Fixes Carthage starting calvary to CC unit instead of mercenary (affects random maps), based on patch by kephra. Fixes #981 .
...
This was SVN commit r10342.
2011-09-29 21:46:43 +00:00
4fd84919cd
This was SVN commit r10341.
2011-09-28 23:43:26 +00:00
e0255741d8
Adds BuildRestrictions accessors to AI's EntityTemplate (important for proper territory support).
...
This was SVN commit r10340.
2011-09-28 19:51:40 +00:00
b40ba972c1
Adds diplomacy functions to Jubot and Testbot gamestate (eventually replace e.g. Entity.isEnemy() with these).
...
This was SVN commit r10339.
2011-09-28 19:40:50 +00:00
75c7028e24
Stops the builders regrouping to town centre, because this is no longer really needed.
...
This was SVN commit r10338.
2011-09-28 15:50:06 +00:00
9cf932eaee
Persian Healer
...
This was SVN commit r10337.
2011-09-28 05:27:54 +00:00
4f18eddc15
Messing with whale actor/entity.
...
Chariot texture.
Persian healer.
This was SVN commit r10336.
2011-09-28 05:23:18 +00:00
43cebfc2dc
This was SVN commit r10335.
2011-09-28 03:49:54 +00:00
70d9596947
Persian faravahar decal texture.
...
This was SVN commit r10334.
2011-09-28 02:34:27 +00:00
d63947597c
Adds new NaturalBehaviour "domestic" to UnitAI, useful for tame animals who should never flee an attacker. Fixes #971 .
...
Renames herd_passive template to herd_domestic.
This was SVN commit r10333.
2011-09-27 18:03:58 +00:00
71a482cfa3
This was SVN commit r10332.
2011-09-27 10:07:11 +00:00
f7b997c3d9
Fixed the Palace portrait.
...
This was SVN commit r10331.
2011-09-27 08:39:06 +00:00
0e39511b3a
Attempts to fix random map OOS errors by avoiding parsing data to floats (uses CFixedVector3D instead). See #977 .
...
Changes to rmgen API for consistency and support of 3D
position/rotation.
This was SVN commit r10326.
2011-09-26 21:36:33 +00:00
43edf6b237
Changes chicken parent template to herd instead of hunt per DD (no behavior change). See #971 .
...
This was SVN commit r10325.
2011-09-26 19:38:05 +00:00
16f5016a1a
sync with work: add compile-time BITS and CeilLog2 and optional IO instrumentation
...
This was SVN commit r10324.
2011-09-26 08:29:57 +00:00
67d99f3001
Shields for Amish's bireme.
...
This was SVN commit r10323.
2011-09-26 04:03:43 +00:00
1acdd54bc4
This was SVN commit r10322.
2011-09-26 02:15:19 +00:00
7039a75cfd
This was SVN commit r10321.
2011-09-26 01:55:42 +00:00
cf89278cb0
This was SVN commit r10320.
2011-09-25 22:36:58 +00:00
3ead9f0b32
Fix to Jubot economy.js
...
This was SVN commit r10319.
2011-09-25 21:36:37 +00:00
a6eccb1290
Here we go...
...
- Gather weights change over time
- Workers are occasionally moved (about once in every 400 turns, at
random, needs to be improved)
- Workers don't go and try hunting fish and snarl up the engine.
This was SVN commit r10318.
2011-09-25 21:15:26 +00:00
4200e33e5e
Update button text color on game disconnected screen
...
This was SVN commit r10316.
2011-09-24 23:00:27 +00:00
0d708b31b4
avoid rare init-order bug when SRAT ACPI table is available AND APIC IDs are NOT
...
move APIC-related code to separate file, with its own initialization to
avoid circular dependency
fixes #976
This was SVN commit r10315.
2011-09-24 19:47:13 +00:00
5a3a1d780a
A couple portraits.
...
This was SVN commit r10314.
2011-09-24 19:31:34 +00:00
bb3b52fb82
This finishes the militia recalling section - militiamen are now recalled every 30 seconds or so.
...
This was SVN commit r10311.
2011-09-24 16:37:31 +00:00
b9fc207437
Okay, lots of changes here. Houses are now built on demand, there's a lot of restructuring to workers, instead of a static defence force citizen soliders are drafted to a militia as needed (this needs some work still but is mostly done). Any citizen infantry given at the start of a game are used in the workforce properly now, too.
...
This was SVN commit r10310.
2011-09-24 15:26:11 +00:00
17076f2561
Gives all fish the new IsSeaCreature class, so AI can identify them more easily.
...
This was SVN commit r10309.
2011-09-24 15:24:16 +00:00
5fc514ab32
Adds a class called "IsSeaCreature" to identify fish for the AI.
...
This was SVN commit r10308.
2011-09-24 15:22:48 +00:00
759e11e801
Updated background.
...
This was SVN commit r10307.
2011-09-24 07:35:29 +00:00
c3bb3ec57e
Adds event data to BaseAI (so that AIs can handle being attacked, defeated, etc) based on patch from quantumstate. Fixes 972.
...
This was SVN commit r10306.
2011-09-23 22:02:04 +00:00
7828544946
Attempts to fix ArchiveViewer build on OS X (use wxString::wc_str() to construct std::wstring).
...
This was SVN commit r10305.
2011-09-23 02:56:19 +00:00
83cfcd181d
Unit actor tweaks.
...
This was SVN commit r10304.
2011-09-22 01:21:39 +00:00
9812ee2780
avoid error dialog when gamma upload fails twice (for reasons still unknown *sign*)
...
http://www.wildfiregames.com/forum/index.php?showtopic=14058&pid=226211&st=50&#entry226211
This was SVN commit r10303.
2011-09-21 20:38:09 +00:00
c77fb0e841
In TrainingQueue changed place of PostMessage in case when all entities of current batch was spawned. Fixes #963 .
...
This was SVN commit r10302.
2011-09-21 19:27:36 +00:00
2ddd237509
This updates JuBot to use the Carthaginian faction and makes a couple of minor changes to give a fractional speed boost.
...
This was SVN commit r10301.
2011-09-21 18:53:36 +00:00
6ff59cbeeb
Enables Atlas build on OS X.
...
This was SVN commit r10300.
2011-09-20 22:52:21 +00:00
08b4d96cf2
Moves Atlas UI to main thread while engine loop runs in new thread.
...
Fixes Atlas compatibility with OS X (wxOSX/Cocoa requires the UI to run
in the main thread). Fixes #500 .
Fixes Windows shutdown to close COM library properly (and WMI).
This was SVN commit r10299.
2011-09-20 22:49:02 +00:00
e66a0c6dac
This was SVN commit r10298.
2011-09-20 03:15:04 +00:00
8d7504aa2e
This was SVN commit r10297.
2011-09-18 06:24:45 +00:00
8c6926cfb9
Fixed persian trader to use Carth trader actor for now.
...
This was SVN commit r10296.
2011-09-18 04:56:29 +00:00
3c43a59f43
This was SVN commit r10295.
2011-09-18 04:55:26 +00:00
92ba917c5a
#Moving new Alpha 8 faction from Internal to Public.
...
Updated some hero tooltips.
This was SVN commit r10294.
2011-09-18 04:30:03 +00:00
d497c28d5e
Renaming some things before I move them.
...
This was SVN commit r10293.
2011-09-18 04:13:32 +00:00
6287158c17
Widen history section tooltips
...
This was SVN commit r10292.
2011-09-17 15:49:57 +00:00
bb6d8b6094
This was SVN commit r10291.
2011-09-17 04:57:37 +00:00
b885498477
Fixes text alignment and inconsistencies in game setup UI.
...
This was SVN commit r10290.
2011-09-16 23:42:37 +00:00
b6882ca146
Fix default network map js
...
This was SVN commit r10289.
2011-09-16 21:40:42 +00:00
3c5bf35f81
This was SVN commit r10288.
2011-09-16 12:20:18 +00:00
f8443f6ef9
Updated Greek penteconter portrait.
...
This was SVN commit r10287.
2011-09-15 22:34:40 +00:00
9aede79908
Fixed tooltip.
...
This was SVN commit r10286.
2011-09-15 21:46:25 +00:00
b1d98cff04
Fixes in-game music playing (assume filename always contains ogg extension). Fixes #956 .
...
This was SVN commit r10285.
2011-09-15 05:19:36 +00:00
170fc8e8b0
Changed selection and complete sounds.
...
This was SVN commit r10284.
2011-09-15 03:56:24 +00:00
3ce370aadb
Walls demo
...
This was SVN commit r10283.
2011-09-15 03:39:29 +00:00
8e0a4557ed
Fixed shields for Carth spearman.
...
This was SVN commit r10282.
2011-09-14 23:34:34 +00:00
45aedb2874
Should fix the music errors in Atlas (related to #956 ) thanks to Ben's suggestion. I think this should be handled at a lower level, but this should do for now.
...
This was SVN commit r10281.
2011-09-14 12:46:34 +00:00
da94100582
Fixes Jubot mills facing the wrong direction.
...
This was SVN commit r10280.
2011-09-14 03:08:05 +00:00
aba6a7f118
Reorder dialog buttons for consistency
...
This was SVN commit r10279.
2011-09-14 00:43:19 +00:00
d4ffe7c887
Adds Alpha number and name to main menu. Fixes #955 .
...
Inverts (i)nfo button sprites.
Shrinks tooltip box so it doesn't obstruct the background.
This was SVN commit r10278.
2011-09-13 23:58:16 +00:00
4d40c8dc7d
Berry bush updates.
...
This was SVN commit r10276.
2011-09-13 23:32:12 +00:00
c3075c8e5b
Fixes AI building angles to face bottom right corner of the map.
...
Cleans up the same concept in random maps.
This was SVN commit r10275.
2011-09-13 22:51:43 +00:00
d63e9eaef4
This was SVN commit r10274.
2011-09-13 16:28:40 +00:00
cbc1198f19
This was SVN commit r10273.
2011-09-13 15:49:25 +00:00
b65b7d95e7
Make the progress bar finish early so that the user can actually see it finish. Display percent progress rather than details.
...
This was SVN commit r10272.
2011-09-13 12:24:13 +00:00
348fa3347c
This was SVN commit r10271.
2011-09-13 08:32:34 +00:00
e219bb5832
Different decal
...
This was SVN commit r10270.
2011-09-13 04:56:46 +00:00
95d36130e4
Gave more room to chat portion of game setup screen. If we need more room for player slots later, we can always take some from the chat space.
...
This was SVN commit r10268.
2011-09-13 02:02:36 +00:00
c362ce0565
Convert spaces to tabs in main menu files
...
This was SVN commit r10267.
2011-09-13 01:28:49 +00:00
a69f957c86
More entity tweaks. Alexander and Cretan Archer.
...
This was SVN commit r10266.
2011-09-13 01:13:29 +00:00
8a3318240f
Updated tooltips.
...
This was SVN commit r10265.
2011-09-13 01:08:50 +00:00
7e6098a19f
Remove exit button from corner of main menu screen
...
This was SVN commit r10264.
2011-09-13 01:06:29 +00:00
97e4f0fd5d
Update alpha version label, change default single player map, update scripts music system
...
This was SVN commit r10263.
2011-09-13 00:45:33 +00:00
eb5a83fc8f
New Carthaginian camel trader
...
This was SVN commit r10262.
2011-09-12 23:58:11 +00:00
782bf32e53
This was SVN commit r10261.
2011-09-12 23:35:48 +00:00
bf8a0bda32
Berry Bushes texture
...
This was SVN commit r10260.
2011-09-12 22:47:09 +00:00
e9d7aa1879
Tweaked the female building animation speed.
...
This was SVN commit r10259.
2011-09-12 20:46:20 +00:00
eccf787ec8
Fix test for GuiInterface. Fixes #957 .
...
This was SVN commit r10258.
2011-09-12 14:57:58 +00:00
6629323f8d
This was SVN commit r10257.
2011-09-12 10:47:33 +00:00
b1247e77cd
fix start/stop music in settings, double ingame menu speed
...
This was SVN commit r10256.
2011-09-12 02:21:20 +00:00
b50fa144f3
The underlying sound system needs some work, so just get scripts sound working better.
...
This was SVN commit r10255.
2011-09-11 22:42:40 +00:00
9c66b4d4f3
Cart scout tower model updates
...
This was SVN commit r10254.
2011-09-11 19:44:28 +00:00
c198e27e89
Updates to Cart civ centre and wall tower
...
This was SVN commit r10253.
2011-09-11 19:16:10 +00:00
f21eb03bf2
This was SVN commit r10252.
2011-09-11 17:46:26 +00:00
bdc1946dc3
This was SVN commit r10251.
2011-09-11 14:08:48 +00:00
cccfaecdfe
This was SVN commit r10250.
2011-09-11 13:30:16 +00:00
be69735582
Trying to clean up music in the scripts. It is still broken.
...
This was SVN commit r10249.
2011-09-11 03:30:41 +00:00
7d95a68a20
This was SVN commit r10248.
2011-09-11 03:06:59 +00:00
80df13f47b
add support for recursive mutex on windows; ensure h_mgr uses them (pthread doesnt guarantee default type is recursive)
...
This was SVN commit r10247.
2011-09-10 22:51:51 +00:00
579f1acb6f
A couple of new loading screen "tips."
...
This was SVN commit r10246.
2011-09-10 22:08:44 +00:00
424410ea07
Some portrait updates.
...
This was SVN commit r10245.
2011-09-10 21:27:51 +00:00
96787667cb
Scorpio tweaks
...
This was SVN commit r10244.
2011-09-10 20:17:24 +00:00
78fe8e1e62
h_mgr: fix simple double-free warning triggered at shutdown when an object's child was freed AND the all objects were forcibly freed (complicated by the fact that the pool allocator overwrites freed storage, which made this appear to be a tag conflict).
...
fixes #860 , #915 , #920
This was SVN commit r10243.
2011-09-10 20:04:01 +00:00
f7a7e9765a
Moved Roman Scorpion to Public as an Alpha 7 Easter Egg.
...
This was SVN commit r10242.
2011-09-10 19:38:29 +00:00
7e3ca5516f
Projectile work on Carth Ballista actor.
...
This was SVN commit r10241.
2011-09-10 19:27:36 +00:00
7c0c044fa8
Kart ballista shifted root, smoothed some faces, uv edits
...
This was SVN commit r10240.
2011-09-10 09:34:50 +00:00
db137737ba
Because we don't randomly change to new tracks and some of the existing ambient ones are too annoying if played constantly, we'll just set a default for now.
...
This was SVN commit r10239.
2011-09-10 01:49:30 +00:00
d2adbca5c6
Updated shrouds texture.
...
This was SVN commit r10238.
2011-09-09 20:00:21 +00:00
a4bf03996b
This was SVN commit r10237.
2011-09-09 09:55:22 +00:00
5233e4c0a7
This was SVN commit r10236.
2011-09-09 09:25:24 +00:00
f2de3ea2ee
Tweaked death anim speeds.
...
This was SVN commit r10235.
2011-09-09 01:24:47 +00:00
2f1f528f1c
Capes for Gallic mercenary swordsmen
...
This was SVN commit r10234.
2011-09-09 01:12:32 +00:00
0eeffd05bd
Adds max player population to sim state, based on patch from quantumstate. Fixes #951 .
...
This was SVN commit r10233.
2011-09-09 00:45:06 +00:00
b8a375656e
Fixes bug in player init (AI is configured by game setup, not always matching map settings).
...
This was SVN commit r10232.
2011-09-09 00:28:56 +00:00
486e002008
Giraffe, infant, lion, lioness death animations
...
This was SVN commit r10231.
2011-09-08 22:56:01 +00:00
3082da9be9
Fixed
...
This was SVN commit r10230.
2011-09-08 21:50:00 +00:00
d5c664e36e
# In-game manual updated to mention AI, map filters, and random maps.
...
This was SVN commit r10229.
2011-09-08 17:21:52 +00:00
3eb4d73438
This was SVN commit r10228.
2011-09-08 09:13:54 +00:00
0e5ef2f2e8
This was SVN commit r10227.
2011-09-08 07:26:20 +00:00
0a168f8436
This was SVN commit r10226.
2011-09-08 07:09:33 +00:00
f489e1205a
new icons for the embassies
...
This was SVN commit r10225.
2011-09-08 07:04:46 +00:00
aa6ad53e80
Shroud texture for ships
...
This was SVN commit r10224.
2011-09-08 07:00:00 +00:00
255bb29ab8
This was SVN commit r10223.
2011-09-08 06:00:33 +00:00
5f720dcace
This was SVN commit r10222.
2011-09-08 05:56:54 +00:00
10b94a6741
Until we deal with networked mode, return to main menu after match. Removed some console.write statements.
...
This was SVN commit r10220.
2011-09-08 04:18:12 +00:00
bab589e8a3
Tweaked game setup screen options area.
...
This was SVN commit r10219.
2011-09-08 04:04:04 +00:00
d22656034e
Tweaked summary screen.
...
This was SVN commit r10218.
2011-09-08 03:59:12 +00:00
238792a524
Reworked game setup and loading screens, and adjusted title decoration for some windows.
...
This was SVN commit r10217.
2011-09-08 03:49:57 +00:00
19e258d36c
Oasis tweaks.
...
Oasis III with 2 Carthage players.
Updated animations for Italian swordsman.
New portrait for shipyard.png
#Islands random map script.
This was SVN commit r10216.
2011-09-08 03:35:31 +00:00
c12d2ac0be
This was SVN commit r10215.
2011-09-08 03:03:08 +00:00
9e2d97a9c0
Fixes actor viewer button (label didn't update after switching tools).
...
This was SVN commit r10214.
2011-09-08 03:00:56 +00:00
06d95fb861
This was SVN commit r10213.
2011-09-08 00:39:57 +00:00
8fa5e80043
Carthage building names.
...
This was SVN commit r10212.
2011-09-08 00:20:00 +00:00
bc59102801
Make menu start out higher so that it is not visible when it is not opened (it appeared as a gold band around menu button)
...
This was SVN commit r10211.
2011-09-08 00:19:38 +00:00
b6f1251089
cart mechanical siege ballista xml
...
This was SVN commit r10210.
2011-09-07 23:43:24 +00:00
4332f37462
Siege ballista entity setup
...
This was SVN commit r10209.
2011-09-07 23:38:44 +00:00
2a0c04c930
Fix prop error on cart wall towers
...
This was SVN commit r10208.
2011-09-07 23:26:18 +00:00
cd3277d101
Maps fix #950 .
...
#New units for Carthage.
This was SVN commit r10206.
2011-09-07 23:01:54 +00:00
e3c3dd1026
Fixes missing template in Bridge Demo map.
...
This was SVN commit r10205.
2011-09-07 22:04:15 +00:00
f6120eb8e6
Carthaginian ballista unit
...
This was SVN commit r10204.
2011-09-07 21:37:14 +00:00
a088a9e3aa
This was SVN commit r10203.
2011-09-07 21:26:17 +00:00
63c7d3d52f
fix warning about missing registry key (happens on one system for unknown reasons)
...
see
http://www.wildfiregames.com/forum/index.php?showtopic=14058&pid=225336&st=50&#entry225336
This was SVN commit r10202.
2011-09-07 19:15:20 +00:00
185571845f
Renaming cancel button to main menu which makes more sense when returning from a match.
...
This was SVN commit r10201.
2011-09-07 02:07:38 +00:00
b65f8ae23a
Return to game setup directly from the summary screen. (BFME2 does this; will see if it's any good.)
...
This was SVN commit r10200.
2011-09-07 02:03:11 +00:00
550cac253d
Resize stances panel to fit better and move delete command to end of list.
...
This was SVN commit r10199.
2011-09-07 01:54:08 +00:00
3f0f1f78fb
Portraits for Carthaginian Bireme and Quinquereme.
...
This was SVN commit r10198.
2011-09-07 01:51:09 +00:00
85f60c4d28
New session tooltip colors and some code cleanup.
...
This was SVN commit r10197.
2011-09-07 01:43:56 +00:00
56ce7f7809
Added new sounds for mining and lumbering
...
- Ryan
This was SVN commit r10196.
2011-09-06 21:43:19 +00:00
21c52b5dcd
Added new sounds for mining and lumbering
...
- Ryan
This was SVN commit r10195.
2011-09-06 21:37:49 +00:00
7a7ebaa983
Allow ingame menu to reverse, add sounds to all menu buttons, and some organizing and cleanup
...
This was SVN commit r10194.
2011-09-06 18:15:27 +00:00
1a76c3b848
Tweaked Sicilia map.
...
This was SVN commit r10193.
2011-09-06 05:16:44 +00:00
81191a6ea7
Fixes garrisoned units disappearing when eject occurs too frequently. See #910 .
...
This was SVN commit r10192.
2011-09-06 03:11:16 +00:00
0210288ef1
Sacred Band Cavalry Easter egg unit. Trainable from the Carthaginian Tophet structure.
...
This was SVN commit r10191.
2011-09-06 02:15:35 +00:00
8b33f5cfd2
Fixes UI becoming unresponsive when ordering units to garrison.
...
This was SVN commit r10190.
2011-09-06 02:06:24 +00:00
e100f7264b
This was SVN commit r10189.
2011-09-05 19:10:27 +00:00
db3deba8dd
This was SVN commit r10187.
2011-09-05 10:32:37 +00:00
d9a56d2765
This was SVN commit r10185.
2011-09-05 04:24:26 +00:00
c4eb410d0d
Fixed devotio calling missing texture.
...
This was SVN commit r10184.
2011-09-04 22:31:13 +00:00
5b120012df
cart long wall gate upgrade mesh and actor
...
This was SVN commit r10183.
2011-09-04 12:35:47 +00:00
cf667d335a
Reorganize sound functions, play new defeat music, clean up some tab versus space issues.
...
This was SVN commit r10182.
2011-09-04 01:54:54 +00:00
d578f53ee2
This was SVN commit r10181.
2011-09-03 16:30:29 +00:00
ac76bd6fef
Carth Bireme Update
...
This was SVN commit r10180.
2011-09-03 05:06:36 +00:00
dfcabe4db3
Adjust main menu background scrolling speed and make submenu use random sounds when opening.
...
This was SVN commit r10179.
2011-09-03 03:18:40 +00:00
8f26bff788
Fix menu and dev commands overlay issue. Add music to Carthage civ file.
...
This was SVN commit r10177.
2011-09-03 02:12:14 +00:00
cb7a4f8b1a
Hopefully fix replay mode
...
This was SVN commit r10175.
2011-09-02 23:47:26 +00:00
33fef3a6fb
This was SVN commit r10174.
2011-09-02 22:51:42 +00:00
832c4d3a57
Added Carthage to Serengeti map. Tweaks to Celt SB and Celtic "Trireme."
...
This was SVN commit r10173.
2011-09-02 22:10:47 +00:00
cef1c1b69a
Some updated portraits.
...
This was SVN commit r10172.
2011-09-02 21:46:32 +00:00
e0ed496458
This was SVN commit r10170.
2011-09-02 14:45:58 +00:00
89532feab6
Fixes Atlas file open dialog on OS X (filters not shown by default in wxOSX 2.9).
...
This was SVN commit r10168.
2011-09-02 02:27:55 +00:00
706153f8ee
This was SVN commit r10167.
2011-09-02 00:40:00 +00:00
e847f5f69e
Removes old mapgen scripts.
...
This was SVN commit r10166.
2011-09-02 00:37:23 +00:00
05c5596827
Fix squished menu background and make clicking on background hide the submenu
...
This was SVN commit r10165.
2011-09-02 00:33:19 +00:00
ec6b9dfc28
Fixes broken color to string conversion in UI. Fixes #939 .
...
This was SVN commit r10164.
2011-09-02 00:24:30 +00:00
65f3126f04
Fixed the rocks on the left edge of this menu background piece. Just need someone to tweak up the code so it isn't crunched. :)
...
This was SVN commit r10163.
2011-09-01 21:56:45 +00:00
a28a5ef934
This was SVN commit r10162.
2011-09-01 19:59:07 +00:00
e2ad017092
Carthaginian entity tweaks. Made Super Dock construct biremes and quinqueremes. Adjusted cost and health for embassies. Made the commercial port less expensive.
...
This was SVN commit r10161.
2011-09-01 19:30:56 +00:00
48aabdf177
This was SVN commit r10160.
2011-09-01 11:08:46 +00:00
90fdd26cf1
Sets default wxFileDialog filters in Atlas.
...
This was SVN commit r10159.
2011-09-01 04:47:45 +00:00
d5b8a39fdd
Fix misaligned text in dialogs
...
This was SVN commit r10158.
2011-09-01 03:27:30 +00:00
5c7b1d8241
Make pause text larger
...
This was SVN commit r10157.
2011-09-01 02:54:05 +00:00
ee0c812b67
Tweaked style of manual and history
...
This was SVN commit r10156.
2011-09-01 02:49:02 +00:00
142bd05380
Menu: removed autohiding, doubled speed, added sound effects. GUI art: changed gold titlebar back to bronze, made progressbar consistent with titlebar. Repositioned start game button.
...
This was SVN commit r10155.
2011-09-01 02:36:38 +00:00
1389f11b6e
Applies Yves' latest patch for premake4.
...
Fixes test generation path in XCode and MSVC.
Fixes PCH dependency tracking in GCC. Fixes #903 .
Fixes PCH being included in its own input (caused GCC bus error).
Ensures premake4 gets rebuilt on *nix after running clean-workspaces.sh.
Updates Windows premake4 binary.
This was SVN commit r10154.
2011-09-01 01:58:04 +00:00
1433bd9ad9
Fixes gaia animals without UnitAI (e.g. fish) blocking foundation construction, by destroying them. Fixes #936 .
...
This was SVN commit r10153.
2011-08-31 23:41:55 +00:00
2d10077581
This was SVN commit r10152.
2011-08-31 16:04:49 +00:00
a267c64ff7
Gold border frame
...
This was SVN commit r10151.
2011-08-31 15:54:44 +00:00
0fe7cd7edc
Some small layout alignment tweaks/fixes
...
This was SVN commit r10150.
2011-08-31 03:23:14 +00:00
c23497f326
Placing "g_GameEnded = true;" first. (Doesn't really matter, but is more clear.)
...
This was SVN commit r10149.
2011-08-31 03:13:33 +00:00
7d2411e6cb
Convert win / loss dialogs to new style.
...
This was SVN commit r10148.
2011-08-31 03:09:18 +00:00
2469fdf8c6
Convert delete dialog to new style. Fixes #937
...
This was SVN commit r10147.
2011-08-31 02:58:57 +00:00
9a00398e24
Converted menu hotkey and ai config to new style. Added basic sliding menus. (Need to evaluate potential performance issues here.)
...
This was SVN commit r10146.
2011-08-31 02:41:21 +00:00
b48c35c512
After a lot of playtesting, I've adjusted the build limits on the Fortresses and Scout Towers. See if these are 'ok'.
...
This was SVN commit r10145.
2011-08-31 02:07:35 +00:00
cda3a7eedf
Tweaked ship health and Super Dock health.
...
Disabled <TerritoryDecay> for some miscellaneous things.
This was SVN commit r10144.
2011-08-31 01:08:58 +00:00
07d48a5c9a
Prevents gaia buildings from decaying in enemy territories.
...
This was SVN commit r10143.
2011-08-30 23:53:34 +00:00
7429cc2b95
Updated Cart trireme portrait.
...
Added Carthaginians to map.
This was SVN commit r10142.
2011-08-30 23:28:49 +00:00
fd52ec7786
This was SVN commit r10141.
2011-08-30 23:23:51 +00:00
1ff6d44f9e
Fixes promoted entities dropping from control groups, based on patch from gruby. Fixes #859 .
...
This was SVN commit r10140.
2011-08-30 22:29:03 +00:00
a9e3368c8b
Persian Trireme Updated
...
This was SVN commit r10139.
2011-08-30 22:24:07 +00:00
4530b45665
Updated Carth Sandbox.
...
This was SVN commit r10138.
2011-08-30 21:30:16 +00:00
8a096711ae
Update to Italian embassy building
...
This was SVN commit r10137.
2011-08-30 20:14:18 +00:00
7b4f6dece1
Props for the Iberian embassy.
...
This was SVN commit r10136.
2011-08-30 05:11:22 +00:00
05afd7796c
Improvements to the Cart Wall entities and to the general wall templates.
...
Removed pop bonus for embassies.
This was SVN commit r10135.
2011-08-30 00:01:07 +00:00
e8253249a2
Switches Atlas player panel to our custom ColourDialog for consistency.
...
This was SVN commit r10134.
2011-08-29 22:27:58 +00:00
fc7d303ee4
Adjusts Atlas sidebar and bottombar to look better on different platforms.
...
This was SVN commit r10133.
2011-08-29 22:12:20 +00:00
a4fbf46deb
Updates to Carthaginian building models
...
This was SVN commit r10132.
2011-08-29 20:07:26 +00:00
6366ad728f
Fixes Atlas toolbar in wxOSX (only Realize() it after creation).
...
Fixes terrain preview not displaying first page in wxOSX.
Formats terrain page labels more nicely.
Adds a bunch of tooltips.
This was SVN commit r10131.
2011-08-29 03:50:29 +00:00
ded514644e
Commented out most of old styles.xml and changed references to new styles, outlined tabs in summary, fixed chat color in multiplayer setup
...
This was SVN commit r10130.
2011-08-28 21:32:35 +00:00
769a927446
Changes Atlas toolbar construction to use CreateToolBar instead of explicitly setting it (which doesn't work on wxOSX 2.9).
...
Adds a call to Atlas_GLSetCurrent after setting Atlas resolution on OS X
(otherwise the canvas doesn't seem to update properly).
This was SVN commit r10129.
2011-08-28 21:10:45 +00:00
c1b6b6d76e
This was SVN commit r10128.
2011-08-28 19:50:46 +00:00
ce17fc4e3f
This was SVN commit r10127.
2011-08-28 19:49:46 +00:00
ba4de704b0
Carthaginian building updates
...
This was SVN commit r10126.
2011-08-28 17:44:35 +00:00
8c09b777e2
This was SVN commit r10125.
2011-08-28 10:58:12 +00:00
3dc491efb7
Updates to Carthaginian buildings
...
This was SVN commit r10124.
2011-08-28 10:34:39 +00:00
47e1e23721
Fixes bug on object panel (assert fail when map was loaded before the panel was displayed).
...
This was SVN commit r10123.
2011-08-28 05:57:09 +00:00
4185aa348a
change button height from 32 to 28
...
This was SVN commit r10122.
2011-08-28 03:04:32 +00:00
ad6c4b6abe
removed close button from ingame menu, updated button texture
...
This was SVN commit r10121.
2011-08-28 02:02:38 +00:00
ab5d1f8482
Changed size of the manual to be based off of the center of the screen, instead of the edges of the screen.
...
This was SVN commit r10120.
2011-08-28 01:49:17 +00:00
6146d948ad
hide yellow border between main menu and submenu
...
This was SVN commit r10119.
2011-08-28 01:28:50 +00:00
f2b61d2e56
Fixes Atlas canvas on OS X (needs to be shown before setting GL context - fixes invalid drawable error).
...
This was SVN commit r10118.
2011-08-28 00:28:06 +00:00
cd6ce56632
Fixes some Atlas button layouts with wxWidgets 2.9 (wxGridSizer seems preferable to wxBoxSizer for equally sized buttons).
...
This was SVN commit r10117.
2011-08-27 23:43:18 +00:00
52b73d4445
Make ingame exit button leave the current game rather than exit the entire program
...
This was SVN commit r10116.
2011-08-27 23:28:12 +00:00
0e81ee4f60
Made ingame resource counters use percent-based positioning. Lined up ingame bottom panel textures better. Remove old session dialog sprites.
...
This was SVN commit r10115.
2011-08-27 23:17:14 +00:00
e933986351
removed session dialog, updated ingame menu
...
This was SVN commit r10114.
2011-08-27 22:44:08 +00:00
e33124631b
Projectile nodes added to civ centre mesh
...
This was SVN commit r10113.
2011-08-27 21:35:34 +00:00
3b958b4a1c
Fixing yet another problem: make sure the submenu closes if we click a button that doesn't use the submenu
...
This was SVN commit r10112.
2011-08-27 19:36:55 +00:00
abda9576b1
Updated panel style and made main menu "x" exit game without confirmation
...
This was SVN commit r10111.
2011-08-27 19:23:32 +00:00
ae866e2cb4
Fix typo in tooltip
...
This was SVN commit r10110.
2011-08-27 18:50:23 +00:00
e1cb8f6e10
Update main menu buttons tooltip text
...
This was SVN commit r10109.
2011-08-27 18:46:00 +00:00
e909567004
Convert most dialogs over to new style
...
This was SVN commit r10108.
2011-08-27 18:34:54 +00:00
2915e9a85e
Update submenu code
...
This was SVN commit r10107.
2011-08-27 15:21:12 +00:00
8729d1115d
Render territory borders in non-shader render path.
...
Add basic support for fixed-function implementations of shader API.
This was SVN commit r10106.
2011-08-27 14:31:24 +00:00
9d25dad969
This was SVN commit r10105.
2011-08-27 13:18:35 +00:00
be02410dd4
Updates to cart civ centre and superdock meshes
...
This was SVN commit r10104.
2011-08-27 11:01:09 +00:00
fc958db168
moved some buttons to second tier, updated style of history section
...
This was SVN commit r10103.
2011-08-27 06:20:16 +00:00
29dc9c3094
Fixes bug in Atlas player panel (AtIter definition must be checked before incrementing).
...
This was SVN commit r10102.
2011-08-26 22:58:55 +00:00
dace16913f
Update to Carthaginian Sandbox
...
This was SVN commit r10101.
2011-08-26 22:37:02 +00:00
fcc02d85c4
This was SVN commit r10100.
2011-08-26 22:35:07 +00:00
bb77e3a300
Changes player panel spin controls to use default style.
...
This was SVN commit r10099.
2011-08-26 22:11:30 +00:00
53de4a8d5d
remove ghost=true to allow clicking on communication buttons
...
This was SVN commit r10098.
2011-08-26 04:32:53 +00:00
9f6f4d8bd1
Beginning of the submenu
...
This was SVN commit r10097.
2011-08-26 04:25:41 +00:00
072751858b
polish the alpha version label
...
This was SVN commit r10096.
2011-08-26 01:56:50 +00:00
2d1fe050b9
Fixes use of deprecated wxWidgets constants as they don't work on all platforms (only when the library was built with WXWIN_COMPATIBILITY_2_6).
...
This was SVN commit r10095.
2011-08-26 01:56:14 +00:00
9090545852
Scenario only embassy simulation template
...
This was SVN commit r10094.
2011-08-25 23:43:03 +00:00
0a3b120aa8
Basic Italiote embassy mesh placeholder
...
This was SVN commit r10093.
2011-08-25 23:07:22 +00:00
b059824b76
Cart embassy updates
...
This was SVN commit r10092.
2011-08-24 23:14:15 +00:00
cbebe83b37
Cart celtic embassy update
...
This was SVN commit r10091.
2011-08-24 21:03:28 +00:00
f9ef989f6d
Carthage embassy and unit updates.
...
Some Barracks cost updates.
This was SVN commit r10090.
2011-08-24 19:30:06 +00:00
9a53cc1395
__SSE[2]__ didn't work on MSVC/ICC after all; introduce HAVE_SSE[2] instead
...
This was SVN commit r10089.
2011-08-24 09:23:44 +00:00
1890b1df49
Align tags to avoid confusion
...
This was SVN commit r10088.
2011-08-24 05:12:17 +00:00
81121ca1e8
Add alpha warning back
...
This was SVN commit r10087.
2011-08-24 05:03:11 +00:00
bf5e94c6e4
Adjusted main menu panel background
...
This was SVN commit r10086.
2011-08-24 04:35:53 +00:00
8a4443e4c7
Update styles to match mockup better
...
This was SVN commit r10085.
2011-08-24 04:16:37 +00:00
37dad6eb62
This was SVN commit r10084.
2011-08-24 02:54:31 +00:00
85336397a3
Don't render neutral territory borders on minimap.
...
This was SVN commit r10083.
2011-08-24 00:28:48 +00:00
f9dc6d9d69
Removes superfluous test build configuration from premake4.
...
This was SVN commit r10082.
2011-08-24 00:15:00 +00:00
60985a3bc9
Fixes training queue behavior when spawning fails due to lack of space (the queue will be blocked). Fixes #893 .
...
Changes training queue to support partial batch success and removal.
This was SVN commit r10081.
2011-08-23 22:43:34 +00:00
9e487bac30
Carthaginian embassy buildings update
...
This was SVN commit r10080.
2011-08-23 21:09:13 +00:00
13dc7a9210
Fix non-PCH build
...
This was SVN commit r10079.
2011-08-23 17:48:06 +00:00
192107a522
New "standing stone" treasures.
...
Updated Gallic Fields with Standing Stone treasures.
Updated Celtic Temple to not use the large celt_struct texture. One more
building to go before we can delete this texture forever.
This was SVN commit r10078.
2011-08-23 06:24:05 +00:00
d204180ed0
Road demo map
...
This was SVN commit r10077.
2011-08-23 04:07:43 +00:00
976529d280
Fix size issue with main menu panel shading
...
This was SVN commit r10076.
2011-08-23 04:01:05 +00:00
762aad3be5
Clean up some styles
...
This was SVN commit r10075.
2011-08-23 03:51:04 +00:00
eb9d5c9f39
This was SVN commit r10074.
2011-08-23 03:38:45 +00:00
05122a4e80
This was SVN commit r10073.
2011-08-23 03:38:32 +00:00
dc2b2aeff4
Converted some more screens over
...
This was SVN commit r10072.
2011-08-23 03:27:13 +00:00
a5a8367ed8
#Temperate stone road decals.
...
This was SVN commit r10071.
2011-08-23 03:08:18 +00:00
c84d31e298
Cart tophet extra building.
...
Touched up the smoke particle.
Took territory effect away from Super Dock.
Touched up the Cart temple footprint.
This was SVN commit r10069.
2011-08-23 01:44:01 +00:00
605e9f97bf
Update chat dialog and some labels in game setup to new style
...
This was SVN commit r10068.
2011-08-22 23:56:42 +00:00
0cd825e552
Converted parts of the game setup dialog and some general GUI elements over to new styles. There are duplicate sprites / textures that will need to be removed later when all references to them are changed.
...
This was SVN commit r10067.
2011-08-22 23:42:16 +00:00
f627229294
kart embassy actor and mesh commit
...
This was SVN commit r10066.
2011-08-22 23:14:07 +00:00
e13aeee36c
Report desktop display size (not just window size)
...
This was SVN commit r10065.
2011-08-22 22:34:59 +00:00
27e5581d27
Fixes Atlas player panel getting out of sync with simulation. Fixes #927 .
...
Fixes object panel not being notified of map loading.
Fixes bug where opening a new map before using the player panel
prevented default player data being displayed for new players.
Fixes wxGTK 2.8 bug: wxChoicebook control doesn't update the choice
control when adding/removing pages.
Notifies player that deleting player in Atlas will delete all their
objects (and gives them the option).
Changes DeleteObject to DeleteObjects to support multiple selections.
Implements undo for map resize (experimental).
Removes annoying debug message from attempted undo of map settings.
Tweaks a few Atlas UI controls.
This was SVN commit r10064.
2011-08-22 21:45:39 +00:00
a4dc290c23
Map tweaks.
...
This was SVN commit r10063.
2011-08-22 19:15:55 +00:00
da438151f0
adjust border around pre-release warning text
...
This was SVN commit r10062.
2011-08-22 17:41:46 +00:00
d9c65c82cf
More work on main menu, and added new button style
...
This was SVN commit r10061.
2011-08-22 17:36:53 +00:00
32f68b7a4b
This was SVN commit r10060.
2011-08-22 12:10:22 +00:00
ed959b8da7
minor fixes: add missing arena.cpp; add required NONCOPYABLE annotation; fix UNUSED2 to work in the case of references.
...
This was SVN commit r10059.
2011-08-22 08:54:56 +00:00
a6f5784c5c
Remove junk characters from beginning of Alpha Warning
...
This was SVN commit r10058.
2011-08-22 04:18:43 +00:00
f2f0263a3d
Made menu panel use a more relative layout to work better with lower resolutions
...
This was SVN commit r10057.
2011-08-22 04:13:05 +00:00
9af4851508
Adds few more animation to Atlas actor viewer (promotion, feeding, garrisoned).
...
This was SVN commit r10056.
2011-08-22 04:11:21 +00:00
4bd86230b1
Old Cart civ centre files renamed
...
This was SVN commit r10055.
2011-08-21 16:10:17 +00:00
b37185f6db
Cart civ centre update
...
This was SVN commit r10054.
2011-08-21 16:06:20 +00:00
6c859fc6bb
add documentation on pointer types and RESTRICT as per yesterday's meeting
...
This was SVN commit r10053.
2011-08-21 15:09:09 +00:00
509f4387d7
Fix build
...
This was SVN commit r10052.
2011-08-21 13:10:44 +00:00
881d3cebf4
lay groundwork for more efficient and flexible allocators. add new sysdep/vm that provides access to additional features on Windows (large pages, autocommit). add Pool/Arena allocators that avoid overhead and support arbitrary storage (not just the expensive virtual memory allocator in DynArray)
...
This was SVN commit r10051.
2011-08-21 11:00:09 +00:00
3eb1ed0139
(actually remove)
...
This was SVN commit r10050.
2011-08-21 10:31:23 +00:00
c26a369762
remove Bucket allocator (superseded by upcoming Arena/Pool with expandable Storage policies)
...
This was SVN commit r10049.
2011-08-21 10:30:35 +00:00
1c2472e67a
Lowered TerritoryDecay from 20 to 5 (hps).
...
Disabled territory decay for Docks.
This was SVN commit r10048.
2011-08-21 05:06:05 +00:00
6368331412
Map tweaks.
...
This was SVN commit r10047.
2011-08-21 02:13:34 +00:00
d92e74ee51
This was SVN commit r10046.
2011-08-21 01:02:01 +00:00
730a89152c
Fixes typecast performance warning in MSVC.
...
This was SVN commit r10045.
2011-08-21 00:09:28 +00:00
5406a68959
feature request by philip: instead of refusing to load textures larger than the OpenGL limit, ensure they have mipmaps (unless it's s3tc, which would be too expensive to recompress) and skip levels until it fits
...
This was SVN commit r10043.
2011-08-20 17:56:12 +00:00
36d897c694
# New menu background image
...
This was SVN commit r10042.
2011-08-20 17:17:53 +00:00
d05d410b46
thicker mast
...
This was SVN commit r10041.
2011-08-20 16:17:51 +00:00
82e044c790
This was SVN commit r10040.
2011-08-20 05:59:25 +00:00
947efe70d1
#Greek trireme changes.
...
This was SVN commit r10039.
2011-08-20 05:12:32 +00:00
5d116c2b8f
This was SVN commit r10038.
2011-08-19 14:27:40 +00:00
5f07107609
Fix build with wxWidgets 2.9
...
This was SVN commit r10037.
2011-08-18 23:38:11 +00:00
49af1880f8
Fix tests
...
This was SVN commit r10035.
2011-08-18 21:12:15 +00:00
308cb26dd4
# Health decay for buildings not in a civ center's territory.
...
This was SVN commit r10034.
2011-08-18 20:28:53 +00:00
6b26820090
Build fix
...
This was SVN commit r10033.
2011-08-18 11:16:52 +00:00
5c3f3c2e15
This was SVN commit r10032.
2011-08-18 04:05:10 +00:00
36c6318296
This was SVN commit r10031.
2011-08-18 03:28:32 +00:00
a0fb46b5d6
#3rd new Celtic Market. :)
...
#Horse fauna entity.
This was SVN commit r10030.
2011-08-18 00:33:22 +00:00
89c22993a4
Adds terrain fill (bucket) tool to Atlas.
...
This was SVN commit r10029.
2011-08-17 23:44:52 +00:00
5a2d7365f9
This was SVN commit r10028.
2011-08-17 21:58:50 +00:00
b12845e6b4
Avoid shaders on GeForce FX, for performance.
...
Update list of Intel device names.
This was SVN commit r10027.
2011-08-17 21:42:32 +00:00
8872bad668
AoEO BAR compatibility in AoE3Ed
...
This was SVN commit r10026.
2011-08-17 16:17:22 +00:00
e8f6be0bf3
Fix GCC build (only reference SIMD types when supported by the compiler (though this might not work in MSVC))
...
This was SVN commit r10025.
2011-08-17 13:41:25 +00:00
9f97610cb2
refactor: remove "wrapping" and "read" functionality for DynArray (in preparation for replacing it with template policies for more flexible Pool etc.)
...
This was SVN commit r10024.
2011-08-17 08:38:53 +00:00
939f056794
Preliminary work on Roman units.
...
This was SVN commit r10023.
2011-08-17 07:23:54 +00:00
7bd2f1c925
Temp fix for autobuild: VC2008 doesn't define hypotf.
...
This was SVN commit r10021.
2011-08-17 04:34:20 +00:00
7679d1073b
Fixes garrison behavior for ships - they no longer unload units underwater. See #893 .
...
Fixes behavior when ships are destroyed (garrisoned units at the time
will also be killed).
Updates ship templates accordingly.
This was SVN commit r10020.
2011-08-17 01:43:23 +00:00
b9df1d3451
Be less grossly inefficient when computing minimap territory texture
...
This was SVN commit r10019.
2011-08-16 23:39:16 +00:00
fab7bf4fcf
Fixes manifest dependencies for Actor Editor. Fixes #924 .
...
This was SVN commit r10018.
2011-08-16 22:08:47 +00:00
609f1643d5
Fix -Wconversion warnings in simulation code.
...
Cast to smaller integer types explicitly.
Generally avoid platform-dependent types (size_t) in simulation code.
Use float versions of math.h functions, not double.
This was SVN commit r10017.
2011-08-16 11:18:32 +00:00
b40b5b8414
Adjusting territory effects.
...
This was SVN commit r10016.
2011-08-16 05:01:35 +00:00
a13f38c9b4
Moves build limits counter to BuildLimits component, to avoid some weirdness with BuildRestrictions for preview entities (caused some warnings in Atlas).
...
This was SVN commit r10015.
2011-08-16 04:44:15 +00:00
a85c8218e9
Fixes player diplomacy init (again)
...
This was SVN commit r10014.
2011-08-16 04:03:57 +00:00
ec973ee005
This was SVN commit r10013.
2011-08-16 03:42:42 +00:00
18c48492ef
Added cast to convert from unsigned to int
...
This was SVN commit r10012.
2011-08-16 02:01:11 +00:00
0f0ac2bcd5
Fixes #898
...
This was SVN commit r10011.
2011-08-16 01:01:39 +00:00
cda5dfbf12
New foundation for Hellene dock.
...
Tweaking warship attacks.
This was SVN commit r10010.
2011-08-15 04:02:01 +00:00
ff85950cb7
Disables build restrictions and limits for AIs (until they can be fixed).
...
Simplifies player diplomacy/team setup.
This was SVN commit r10008.
2011-08-15 00:25:22 +00:00
1b8471da1f
Changes shore definition to distance on land (all water included) for better dock placement.
...
Updates build passability classes.
Fixes tile expansion in CheckBuildingPlacement (don't use FromFloat).
Changes dock rotation snapping to search outward.
This was SVN commit r10007.
2011-08-14 23:36:13 +00:00
132f9bd63b
Fixes bug in Atlas random map generator UI.
...
This was SVN commit r10006.
2011-08-14 06:11:35 +00:00
7b27fcb716
Disables water rendering in the actor viewer.
...
This was SVN commit r10005.
2011-08-13 23:00:58 +00:00
8e5f87f240
Adjusts random map starting entities to face consistent direction.
...
This was SVN commit r10004.
2011-08-13 00:54:24 +00:00
5288cda0ba
Greek warship sail.
...
This was SVN commit r10003.
2011-08-12 15:19:48 +00:00
ecee073860
#New Greek Trireme
...
This was SVN commit r10002.
2011-08-12 12:08:21 +00:00
68fe745eb7
Fix packaging scripts for 5-digit revision numbers
...
This was SVN commit r10001.
2011-08-11 18:16:00 +00:00
9be60bf29d
Unit texture updates. Getting rid of "high" res texture folder.
...
This was SVN commit r10000.
2011-08-11 18:11:39 +00:00
e4c6cd8b85
This was SVN commit r9999.
2011-08-11 17:58:08 +00:00
13705a71e0
cleanup
...
This was SVN commit r9998.
2011-08-11 17:57:37 +00:00
ca0f54f17a
Moving textures.
...
This was SVN commit r9997.
2011-08-11 17:51:45 +00:00
dc909411a8
This was SVN commit r9996.
2011-08-11 17:46:01 +00:00
d724ff2b69
Remove rally point for House (females previous removed)
...
This was SVN commit r9995.
2011-08-11 06:39:06 +00:00
a681ff1189
Projectile prop point work for Civic Centres and Fortresses.
...
New foundation for Iberian Dock.
This was SVN commit r9994.
2011-08-11 03:48:52 +00:00
26e249797f
Removed legacy description.
...
This was SVN commit r9993.
2011-08-11 01:45:36 +00:00
bcebde9c8e
#Unit balancing for Carthaginian unit ranks. Closes #923
...
This was SVN commit r9992.
2011-08-11 01:41:49 +00:00
e51849b29f
Fixes incorrect distance calculation.
...
Improves dock foundation snapping.
This was SVN commit r9991.
2011-08-10 23:57:54 +00:00
19ae44ad17
This was SVN commit r9990.
2011-08-10 23:54:37 +00:00
819f354cca
Removes Devil. Fixes #666 .
...
Adds no_delayload to OpenAL, which has been causing startup problems.
This was SVN commit r9989.
2011-08-10 23:15:40 +00:00
2726f6ed88
Changes GetFocus to return points above water.
...
Fixes camera following of boats.
This was SVN commit r9988.
2011-08-10 22:45:55 +00:00
d605e85ae5
Removes ColourTester utility (needs update-workspaces).
...
Adds busy cursor to Atlas map generator.
This was SVN commit r9987.
2011-08-10 22:23:35 +00:00
6d2ff5162e
Made female only trainable from the Civ Centre, then made them train faster. This is a test to see what everybody thinks.
...
This was SVN commit r9986.
2011-08-09 23:10:05 +00:00
5fd0d3b543
New foundation for Carth Market.
...
This was SVN commit r9985.
2011-08-09 23:05:54 +00:00
0adcad8662
Change promoted unit health to the same percent of hitpoints as unit had before promotion. Closes #922 .
...
This was SVN commit r9984.
2011-08-09 18:42:21 +00:00
c513b5e35e
Foundation for the Super Dock. Updated Carthaginians Sandbox demo map.
...
This was SVN commit r9983.
2011-08-09 18:20:31 +00:00
a02eb067f4
Makes Carthaginians selectable in game setup and random maps
...
This was SVN commit r9982.
2011-08-08 20:13:11 +00:00
0952fa879c
This was SVN commit r9981.
2011-08-08 07:13:58 +00:00
511a36e45a
This was SVN commit r9980.
2011-08-08 02:44:41 +00:00
ed3d4c5197
A couple of dock foundations. Tweaked some Carth dock stuff.
...
This was SVN commit r9979.
2011-08-08 02:38:32 +00:00
4a2adece07
Fixes class types for Atlas pathfinding overlay
...
This was SVN commit r9978.
2011-08-08 01:04:18 +00:00
065e13b4d5
Pikemen walk at 6.0 now.
...
This was SVN commit r9977.
2011-08-07 19:25:59 +00:00
5570126bca
Carthaginian dock and superdock files.
...
This was SVN commit r9976.
2011-08-07 10:46:18 +00:00
336c938296
Beefed walking speeds.
...
This was SVN commit r9974.
2011-08-07 06:17:59 +00:00
633c366847
Roman Arch
...
This was SVN commit r9973.
2011-08-07 03:03:06 +00:00
b9bd7ff86e
Fix signed/unsigned comparison warning
...
This was SVN commit r9972.
2011-08-06 12:31:48 +00:00
f378e2e651
Implements building restrictions (by terrain, territory, category, and distance). See #41 . Fixes #804 , #287 .
...
Implements build limits. See #687 .
Implements autorotation for dock placement.
Fixes unit spawning to consider terrain passability. See #893 .
Adds new passability criteria based on distance from shore.
Updates build restrictions on some templates.
Changes unit spawning search to 4 tiles away from foundation.
Changes garrison/training spawn failure to nicer UI notification.
This was SVN commit r9970.
2011-08-06 08:11:05 +00:00
76e6b04c71
Greek Trireme Model
...
This was SVN commit r9969.
2011-08-06 08:04:33 +00:00
c5b512584a
New kart roof tile color.
...
This was SVN commit r9967.
2011-08-05 07:42:48 +00:00
52eabed63d
Resized the carthaginian trade ship. Tweaked its texture color. Added cargo prop.
...
This was SVN commit r9966.
2011-08-05 04:43:54 +00:00
fc5c998dc6
Some updates to Necropolis--trees and such.
...
This was SVN commit r9965.
2011-08-04 22:40:10 +00:00
81c9a9b1f1
Fix build with old GCC
...
This was SVN commit r9964.
2011-08-04 21:36:57 +00:00
93125e29d4
This was SVN commit r9963.
2011-08-04 19:15:24 +00:00
083e7a41fd
fix typo
...
This was SVN commit r9962.
2011-08-04 17:27:14 +00:00
0748c5a75e
cleanup and simplification of the really old h_mgr code.
...
replace array-of-pages data structure with demand-committed VM => allows
simple allocation of new resources without having to search for the
first free index. I suspect the cause of multiple reported bugs (refs
#860 , #899 , #915 ) was a race. Most issues are fixed, but the pool's
freelist also needs to be made thread-safe and lock-free. this has
performance and 64-bit portability implications, so I'll leave it for
later (Pool is due for some serious refactoring anyway).
please post a comment if this or similar issues persist.
This was SVN commit r9961.
2011-08-04 17:11:16 +00:00
22191bfcc6
Windows fix (smaller type conversion)
...
This was SVN commit r9960.
2011-08-04 15:31:01 +00:00
fad5182d6c
This was SVN commit r9959.
2011-08-04 00:51:33 +00:00
9ed3b3f801
Tweaks to the skies textures.
...
This was SVN commit r9958.
2011-08-04 00:49:54 +00:00
154bee8f5c
More vision adjustments.
...
This was SVN commit r9957.
2011-08-03 22:57:52 +00:00
5d992994d4
Territory demo map.
...
Updated vision ranges and territory ranges for templates.
This was SVN commit r9956.
2011-08-03 01:24:06 +00:00
2d662a1228
Add WELL512 RNG
...
This was SVN commit r9955.
2011-08-02 22:58:10 +00:00
94e9a8b459
Fix hang with Boost 1.47
...
This was SVN commit r9954.
2011-08-02 21:07:58 +00:00
acbb59d982
Some texture and actor updates, specifically in regards to capes.
...
This was SVN commit r9953.
2011-08-02 02:14:10 +00:00
6aeb5c64de
# Remove SoD inside territories.
...
Fix some serialisation issues.
This was SVN commit r9951.
2011-08-01 21:25:12 +00:00
9430de3d85
Support TerrainChanged messages in scripts, and report use of unsupported messages
...
This was SVN commit r9950.
2011-08-01 21:01:06 +00:00
7e67e816c9
Add small 'X' exit button to corner
...
This was SVN commit r9949.
2011-08-01 03:30:13 +00:00
bd3c395d00
This was SVN commit r9948.
2011-08-01 02:46:29 +00:00
6bcb3f5695
A very rough attempt at the new main menu style.
...
This was SVN commit r9947.
2011-08-01 00:41:24 +00:00
0401d07659
kart_struct texture update. Updates to civcentre, market, temple models
...
This was SVN commit r9946.
2011-07-31 16:51:51 +00:00
22cf7d4d83
Fix #913 (corrupted map file)
...
This was SVN commit r9945.
2011-07-31 12:19:06 +00:00
6304797cbd
pool - safely handle zero-sized allocations ( fixes #909 )
...
snd_mgr - remove no longer needed hacks for native OpenAL
implementations
test_wdbg_sym.h - belated commit of warning fix
This was SVN commit r9944.
2011-07-31 09:42:57 +00:00
14fbdb9aae
This was SVN commit r9943.
2011-07-31 07:41:34 +00:00
f258ce921d
Territory tweaks for structures. Playtest and see what you think.
...
This was SVN commit r9942.
2011-07-31 04:52:53 +00:00
0cf9dbf9c6
Cavalry version for the cape. New updated shields for Cart and Samnite units.
...
This was SVN commit r9941.
2011-07-31 04:41:20 +00:00
f73a44527d
Miscellaneous stuff, like Kart Samnite unit stuff, and brand new capes.
...
This was SVN commit r9940.
2011-07-31 01:42:41 +00:00
e7ac0926a7
Replace console prefix-search behaviour with more standard history navigation, based on patch by Ross Bearman.
...
Fixes #906 .
This was SVN commit r9939.
2011-07-30 23:06:09 +00:00
3cc1c7e24e
Templates sorting utility. Closes #801 .
...
This was SVN commit r9938.
2011-07-30 20:20:34 +00:00
328d33b9e9
Simulation templates sorting in internal mod. See #801 .
...
This was SVN commit r9937.
2011-07-30 20:18:21 +00:00
2ecbfa81c3
Simulation templates sorting. See #801 .
...
This was SVN commit r9936.
2011-07-30 20:09:46 +00:00
22f2878c26
This was SVN commit r9935.
2011-07-30 18:34:08 +00:00
a1f925a378
Fix broken entity reference
...
This was SVN commit r9934.
2011-07-30 16:40:42 +00:00
b63cc7b18d
Delete seemingly bogus file
...
This was SVN commit r9933.
2011-07-30 16:38:32 +00:00
04ec40259b
Use player colours for territory borders in minimap
...
This was SVN commit r9932.
2011-07-30 12:07:27 +00:00
4e4a5fd8a6
Increase territory border thickness
...
This was SVN commit r9931.
2011-07-30 12:06:07 +00:00
8fee3d8ef8
# New territory border rendering.
...
Add textured line overlay rendering.
Change terrain height calculations to be triangulation-dependent for
improved accuracy.
Add triangulation-dependent terrain normal function.
Support separate S/T wrap modes for textures.
Rename CVector2D_Maths since it no longer conflicts with simulation
CVector2D.
Coalesce freed chunks in vertex buffers, to avoid excessive
fragmentation.
Add some things to help debug vertex buffer allocation a little.
This was SVN commit r9929.
2011-07-30 00:56:45 +00:00
239685d754
#New Carthaginian Merchant Ship
...
This was SVN commit r9927.
2011-07-27 15:23:14 +00:00
e7677a48e2
1 more Samnite shield texture.
...
This was SVN commit r9926.
2011-07-27 05:32:40 +00:00
29a178d9d6
Samnite portraits.
...
This was SVN commit r9925.
2011-07-27 05:06:06 +00:00
8a400f7b97
#Samnites.
...
#Greek shield guides.
This was SVN commit r9924.
2011-07-27 04:48:44 +00:00
b892d35fea
Removes ConquestCritical token from fauna units, so they don't count against victory. Fixes #911 .
...
This was SVN commit r9923.
2011-07-26 22:26:49 +00:00
f32beb879b
Kart wall and tower testing
...
This was SVN commit r9922.
2011-07-26 20:13:30 +00:00
8bc942d271
A bunch of "Samnite" i.e. Italic Cavalry stuff.
...
This was SVN commit r9921.
2011-07-26 06:35:29 +00:00
27e895b1b0
Closed palisade gate
...
This was SVN commit r9920.
2011-07-25 17:53:05 +00:00
2a9e7f9449
Unit actor work. Updated some portraits. Started work on a samnite shield, but the collada files are being goofy (looks like the normals are flipped, but they aren't).
...
This was SVN commit r9919.
2011-07-25 08:56:54 +00:00
3afbab309a
Tweaks to Carth corral.
...
Made the palisade fort shoot from the proper place.
This was SVN commit r9917.
2011-07-25 01:53:18 +00:00
713197b98d
This was SVN commit r9916.
2011-07-25 00:53:20 +00:00
3b70097dbe
New palisade Outpost, Watchtower, and Spike structures
...
This was SVN commit r9915.
2011-07-25 00:10:20 +00:00
cbbc4e148b
Updates to some of the palisade models
...
This was SVN commit r9914.
2011-07-25 00:00:41 +00:00
5516f11fc2
This was SVN commit r9913.
2011-07-24 22:20:30 +00:00
3d9d6bd3dc
Greek wall tower shoots from the proper place now.
...
Tweaks to the black capes.
This was SVN commit r9912.
2011-07-24 22:19:19 +00:00
cdfeeab25f
Fixes Atlas non-PCH build.
...
This was SVN commit r9911.
2011-07-24 21:50:58 +00:00
c072e8a85d
New Kart corral files
...
This was SVN commit r9910.
2011-07-24 21:42:38 +00:00
f0fe1b0b28
Fixes rmgen to use GetCivData and handle invalid/unfinished civs.
...
This was SVN commit r9909.
2011-07-24 20:04:04 +00:00
b2837e2878
Fix compatibility more with Boost 1.47
...
This was SVN commit r9907.
2011-07-24 11:59:57 +00:00
955f94976e
# New dynamic territories design
...
This was SVN commit r9906.
2011-07-24 11:42:35 +00:00
78fd3a2ba2
Fix compatibility with Boost 1.47
...
This was SVN commit r9905.
2011-07-24 11:41:06 +00:00
2612cd511d
This was SVN commit r9904.
2011-07-24 09:18:42 +00:00
51b99950c4
Thespian Melanochitones.
...
This was SVN commit r9903.
2011-07-24 08:52:06 +00:00
18f6d55dc0
#Italic Cavalry stuff.
...
This was SVN commit r9902.
2011-07-24 05:45:58 +00:00
813fed5b9e
Adds GetCivData to map generator API (to replace the hardcoded starting entities in rmgen).
...
Adds some starting entities to unfinished civs.
This was SVN commit r9901.
2011-07-24 03:28:18 +00:00
17d8807566
Touched up some animal stuff. Added Asian elephant entity.
...
This was SVN commit r9900.
2011-07-23 21:17:16 +00:00
3f950d1774
Elven Ship(under the name noldor_ship_trireme)
...
This was SVN commit r9899.
2011-07-23 10:24:36 +00:00
44742dd78d
#Hannibal updated.
...
This was SVN commit r9898.
2011-07-22 21:48:35 +00:00
cdd10cf8d2
#New Carthaginian shields.
...
This was SVN commit r9894.
2011-07-22 06:07:11 +00:00
a32dff97b5
Sail textures.
...
This was SVN commit r9893.
2011-07-21 23:19:03 +00:00
7ff8b75c89
Tooltip for Carthaginian Temple.
...
This was SVN commit r9892.
2011-07-21 05:35:41 +00:00
153357f640
Replaces architecture-dependent cpuid function with inline GCC assembly. Should fix #670 by eliminating nasm dependency.
...
This was SVN commit r9891.
2011-07-21 01:44:29 +00:00
f9d7c1246d
# Initial support for territories
...
This was SVN commit r9889.
2011-07-20 19:48:06 +00:00
cdbd347466
Fix inconsistent function prototype ( fixes #897 )
...
This was SVN commit r9888.
2011-07-20 19:44:31 +00:00
15df4aa4be
OS X fix: if os_cpu_ClockFrequency reports an unknown/invalid value, measure the frequency instead; also avoid reporting invalid freqs in system_info
...
This was SVN commit r9886.
2011-07-20 08:10:36 +00:00
ce42cd611a
Update release packaging script for recent library changes
...
This was SVN commit r9884.
2011-07-19 17:30:49 +00:00
8da2640f5e
Fixes no-PCH build
...
This was SVN commit r9883.
2011-07-19 09:00:15 +00:00
83f7639ac9
Removes hacks for typed array initialization
...
This was SVN commit r9882.
2011-07-19 08:52:17 +00:00
b2be81c51f
#Mauritanian Archers.
...
This was SVN commit r9881.
2011-07-19 07:59:32 +00:00
0b5e959a31
Some updates to Oasis II map.
...
This was SVN commit r9880.
2011-07-18 23:29:15 +00:00
8ed6a0b335
This was SVN commit r9879.
2011-07-18 23:07:33 +00:00
840a404952
Regenerate makefiles for modified Premake using unmodified Premake, for OS X compatibility
...
This was SVN commit r9878.
2011-07-18 21:42:41 +00:00
708e9cea05
Fix looping of non-streaming sounds
...
This was SVN commit r9877.
2011-07-18 17:56:17 +00:00
9edfe0fbcd
Fix clean-workspaces script for new SpiderMonkey
...
This was SVN commit r9876.
2011-07-18 17:32:07 +00:00
b738f27283
hopefully fix non-Windows build errors
...
This was SVN commit r9875.
2011-07-18 15:25:48 +00:00
ead45aa957
Report XML parse errors better in validator tool
...
This was SVN commit r9874.
2011-07-18 14:57:41 +00:00
65d87eaee7
Fix XML error and probable typo
...
This was SVN commit r9873.
2011-07-18 13:35:29 +00:00
c33246d603
Fix build errors
...
This was SVN commit r9872.
2011-07-18 11:10:13 +00:00
0d23e3f333
post-alpha sync with work.
...
debug stack trace fixes, remove more asm, change CONTINUE/OK scheme to
OK/ALL_COMPLETE, fix tests
This was SVN commit r9871.
2011-07-18 09:21:56 +00:00
2d9e473483
fix for non-contiguous APIC IDs within a single package (happens on recent Intel CPUs)
...
This was SVN commit r9870.
2011-07-18 08:08:06 +00:00
bb3e37725d
#Added ranks to Carthaginian units.
...
#Updated some temperate biome terrain textures.
This was SVN commit r9869.
2011-07-18 06:31:57 +00:00
edb063dbc8
Temporary fishing boat (Greek) and merchant ship (Iberian) for Carthage.
...
Touched up maps.
This was SVN commit r9868.
2011-07-18 03:48:24 +00:00
af5fad90fa
UI Portraits for fauna.
...
This was SVN commit r9867.
2011-07-18 02:01:33 +00:00
7c47df6c8e
Touched up Mediterranean Coves map.
...
UI Portrait for Palisades.
This was SVN commit r9866.
2011-07-18 01:18:56 +00:00
68c978ea75
Additional Cretan Date Palms.
...
New and Updated UI Portraits.
This was SVN commit r9865.
2011-07-18 00:31:42 +00:00
37d7769d53
Carthaginian portraits.
...
This was SVN commit r9864.
2011-07-17 20:09:08 +00:00
aeddb5fb48
avoid warning when running a second instance and Mahaf is enabled
...
This was SVN commit r9863.
2011-07-17 19:19:33 +00:00
a31ce6a3ce
Fix "hides overloaded virtual function" warnings in Clang
...
This was SVN commit r9862.
2011-07-17 17:30:07 +00:00
be3eb579d4
fix another cast runtime error
...
This was SVN commit r9861.
2011-07-17 14:48:23 +00:00
d20582e1dc
Slight color correction.
...
This was SVN commit r9860.
2011-07-17 04:55:25 +00:00
426bd5561d
Added some Cretan Date Palms.
...
This was SVN commit r9859.
2011-07-17 04:38:13 +00:00
5eec0485f1
#New Cretan Date Palms.
...
This was SVN commit r9858.
2011-07-17 04:00:12 +00:00
ea7f65818a
Avoid release-mode-only warning
...
This was SVN commit r9857.
2011-07-17 01:26:04 +00:00
7d0b5e2b39
This was SVN commit r9856.
2011-07-17 00:54:57 +00:00
b8819cfe75
Increased walking speed 0.5 for almost all units.
...
This was SVN commit r9855.
2011-07-17 00:54:39 +00:00
2f0bd8d8b0
Upgrade to SpiderMonkey 1.8.5 ( fixes #734 )
...
This was SVN commit r9852.
2011-07-16 23:24:14 +00:00
c7ba150c40
Fix handling of update-workspaces arguments on Windows
...
This was SVN commit r9849.
2011-07-16 22:17:47 +00:00
364f76c5ff
Fix rare use of uninitialised values
...
This was SVN commit r9847.
2011-07-16 19:52:48 +00:00
dd054c8d97
acpi: fix cast error (caught by runtime check)
...
x86_x64: simplify MSC version check
This was SVN commit r9846.
2011-07-16 17:27:07 +00:00
4ca278c48f
A new skybox.
...
Moved billboards from Internal to Public.
Gave the Persian trireme 3 banks of oars for testing.
This was SVN commit r9845.
2011-07-16 08:49:49 +00:00
516b5279a9
This was SVN commit r9844.
2011-07-16 06:01:16 +00:00
5870b77865
Sicilia complete.
...
This was SVN commit r9843.
2011-07-16 05:49:35 +00:00
d3da151676
This was SVN commit r9842.
2011-07-16 04:28:49 +00:00
84608d7001
Palisade "forts" now have ranged attack.
...
This was SVN commit r9841.
2011-07-16 04:09:12 +00:00
dcc8042e61
A few updated unit portraits.
...
This was SVN commit r9840.
2011-07-16 03:21:01 +00:00
9118f5cb98
This was SVN commit r9839.
2011-07-16 03:01:18 +00:00
d86bb7cf73
Gallic Fields, final (I think).
...
A few more Pine Tree variants.
This was SVN commit r9838.
2011-07-16 02:57:58 +00:00
0aba4006cc
Fix object path for .asm files in VC200x
...
This was SVN commit r9837.
2011-07-15 22:48:37 +00:00
e8e4d37c8d
Set up manifest via linkoptions for test executable
...
This was SVN commit r9836.
2011-07-15 22:45:50 +00:00
5dd08d3cb0
This was SVN commit r9835.
2011-07-15 22:32:00 +00:00
1ebc3333b0
Updated Gallic Fields map with new wooden bridge.
...
Updated Leonidas' running speed.
This was SVN commit r9834.
2011-07-15 22:14:43 +00:00
b551a744cc
Premake4 binary for Windows
...
This was SVN commit r9833.
2011-07-15 19:01:50 +00:00
1e470d37ff
Pre-generated Premake4 build files
...
This was SVN commit r9832.
2011-07-15 18:55:36 +00:00
befba20acb
Fix Makefile dependency generation.
...
Fix PCH dependency to work with parallel builds.
This was SVN commit r9831.
2011-07-15 18:51:18 +00:00
0dc3ae487d
Premake4 build scripts for the game, from Yves (plus minor tweaks)
...
This was SVN commit r9830.
2011-07-15 17:56:57 +00:00
76ff2cc83a
Non-standard Premake4 patches from Yves (plus minor tweaks).
...
Add nasm support.
Add cxxtest support.
Some other fixes.
This was SVN commit r9829.
2011-07-15 17:48:21 +00:00
fcab9e3b5e
Import Premake4 source (rev fc0374a03b17), minus samples/ and packages/
...
This was SVN commit r9828.
2011-07-15 17:32:06 +00:00
8eb7af4ac9
Be a bit more robust to build environment changes.
...
Reduce some module dependencies.
Clean up some unused instantiations.
This was SVN commit r9827.
2011-07-15 13:22:48 +00:00
a3e88e6705
Temperate stone and metal quarries.
...
Tweaked Thracian animations.
Renamed Celtic Fortress to Gallic Fields.
This was SVN commit r9825.
2011-07-15 05:43:28 +00:00
de2f377ee0
Changed Tholos to Prytaneion.
...
Sicilia map, still wip.
This was SVN commit r9824.
2011-07-15 00:01:08 +00:00
486d2854e4
This was SVN commit r9823.
2011-07-14 22:57:48 +00:00
ce7ffb24ff
Celtic Fortress is a wip map.
...
Ship Formations is a mockup showing what I think ship formations should
be.
This was SVN commit r9821.
2011-07-14 20:50:34 +00:00
ca42649c5b
Fix MSVC warning
...
This was SVN commit r9820.
2011-07-13 19:28:31 +00:00
f28ae0d427
Disable SDL's DGA mouse support by default, to fix Linux fullscreen mouse sensitivity problems
...
This was SVN commit r9819.
2011-07-13 17:40:12 +00:00
7f74693052
Disable culling of transparent objects in shadows/reflections, to fix trees
...
This was SVN commit r9818.
2011-07-13 13:51:40 +00:00
f02e67d012
Tweaked Loot values to be roughly 10% of the unit cost. Still seems kinda weird to get Food loot from a corpse.
...
Shield fixes and tweaks.
Touch-ups to Siwa Oasis.
This was SVN commit r9817.
2011-07-13 08:31:33 +00:00
5940c64886
All Public scout towers/outposts shoot arrows from the correct spot. :)
...
This was SVN commit r9816.
2011-07-13 03:10:54 +00:00
b08e142193
Graphics optimisations and features from eihrul.
...
Add shadow filtering (PCF) option.
Fix ugly shadow saturation in old lighting mode.
Fix fancy water shader.
Fix camera matrix computation.
Support scissoring of camera frustum.
Optimise vertex skinning.
Inline various matrix functions.
Support filtering of the list of submitted models before a rendering
pass, for more precise culling.
Optimise water renderer (fixes #721 , based on patch by ortalo).
Use scissoring when generating reflection/refraction textures.
Skip reflection/refraction texture generation when no water is visible.
Render alpha-blended objects differently (fixes #434 ).
Reduce shadow swimming effects.
This was SVN commit r9814.
2011-07-12 23:48:05 +00:00
5ada37e8fa
Wooden bridge edge files
...
This was SVN commit r9812.
2011-07-12 23:26:31 +00:00
6e13e0fa49
Update to palisade wall 3D models
...
This was SVN commit r9811.
2011-07-12 23:22:03 +00:00
7a4d86b58f
Javelin Updates.
...
This was SVN commit r9810.
2011-07-12 22:24:52 +00:00
e31e3aa763
Updated Carthaginian scout tower with properly firing projectiles.
...
This was SVN commit r9808.
2011-07-11 23:29:32 +00:00
af57bc2262
Palisade spikes template files
...
This was SVN commit r9807.
2011-07-11 22:51:20 +00:00
e03138ea22
fixed projectiles
...
This was SVN commit r9806.
2011-07-11 22:15:05 +00:00
c8c7799528
Palisades committed. Some need obstruction offset
...
This was SVN commit r9805.
2011-07-11 22:09:57 +00:00
fe878cedc2
Fix promotion element in Carthage units templates
...
This was SVN commit r9804.
2011-07-11 13:28:47 +00:00
9c3b41644a
Stats tweaks.
...
This was SVN commit r9803.
2011-07-11 08:10:27 +00:00
6217522b6f
Add lava terrain set to the terrain tabs.
...
This was SVN commit r9802.
2011-07-11 06:14:55 +00:00
6396ad950a
Updated Demetrius portrait.
...
This was SVN commit r9801.
2011-07-11 05:01:21 +00:00
799bc98d86
Moving more Carthage stuff from Internal to Public.
...
This was SVN commit r9800.
2011-07-11 02:27:06 +00:00
704ce541ba
Move Carthage from Internal to Public.
...
This was SVN commit r9799.
2011-07-11 02:06:48 +00:00
6d95933cd7
This was SVN commit r9798.
2011-07-11 01:51:20 +00:00
bb33a259b6
Fixes Atlas build errors on OS X (specifically MacPorts' version of wxWidgets doesn't support constructing wxString with std::wstring)
...
This was SVN commit r9797.
2011-07-10 21:00:21 +00:00
21830623d5
Temporary user interface button sounds
...
This was SVN commit r9796.
2011-07-10 14:03:41 +00:00
51c574bcc5
Made the siege tower's status bar bigger.
...
This was SVN commit r9795.
2011-07-10 06:15:58 +00:00
0496007f5e
Added <GenericNames> to some Greek units.
...
This was SVN commit r9794.
2011-07-10 06:01:28 +00:00
73e825f9f7
This was SVN commit r9793.
2011-07-10 05:27:10 +00:00
0fd79bf9cd
Lots of Actor fixes for Carthaginians (animation speeds, props).
...
Lots of entity fixes that include SelectionGroupName and GenericName
tags.
This was SVN commit r9792.
2011-07-10 05:09:24 +00:00
bfef903c94
Adds hotkey for finding idle warriors (comma). See #792 .
...
Updates finding idle units to be more flexible.
Resets finding idle units when unit is deselected.
Adds Warship class to relevant templates.
This was SVN commit r9791.
2011-07-10 02:11:51 +00:00
20ebb2b829
Fix incorrect string type in log message on non-Windows
...
This was SVN commit r9790.
2011-07-09 18:41:58 +00:00
c964904e1b
Carthaginian units actor fixes.
...
This was SVN commit r9789.
2011-07-09 05:24:33 +00:00
5169a05237
Fixed something in the description.
...
This was SVN commit r9787.
2011-07-09 03:00:34 +00:00
Ykkrosh