1
0
forked from mirrors/0ad

Compare commits

...

3635 Commits

Author SHA1 Message Date
historic_bruno 9c92f45c61 Fixes typo in OS X bundle build script.
Changes SDL2 version in build-osx-libs.sh to Hg snapshot SDL-2.0.4-9134,
refs #2852

This was SVN commit r15849.
2014-10-06 23:45:34 +00:00
historic_bruno 0b0184af1d Removes SDL1 from OS X libraries build script
This was SVN commit r15848.
2014-10-06 01:05:46 +00:00
Itms a028027f75 Fix previous commit.
This was SVN commit r15847.
2014-10-05 22:46:24 +00:00
Itms 41ea9539a2 Update the translations selection script to match our choices for A17.
This was SVN commit r15846.
2014-10-05 22:05:22 +00:00
Itms 5d9d9a67bf Allow enabling the post processing filters during a game.
Includes numerous code updates, also updated the copyright for
cd5de73f3a.

Patch by dan@sstrev.com, fixes #2672.

This was SVN commit r15843.
2014-10-05 20:50:10 +00:00
Itms cd5de73f3a Allow setting the "Smoothing LoS" option during a game.
Patch by dan@sstrev.com, fixes #2513

This was SVN commit r15841.
2014-10-05 20:02:04 +00:00
mimo 2af4272c07 allow war dogs to garrison in ships
This was SVN commit r15840.
2014-10-05 19:25:27 +00:00
mimo 807fd8c236 fix bonus caption display, thanks to Polakrity
This was SVN commit r15839.
2014-10-05 13:57:59 +00:00
leper 642011e6c0 Fixes tests broken in e91215d5c9.
This was SVN commit r15838.
2014-10-04 15:37:33 +00:00
scythetwirler 90c0957cef Fixes cavalry upgrade inconsistencies.
This was SVN commit r15837.
2014-10-04 14:13:14 +00:00
mimo e91215d5c9 improve gui performance, refs #2179 comment 21
This was SVN commit r15836.
2014-10-04 11:40:53 +00:00
scythetwirler 8a3435915b Slightly buffs swordsmen and fixes a couple inconsistencies.
This was SVN commit r15835.
2014-10-04 05:31:29 +00:00
scythetwirler 54bc1c7173 Fixes #2831. Patch by prodigalson.
This was SVN commit r15834.
2014-10-04 05:17:36 +00:00
historic_bruno 69c8b89f84 Fixes blank window after maximizing, minimizing, then restoring the game on Windows. In SDL2, this is an SDL_WINDOWEVENT_EXPOSED event, which we must handle to reset the game's minimized state. Refs #2041
This was SVN commit r15832.
2014-10-04 00:46:53 +00:00
Yves 5a985e18f4 Modify GC scheduling and reduce VFS cache size.
It seems like there is a memory leak if we haven't finished with the
marking phase of an incremental GC and SpiderMonkey has to trigger a
full GC because it runs out of memory. With this patch we stop trying to
make incremental GCs if we are above 1/2 of the runtime size and do Full
GCs instead. This should make such low memory conditions even less
likely than they were already after the previous patch. Also reduce the
maximum VFS cache size to 400 MB.
Refs #2808

This was SVN commit r15831.
2014-10-04 00:43:04 +00:00
historic_bruno 9c4eb0295a Fixes some bugs related to IME text input in SDL2, including a possible crash, refs #2041. Behavior seems reasonably consistent now on Windows and OS X
This was SVN commit r15830.
2014-10-03 23:33:41 +00:00
mimo 5c97a681d4 fix typo in Petra, thanks niektb for noticing
This was SVN commit r15829.
2014-10-02 19:01:26 +00:00
historic_bruno a86231240d Fixes some bugs in OS X bundle build script.
Logs most build output to file using simple redirects for now.
Hides output of pushd/popd commands

This was SVN commit r15828.
2014-09-29 04:33:51 +00:00
historic_bruno f10bdf5089 Fixes some issues when toggling fullscreen mode with SDL2, refs #2041:
* SDL_WINDOW_RESIZABLE must be set when creating the window, apparently
only fullscreen flags take effect in SDL_SetWindowFullscreen
* Stores window position, so a window can be restored to both its
original position and size, rather than defaults
* Changes initial window position from undefined to centered, it caused
some problems with window positioning returning from fullscreen mode

This was SVN commit r15827.
2014-09-28 22:10:09 +00:00
leper 2afeec0c01 Unify removal of incomplete translations in packaging scripts. Fixes #2825.
This was SVN commit r15826.
2014-09-28 21:51:48 +00:00
historic_bruno 436eb18397 Updates precompiled win32 gloox lib to 1.0.11 and rebuilt glooxwrapper with VC++ 2010. Note: gloox 1.0.3 and later changed the license from GPL v2 to v3.
Updates LICENSE.txt accordingly.

This was SVN commit r15825.
2014-09-28 21:44:48 +00:00
historic_bruno db71b74d7d Clarifies some license versions in LICENSE.txt and makes formatting more consistent
This was SVN commit r15824.
2014-09-28 21:37:03 +00:00
historic_bruno 001f32e080 Removes lib path for cxxtest from extern_libs4.lua, to avoid clang linker warning
This was SVN commit r15823.
2014-09-28 21:18:44 +00:00
Itms a18107aa7c Fix placing of some entities in various maps, refs #2560.
This was SVN commit r15822.
2014-09-28 16:53:19 +00:00
historic_bruno 5200ea0365 Fixes starting Atlas from in-game on OS X, patch by trompetin17, refs #2427
This was SVN commit r15821.
2014-09-28 07:03:51 +00:00
historic_bruno 9148e5609f Updates library LICENSE.txt for new cxxtest version and addition of SDL2
This was SVN commit r15820.
2014-09-28 01:58:37 +00:00
leper 857698e231 Fix memory leak when loading mods from config.
This was SVN commit r15818.
2014-09-28 00:13:55 +00:00
scythetwirler e07305fd9f Buffs melee cavalry attack by 20% and overall cavalry speed by 2.0.
This was SVN commit r15817.
2014-09-27 22:01:50 +00:00
historic_bruno 0caab0429f Fixes Reset Water Data button position in Atlas, fixes #2820
This was SVN commit r15815.
2014-09-27 02:42:42 +00:00
historic_bruno ea2db5386b Fixes water rendering and crashes on GPUs without FBO support, fixes #2667
This was SVN commit r15814.
2014-09-27 01:32:03 +00:00
scythetwirler 2f8ed7980d Makes the bot more lenient on case sensitivity due to inconsistencies in case between Windows and Unix.
This was SVN commit r15813.
2014-09-27 01:06:28 +00:00
mimo b524f59657 check ResourceGatherer interface before trying to gather, fixes #2801
This was SVN commit r15812.
2014-09-26 21:23:32 +00:00
mimo 119aad9da9 fix a debug message
This was SVN commit r15811.
2014-09-26 17:07:17 +00:00
leper 20956c94b0 Update some strings.
This was SVN commit r15809.
2014-09-26 14:26:21 +00:00
historic_bruno 8f039bfb44 Fixes translation inclusion regex for build-osx-bundle.sh, fixes #2764
This was SVN commit r15808.
2014-09-26 01:06:21 +00:00
leper 7ca08e2485 Fix type errors in cmpAttack by switching parameter and object.
This was SVN commit r15805.
2014-09-25 16:33:38 +00:00
Itms eda8f3cc18 Tweak some strings, addressing concerns pointed out by translators on Transifex.
This was SVN commit r15804.
2014-09-25 15:36:18 +00:00
leper fe30c0e6a1 Switch to ErrorPrinter on Windows. Refs #2488.
This was SVN commit r15803.
2014-09-25 15:17:30 +00:00
Itms d7d1607021 Fix GUI errors when a client joins a multiplayer game setup room.
Based on a patch by cwprogger, fixes #2779

This was SVN commit r15802.
2014-09-25 15:05:10 +00:00
historic_bruno b155d4f7e3 Updates OS X bundle build script. Adds --release flag which can be used to build a proper release bundle, including SVN export, at the expense of time and disk space. Moves SVN-specific logic to this mode, otherwise the script works with git or no source control at all.
Removes obsolete instructions for building a 32-bit 10.5 bundle.

This was SVN commit r15801.
2014-09-25 02:18:19 +00:00
historic_bruno d1a31b3f54 Fixes regex for excluding translations from release packages, refs #2494
This was SVN commit r15800.
2014-09-25 02:07:46 +00:00
historic_bruno 5ad07045e2 Sets OS X build to use SDL2 by default, refs #2041
This was SVN commit r15799.
2014-09-25 01:54:58 +00:00
scythetwirler a815ca0de9 Nerfs sele hero aura, transitions a tech, and fix spaces.
This was SVN commit r15798.
2014-09-25 00:53:48 +00:00
leper d67ffa039c Handle an error of no suitable tiles being found gracefully in Schwarzwald RMS. Fixes #2787.
This was SVN commit r15797.
2014-09-24 20:48:19 +00:00
leper 533fb6f7bc Load the public mod by default. Fixes #2754.
This was SVN commit r15796.
2014-09-24 17:49:22 +00:00
leper 4753a0c1c2 Replace usage of "GUIs" in cxxtest with the command line,
and extend that to support -libdir <dir> and -disabled. Fixes #2488.

This was SVN commit r15795.
2014-09-24 15:35:31 +00:00
leper 29effb5089 Build fixes and improvements for BSDs. Fixes #2804.
This was SVN commit r15793.
2014-09-24 14:11:13 +00:00
leper d6709d3e08 Ignore mods (in the modmod) that do not specify required properties. Fixes #2822. Refs #2794.
Fixes description display if filters are used.

This was SVN commit r15792.
2014-09-24 01:36:57 +00:00
leper 091b958344 Fix an issue with filters and translations in the modmod.
This was SVN commit r15791.
2014-09-24 00:26:13 +00:00
historic_bruno b5a0e2ec5c Updates OS X DMG background image, by He who must not be named
This was SVN commit r15790.
2014-09-23 02:48:23 +00:00
historic_bruno 1a2c9835c9 Adds patch for wxWidgets build on OS X, fixes Atlas crash on VMs with software rendering.
Cleans up wxWidgets config flags

This was SVN commit r15788.
2014-09-23 00:33:14 +00:00
Yves 3b49576fa6 Tunes GC scheduling a bit to reduce memory usage.
The main problem was that GC was only called from the simulation before
this patch. This means when you were waiting in the multiplayer lobby or
just had the GUI open, it only called GC when getting close to the JS
runtime size limit (I assume). Another problem was the Net Server
runtime which didn't GC either. Here the runtime size limit is 16 MB
though, so it's not too terrible. These issues have both been addressed
and GC has been given a bit more time per incremental slice to make sure
it gets done in time. It's still far from perfect, but there are too
many changes in SpiderMonkey related to GC, so I don't want to spend too
much time on this yet.

Refs #2808

This was SVN commit r15787.
2014-09-22 20:13:04 +00:00
historic_bruno 3f75e5db0e Adds --sdl2 flag to update-workspaces.bat, making SDL2 the default on Windows, refs #2041
This was SVN commit r15786.
2014-09-22 19:42:55 +00:00
historic_bruno 5593f573f4 Cleans up handling of SDL2 text input events, no behavior change expected.
Implements SDL2 text editing handler for input fields, this is for IME
support, so users entering CJK text can see what they're composing
before committing it. Should have no effect on SDL1 or normal text
input.

This was SVN commit r15785.
2014-09-22 19:00:20 +00:00
mimo 03dd6908ec Petra: decreases size of attacking armies in easy level
This was SVN commit r15784.
2014-09-22 18:53:54 +00:00
historic_bruno 9592c59704 Fixes crash in Atlas color picker tool, noticeable with wxWidgets 3.0. Colors returned by wxColourData::GetCustomColour aren't always valid, so we have to test them with IsOk() before accessing them. Fixes #2805
This was SVN commit r15782.
2014-09-21 21:25:51 +00:00
Yves a89d0190bd Use ES6 Maps in the AI API for applying tech and aura modification to entity templates.
This should improve performance a bit (check the ticket for details).

Refs #2475

This was SVN commit r15781.
2014-09-21 21:02:15 +00:00
Itms b1ca37eead Extend visibility update to all tiles around LoS vertices. Incidentally prevent an issue from arising on square maps. Also improve a code comment.
This should be enough to fix #2760.

This was SVN commit r15779.
2014-09-21 20:29:54 +00:00
mimo bce96c99bb small fixes/improvments to the AI
This was SVN commit r15776.
2014-09-21 12:02:33 +00:00
Itms 357fa957c8 Add a translation comment for "Join Game" buttons in the main menu and the lobby, to clarify the translation context.
Fixes #2548

This was SVN commit r15775.
2014-09-21 08:35:21 +00:00
historic_bruno 8f61e36352 Adds SDL2 to build-osx-libs.sh, but leave SDL1 as the default while we test, refs #2041.
Note: SDL2_CONFIG is now the variable to override the path to
sdl2-config, SDL_CONFIG remains to override the path to sdl-config

This was SVN commit r15774.
2014-09-20 19:02:24 +00:00
Yves a8d8c6d101 Reverts the use of Set in f5336c42b8.
Sets don't support multiple elements with the same key which is required
here to fire timers multiple times per turn.
Refs #2475

This was SVN commit r15773.
2014-09-20 18:48:12 +00:00
Yves f5336c42b8 Adds Serialization support for ES6 Maps.
Also includes the patch from Sanderd17 to use Maps and Sets for the
Timer components. Sets can't be serialized yet, but in this case they
don't require serialization.
Refs #2475

This was SVN commit r15770.
2014-09-20 17:14:53 +00:00
scythetwirler 6b2677a3fd Adds profiles to the multiplayer lobby. Fixes #2504.
This was SVN commit r15768.
2014-09-20 15:35:26 +00:00
historic_bruno d62e3729d5 Improves SDL2 support, includes patch by yashi and fabio, refs #2041:
* Adds SDL color cursor implementation
* Adds config option for choosing preferred display in multimonitor
setup
* Uses text input API to better handle CJK input
* Fixes various hotkey and input bugs

SDL 1.2 is still the default and recommended, to test experimental SDL2
support, pass the --sdl2 flag to update-workspaces

This was SVN commit r15767.
2014-09-20 12:12:35 +00:00
Itms 801d13aa8b Address some possible causes of bad handling of visibility updates. Also includes a little code tweaking allowing the global update of all visibility data.
Refs #2760

This was SVN commit r15765.
2014-09-20 08:26:45 +00:00
scythetwirler 55b12857b3 Buffs ranged units slightly as massing melee units was slightly overpowered.
This was SVN commit r15764.
2014-09-19 03:39:24 +00:00
scythetwirler 6999295b7e Fixes #2768.
This was SVN commit r15763.
2014-09-19 03:14:46 +00:00
historic_bruno aa5fded9ae This was SVN commit r15762. 2014-09-17 23:22:20 +00:00
historic_bruno c56407a1f8 Fixes autostart init of player data, patch by mimo, fixes #2798.
Cleans up some of the autostart logic, removes and renames a few options
for clarity.
Updates readme.txt to reflect these changes and include some examples

This was SVN commit r15761.
2014-09-17 01:15:03 +00:00
Itms b5f32e720f Rename the Briton hero Cynvelin to Cunobelin, which is a more common appellation, and is coherent with the historical data of the game. Also fix some typos by this mean.
Fixes #2639

This was SVN commit r15759.
2014-09-16 09:13:26 +00:00
historic_bruno 809189d953 Fixes "quit" command and GUI notification for AI debugging, fixes #2755
This was SVN commit r15758.
2014-09-16 02:50:49 +00:00
mimo b2a479cc74 reset some map attribute, addresses #2803
This was SVN commit r15757.
2014-09-15 21:59:51 +00:00
mimo 3f1db1ef01 remove aegis bot
This was SVN commit r15756.
2014-09-15 20:19:00 +00:00
leper 66a2fe6308 Unload hotkeys on shutdown.
Fixes double registration of hotkeys on engine restart.

This was SVN commit r15755.
2014-09-15 01:27:06 +00:00
scythetwirler 28c0b00b2e Sorts games in gamesList by status, then name. Refs #2463, #2448.
This was SVN commit r15754.
2014-09-14 22:11:03 +00:00
scythetwirler 7b80c86645 Updates a comment forgotten in 113f72a503. Refs #2463, #2448.
This was SVN commit r15753.
2014-09-14 21:23:49 +00:00
historic_bruno 16a99e5ad3 Fixes some untranslated text in the multiplayer lobby (map name, type, and description), refs #2547
This was SVN commit r15752.
2014-09-14 21:10:49 +00:00
scythetwirler 113f72a503 Makes running games visible in the lobby. These will be colored in red. Refs #2463, #2448.
This was SVN commit r15751.
2014-09-14 20:59:35 +00:00
mimo 67c3a80c42 reset the trigger script when changing map, fix #2793
This was SVN commit r15750.
2014-09-14 16:52:33 +00:00
mimo 4f7a935f44 fix a rare case where a Petra attack would not know its target is already destroyed
This was SVN commit r15749.
2014-09-14 13:43:11 +00:00
historic_bruno 0f0f4f7b03 Fixes crash on OS X if dir_watch_Poll is called during init before dir_watch_Add, refs #2427, #2650
This was SVN commit r15748.
2014-09-14 00:27:38 +00:00
Itms 0605232aaf Updated the welcome screen to inform players about the temporary removal of formations.
This was SVN commit r15747.
2014-09-13 20:34:27 +00:00
historic_bruno 60d92b643d Fixes some unused variables in Atlas
This was SVN commit r15746.
2014-09-13 19:34:04 +00:00
historic_bruno 01395ce96d Fixes clang warning about hidden overloaded virtual function
This was SVN commit r15745.
2014-09-13 19:06:55 +00:00
mimo fe381158fb fix ptol_trader camel sounds, patch by thamlett
This was SVN commit r15744.
2014-09-13 17:54:40 +00:00
mimo 2acfbb04a5 fix a stupid typo, fixes #2797
This was SVN commit r15743.
2014-09-13 17:25:33 +00:00
historic_bruno 70d81040cb Fixes Atlas copy/paste not copying actor seeds, patch by trompetin17, fixes #2791
This was SVN commit r15742.
2014-09-13 16:53:43 +00:00
Itms ab4a1952f5 Small tweak for the options page, requesting game restart when enabling postproc effects.
This was SVN commit r15740.
2014-09-13 10:13:48 +00:00
mimo b0c14154ee prevent a warning message of undefined variable
This was SVN commit r15739.
2014-09-13 09:57:12 +00:00
scythetwirler 8c5470daf1 Fixes #2795. Refs #2792
This was SVN commit r15738.
2014-09-13 00:39:56 +00:00
leper acd86047dc Only split strings if they are non-empty. Fixes previous commit.
This was SVN commit r15737.
2014-09-12 23:11:03 +00:00
mimo dd6b6779af trained animals in corral should not respond to alert, adresses #2792
This was SVN commit r15736.
2014-09-12 22:01:21 +00:00
leper 134e3c84b0 Clean up some code.
Fixes linker error on OSX.

This was SVN commit r15735.
2014-09-12 21:45:30 +00:00
Itms a8189f89e5 Stop music when resetting the simulation test mode in Atlas.
Patch by trompetin17, fixes #1712

This was SVN commit r15734.
2014-09-12 21:38:10 +00:00
leper 83dda90662 Remove last traces of removed persian background images. Patch by dan@sstrev.com. Fixes #2777.
This was SVN commit r15733.
2014-09-12 21:14:07 +00:00
leper d0abd6628b Add messages.json file to the modmod. Fixes #2790.
This was SVN commit r15732.
2014-09-12 20:08:38 +00:00
mimo 87e0d9e6c1 Petra: some tunings in tech research following the merge of balance branch
This was SVN commit r15728.
2014-09-10 17:56:19 +00:00
mimo 9ba74f5b5f fix heal_barracks tech
This was SVN commit r15727.
2014-09-10 17:51:51 +00:00
historic_bruno e4d7586cdd Sets default compiler for OS X build to clang, using hack that should be replaced if we upgrade premake.
Fixes linking error in ICU build from build-osx-libs.sh (it was setting
the C++ compiler to clang, which is the C compiler, so it wouldn't
automatically link to the c++ lib). Now build-osx-libs.sh and the game
should use clang and whichever c++ lib is the default

This was SVN commit r15725.
2014-09-09 23:56:39 +00:00
Itms 7ada7dd2a8 Some tweaks to profiler2:
* separate the HTTP profiling server from the on-screen profiler
* allow shutting down the HTTP profiler
* print messages when enabling/disabling HTTP and GPU profilers

Patch by kingbasil, fixes #1862

This was SVN commit r15723.
2014-09-09 18:17:08 +00:00
mimo bdd8bc1f44 update the in-game hotkeys page following 2f1d143dc2
This was SVN commit r15722.
2014-09-09 17:22:13 +00:00
historic_bruno fee304d789 Fixes crash from 41b98a6f12 where a VBChunk* was released but not set to NULL
This was SVN commit r15721.
2014-09-09 04:13:50 +00:00
mimo 7b3476e104 fix #2783
This was SVN commit r15720.
2014-09-08 20:37:04 +00:00
historic_bruno 9c683af1e4 Fixes undefined property reference in Atlas after generating random map.
Fixes crash after failed random map generation in Atlas

This was SVN commit r15719.
2014-09-08 03:48:24 +00:00
historic_bruno 881ad4090b Fixes weird unconventional use of logical not operator that also triggered a warning in clang
This was SVN commit r15717.
2014-09-08 00:19:35 +00:00
historic_bruno 3d1cd08a4c Suppresses noisy clang/libc++ warnings from SpiderMonkey headers on OS X
This was SVN commit r15716.
2014-09-07 23:58:22 +00:00
historic_bruno 41b98a6f12 Fixes incorrect reuse of a member variable in WaterManager, caused a crash when starting a new map in Atlas after loading a water map. Fixes #2784.
Fixes likely mem leaks from not cleaning up vertex buffer allocations

This was SVN commit r15715.
2014-09-07 23:49:24 +00:00
historic_bruno e027981f95 Fixes missing functions_utility_list.js in initial mod selector screen
This was SVN commit r15714.
2014-09-07 23:29:33 +00:00
scythetwirler 13b229d503 Gameplay rebalance after a long period of testing and rebalancing. See https://github.com/scythetwirler/0ad for details on changes.
This was SVN commit r15713.
2014-09-07 21:47:26 +00:00
mimo 7ce9097d1c small cleaning of d0472b021b
This was SVN commit r15710.
2014-09-07 10:28:18 +00:00
Itms 640f898377 Move some animals outside of deep water in the skirmish map "Watering Holes (4)".
Fixes #2013

This was SVN commit r15709.
2014-09-07 09:27:36 +00:00
OmriLahav 5b51ca862f 2014 remake (A17)
This was SVN commit r15708.
2014-09-06 23:21:06 +00:00
Itms be98e31de2 Improve the description of the British hero Kunobelinos in the History panel.
New text by Haommin, fixes #2639.

This was SVN commit r15706.
2014-09-06 20:09:07 +00:00
Itms d0472b021b Supersede the "Reveal all" flag when displaying mirages, to avoid seeing other players' mirages. This is especially problematic when switching perspective to an AI player.
Fixes #2712, thanks mimo for the report and for having looked into the
related code.

This was SVN commit r15705.
2014-09-06 19:59:49 +00:00
Itms 76a5be4c4c Fix previous commit.
This was SVN commit r15704.
2014-09-06 15:31:36 +00:00
Itms 2b1efa5035 Revert an unoptimized GUI update from f7e591c9f2. Instead, notify directly the GUI in case of miraged entities, and treat them the same way we treat renamed entities.
Fixes #2778

This was SVN commit r15703.
2014-09-06 13:34:54 +00:00
Enrique 001e6f6ca3 Fixed iberian fortress garrison flag and smooth groups. Patch by stanislas69. Removed kennel mud mesh. Fixes #2765
This was SVN commit r15702.
2014-09-05 15:59:36 +00:00
Enrique 72ee7a12de fixed kennel crash. Patch by stanislas69. Fixes #2766
This was SVN commit r15701.
2014-09-05 15:37:44 +00:00
Pureon bafb300bf8 Updated Persian Civic structure. Fixes #2630
This was SVN commit r15700.
2014-09-03 21:27:55 +00:00
Itms c56089a082 Reference a missing script file in the mod selector.
Reported and patched by Radagast, fixes #2762

This was SVN commit r15699.
2014-09-03 16:58:08 +00:00
historic_bruno 69bd930219 Excludes debug DLLs from Windows installer, fixes #855
This was SVN commit r15697.
2014-09-01 01:44:10 +00:00
historic_bruno 8034a677e5 Fixes build-osx-libs.sh to rebuild SpiderMonkey when its README.txt changes, fixes #2551
This was SVN commit r15696.
2014-08-31 04:19:13 +00:00
mimo 032d031729 Petra: revisit the attacks + several bugfixes + add some more debug printouts
This was SVN commit r15695.
2014-08-30 20:06:48 +00:00
mimo 611d20016a fixes error with GetPosition2D called while out of world
This was SVN commit r15694.
2014-08-30 17:03:04 +00:00
Itms 5bfe2a4b65 Don't call miraging codes while iterating through the range manager's entities map.
I already had made that mistake when working on the fogging system so I
documented it in the code.

Fixes #2756

This was SVN commit r15692.
2014-08-29 09:01:08 +00:00
mimo c069a6555c prevent js error
This was SVN commit r15691.
2014-08-28 08:59:45 +00:00
mimo 52e9551957 Petra: prevent infinite loop in mods where units are their own promotion
This was SVN commit r15690.
2014-08-28 08:01:25 +00:00
Itms c0621ee28f Stop updating some data after the end of a game.
This prevents game music from being played again, just after
defeat/victory.

Fixes #2714, #2744

This was SVN commit r15689.
2014-08-27 18:37:20 +00:00
Itms 30b5fb6c41 Pass map settings also to Scenario games, including in particular trigger scripts for victory conditions.
Fixes #2715

This was SVN commit r15688.
2014-08-27 15:25:16 +00:00
Yves 179162069e Updated cxxtestgen.exe for cxxtest4.4 (created as described in #2450).
This was SVN commit r15686.
2014-08-27 12:39:04 +00:00
Itms 6942edb788 Fix a misplaced block of code from ea78d97989 that caused Atlas to show errors at startup.
This was SVN commit r15685.
2014-08-27 12:30:29 +00:00
mimo a994053a6a Petra: fix for some units which stay idle when their base is destroyed
This was SVN commit r15684.
2014-08-27 12:21:13 +00:00
mimo b2d07d5e5a complete 2f1d143dc2 for moveAttack in rallyPoint + some cleaning
This was SVN commit r15682.
2014-08-26 19:35:43 +00:00
Itms ea78d97989 Explore the map inside a player's territory border at the beginning of a game.
Also handle properly the "Explore Map" option with the new fogging
system.

Fixes #2709

This was SVN commit r15681.
2014-08-26 10:01:04 +00:00
mimo 4cd7dd77c1 add missing files from dd189ffe1f
This was SVN commit r15680.
2014-08-26 09:53:29 +00:00
mimo dd189ffe1f fix #15678 when preferglsl=true
This was SVN commit r15679.
2014-08-26 09:41:14 +00:00
leper be2f0e69fc Make the modmod standalone.
Mount public in case we are starting Atlas and no mods are specified in
the config.
If users remove all mods and save this to the config and try to start
Atlas it will
crash, as it cannot find some needed files.

This was SVN commit r15678.
2014-08-25 16:38:54 +00:00
leper 64bfa089af Add mod selection mod.
Includes some contributions by rada and sanderd17.

This was SVN commit r15677.
2014-08-25 16:02:54 +00:00
leper 523d220ac5 Add engine support to load mods from config and restart into mods.
Restructure mod mounting code a bit to make it reusable, and use it for
replays. Fixes #2703.

This was SVN commit r15676.
2014-08-25 16:02:40 +00:00
mimo 09e6d5ae02 fix 2f1d143dc2, which fixes #2747
This was SVN commit r15674.
2014-08-24 19:56:50 +00:00
leper c5c394fd17 Fix some disabled tests.
This was SVN commit r15673.
2014-08-24 15:29:53 +00:00
leper 2b7e9728b6 Fix failure in TestNetComms::test_basic_DISABLED. Patch by Echelon9. Fixes #2426.
This was SVN commit r15672.
2014-08-24 12:02:52 +00:00
mimo 2f1d143dc2 give possibility to choose type of targets in moveAttack, fixes #2740
This was SVN commit r15671.
2014-08-24 11:51:03 +00:00
mimo ac9d4f1036 various small fixes and cleanings to Petra
This was SVN commit r15670.
2014-08-24 11:35:08 +00:00
leper 0e01f20d29 Upgrades cxxtest.
Replaces cxxtest-4.3 with cxxtest-4.4 (without .gitignore or .cvsignore
files) (see [[SVN:14817]]).
Applies the same changes as done in c8bdd993c0 to the new version.

This was SVN commit r15667.
2014-08-24 08:19:24 +00:00
leper da2050793d Fix some greek unit names. Patch by pstumpf2. Fixes #2746.
This was SVN commit r15666.
2014-08-24 07:04:39 +00:00
leper 057bef91f2 Fix undefined property warning. Fixes #2742.
This was SVN commit r15665.
2014-08-23 17:23:15 +00:00
mimo efe21b85da Garrison orders canceled in the ai were not properly canceled in the simulation. Fixes #2741 and #2743.
This was SVN commit r15664.
2014-08-23 13:40:56 +00:00
Spahbod 811e38a833 Fixes for survival of the fittest map.
This was SVN commit r15663.
2014-08-22 05:33:12 +00:00
mimo e4194af0c2 fixes some non-working techs (was in reverted 40365ee815)
This was SVN commit r15661.
2014-08-21 09:09:08 +00:00
mimo 5616221c99 improve comment, see #2737
This was SVN commit r15660.
2014-08-21 09:00:42 +00:00
mimo 6fe9af70cf remove debug output from previous commit
This was SVN commit r15659.
2014-08-19 09:41:38 +00:00
mimo 14b7472c15 petra: prevent JS errors when expected buildings do not exist (for mods)
This was SVN commit r15658.
2014-08-19 09:34:34 +00:00
LordGood 36d205035e New Iberian tower models
This was SVN commit r15657.
2014-08-18 19:30:56 +00:00
sanderd17 edcc4d3ec5 Change the vision range together with the attack range for some techs. Refs #2736. Patch by serveurix
This was SVN commit r15656.
2014-08-18 19:20:46 +00:00
wraitii d9fcebd433 Revert Surprise commits by Mythos_Ruler, 4f7549b4f8 and 40365ee815 following team decision. They will be put in a separate git branch. This is done to avoid conflict with scythetwirler's balance branch and potential other work in that area.
This was SVN commit r15655.
2014-08-18 10:35:30 +00:00
mimo f939f7953d petra: first step towards use of heroes
This was SVN commit r15654.
2014-08-18 09:44:32 +00:00
Enrique 6c8fd6b3dd Fix the rotary mill animation
This was SVN commit r15653.
2014-08-17 17:34:43 +00:00
LordGood d112902b99 fixing ngon glitch on iberian wonder
This was SVN commit r15651.
2014-08-17 13:53:01 +00:00
LordGood cb1612ad8a Iberian wonder
This was SVN commit r15650.
2014-08-17 13:19:27 +00:00
Mythos_Ruler 4f7549b4f8 fix'd attack elements in these templates
This was SVN commit r15647.
2014-08-16 02:32:58 +00:00
leper 12771edb0e Delete dynamic message subscriptions on simulation reset.
This was SVN commit r15646.
2014-08-16 01:23:50 +00:00
leper 422b9d79dc Fixes the cataphract helmet. Textures by stanislas69.
This was SVN commit r15645.
2014-08-15 23:54:09 +00:00
Mythos_Ruler 40365ee815 Surprise.
100% brand new rebalance for every unit in the game, after lengthy
discussion with Enrique.

Some updated portraits.

A couple new tips.

Stan's "cataphract" mask and helmet (the helmet needs a texture).

This was SVN commit r15644.
2014-08-15 23:10:44 +00:00
leper aa6de51793 Fix FPS, real time, and game time overlay hotkeys. Fixes 704d0f9511.
This was SVN commit r15643.
2014-08-15 22:03:12 +00:00
mimo 1a33003538 AI should not use EntityRenamed messages coming from mirages, addresses #2724
This was SVN commit r15642.
2014-08-15 16:18:57 +00:00
Enrique d5cacb027f Snow wolf. Texture edited by stanislas69
This was SVN commit r15641.
2014-08-15 12:14:45 +00:00
Enrique fef9b87381 Ptolemy I hero for ptolemaics by stanislas69
This was SVN commit r15640.
2014-08-15 12:04:52 +00:00
Enrique 302b67049c Gaul farmstead reshape (smaller) by stanislas69
This was SVN commit r15639.
2014-08-15 11:49:23 +00:00
Enrique 8c1a7d5d4c Ptolemaic blacksmith update by stanislas69
This was SVN commit r15638.
2014-08-15 11:35:07 +00:00
LordGood 4f44416bb0 New Iberian houses
This was SVN commit r15637.
2014-08-14 21:01:04 +00:00
Spahbod a4be909094 Temporary fixing the victory bug in survival of the fittest map. Refs #2721.
This was SVN commit r15636.
2014-08-14 09:50:51 +00:00
JoshuaJB b67a6f230b Fix typo from 704d0f9511.
This was SVN commit r15635.
2014-08-13 19:02:59 +00:00
JoshuaJB 704d0f9511 Add config settings for FPS, realtime, and gametime overlays.
This was SVN commit r15634.
2014-08-13 18:56:07 +00:00
LordGood c13547c9a0 Stan's rotary mill
This was SVN commit r15633.
2014-08-13 17:55:14 +00:00
wraitii a4df483f60 Forgot to make a variable unused.
This was SVN commit r15631.
2014-08-13 14:52:38 +00:00
JoshuaJB ada7691bce Add current time counter which can be triggered using Alt+T. Fixes #2718. Patch by thamlett.
This was SVN commit r15630.
2014-08-13 02:35:29 +00:00
mimo abef0673bd fixes some typos
This was SVN commit r15629.
2014-08-12 20:45:06 +00:00
wraitii 0b385384aa Fix terrain overlay rendering after water.
This was SVN commit r15628.
2014-08-12 15:58:03 +00:00
LordGood f7cab71243 Iberian barracks replacement
This was SVN commit r15627.
2014-08-12 03:42:59 +00:00
Yves 8593825eee Modifies 23c708f72a to use the NONCOPYABLE macro as suggested by leper.
This was SVN commit r15626.
2014-08-09 21:16:25 +00:00
Yves 23c708f72a Prevent copying of ScriptInterface objects.
Copying a ScriptInterface is not allowed. The destructor destroys the
JSContext and if there's a copy around that still uses it, that causes
crashes which can be quite hard to debug. This change prevents copying
by of ScriptInterface objects by making the copy constructor private,
which will reveal such errors at compile time.

This was SVN commit r15625.
2014-08-09 20:20:32 +00:00
Yves 83aa817f71 Exact stack rooting for simulation message type conversions.
Also replaces some deprecated API (jsval typedef and OBJECT_TO_JSVAL) in
that part of the code.

Refs #2415

This was SVN commit r15624.
2014-08-09 20:02:49 +00:00
Yves 8ce8e6ba9a Exact stack rooting for IGUIObject.
Refs #2415
Refs #2462

This was SVN commit r15623.
2014-08-08 13:41:47 +00:00
Yves 9872f5741f Exact stack rooting for ScriptInterface::FreezeObject.
Refs #2415

This was SVN commit r15622.
2014-08-08 11:59:49 +00:00
Spahbod 7471662ddc A small change that increases the performance of most random map generation noticeably.
This was SVN commit r15621.
2014-08-07 09:27:22 +00:00
wraitii 403b3b68af Fix some errors in WaterManager.
This was SVN commit r15620.
2014-08-06 15:24:38 +00:00
leper e578d215ea Fix free() of not allocated struct in the UPnP code. Patch by Echelon9. Fixes #2338, #2418.
This was SVN commit r15619.
2014-08-06 14:11:04 +00:00
leper 5ae040ea54 Fix non-PCH build.
This was SVN commit r15618.
2014-08-06 13:23:02 +00:00
wraitii e865dc797d Revert RedFox's changes to Spatial subdivisions in the simplest possible way (hopefully won't cause OOS, but at least we'll get reports). Fixes #2573, Refs #2430 . There probably are opportunities to remove more things.
This was SVN commit r15617.
2014-08-06 09:21:00 +00:00
Itms c0e7208130 Fixes 016d4599e1 by registering the new DisabledTemplatesChanged message.
Also fixes a typo.

This was SVN commit r15616.
2014-08-05 21:21:06 +00:00
Yves c662a4e9e9 Fixes #2713
This was SVN commit r15615.
2014-08-05 19:03:10 +00:00
Spahbod 016d4599e1 Added the ability to disable training/building of entities by triggers. Changes survival of the fittest random map to work with this. Refs #52
This was SVN commit r15614.
2014-08-05 12:49:12 +00:00
Itms f7e591c9f2 Hide changes to buildings in the fog-of-war.
To achieve this, mirage entities are created per player, to replace the
real entities when these ones fall into the fog-of-war. These mirage
entities are created on-the-fly, and destroyed when they get back in
sight.
This depends heavily on the VisibilityChanged message added in
2174eaaeee.

As a temporary adjustment, territories do not explore the map anymore
when their borders change. See #2709.

Fixes #599

This was SVN commit r15612.
2014-08-04 22:49:19 +00:00
Yves e41f010f91 Fixes crash when loading maps in Atlas.
The ScriptInterface pointer can be NULL there, so using it without
checking is not safe.
This fixes the problem by continuing with the exact stack rooting
changes, which makes the temporary solution unnecessary.

Fixes #2707
Refs #2415

This was SVN commit r15611.
2014-08-04 20:14:17 +00:00
JoshuaJB 30fa275f9d Fixed some keys not being recognized after a719696658. Refs #195.
This was SVN commit r15610.
2014-08-04 16:48:54 +00:00
JoshuaJB a719696658 Support more mouse buttons. Fixes #195. Patch by 01d55 with some minor cleanup.
This was SVN commit r15609.
2014-08-04 01:06:36 +00:00
JoshuaJB be9d69fd24 Link actor editor built in debug mode to debug version of atlasUI. Fixes #2655. Patch by Echelon9.
This was SVN commit r15608.
2014-08-03 22:46:20 +00:00
Yves efb889b79a Exact stack rooting for WriteStructuredClone and functions that use it.
Refs #2415

This was SVN commit r15607.
2014-08-03 19:32:39 +00:00
Yves f4d62152e7 Exact stack rooting for GetClass and GetPrivate.
Refs #2415

This was SVN commit r15606.
2014-08-03 17:53:21 +00:00
Yves 169174824f Exact stack rooting for ScriptInterface::ToString.
I had to change a few other functions to take JS::MutableHandleValue
because JS::Stringify takes a JS::MutableHandleValue as input parameter.
That seems a bit strange because it should not change that value.
I assume it has historical reasons.

Refs #2415
Refs #2462

This was SVN commit r15605.
2014-08-03 17:29:49 +00:00
wraitii 1561f55b27 Batch-change RM map water type and waviness settings. Again, this errs on the "not enough" side.
This was SVN commit r15604.
2014-08-03 11:01:41 +00:00
Yves a2bd44b23a Exact stack rooting for JSON related ScriptInterface functions.
Refs #2415
Refs #2462

This was SVN commit r15603.
2014-08-02 22:21:50 +00:00
wraitii 15fa9e2c2e (semi-auto) update scenarios and skirmishes water settings (type and waviness). Probably errs on the "not enough" side.
This was SVN commit r15602.
2014-08-02 17:08:42 +00:00
Yves c818b8e475 Exact rooting for CallConstructor.
Refs #2415
Refs #2462

This was SVN commit r15601.
2014-08-02 16:30:15 +00:00
Yves 736d934107 Removes an unused codepath for AI deserialization and related ScriptInterface code.
It might actually be needed again in the future, but I think even then
it would be easier to rewrite it than having to update the code in the
meantime.

Refs #2462

This was SVN commit r15600.
2014-08-02 13:22:02 +00:00
wraitii 4028cd425e Actually fix bugs on ATI cards. Switch reflection and refractions to use POT textures in an attempt to improve compatibility.
This was SVN commit r15598.
2014-08-02 12:54:45 +00:00
Yves 608c27fe10 Exact stack rooting for structured cloning functions.
Refs #2415
Refs #2462

This was SVN commit r15597.
2014-08-01 20:55:16 +00:00
mimo 7dbbb4e419 some cleaning of petra code
This was SVN commit r15596.
2014-08-01 14:32:31 +00:00
wraitii 2b0af756f6 Temporary reversion for a graphic problems with some ATI cards when disabling water reflections.
This was SVN commit r15595.
2014-08-01 13:26:45 +00:00
wraitii e50147fd96 Metaprogramming 9ce51f4357.
Change something on water shaders to see if it works better on ATI
cards.

This was SVN commit r15594.
2014-08-01 10:15:29 +00:00
mimo ec6b098dd4 Petra: some adjustements on naval transport
This was SVN commit r15593.
2014-07-31 21:35:28 +00:00
Yves 5c07a25ddc More exact stack rooting (CallFunction object).
Changes CallFunction and CallFunctionVoid to use a HandleValue as object
parameter. Also changes some JS serialization/deserialization functions
to only support the JSAPI rooted types (drop support for CScriptVal and
CScriptValRooted there). Some other functions got changed too because
they were closely related.

Refs #2415
Refs #2462

This was SVN commit r15592.
2014-07-31 19:18:40 +00:00
Yves d677a30c39 Adds support for passing JS::HandleValue and JS::RootedValue& to CallFunction.
Also adds tests for these cases.

Refs #2415

This was SVN commit r15591.
2014-07-31 16:34:15 +00:00
Itms af8b76e227 Avoids dividing by zero when generating Gulf of Bothnia random map with one player. Patch by FeXoR, fixes #2699.
This was SVN commit r15590.
2014-07-31 16:03:35 +00:00
Yves 2ae74221c7 Fixes saving/loading problems introduced in 28bdd8540f.
* CGameLoader created a new JS::Value when assigning to m_Metadata.
This means it didn't actually update metadata in SavedGames::Load. The
new approach solves this problem and should work well if
CScriptValRooted gets replaced in the future.
 * The cloning in ScriptFunctions.cpp was required. Removing it caused
compartment mismatches.
 * Now CGameLoader loads the metadata unconditinally because we didn't
actually use the option to not load load it.

Ref #2415

This was SVN commit r15589.
2014-07-31 14:44:51 +00:00
wraitii cf563657b6 Add some information about gathered resources to the multiple selection panel's tooltips. Refs #2695
This was SVN commit r15588.
2014-07-31 12:46:33 +00:00
mimo cf121baa1d Petra: small changes in naval transport to (hopefully) make it more robust
This was SVN commit r15587.
2014-07-30 21:36:48 +00:00
Itms f85272e3de Small code style fix, related to a typo in the documentation. Also updates the Example component's copyright to match the current year.
This was SVN commit r15586.
2014-07-30 17:34:40 +00:00
mimo 15e536dbb6 remove the hardcoded StartingCamera of player 3 which was pointing to player 1 location
This was SVN commit r15585.
2014-07-30 16:56:45 +00:00
Itms cd3b35ed52 Handle callback functions when using the "leave" hotkey (by default Esc) to close a message box.
Fixes #2635

This was SVN commit r15584.
2014-07-30 09:27:46 +00:00
mimo 707b255e2b Petra: prevent overseas attack to try to start before dock construction
This was SVN commit r15583.
2014-07-29 20:55:16 +00:00
mimo 58a19e8e30 Petra: prevent stuck units when a transport ship is destroyed
This was SVN commit r15582.
2014-07-29 17:32:59 +00:00
sanderd17 c2579c3c22 let allies build and repair stuff
This was SVN commit r15581.
2014-07-29 15:57:42 +00:00
wraitii 00b072ea14 Fix a UnitAI issue where a builder would become idle if, upon completion of a foundation, it was close enough to immediately start working on another foundation. This was particularly infuriating with palisades.
This was SVN commit r15580.
2014-07-29 11:34:58 +00:00
mimo a57747472c Petra: proper fix for the juggernaut limit reported by brian
This was SVN commit r15579.
2014-07-28 20:15:06 +00:00
mimo 3ed6681aa4 fix #2691, Petra should not try to unload allied garrisoned inside its buildings
This was SVN commit r15578.
2014-07-28 18:13:49 +00:00
wraitii 9ce51f4357 Commit coastal waves when activating fancy effects, and incidentally completely change how this effect work. Refs #48.
This was SVN commit r15576.
2014-07-28 10:14:00 +00:00
mimo 91ead32b1a petra: temporary fix, waiting to be able to deal with training restrictions
This was SVN commit r15575.
2014-07-27 21:48:02 +00:00
mimo afa769f873 fixes #2690 in Petra AI
This was SVN commit r15574.
2014-07-27 20:45:40 +00:00
Yves 2be86ef79e Fix crash when starting Atlas (introduced in 28bdd8540f).
This was SVN commit r15573.
2014-07-27 18:38:31 +00:00
Yves 07653c9a70 Fixes crash when generating random maps.
We must not be in a request when calling the ScriptInterface destructor.

This was SVN commit r15572.
2014-07-27 18:17:16 +00:00
Yves cef9e7d4f0 Fixes crash in replay mode introduced in 28bdd8540f.
This was SVN commit r15571.
2014-07-27 17:28:36 +00:00
mimo fe8e19ebfe Bunch of petra bug fixes: fixes #2685, #2686 and makes 074cf06803 really working
This was SVN commit r15570.
2014-07-27 15:25:26 +00:00
Yves 64efbfeae3 Fixes small memory leak introduced in 28bdd8540f.
Thanks to leper for pointing it out.

This was SVN commit r15569.
2014-07-26 23:09:24 +00:00
Yves 28bdd8540f Quite a lot of stack rooting related changes.
Changes GetProperty, SetProperty and HasProperty and a few other
functions to take handles. The conversions to CScriptVal or
CScriptValRooted at some places should be removed in the future. I've
done that to avoid an even larger patch.

Refs #2415
Refs #2462

This was SVN commit r15568.
2014-07-26 22:33:16 +00:00
Yves e818b08344 Better support for SpiderMonkey rooted types in the ScriptInterface.
* Adds additional overloads/specializations which are required when
passing JS::Handle<T>/JS::MutableHandle<T> types to different functions.
* Replaces GetPropertyJS with a GetProperty specialization.
* Allows us to avoid the implementation of ToJSVal specializations for
JS::Value and JS::HandleValue. Such conversions should only happen if
there's no way around it and if you are aware of it.
* Adds test to make sure that all potentially required specializations
with custom implementations are instantiated. This should help prevent
introducing bugs in temporarily unused code.

Refs #2415

This was SVN commit r15567.
2014-07-26 20:31:29 +00:00
sanderd17 30f7837c44 Should be workaround for issue #2684
This was SVN commit r15566.
2014-07-26 17:12:45 +00:00
sanderd17 9cd75067bc Workaround for issue #2486
This was SVN commit r15565.
2014-07-26 17:09:49 +00:00
Itms ea708e14bf Some changes on the VisibilityUpdate message system, aimed at correcting recent OOS problems.
I still experience troubles with serialization tests but I played a few
games without OOS. At least these changes will help us to debug more
efficiently the remaining problems.

Fixes initialization of visibility data and update order for LoS-related
systems (territory borders, etc).
Also removes a C-like array and fixes a player ID shifting.

Refs #599

This was SVN commit r15563.
2014-07-26 16:02:18 +00:00
Yves e3888448c4 Removes rooting test.
Rooting works different now and the CScriptVal types are going to be
removed. We will need rooting tests again, but they will have to work
completely different than this test implementation.

Refs #2415

This was SVN commit r15562.
2014-07-26 14:07:56 +00:00
Yves f41d4fa48e Fixes compartment mismatch introduced in a5ebd8dafd.
Also modifies some related functions to use SpiderMonkey stack rooting
types instead of CScriptValRooted.

Refs #2415

This was SVN commit r15561.
2014-07-26 10:58:24 +00:00
mimo 5c3f1b6dba fix previous commit
This was SVN commit r15560.
2014-07-25 21:24:05 +00:00
mimo 074cf06803 Petra: deals more efficiently with naval transport
This was SVN commit r15559.
2014-07-25 18:16:33 +00:00
leper 05de9def0b Remove unused --with-system-enet option (see 6bec648833) from premake.
Sort options in premake.

This was SVN commit r15558.
2014-07-25 13:50:59 +00:00
JoshuaJB f017922910 Update system icons to the newer logo and add higher resolution images to the ico/icns sets. (the OS X icon might need to be checked as I had to use an online converter to get that.)
This was SVN commit r15557.
2014-07-24 23:12:46 +00:00
leper 7c82e59ce5 Replace or remove uses of Engine.Console_Write. Patch by Adrian Fatol. Fixes #2141.
Cleans up list utility functions a bit.
Removes Engine.Console_Write.

This was SVN commit r15556.
2014-07-24 21:27:24 +00:00
mimo 4278e93b97 Petra: improve AI behaviour in scenarios without building possibility
This was SVN commit r15555.
2014-07-24 21:26:53 +00:00
mimo f8cbef8379 fix previous commit
This was SVN commit r15554.
2014-07-24 21:05:16 +00:00
mimo c5929ca7d5 make tooltip agree with buildrestrictions
This was SVN commit r15553.
2014-07-24 20:59:25 +00:00
mimo a574ca2e8f Petra: improve use of garrisoning for defense + some cleanings
This was SVN commit r15552.
2014-07-23 17:57:32 +00:00
mimo 2eb12c13ec give war ships at dock for carthage, for better balance of naval maps
This was SVN commit r15551.
2014-07-23 17:18:22 +00:00
wraitii 600e0a4081 Fix an oversight in CcmpPosition from the turret changes. Reported on IRC by Falsevision.
This was SVN commit r15550.
2014-07-23 13:02:42 +00:00
leper a5ebd8dafd Load trigger scripts in serialization test mode.
This was SVN commit r15549.
2014-07-22 23:30:27 +00:00
mimo bfe1e9f182 fix #2603
This was SVN commit r15548.
2014-07-22 21:23:25 +00:00
leper a7b18d02bf Add serialization test support for replays.
This was SVN commit r15547.
2014-07-22 19:41:49 +00:00
mimo b41289807a fix a rare JS warning
This was SVN commit r15546.
2014-07-22 18:20:47 +00:00
sanderd17 68121f387c Don't cache (and serialise) all technology templates multiple times. It's still cached once in the TechnologyTemplateManager.
This was SVN commit r15545.
2014-07-22 16:18:37 +00:00
mimo 9d505f2fd1 fixes petra javascript warnings
This was SVN commit r15543.
2014-07-21 16:19:59 +00:00
Yves a9048fa43d Adds support for passing JS::HandleValue to SetProperty and CallFunctionVoid without using ugly casing.
Also includes one little "demo-usecase", but additional code will be
changed to use that in future commits.

Refs #2415
Refs #2462

This was SVN commit r15542.
2014-07-20 19:45:18 +00:00
Yves 31f9ca9ebf Implements CallFunction with JS::MutableHandle<T> return type.
Changes the CallFunction implementation to use macros because otherwise
we'd have to write twice as many functions manually.
Adapts GetSavedGameData to use the new function template. Additional
callers will be changed in future commits.

Refs #2415
Refs #2462

This was SVN commit r15541.
2014-07-20 15:08:28 +00:00
mimo 3782857333 Petra: small fixes + reformat debug outputs
This was SVN commit r15540.
2014-07-19 16:17:09 +00:00
mimo 1d35d22a7b let the AI know when a building is decaying
This was SVN commit r15539.
2014-07-17 19:56:54 +00:00
Itms e1d4c10f13 Recompute the number of LoS tiles whenever these tiles are reset (especially when loading serialized data).
Also add a verification about LoS tiles in the tests.

Fixes #2678
Refs #599

This was SVN commit r15538.
2014-07-17 19:08:06 +00:00
mimo 98281689f2 Petra: fix a rare bug where the AI would never attack + some attack tunings
This was SVN commit r15537.
2014-07-17 17:04:13 +00:00
mimo de9ae66326 Petra: improve support for wonder games
This was SVN commit r15535.
2014-07-15 19:07:11 +00:00
Yves 52f4cda439 Changes ToJSVal to take JS::MutableHandleValue instead of JS::Value&.
JS::MutableHandleValue is similar to JS::HandleValue, but the whole
JS::Value it points to can be replaced.
This change is needed for support of exact stack rooting and moving GC.
Contains a few other trivial API adjustments and style improvements too.

Refs #2462
Refs #2415

This was SVN commit r15534.
2014-07-14 19:52:35 +00:00
JoshuaJB 17634d7507 Move the minimap to only use the shader pipeline. Should make it OpenGL ES compatible (untested).
This was SVN commit r15533.
2014-07-14 17:15:22 +00:00
wraitii 47426b2dad Per scythetwirler's suggestion, add some tables on my template analyzer script to compare units to their parent template.
This was SVN commit r15532.
2014-07-14 16:25:39 +00:00
Yves 09e04cb741 Adds missing request (fixes tests in debug mode).
This was SVN commit r15530.
2014-07-13 22:08:29 +00:00
historic_bruno 882f3406e3 Syncs _test.sim required simulation data with public mod, copies RelaxNG schemas for future use
This was SVN commit r15528.
2014-07-13 21:29:30 +00:00
historic_bruno a47dda7d66 Disables MSVC CRT deprecation warnings when building Atlas w/ wxWidgets 3.0
This was SVN commit r15527.
2014-07-13 21:19:30 +00:00
historic_bruno a82d32bd3c Fixes MSVC warning C4189: 'componentManager' : local variable is initialized but not referenced (Script_RegisterComponentType_Common is a static member function, so an instance of CComponentManager isn't needed)
This was SVN commit r15526.
2014-07-13 20:38:34 +00:00
historic_bruno 7b15b526ac Fixes tests.
Changes direct access of EndGameManager.gameType to getter function, by
convention

This was SVN commit r15525.
2014-07-13 19:45:44 +00:00
Yves 1b5ab8142e Makes custom JS objects compatible with SpiderMonkey ESR31.
In v24 you called JS_InitClass and passed in a definition of JSNative
functions. Later you could call JS_NewObject with this class and the
object would get a prototype with the specified JSNative functions.
In ESR31 you now have to explicitly store the prototype object returned
by JS_InitClass and pass it as prototype argument to JS_NewObject to
achieve the same.
This change modifies our existing ScriptInterface implementation for
custom object types a bit and uses it at places where the JSAPI was used
directly before.

Refs #2462

This was SVN commit r15524.
2014-07-13 15:31:48 +00:00
wraitii f4949c82ff Fix how the template analyzer scripts takes walkspeed into account to some extent for ranged units, add a new script to create a RM to check balance using triggers, and add a readme file to try and explain the outputs and parameters better.
This was SVN commit r15523.
2014-07-13 14:22:32 +00:00
wraitii 0cf5f57a68 Update of the template analyzer tool with more parameters and probably a more accurate representation of civs (with the right settings).
This was SVN commit r15522.
2014-07-13 10:20:35 +00:00
sanderd17 83d37f7857 Re-allow placing skirmish entities in Atlas. Refs #1696
This was SVN commit r15521.
2014-07-13 09:35:00 +00:00
sanderd17 7531a417e5 Fix re-garrisoning on visible garrison points after killing the units on that spot. Issue found by Stan.
This was SVN commit r15520.
2014-07-12 21:38:10 +00:00
sanderd17 eebc2f07bb Move some trees to accessible locations. Issue found by willsmith182.
This was SVN commit r15519.
2014-07-12 20:08:43 +00:00
Yves 5a3f07b3d9 Forgot to use excnObj in db9c20e0a9. Also roots an additional jsval.
This was SVN commit r15518.
2014-07-12 19:46:12 +00:00
Yves db9c20e0a9 Changes FromJSVal to take a JS::HandleValue instead of JS::Value.
JS::HandleValue is basically a wrapper around a JS::Value that is safe
for exact stack rooting and moving GC.
I've tried to keep this changeset rather small and isolated and
therefore create additional JS::Rooted<T> values at some places where
the function should eventually directly take a JS::Handle<T>.
The functions "CallFunction" and "CallFunctionVoid" put their arguments
inside a JS::AutoValueVector because this will be passed directly to
"CallFunction_" with ESR31.

Refs #2462
Refs #2415

This was SVN commit r15517.
2014-07-12 19:08:39 +00:00
Yves cfa59fc4e1 Changes our JSNative functions to use JS::CallReceiver/JS::CallArgs.
This is the new way for working with arguments in JSNative functions.
JS_THIS_VALUE, JS_ARGV, JS_SET_RVAL and direct access to vp or argc are
deprecated and will probably be removed in future versions of
SpiderMonkey.
CallArgs also takes care of proper rooting and you can get the values as
Handles or MutableHandles. The interface changes a little bit for ESR
31, but commiting this now still makes it easier and the changes shout
be straigtforward (search and replace more or less).

Refs #2462
Refs #2415

This was SVN commit r15516.
2014-07-12 16:55:09 +00:00
wraitii 7a1b92bffc Update my "Template Analyzer" script to have output about civ too. Try to guess if they are balanced against each other.
This was SVN commit r15515.
2014-07-12 16:08:35 +00:00
Itms 319cf16b5a Small cleanup, including a correction in the templates documentation, and the removal of residues from the culling changes.
This was SVN commit r15514.
2014-07-12 16:03:37 +00:00
wraitii 5279f9625e Add a new tool to make some quick template analysis to try and detect imbalances or see if our balancing works. WIP.
This was SVN commit r15513.
2014-07-11 22:24:58 +00:00
Itms 42591ef4cb Fix previous commit, refs #1257
This was SVN commit r15512.
2014-07-11 18:29:18 +00:00
Itms f5cc99f78b Fix OOS problems caused by an unwanted modification of the simulation state by the GUI.
Refs #1257

This was SVN commit r15511.
2014-07-11 18:11:32 +00:00
sanderd17 a4e3422a22 Fix the hero flickering overlay after healing. Fixes #2666. Patch by Adrian
This was SVN commit r15510.
2014-07-11 17:48:01 +00:00
Itms 2174eaaeee Add a VisibilityChanged message sent by the range manager whenever an entity changes visibility for any player.
This will be necessary for hiding buildings/trees/etc in fog-of-war, and
may be useful for AIs and for UnitAI.

Refs #599.

This was SVN commit r15508.
2014-07-10 20:51:39 +00:00
sanderd17 9d335f2e22 Fix typos found by FalseVision
This was SVN commit r15507.
2014-07-10 19:17:45 +00:00
mimo 255ab52725 fix previous commit
This was SVN commit r15506.
2014-07-10 06:30:08 +00:00
mimo e2d893103b make the AI aware of the game type and start interfacing with wonder victory condition + some fixes
This was SVN commit r15505.
2014-07-09 21:41:14 +00:00
leper 689272d4bd Remove collision in global namespace.
Fixes config/vfs deadlocks on OSX.

This was SVN commit r15504.
2014-07-09 19:16:03 +00:00
mimo 77e9e58a32 Petra: fixes + changes on the attack management
This was SVN commit r15503.
2014-07-08 19:01:27 +00:00
wraitii 7e81f4f52a Update the "number of builders" tooltip to be slightly more helpful.
This was SVN commit r15502.
2014-07-08 18:48:08 +00:00
wraitii 3ba325f9e8 Remove the HQDOF since it did not really work properly and we already have DOF. Fixes #2111
This was SVN commit r15501.
2014-07-08 18:23:53 +00:00
sanderd17 56bcbd59a0 Fix allied garrison issue.
This was SVN commit r15500.
2014-07-07 09:28:34 +00:00
mimo 27c700ce3a Petra: various small tunings or fixes
This was SVN commit r15499.
2014-07-06 17:31:02 +00:00
leper 8b45f453e5 Fix non-PCH build.
This was SVN commit r15498.
2014-07-06 16:35:41 +00:00
wraitii 62c1ac310d It would appear like I inadvertently committed a version of the water with some debug information in that made it look black.
This was SVN commit r15497.
2014-07-06 15:22:44 +00:00
Yves 334ba4b740 SpiderMonkey now supports default parameters!
I've just modified those places with TODO comments, but there are most
likely others that could benefit of the feature to make the code a bit
cleaner and easier to understand.
Thanks to Fabio for pointing it out.
Refs #1886

This was SVN commit r15496.
2014-07-05 13:58:51 +00:00
Yves 8b493c2739 Revert obsolete workaround for structured clones.
Reverts 8195e767ef because that workaround isn't needed anymore with
SpiderMonkey 24 (and 31).

Refs #2241
Refs #1886

This was SVN commit r15495.
2014-07-05 11:35:00 +00:00
Yves de6823d23f Makes tinygettext handle missing plural forms more sanely.
Print an error to the console and return the original (untranslated)
string instead of triggering an assertion in debug builds or a crash and
memory corruption in release builds.
Works around a crash on the history screen. Why the plural form is
missing is another topic and will have to be solved separately.

This was SVN commit r15493.
2014-07-05 10:29:24 +00:00
wraitii 5571f7a7f9 Fix "Wind Angle" parameter not working properly. Add a precomputed "wind strength" variable so that waves look smaller behind islands. Some tweaks. Refs #48 as usual.
This was SVN commit r15492.
2014-07-05 10:20:30 +00:00
wraitii aa99f98fce Fix rmgen for my changes, I had missed that, thanks mimo.
This was SVN commit r15491.
2014-07-04 18:24:39 +00:00
mimo 4852fad86a Petra: adapt the AI to gaia now able to launch attacks (with triggers) + cleaning of unused functions
This was SVN commit r15490.
2014-07-04 16:12:09 +00:00
wraitii 9d4665248b Check water FBOs creation correctly to detect some errors. Use two depth textures since I have a hunch the issues people encounter are caused by my using only one.
This was SVN commit r15488.
2014-07-04 10:14:35 +00:00
wraitii 991d5bbd63 Fix random maps for my water changes. Fix the replay mode after I had broken it. Fix an occasional crash (that might have crashed Atlas, need someone to check).
Improve debugging slightly in case of framebuffer errors. Fix a few
style issues.

This was SVN commit r15486.
2014-07-04 09:03:21 +00:00
wraitii 326290463e Further WIP water improvements. Add 3 different textures for different looks. Update some oasis maps for that. Streamline water settings (some removed, some added). Update Atlas for those (needs to be tested). Fix an issue with HQ water effects.
Please report any issue and/or crash. Those will get fixed in commits to
come. Refs #48.

This was SVN commit r15484.
2014-07-03 20:07:15 +00:00
Ykkrosh eb7955599a Optimise silhouette rendering.
Do some intersection tests on the CPU so that the silhouette render
passes only have to draw models/patches that might actually contribute
to silhouettes, saving the CPU and GPU cost of rendering more objects
than necessary.

This was SVN commit r15483.
2014-07-03 01:00:25 +00:00
leper ffd6e10edf Make CGUIManager register a callback function for hotloading instead of specifically calling it.
This was SVN commit r15482.
2014-07-02 23:44:39 +00:00
Ykkrosh 30e851ab90 Forward-declare CShaderProgramPtr, to avoid pulling in more headers than necessary and to hypothetically reduce build times by a minuscule amount.
This was SVN commit r15481.
2014-07-02 22:36:45 +00:00
sanderd17 404e808ed5 Add yes-no dialog and general dialog code to present choices to players. Can be used by triggers.
This was SVN commit r15480.
2014-07-02 14:48:22 +00:00
JoshuaJB c844589f48 Add missing translate() call.
This was SVN commit r15479.
2014-07-01 21:05:33 +00:00
mimo a5065b523d Petra: refrain AI to build/repair under enemy fire and few fixes on economy management
This was SVN commit r15478.
2014-07-01 19:48:38 +00:00
leper 343066040f Remove inconsistent checks for pSimulation2 when saving maps and ensure that it is set.
Remove commented out code writing triggers that has nothing to do with
the actual triggers implementation.
Free memory that was allocated for error reporting when when fork()
fails.
Remove dead initialization.

This was SVN commit r15477.
2014-07-01 19:00:41 +00:00
wraitii 89c6487ffe Forgot to remove my fake radiosity changes.
This was SVN commit r15476.
2014-07-01 16:53:13 +00:00
wraitii f8d53d9a1d Clean up of the last commit.
This was SVN commit r15474.
2014-07-01 16:15:03 +00:00
wraitii ab30e0d4fb Change the water texture to a new, bigger one, created in Blender (thanks to Enrique). Change settings so that they are more logical, yet allow reverting back to an even lower quality setting. Add a WIP high setting (with foam) which isn't finished yet.
Change the shader itself so that the effects look nicer and are more
consistent across settings.
Rework the water mesh generation (simpler system). Fix a few issues.

May work oddly with Atlas since I haven't been able to compile yet.

Refs #1875 (maybe fix), Fixes #2077 (I'll assume it does), Fixes #2114
(assumption again), refs #48.

This was SVN commit r15473.
2014-07-01 16:05:05 +00:00
sanderd17 0bde61fa5b Simplify 'survival of the fittest' map by using Gaia as attacker, and using the trigger point ownership to differentiate between different players, instead of hardcoding a list.
This was SVN commit r15471.
2014-07-01 09:29:45 +00:00
leper fa5b373698 Add some missing semicolons.
This was SVN commit r15470.
2014-06-30 21:38:45 +00:00
JoshuaJB 66485bcd17 Check that at least one assignment exists before tryintg to copy it.
This was SVN commit r15469.
2014-06-30 17:21:12 +00:00
Spahbod 00fa45161d Added "Survival of the Fittest", a demo random map with triggers. Refs #52
This was SVN commit r15468.
2014-06-30 13:59:34 +00:00
sanderd17 c339928c6f Disallow placing some special entities in Atlas. Fixes #1696. Patch by trompetin17
This was SVN commit r15467.
2014-06-30 10:20:20 +00:00
leper b4fc393f18 Change camera rotation in Atlas to be the same as in the game. Refs #1066.
This was SVN commit r15466.
2014-06-29 21:30:51 +00:00
mimo fd91398a95 Petra: fix the fix preventing the AI to be stuck trying to produce unavailable units
This was SVN commit r15465.
2014-06-29 19:16:18 +00:00
mimo 6ed07ef4d9 Petra: hopefully improve the gatherers management + some cleanings
This was SVN commit r15464.
2014-06-28 20:02:18 +00:00
mimo 97118f39b3 remove predefined AI in some skirmish maps, so that the default is taken
This was SVN commit r15463.
2014-06-28 19:46:10 +00:00
LordGood d90020e88e This was SVN commit r15462. 2014-06-28 11:01:59 +00:00
wraitii c626cf66f9 Fix build-osx-libs properly for mavericks after learning some Bash.
Fix a long-standing typo in TerrainRenderer for water rendering that
apparently had no effect.
Don't compress the water textures to make it look better. They will be
changed anyhow.

This was SVN commit r15461.
2014-06-28 08:54:59 +00:00
historic_bruno 789922b15a Updates LICENSE.txt files for recent changes
This was SVN commit r15459.
2014-06-28 06:21:27 +00:00
historic_bruno 59b2493990 Missed changes from 304a7c1201
This was SVN commit r15458.
2014-06-28 05:50:32 +00:00
historic_bruno 6bec648833 Removes bundled ENet source. NOTE: system libenet (1.3) is now required on *nix, see BuildInstructions for updates. This change requires running update-workspaces. Fixes #1568.
Updates update-workspaces.sh and build-osx-libs.sh for this change.
Updates precompiled win32 ENet to 1.3.12, built with VC++ 2010, and
moves it to libraries/win32, refs #864.

This was SVN commit r15457.
2014-06-28 05:48:51 +00:00
historic_bruno 304a7c1201 Updates precompiled win32 libpng to 1.6.12, built with VC++ 2010, refs #864.
Removes unused ffmpeg definition from extern_libs4.lua

This was SVN commit r15456.
2014-06-28 05:34:39 +00:00
JoshuaJB dd3fdf6800 Correct assignment dropdowns to always be adjustable by the game controller.
This was SVN commit r15454.
2014-06-28 05:02:29 +00:00
LordGood c2763dca24 This was SVN commit r15453. 2014-06-27 05:31:47 +00:00
mimo b1307c83be fix guard command broken in recent commits
This was SVN commit r15452.
2014-06-26 21:15:16 +00:00
mimo 58932825a6 Petra: some tunings and cleanings
This was SVN commit r15451.
2014-06-26 20:50:24 +00:00
Yves ae93c02ba8 Fixes a bug that caused script filenames to be defined as properties of the global object.
This was SVN commit r15450.
2014-06-26 17:08:46 +00:00
LordGood 217a399ee3 Carthaginian ballista
This was SVN commit r15449.
2014-06-26 12:10:36 +00:00
LordGood 05693744cc Hellenistic ranged siege animations commit
This was SVN commit r15448.
2014-06-26 06:37:08 +00:00
wraitii fd6b199606 Fix compiling on Mavericks. Users on older systems will need to change a few lines in either of those scripts, but it should not break their build. For now, I'm saying it Fixes #2304 .
This was SVN commit r15447.
2014-06-25 18:01:00 +00:00
fabio 3b35afeeee typo
This was SVN commit r15446.
2014-06-25 15:19:31 +00:00
Ykkrosh b1b96a89d6 Fix culling for shadows and reflections.
Previously we had a single culling frustum based on the main camera, and
any object outside the frustum would never get rendered, even if it
should actually contribute to shadows or reflections/refractions. This
caused ugly pop-in effects in the shadows and reflections while
scrolling.

Extend the renderer to support multiple cull groups, each with a
separate frustum and with separate lists of submitted objects, so that
shadows and reflections will render the correctly culled sets of
objects.

Update the shadow map generation to compute the (hopefully) correct
bounds and matrices for this new scheme.

Include terrain patches in the shadow bounds, so hills can cast shadows
correctly.

Remove the code that tried to render objects slightly outside the camera
frustum in order to reduce the pop-in effect, since that was a
workaround for the lack of a proper fix.

Remove the model/patch filtering code, which was used to cull objects
that were in the normal camera frustum but should be excluded from
reflections/refractions, since that's redundant now too.

Inline DistanceToPlane to save a few hundred usecs per frame inside
CCmpUnitRenderer::RenderSubmit.

Fixes #504, #579.

This was SVN commit r15445.
2014-06-25 01:11:10 +00:00
JoshuaJB bb4b911e99 Remove remaining warnings about AI naval map support. Also hide player assignment dropdowns on network clients.
This was SVN commit r15444.
2014-06-24 22:53:02 +00:00
mimo ec5215f843 Petra: avoid doing some unused stuff
This was SVN commit r15443.
2014-06-24 20:44:37 +00:00
Pureon 067a1d4829 Latin female sound files from Itms
This was SVN commit r15442.
2014-06-24 19:40:48 +00:00
wraitii 06c1f9f972 Fix canyon rms when you for some reason want to start as the only player.
This was SVN commit r15441.
2014-06-24 19:12:44 +00:00
mimo 3013b35c13 Petra fixes
This was SVN commit r15440.
2014-06-24 18:31:36 +00:00
sanderd17 be767e7983 Fix dog bark xml files
This was SVN commit r15439.
2014-06-24 11:14:13 +00:00
sanderd17 5509e8e51c This shouldn't have been comitted
This was SVN commit r15438.
2014-06-24 11:09:04 +00:00
sanderd17 006bf42809 Fix segmentation fault in the sound destructor. Happened when the sound file doesn't exist. Errors are shown by other code.
This was SVN commit r15437.
2014-06-24 11:07:39 +00:00
wraitii 7d8a4c3a88 Improve the hawk with a gliding animation and a better flapping animation.
This was SVN commit r15436.
2014-06-24 11:06:04 +00:00
Pureon 4ad2677920 Adding latin voice files by Itms
This was SVN commit r15435.
2014-06-23 23:41:23 +00:00
Pureon ed1fb3058f Small audio folder restructure and further deletes
This was SVN commit r15434.
2014-06-23 23:22:53 +00:00
Pureon a6e6fd6591 Removing redundant placeholder audio
This was SVN commit r15433.
2014-06-23 22:59:43 +00:00
Yves 3746d7c3d9 Adds a playable trigger demo mission for multiplayer and TreasureCollected events.
Search treasures on small islands and on water. Collect more treasures
than your opponent to win.
I've used the Cycladic Archipelago scenario map with some minor
adjustments, mainly treasure placement and civ preselection for even
chances (both need townphase to build trading boats that can collect
floating treasures).
There's still some room for improvement to make it more fun and add
additional triggers, but I'll leave that for modders. :)

This was SVN commit r15432.
2014-06-23 20:14:43 +00:00
Yves 7e9d6f8ebe Adds translation message extraction for map specific trigger scripts.
This was SVN commit r15431.
2014-06-23 19:59:37 +00:00
sanderd17 692cc8240d Remove empty comment + turn delay times into 0.
This was SVN commit r15430.
2014-06-23 18:25:19 +00:00
sanderd17 17c473f2f3 Add a trigger to the gallic fields map + fix a typo.
This was SVN commit r15429.
2014-06-23 18:12:51 +00:00
mimo fcc4d7433a Petra: fix a bug and some typos
This was SVN commit r15428.
2014-06-23 17:54:32 +00:00
sanderd17 8915037631 Turn victory conditions into trigger scripts. Gui needs to be updated to allow combining of different victory conditions + to allow different lists per map. So there are no specific missions yet.
This was SVN commit r15427.
2014-06-23 17:37:27 +00:00
sanderd17 b811066b85 Add ownership changed event to Triggers.
This was SVN commit r15426.
2014-06-23 16:32:44 +00:00
sanderd17 e33e70e626 Change trigger initialisation as it's not compatible with multiple trigger files (functions would overwrite each other)
This was SVN commit r15425.
2014-06-23 15:55:07 +00:00
sanderd17 49c7efad4f Add demo triggers map. Showing all triggers with a minimum amount of code.
This was SVN commit r15423.
2014-06-23 14:19:42 +00:00
sanderd17 f94491a1d1 Forgot to remove some debug info
This was SVN commit r15422.
2014-06-23 13:52:52 +00:00
sanderd17 9f47ed536d Add engine support to triggers + a component to provide an easy interface and to be extended by triggers. Thanks to SpahBod for the biggest part of the code, and Yves for the review.
This was SVN commit r15421.
2014-06-23 13:42:59 +00:00
historic_bruno 213732d5af Updates some precompiled win32 libraries with VC++ 2010 (note: requires update-workspaces), refs #864:
Updates libiconv to v1.14.
Updates libxml2 to v2.9.1.
Updates zlib to v1.2.8.
Rebuilds FCollada.
Updates libxml2 to use same libiconv as tinygettext.
Cleans up unneeded libiconv files.

This was SVN commit r15416.
2014-06-23 01:07:16 +00:00
historic_bruno 600e8bd226 Fixes MSVC warning about uninitialized playerId in Atlas entity pasting code (using 0 as a sensible default value), refs #96
This was SVN commit r15415.
2014-06-22 22:19:02 +00:00
leper 09637ea0cf Fix selection issue with mace champ cav.
This was SVN commit r15414.
2014-06-22 21:45:00 +00:00
sanderd17 7b781f82d3 Fix capitalisation issue
This was SVN commit r15413.
2014-06-22 20:35:16 +00:00
sanderd17 f1e077d7e9 Fix hero overlay by requiring at least one unit to be trained
This was SVN commit r15412.
2014-06-22 20:00:34 +00:00
mimo 144cb0e44a Petra: fix trying to barter while market is still a foundation
This was SVN commit r15411.
2014-06-22 12:10:51 +00:00
wraitii 0e6f6576dc Fix compilation on Mavericks when running build-osx-bundle.sh.
Fixes to build-osx-libs.sh.
Support gloox properly on OSX.
Refs #2304 (not fixed since afaik xCode still runs into some issues)

This was SVN commit r15410.
2014-06-22 08:27:58 +00:00
sanderd17 4e996de883 Fix UnitAI bug found by FalseVision
This was SVN commit r15409.
2014-06-21 21:03:44 +00:00
mimo 67d81996f6 petra: various (small) changes in attack and economic management + cleanings
This was SVN commit r15408.
2014-06-21 16:21:11 +00:00
sanderd17 8f0772034e Don't process tokens starting with a '-' into translatable strings.
This was SVN commit r15407.
2014-06-21 08:09:24 +00:00
JoshuaJB c793da5368 Don't allow changeing disabled dropdowns using the scrollwheel. Also corrects some things in b9a4af4cc6.
This was SVN commit r15406.
2014-06-21 00:25:12 +00:00
JoshuaJB b9a4af4cc6 Fix #2595 by validating cheats are disabled in rated games. Also forces locked teams in ranked games and adds a scrollbar to the lobby subject.
This was SVN commit r15405.
2014-06-20 23:59:04 +00:00
JoshuaJB 160a83b73f Bits of cleanup
This was SVN commit r15403.
2014-06-20 03:45:19 +00:00
JoshuaJB 1659a28aa0 Correctly remove players who cancel while rejoining. Fixes #2240
This was SVN commit r15402.
2014-06-20 03:22:40 +00:00
Ykkrosh 754e76e4a1 Fix non-PCH build
This was SVN commit r15401.
2014-06-19 23:36:09 +00:00
Ykkrosh d936bde74a Dynamic message subscriptions.
Allow components to individually subscribe/unsubscribe to messages,
instead of statically subscribing the entire component type. Use this
for most Interpolate/RenderSubmit messages, to avoid the performance
cost of passing those messages to a large number of components that will
just ignore them anyway.

On Azure Coast this reduces total time per frame by about 30% on a
CPU-bound system.

This was SVN commit r15400.
2014-06-19 23:20:12 +00:00
JoshuaJB ec7a452d4e Convert multiplayer connection dialog to only use 'modern' styles and make it larger for languge-friendliness and consistancy.
This was SVN commit r15399.
2014-06-19 19:22:31 +00:00
Yves bee865416b Fixes small issues in 81d1f5f71f.
This was SVN commit r15398.
2014-06-19 18:50:41 +00:00
Gallaecio b8078deea8 Splitted the PO and POT files
Fixes #2494

This was SVN commit r15397.
2014-06-19 18:45:11 +00:00
Yves 8817bd394b Fix the check if the script is beeing exectued as root for sh (== comparision seems to work for bash but not for sh).
This was SVN commit r15396.
2014-06-19 15:19:08 +00:00
sanderd17 e529e551d9 fix typo
This was SVN commit r15395.
2014-06-19 14:48:48 +00:00
sanderd17 81d1f5f71f Clean up notifications. Merge the timed and untimed text notifications, allow passing a list of players to all notifications, make modification types moddable. Refs #52
This was SVN commit r15394.
2014-06-19 14:37:08 +00:00
sanderd17 6d5039791f Fix barter panel. Reported by Gameboy
This was SVN commit r15393.
2014-06-19 12:34:52 +00:00
mimo 12c7fe2bc7 fix a bug in petra attack preparation
This was SVN commit r15392.
2014-06-18 20:22:18 +00:00
sanderd17 c9f2ac4b12 Fix giving foundations a population bonus after a tech research. Reported by bouke
This was SVN commit r15391.
2014-06-18 15:58:04 +00:00
sanderd17 a76364f825 fix previous commit
This was SVN commit r15390.
2014-06-18 15:42:19 +00:00
sanderd17 7baaf382ed Organise the session helper functions a bit per topic
This was SVN commit r15389.
2014-06-18 15:27:28 +00:00
sanderd17 1307a9038a Split the selection panels in session.xml into multiple xml files
This was SVN commit r15388.
2014-06-18 13:03:59 +00:00
sanderd17 7266ea681b Allow mixing the buttons for the right pane, so make it possible to have a structure that can pack and produce units. Refs #1919
This was SVN commit r15387.
2014-06-18 11:23:22 +00:00
sanderd17 054706a114 Allow showing the productionqueue for multiple selected buildings at once
This was SVN commit r15386.
2014-06-18 10:46:41 +00:00
historic_bruno 7d92890900 Updates wxWidgets to 3.0.1 in OS X libs build script (hopefully fixes the crash when starting Atlas), refs #2356
This was SVN commit r15385.
2014-06-18 01:32:39 +00:00
sanderd17 f1379a77b5 Fix build for wxWidgets version 2.8.10 and older.
This was SVN commit r15383.
2014-06-17 19:32:33 +00:00
sanderd17 94b49a01a9 Adapt the relaxNG files to new gui changes
This was SVN commit r15382.
2014-06-17 18:45:40 +00:00
sanderd17 7d265cec80 Add copy-paste (CTRL+C/V) to Atlas. Patch by trompetin17. Fixes #96
This was SVN commit r15381.
2014-06-17 13:14:25 +00:00
sanderd17 02fd235bbd Make hotkeys and top panel fully moddable by splitting up the xml file. Allow entire directories to be loaded via an 'include' to provide extra moddability (modders don't have to edit any files, they can just add new ones).
This was SVN commit r15380.
2014-06-17 13:03:55 +00:00
historic_bruno 8c547a3fad Fixes a few other invalid XML files reported by the validator script, refs #245
This was SVN commit r15379.
2014-06-17 03:53:13 +00:00
historic_bruno aa04b6d782 Fixes invalid actors reported by XML validator script. Some were only technically invalid but others were broken. Refs #245
This was SVN commit r15378.
2014-06-17 03:49:37 +00:00
historic_bruno 2c9939ac74 Adds Relax NG Compact syntax grammars for most of the XML formats in the engine.
Adds converted Relax NG XML grammars for each (Note: don't edit these
directly, modify the compact syntax .rnc files instead, then use a
conversion tool http://relaxng.org/#conversion to generate the .rng
files).
Adds Perl script to validate the XML files using the new grammars

This was SVN commit r15377.
2014-06-17 03:31:40 +00:00
mimo d11e48cd85 Petra: bugfixes + improved attack/defense behaviour
This was SVN commit r15376.
2014-06-16 22:03:30 +00:00
sanderd17 013ab4bda7 Make the barter panel uniform with the others, clean up more gui code.
This was SVN commit r15375.
2014-06-16 18:34:27 +00:00
mimo ce3b11a3fe fix the fix of setHeldPosition in b17ffaeb7e
This was SVN commit r15374.
2014-06-15 17:27:03 +00:00
leper 190f3b0ce1 Exclude .git dirs when adding subfolders to the VFS.
This was SVN commit r15373.
2014-06-15 17:06:24 +00:00
leper f115759901 Handle mods specified on the command line when using the archive builder.
This was SVN commit r15372.
2014-06-15 16:43:08 +00:00
mimo bec1e1edfd fix b17ffaeb7e + fixes from FalseVision on setHeldPosition
This was SVN commit r15371.
2014-06-15 16:41:01 +00:00
mimo 74e5c8ae26 fix e2b493bb67
This was SVN commit r15370.
2014-06-15 16:13:12 +00:00
sanderd17 519c00c1a6 Don't allow users to build workspaces as root user
This was SVN commit r15369.
2014-06-15 15:23:03 +00:00
sanderd17 86aa30e0d9 Remove useless line in UnitAI, found by FalseVision
This was SVN commit r15368.
2014-06-15 14:38:25 +00:00
sanderd17 1e38fa7b58 UnitAI fix by FalseVision
This was SVN commit r15367.
2014-06-15 14:23:49 +00:00
mimo ef7e19c13e reset petra debug left in previous commit
This was SVN commit r15365.
2014-06-15 12:59:19 +00:00
mimo b17ffaeb7e Petra: make better use of garrisoning when attacked
This was SVN commit r15364.
2014-06-15 12:57:12 +00:00
sanderd17 9a743d65fe Fix to unitAI by FalseVision + fix a mistake of my own
This was SVN commit r15363.
2014-06-15 12:43:52 +00:00
sanderd17 89f33e7579 Fix group number rendering
This was SVN commit r15362.
2014-06-15 12:08:58 +00:00
sanderd17 e042fa8768 Make trigger points templates
This was SVN commit r15361.
2014-06-15 11:25:25 +00:00
sanderd17 beaf3139c0 Move position calculation of buttons to something cleaner.
This was SVN commit r15360.
2014-06-15 09:56:54 +00:00
sanderd17 5064f2728f Fix tech pairing visuals + hiding
This was SVN commit r15359.
2014-06-15 07:56:40 +00:00
leper e12d4b880a Add XMB file format version to the XMB files and check it when loading a file.
This was SVN commit r15358.
2014-06-14 23:41:33 +00:00
leper f460057700 Fix error for entities that require a technology to be trainable.
This was SVN commit r15357.
2014-06-14 22:28:06 +00:00
Pureon 2766ae7eb5 Marker objects for Atlas
This was SVN commit r15356.
2014-06-14 18:44:18 +00:00
sanderd17 e152223a53 fix fix
This was SVN commit r15355.
2014-06-14 18:21:48 +00:00
leper b93877571f Add missing quotation mark to quote.
This was SVN commit r15354.
2014-06-14 17:20:09 +00:00
sanderd17 b469983c58 Fix for 89f5e7b260. Refs #2622
This was SVN commit r15353.
2014-06-14 16:12:41 +00:00
sanderd17 86ca3b2142 Small cleanup: i, numbButtons and numberOfItems all contain the same value anyway
This was SVN commit r15352.
2014-06-14 15:57:42 +00:00
sanderd17 7f172037ac Clean up a big part of unit_commands.js, and bring most data to a separate JS object (instead of having deep nests of switches and if-else structures)
This was SVN commit r15351.
2014-06-14 15:35:13 +00:00
mimo 5903935e4a let the AIs know when a training has started
This was SVN commit r15350.
2014-06-14 14:34:37 +00:00
mimo 4e6a21e9da fix promotion of autogarrisoned units (forgot in previous tag)
This was SVN commit r15349.
2014-06-14 14:26:51 +00:00
mimo e2b493bb67 fix double-click on a garrisoned hero button should select its holder, even if from autogarrison
This was SVN commit r15348.
2014-06-14 14:21:30 +00:00
mimo 7cf927baec fix typo from 2b8758745f
This was SVN commit r15347.
2014-06-14 14:14:33 +00:00
leper 8d164ca5d1 Add civ requirement to tech that was missed in the previous commit. Refs #2580.
This was SVN commit r15346.
2014-06-13 21:02:32 +00:00
leper 121f14d521 Add civ requirements to civ specific techs. Patch by s0600204. Refs #2580.
This was SVN commit r15345.
2014-06-13 16:16:31 +00:00
leper 1142fc55ca Clean up Commands.js a bit.
This was SVN commit r15344.
2014-06-13 16:16:25 +00:00
leper 58e628338c Also check if a technology was already researched when checking requirements. Fixes #2580.
This was SVN commit r15343.
2014-06-13 16:16:10 +00:00
leper 9990d4c885 Actually call the function instead of testing if it exists. Patch by falsevision. Fixes #2626.
This was SVN commit r15342.
2014-06-13 12:54:57 +00:00
sanderd17 55247e926a Remove legacy trading pane
This was SVN commit r15341.
2014-06-13 12:06:57 +00:00
sanderd17 2b8758745f put the unit commands in a JS object
This was SVN commit r15340.
2014-06-13 11:35:16 +00:00
sanderd17 2b408e766b Fix problem with setting up trade routes
This was SVN commit r15339.
2014-06-13 08:01:06 +00:00
mimo 350d4a6b7e add rally points for the AIs
This was SVN commit r15338.
2014-06-12 18:41:13 +00:00
mimo e3f3051b2a Petra: code cleaning and minor improvments
This was SVN commit r15337.
2014-06-12 16:47:43 +00:00
sanderd17 2e00628562 Take the action definitions out of input.js, and in a separate JS object that can be edited by other scripts. This makes it possible to easier add new actions by editing this new script, or (in mods) even by editing the object in other scripts.
This was SVN commit r15336.
2014-06-12 13:47:37 +00:00
fabio 2e4441b528 Minor typos in text strings
This was SVN commit r15335.
2014-06-12 13:24:36 +00:00
Ykkrosh 85e2e72eb7 Fix TestHeaderless failure on GCC 4.9.
Once 'delete' is called on an object, that object no longer exists, and
accessing its member variables is undefined behaviour. GCC 4.9's
optimiser recognises this, and eliminates any writes to member variables
inside the destructor, since it knows they cannot legally be read later.

BoundaryTagManager relied on ~FreedBlock resetting its memory to 0, so
this optimisation broke it. Replace the placement new/delete with plain
non-magic Setup/Reset functions, to avoid the optimisation.

Fixes #2481.

This was SVN commit r15334.
2014-06-11 19:50:38 +00:00
JoshuaJB 548f50b071 Give gaia back it's vision.
This was SVN commit r15332.
2014-06-11 18:20:02 +00:00
sanderd17 89f5e7b260 Improve gui moddability by allowing to load an entire directory of scripts at once, and being able to split up big gui XML files. Fixes #2622
This was SVN commit r15330.
2014-06-11 17:14:35 +00:00
sanderd17 791eba9451 Fix Splash damage calculation. Patch by falsevision. Fixes #2623
This was SVN commit r15329.
2014-06-11 14:02:02 +00:00
sanderd17 b289303c25 Fix setting rallypoint via the minimap + fix out-of-world problem when the targeted entity for a rallypoint disappeared
This was SVN commit r15328.
2014-06-11 13:36:12 +00:00
sanderd17 49194819f6 Schwarzwald random map. Script by niektb, with random terrain generation from FeXoR.
This was SVN commit r15327.
2014-06-10 19:59:17 +00:00
sanderd17 6d0df59697 Fix theatrons
This was SVN commit r15326.
2014-06-10 14:27:43 +00:00
mimo 8551a799d0 Petra: prevent gatherers to stay blocked when UnitAI make them return resource in an inaccessible dropsite, see #2563
This was SVN commit r15325.
2014-06-10 13:45:23 +00:00
mimo 57a7bbcb90 fix javascript warning
This was SVN commit r15324.
2014-06-10 13:34:49 +00:00
mimo 3b519b132a fix undefined variable in petra
This was SVN commit r15323.
2014-06-10 13:27:49 +00:00
sanderd17 60212b0418 Fix Iberian monument.
This was SVN commit r15322.
2014-06-10 13:18:33 +00:00
mimo 7cb6768132 fix productionTime computation on AI common-api
This was SVN commit r15321.
2014-06-10 12:59:42 +00:00
sanderd17 9723f73262 Fix tests
This was SVN commit r15320.
2014-06-09 18:13:29 +00:00
sanderd17 1d7001c8cd Fix walls + remove debug warning
This was SVN commit r15319.
2014-06-09 17:51:23 +00:00
sanderd17 2fb0262142 Futher clean up heroes tooltips + move auras to the templates. Hope they have a bigger chance of staying consistent now.
This was SVN commit r15318.
2014-06-09 17:35:37 +00:00
sanderd17 3a2670f7fa Take aura descriptions out of tooltip, let auras be defined in the entity template rather than in JSON files, as they can't be reused anyway. Fix tooltips and auras for all heroes from athen to gaul.
This was SVN commit r15317.
2014-06-09 14:15:05 +00:00
mimo d6b8f1989e Petra: complete and improve 2c0daaf80b
This was SVN commit r15316.
2014-06-09 13:30:41 +00:00
sanderd17 1776aa4750 Continue the transition to the usage of visible classes. Fix Hero inheritance for that.
This was SVN commit r15315.
2014-06-09 09:32:36 +00:00
mimo 2c0daaf80b Petra: improve choice of ships to train and some style cleaning
This was SVN commit r15314.
2014-06-09 07:54:59 +00:00
mimo 5f42834710 some aegis fixes, patch by falsevision, close #2617
This was SVN commit r15313.
2014-06-09 07:48:29 +00:00
mimo 91a511560c remove code dupplication for dock angle computation
This was SVN commit r15312.
2014-06-08 16:00:00 +00:00
sanderd17 049caba9f9 Let the timer hold the latest turnLength instead of the Attack component. Reduces a lot of messages
This was SVN commit r15311.
2014-06-08 09:39:57 +00:00
historic_bruno cb9d0733ef Changes XMB format to store UTF-8 strings and removes pointless UTF-16 conversions, refs #204, #244.
Bumps XMB version to 2.

This was SVN commit r15309.
2014-06-08 03:23:37 +00:00
historic_bruno 40b351a99a Fixes error in silhouettes hotkey handler
This was SVN commit r15308.
2014-06-08 02:04:29 +00:00
Mythos_Ruler 72706f708b Some unfinished maps for others to finish if they wish.
Tweaked Siwa Oasis.

This was SVN commit r15307.
2014-06-07 14:39:01 +00:00
sanderd17 567917bf41 Give RMS access to the simulation templates. Fixes #1589. Patch by Itms.
This was SVN commit r15306.
2014-06-07 12:12:53 +00:00
Mythos_Ruler 27ca5fe19d Iberians now have the Celtic war barge.
This was SVN commit r15304.
2014-06-07 11:21:42 +00:00
mimo 67a4af0fe0 fix typo from a4f2c2ac90
This was SVN commit r15303.
2014-06-05 18:29:11 +00:00
mimo a96953efea remove dupplicated (and buggy) line introduced in 0fcc074a65
This was SVN commit r15302.
2014-06-05 17:51:06 +00:00
leper 53ea269af0 Add the ability to specify a log level when using dlopen and change it to normal for Atlas.
This way we do not have two error messages when starting Atlas, but the
dynamic Atlas lib is not available.
Patch by Gallaecio. Fixes #1540.

This was SVN commit r15301.
2014-06-05 17:07:04 +00:00
JoshuaJB fd8ffb506b Remove commented out code and add licence headers to COList.cpp/.h.
This was SVN commit r15300.
2014-06-05 14:33:44 +00:00
leper c699409246 Add translation context to stances.
This was SVN commit r15299.
2014-06-05 14:06:15 +00:00
sanderd17 55760f6413 cache the affected players in order to remove the template bonuses given by auras from the right players before adding them again.
This was SVN commit r15298.
2014-06-05 11:24:31 +00:00
sanderd17 2d1f9c33dc Bring healable classes to the uniform class matching
This was SVN commit r15297.
2014-06-05 10:34:41 +00:00
leper 638123950c Check if the position changed before updating it for rally points set on entities. Refs #1257.
This was SVN commit r15296.
2014-06-05 10:27:40 +00:00
leper fd615c4c54 Round some alpha values for overlays.
This was SVN commit r15295.
2014-06-05 10:22:16 +00:00
sanderd17 a4f2c2ac90 Allow for unification in identity class matching + add the opportunity to combine with AND and OR. Fixes #2612
This was SVN commit r15294.
2014-06-05 09:39:36 +00:00
sanderd17 cbfbc72d36 Other auras fix
This was SVN commit r15293.
2014-06-05 07:57:05 +00:00
leper 02c68064ed Fix syntax errors in two auras.
Some code style cleanup in aura related files.

This was SVN commit r15290.
2014-06-04 22:27:36 +00:00
leper d5b4dbcb71 Retain corpses in FoW. Patch by Itms. Fixes #1366.
This was SVN commit r15289.
2014-06-04 22:13:47 +00:00
leper b09a702c60 Recompute rally point lines when the rally point is set on a moving unit.
Does not account for setting rally points on units that can move into
the FoW/SoD.
Recalculates paths even if the rally points are not displayed.
Refactors UpdateMarkers() to remove some indentation levels.
Based on patch by Itms. Fixes #1257.

This was SVN commit r15288.
2014-06-04 22:07:58 +00:00
mimo 6b015e935e remove a forgotten debug warning in petra
This was SVN commit r15287.
2014-06-04 20:52:21 +00:00
mimo 0fcc074a65 Petra: try to improve cart shipyard placement
This was SVN commit r15286.
2014-06-04 20:13:15 +00:00
sanderd17 d883fc332d Correct mime-types and end-of-lines for the XML files in simulation/templates
This was SVN commit r15285.
2014-06-04 17:21:24 +00:00
leper b67aca01c8 Fix color fade to not go beyond 255 and be integer.
This was SVN commit r15284.
2014-06-04 16:23:56 +00:00
Mythos_Ruler 8d2835d9e0 Fixed resource balance for players 3 and 4. (they didn't have chickens or huntable fauna before).
This was SVN commit r15283.
2014-06-04 15:59:43 +00:00
JoshuaJB 685d5e0197 Switch default AI to Petra and remove an old Aegis warning.
This was SVN commit r15282.
2014-06-04 15:29:20 +00:00
sanderd17 9a7984c544 Fix class checking for technologies
This was SVN commit r15281.
2014-06-04 12:07:35 +00:00
sanderd17 b6870bf415 Move the extraction of the classes from templates to the global scripts, and let the AI use it to reduce redundancy.
This was SVN commit r15280.
2014-06-04 08:42:48 +00:00
JoshuaJB c07d394999 Fix GCC build of 2c14d94559. Refs #2589
This was SVN commit r15279.
2014-06-04 03:03:58 +00:00
leper 2c14d94559 Replace usage of CParser for CColor.
Switches format to use integers only.
Adds logging if the string is invalid.
Refs #2589.

This was SVN commit r15278.
2014-06-04 00:58:05 +00:00
Ykkrosh db39d742f0 Fix units falling off the edge of the world.
I guess changes to the map loading sequence caused the TerrainChanged
message to be sent before the map was switched from square to circular
instead of after. The pathfinder didn't notice the switch, so it
continued treating the map as if it were square, allowing units to walk
into the permanent map-corner SOD and vanish, and allowing territories
to expand into the SOD.

Tell the pathfinder explicitly when the map shape changes, so it can
discard its cached data correctly.

This was SVN commit r15277.
2014-06-03 22:35:40 +00:00
mimo 0900005e5b fix #2605
This was SVN commit r15276.
2014-06-03 19:41:11 +00:00
mimo 86a99b745e Petra: code rearrangement + small improvments
This was SVN commit r15275.
2014-06-02 20:21:28 +00:00
leper 4f6afbc0bf Fix non-PCH build.
This was SVN commit r15274.
2014-06-02 20:06:27 +00:00
sanderd17 b4f3b503f2 code style cleanup
This was SVN commit r15273.
2014-06-02 15:48:37 +00:00
sanderd17 a500826ae4 Since the VFS logs the missing files now, there's no reason to crash on it.
This was SVN commit r15272.
2014-06-02 15:41:41 +00:00
sanderd17 49ca719049 Reinitialize music when hotloading. Fixes crash when hotloading GUI files.
This was SVN commit r15271.
2014-06-02 15:13:16 +00:00
historic_bruno a63ed4e4c4 Fixes rare crash in sound manager, due to worker thread dereferencing global pointer before it had been assigned. Fixes #2333, refs #2387, #2317.
Fixes potential infinite loop if worker thread was running but not
enabled.
Fixes apparent bug in fading sound smoothness.
Cleans up worker class slightly.
Cleans up weird and inconsistent whitespace.

This was SVN commit r15269.
2014-06-02 02:09:58 +00:00
Ykkrosh c17bf75cbb Fix bad merge.
This was SVN commit r15268.
2014-06-01 19:06:58 +00:00
Ykkrosh fb0b4572ab Fix Valgrind complaint about delete vs delete[].
This was SVN commit r15267.
2014-06-01 18:46:14 +00:00
Ykkrosh e6b8339103 Minor optimisation for non-animated units.
This was SVN commit r15266.
2014-06-01 18:25:20 +00:00
Ykkrosh 1882f28504 New unit renderer.
Instead of each CCmpVisualActor rendering itself individually, collect
all the units in a single CCmpUnitRenderer. This avoids the overhead of
doing Interpolate/RenderSubmit calls every frame for every object in the
world. It also allows more efficient culling.

CCmpUnitRenderer knows the positions of each object at the start and end
of each turn, and computes the bounding sphere of the object along that
path. That allows quick culling without recomputing the precise
interpolated transform every frame. (In the future it could be improved
much more.)

Clarify and clean up the sending of PositionChanged messages, and add
new InterpolatedPositionChanged.

Remove the forceFloating parameter from GetInterpolatedTransform, since
it doesn't fit the new design. Replace it with a (non-synchronised) flag
in CCmpPosition.

Move construction progress from CCmpVisualActor to CCmpPosition, so that
it consistently affects all position/transform computation.

Refs #2337.

This was SVN commit r15265.
2014-06-01 18:24:50 +00:00
Ykkrosh d117d96d22 Simplify component deserialization.
Deserialize SYSTEM_ENTITY before any other entities. This makes it safe
for Deserialize() methods to access system components (mirroring how
Init() can already access system components).

Add a Deserialized message, sent after all entities have been
deserialized, to help with some other sequencing problems.

This was SVN commit r15264.
2014-06-01 18:14:09 +00:00
Ykkrosh b30a9a6384 Remove m_NeedInitialXZRotation - not needed after changes to map loading order.
This was SVN commit r15263.
2014-06-01 18:10:00 +00:00
Ykkrosh ceb3c3d366 MapReader: Load terrain before entities.
This allows component Init functions to make use of the terrain
immediately, instead of delaying some computations until the first
frame.

This was SVN commit r15262.
2014-06-01 18:08:11 +00:00
Ykkrosh fe3315376c Add BoundingSphere, SOverlaySphere.
BoundingSphere is similar to a bounding box, but more spherical.

SOverlaySphere is useful for visualising BoundingSphere (it's quite
inefficient and should only be used for debug functionality).

Normalise the camera frustum clipping planes, so that IsSphereVisible
gives the correct result.

This was SVN commit r15261.
2014-06-01 18:05:46 +00:00
Mythos_Ruler 3b0fee9073 This was SVN commit r15260. 2014-06-01 13:15:16 +00:00
mimo ac925ed1b6 fix 8efc3b0241
This was SVN commit r15259.
2014-06-01 12:49:34 +00:00
mimo 8efc3b0241 code rearrangement
This was SVN commit r15258.
2014-06-01 09:47:12 +00:00
sanderd17 6f11097c00 Allow the CLI to load skirmish maps. From now on, the directory must be included in the map path to load any maps (see the readme). Patch by Teiresias. Fixes #2572
This was SVN commit r15257.
2014-06-01 08:18:46 +00:00
Mythos_Ruler 38130e5b94 Brit woman can build rotary mill now.
Spartan commando can build the Theatron now.

Sibylline Books tech from Roman Wonder to Roman Temple.

This was SVN commit r15256.
2014-06-01 04:13:19 +00:00
sanderd17 608ab456d5 fix tests
This was SVN commit r15255.
2014-05-31 14:57:14 +00:00
sanderd17 59c9ae670f Stop VFS from causing a crash when the AI player isn't found. Patch by Itms. Fixes #2558
This was SVN commit r15254.
2014-05-31 14:55:09 +00:00
sanderd17 bb16a8ee98 Fix ungarrisoning via ungarrisoning pane
This was SVN commit r15253.
2014-05-31 14:03:00 +00:00
sanderd17 17d83a8b4c Add ungarrison button to ungarrison specific entities
This was SVN commit r15252.
2014-05-31 13:58:16 +00:00
sanderd17 e2aa24fc9a Clean up the turret interface a bit + fix serialisation for turrets
This was SVN commit r15250.
2014-05-31 11:35:07 +00:00
sanderd17 8ef7278306 Add a bonus to units on walls + disable placing units on palisades (which was enabled by accident due to inheritance)
This was SVN commit r15249.
2014-05-31 11:02:58 +00:00
mimo f5c5bbe26d some fixes for Petra AI
This was SVN commit r15247.
2014-05-30 15:24:19 +00:00
sanderd17 cfec28e553 Add the Engine code for turrets + use them to get units on walls. The scripted TurretHolder isn't included due to lack of usability for now. Refs #2577
This was SVN commit r15246.
2014-05-30 14:46:06 +00:00
Mythos_Ruler d05bd656e7 Added Sibylline Books tech for Romans.
Tweaked Roman Logistics tech. Tweaked Siwa Oasis skirmish.

Balance changes: -5 attack, -4 range, -10 health for cavalry
skirmishers, after discussion with alpha123.

This was SVN commit r15245.
2014-05-30 04:18:05 +00:00
mimo 84d799ed9f Petra: reduce the CPU time for building placement
This was SVN commit r15244.
2014-05-29 20:39:09 +00:00
mimo 7105dabca7 fix failing unit training in Aegis and Petra
This was SVN commit r15243.
2014-05-29 20:18:29 +00:00
sanderd17 e0218fff8d New final fix?
This was SVN commit r15242.
2014-05-27 14:54:51 +00:00
sanderd17 7c39259ee5 Now I should get it right
This was SVN commit r15241.
2014-05-27 14:00:21 +00:00
sanderd17 5762721b09 Strange how I'm able to make that many mistakes
This was SVN commit r15240.
2014-05-27 13:42:04 +00:00
sanderd17 82db905b8e Fix previous commit
This was SVN commit r15239.
2014-05-27 12:32:57 +00:00
sanderd17 3413dc84a1 make it possible for mods to add new unit commands
This was SVN commit r15238.
2014-05-27 11:17:29 +00:00
sanderd17 b9f3a95e17 Make UnitAI moddable by exposing the FSM spec and calculated FSM as part of the prototype
This was SVN commit r15237.
2014-05-27 07:24:07 +00:00
JoshuaJB e4d3189494 Lots of GUI fixes to issues pointed out by alpha123 on IRC.
This was SVN commit r15235.
2014-05-27 05:34:28 +00:00
mimo a75342e2c7 minor changes in petra: cleanings and timing optimization
This was SVN commit r15234.
2014-05-26 19:52:51 +00:00
sanderd17 a0913cbc75 Fix the interpolation changes from the previous commit, as they weren't smooth
This was SVN commit r15232.
2014-05-26 17:12:05 +00:00
Ykkrosh 85a1f880ab Fix compatibility with LLVM libc++ (used on OS X).
libc++ vector asserts that allocator::value_type is correct, so we have
to pass in the correct types.

This was SVN commit r15231.
2014-05-26 16:48:28 +00:00
sanderd17 5ae9f678b0 Clean up position height methods + add new. Now we have the ability to losslessly read and write positions to entities from the scripts.
This was SVN commit r15230.
2014-05-26 16:23:46 +00:00
Ykkrosh c3a0ac43bf Broadcast TerrainChanged message, so CCmpSelectable can actually see it.
This was SVN commit r15229.
2014-05-26 15:44:35 +00:00
Ykkrosh 4ca40116ed Fix building selection rings not being recomputed when the terrain or water under them is changed.
This was SVN commit r15228.
2014-05-26 13:45:49 +00:00
Ykkrosh 1871daab0d Fix pathfinding and territories not being recomputed when water height changes.
This was SVN commit r15227.
2014-05-26 13:45:10 +00:00
Ykkrosh 41f62cd3ff Add WaterChanged message, for things that need to be recomputed when the water height changes.
This was SVN commit r15226.
2014-05-26 13:44:24 +00:00
Ykkrosh 6407b593d6 Make displayFrustum controllable from scripts.
This was SVN commit r15225.
2014-05-26 13:42:32 +00:00
Ykkrosh 1936abad98 Remove length limits on script output in console.
This was SVN commit r15224.
2014-05-26 13:39:45 +00:00
Ykkrosh b78c38b935 Disable GCC warning triggered by wxWidgets.
This was SVN commit r15223.
2014-05-26 13:38:09 +00:00
Mythos_Ruler b7281c629c Rocks -> Arrows. Fixes #2565.
This was SVN commit r15222.
2014-05-26 04:48:33 +00:00
Mythos_Ruler bc8792ba96 Proper double-click behavior for these champion units. Fixes #2586.
This was SVN commit r15221.
2014-05-26 04:41:35 +00:00
historic_bruno 39cfb6748d Fixes flickering in main menu backgrounds on old Intel GPUs, by manually setting the z-values for each layer, fixes #2143
This was SVN commit r15220.
2014-05-26 04:38:47 +00:00
Mythos_Ruler 4dd90a1ef3 A new skirmish map.
This was SVN commit r15219.
2014-05-26 04:23:10 +00:00
Mythos_Ruler d7f1427c9b Tweaked Ptolemies sandbox scenario.
This was SVN commit r15218.
2014-05-26 01:28:56 +00:00
Mythos_Ruler 7bc0f611b3 Auras for Roman heroes Marcellus and Maximus.
This was SVN commit r15217.
2014-05-26 01:26:53 +00:00
Ykkrosh e79adae921 Attempt to work around LOS texture alignment bug.
For unknown reasons, sometimes glTexSubImage2D acts as if
GL_UNPACK_ALIGNMENT = 2 or 4, instead of 1. This causes the odd-sized
array uploaded for the LOS texture to be interpreted incorrectly, and
the LOS texture gets rendered very incorrectly.

Pad the array to a multiple of 4 in all cases, so that
GL_UNPACK_ALIGNMENT shouldn't affect it.

Hopefully fixes #2594.

This was SVN commit r15216.
2014-05-25 13:30:39 +00:00
mimo 3d306702df Petra: recover some cases where units are blocked because of pathfinder
This was SVN commit r15215.
2014-05-25 10:00:55 +00:00
JoshuaJB 072e4a614e Bump lobby version string.
This was SVN commit r15214.
2014-05-25 03:21:32 +00:00
JoshuaJB 5ce12c2263 Start phasing out the use of CParser in the GUI. Makes GUI parsing generally faster and stricter while adding better tests and debug information.
This was SVN commit r15213.
2014-05-25 03:16:52 +00:00
mimo 9c908a5f46 improve 6764b15ae2 by allowing a selected button to be selected again
This was SVN commit r15212.
2014-05-24 16:23:11 +00:00
mimo 6764b15ae2 ease switch to 100% trade of one resource using Shift-click
This was SVN commit r15211.
2014-05-24 15:37:19 +00:00
mimo 874ceb76a5 fix JS warning in Petra
This was SVN commit r15210.
2014-05-24 14:52:05 +00:00
sanderd17 8589003ac6 Let for loop return early. Small code style fix.
This was SVN commit r15209.
2014-05-24 10:18:15 +00:00
sanderd17 7f5264d3be Fix test for unhealable and healable classes. Make healers able to heal again
This was SVN commit r15208.
2014-05-24 09:50:10 +00:00
sanderd17 1e3ba2d438 Let formations use the UnitAI.AddOrder method, instead of directly deciding if ReplaceOrder or PushOrder should be used. This replaces the expectedRoute, and might lead to units behaving more as demanded. Refs #2568
This was SVN commit r15207.
2014-05-24 09:40:21 +00:00
JoshuaJB 2fbc55ec96 Update lobby server README.
This was SVN commit r15206.
2014-05-23 15:52:29 +00:00
JoshuaJB 9ee17342b1 Change developer overlay to only be openable through Alt+D shortcut. Fixes #2569
This was SVN commit r15205.
2014-05-23 00:18:16 +00:00
mimo 84b53933ff fix the AIs broken after b55b6a9cf1
This was SVN commit r15204.
2014-05-22 20:40:14 +00:00
leper 27104a4f33 Remove MaxDistance from Roman merchant ship. See 1207b146bb.
This was SVN commit r15203.
2014-05-22 16:39:00 +00:00
leper 52e807a207 Healers should not heal animals.
If we want war dogs to be healable we should change the class to
Domestic.

This was SVN commit r15202.
2014-05-22 16:38:57 +00:00
sanderd17 ea334e3716 Fix class counting
This was SVN commit r15201.
2014-05-22 16:20:36 +00:00
mimo 41de9f6e84 Petra fixes for maps without cc
This was SVN commit r15200.
2014-05-22 15:09:42 +00:00
sanderd17 3fc2574ecf Disable syntagma and testudo for champion cavalry
This was SVN commit r15199.
2014-05-22 14:50:53 +00:00
sanderd17 d20e244a37 fix tests
This was SVN commit r15198.
2014-05-22 14:38:49 +00:00
sanderd17 16c5bc96dc Add ptol and sele hero auras. Fixes #2444. Patch by Silk.
This was SVN commit r15197.
2014-05-22 14:37:11 +00:00
sanderd17 b55b6a9cf1 Add visible class names to all common buildings
This was SVN commit r15196.
2014-05-22 14:31:48 +00:00
sanderd17 ac1a9bf8d1 Clean up class parsing + add visible classes to be displayed in the GUI without adding them separatedly to our tooltips
This was SVN commit r15195.
2014-05-22 10:20:02 +00:00
historic_bruno eaa382a60c This was SVN commit r15194. 2014-05-22 01:38:46 +00:00
historic_bruno ee50168096 Removes errant text from GUI XML files, fixes some untranslated text per [wiki:Internationalization]. Refs #2507
This was SVN commit r15193.
2014-05-22 01:36:45 +00:00
scythetwirler eae7978868 Makes a word consistent with American English
This was SVN commit r15192.
2014-05-21 20:24:37 +00:00
sanderd17 3e985225fc Remove remaining MaxDistance. See 1207b146bb
This was SVN commit r15191.
2014-05-21 14:20:00 +00:00
sanderd17 1207b146bb Let trading range depend on obstruction. Fixes #2556
This was SVN commit r15190.
2014-05-21 14:03:57 +00:00
sanderd17 0a3eb92d62 Add slower game options. Might be usefull for slow players or development. Fixes #2499. Patch by DanCar.
This was SVN commit r15189.
2014-05-21 13:46:42 +00:00
sanderd17 01777a7ade fix tests
This was SVN commit r15188.
2014-05-21 12:28:39 +00:00
mimo 2303ad97cf petra: test on cc existence before trying to build
This was SVN commit r15187.
2014-05-21 09:37:41 +00:00
scythetwirler e0fb1223d6 Put the colon inside the translate tag.
This was SVN commit r15186.
2014-05-21 03:02:54 +00:00
mimo 153b1162fb changes for the AI to deal with maps with celts and change comment on naval maps
This was SVN commit r15185.
2014-05-20 21:30:48 +00:00
Mythos_Ruler 5dbf7ffa1e Portraits for these two Ptol boats.
This was SVN commit r15184.
2014-05-20 21:09:25 +00:00
mimo 4707f11b07 Petra AI: fix a bug in naval transport and adapt strategy to initial available resources
This was SVN commit r15183.
2014-05-20 19:48:54 +00:00
sanderd17 99a7bc67ac Fix 672f5a8b11 when sloppyness is 0
This was SVN commit r15182.
2014-05-20 18:45:36 +00:00
sanderd17 317c6057ed Remove members from a formation when they garrison. Fixes #2545
This was SVN commit r15181.
2014-05-20 17:47:47 +00:00
sanderd17 672f5a8b11 Add sloppyness and separate icon path to formation templates (makes it possible to have multiple formation templates - like different settings for different civs - with only one icon file)
This was SVN commit r15180.
2014-05-20 17:18:40 +00:00
leper 4c9d99ff68 Add plural forms for Gaelic. Fixes #2575.
This was SVN commit r15179.
2014-05-20 17:11:47 +00:00
fabio 41bc9fa65e Remove a newline in a tooltip.
There is no need for it.
Some translations also add the newline that, due to different words
length, appears in an unwanted place.

This was SVN commit r15178.
2014-05-20 10:41:09 +00:00
historic_bruno d8dbd499f8 Probably fixes uninitialized variable warning in GLSL model shader on some drivers
This was SVN commit r15177.
2014-05-20 03:41:46 +00:00
mimo d0e18900ae avoid new harmless spidermonkey warnings
This was SVN commit r15176.
2014-05-19 22:09:44 +00:00
leper 2081c62ab4 Support newer version of miniupnpc api. Refs #2552.
This was SVN commit r15174.
2014-05-19 21:01:06 +00:00
leper 940868398c Use Boost.Signals2 for Atlas. Patch by fabio. Fixes #2469.
This was SVN commit r15173.
2014-05-19 21:01:02 +00:00
mimo 15472f7797 fix Petra not gathering already dead animals and remove forgotten debug printout
This was SVN commit r15172.
2014-05-19 19:45:08 +00:00
JoshuaJB dfc7567561 Fix multiple observers on multiplayer games to work more reliably. Fixes #2529
This was SVN commit r15171.
2014-05-19 16:02:42 +00:00
fabio f4edb8dce5 Simplify and improve x86/amd64 CPU build flag
On amd64 removes the "-msse" flag, which is already
enabled by default.

On x86 changes the flags from "-march=i686 -msse" to
"-march=pentium3 -mtune=generic". This should also enable
other CPU features like MMX, while keeping the same
minimun supported CPU (Intel Pentium3 or AMD Athlon 4)
previously required by "-msse".

Fixes #2329.

This was SVN commit r15170.
2014-05-19 12:18:55 +00:00
sanderd17 4a3df1c8c5 Add extra check so units can't attack entities out of range. Fixes #2570
This was SVN commit r15168.
2014-05-19 09:05:18 +00:00
sanderd17 196eebe803 Fix partial internationalisation of the limit changers
This was SVN commit r15167.
2014-05-19 08:22:20 +00:00
sanderd17 5ae4619b81 Internationalize the AllowedToCreate method from EntityLimits. Fixes #2546.
This was SVN commit r15165.
2014-05-19 07:35:05 +00:00
historic_bruno 81da366268 Deletes some obsolete and broken old art files, refs #2524
This was SVN commit r15164.
2014-05-19 01:47:22 +00:00
historic_bruno ae29becb37 Removes pointless minimap state change during attack notification, it broke synchronized simulation state and caused some OOS errors. Fixes #2525. Refs #1719, #2526.
This was SVN commit r15163.
2014-05-19 01:35:14 +00:00
scythetwirler e6d762882a Add the tooltip option to default.cfg. Refs #2549.
This was SVN commit r15162.
2014-05-19 01:00:30 +00:00
scythetwirler 61b6eba4c1 Adds a config option for more detailed tooltips. Fixes #2549.
This was SVN commit r15161.
2014-05-19 00:01:47 +00:00
mimo 8e6b624ea5 fix civ in template
This was SVN commit r15160.
2014-05-18 17:00:54 +00:00
sanderd17 bd7ebe268e Make skirmish entities better moddable. Fixes #2523. Patch by Idanwin.
This was SVN commit r15159.
2014-05-18 15:53:57 +00:00
sanderd17 7ff5fbda2b Allow system components to be registered on the scripting side (so mods can make their own system components).
This was SVN commit r15157.
2014-05-18 13:44:08 +00:00
leper 2b05a8d233 Reenable JS warnings that were disabled in db0376fdc2.
This was SVN commit r15156.
2014-05-18 13:25:08 +00:00
leper 1432e082bf Update room and bot name.
This was SVN commit r15155.
2014-05-18 13:25:00 +00:00
mimo 814d3dc0e8 fix previous commit
This was SVN commit r15154.
2014-05-18 12:39:58 +00:00
mimo 3273720776 major update of Petra AI with first version of naval map support
This was SVN commit r15153.
2014-05-18 11:34:36 +00:00
mimo 3596f1c341 modify AI common-api to allow fishing and minor fixes
This was SVN commit r15152.
2014-05-18 10:50:44 +00:00
sanderd17 b7f6c00c2b Mark all components as global variables and allow to re-register existing components to update their schema and/or message receiving methods.
This allows for components to be extended in other files, so mods don't
have to overwrite entire components.
Fixes #2517. Thanks to Rada for helping on this
(also fix some tests broken in the previous commit)

This was SVN commit r15150.
2014-05-18 08:20:02 +00:00
sanderd17 86196212e2 Improve navigation for ship formations by setting the formation controller to the right passability class
This was SVN commit r15149.
2014-05-18 07:59:43 +00:00
Yves 96c806841d Fixes the packaging script for some changes related to l10n and SpiderMonkey
This was SVN commit r15148.
2014-05-12 01:36:32 +00:00
Ykkrosh 3ecbb7667b Restrict set of translations included in releases
This was SVN commit r15147.
2014-05-11 17:43:36 +00:00
sanderd17 0a880413fe Fix the out-of-world error we saw in the team game yesterday
This was SVN commit r15145.
2014-05-11 09:36:12 +00:00
JoshuaJB d70abd548a Move yellow modern buttons to their own style to correct naming issues (eg. ModernButtonRed was yellow). New name is ModernButtonYellow. Also switched the default button color back to red due to complaints by team members on IRC.
This was SVN commit r15144.
2014-05-11 03:25:34 +00:00
Mythos_Ruler 056d740e7f Fixes #2542
This was SVN commit r15143.
2014-05-10 23:40:53 +00:00
mimo fb2cda5aba prevent weird behaviour when the ship in which we want to garrison is selected with the units to garrison
This was SVN commit r15142.
2014-05-10 22:21:24 +00:00
Mythos_Ruler b2ec4e0e2a Portrait for Roman bireme.
Modern button from red to yellow.

This was SVN commit r15141.
2014-05-10 21:33:46 +00:00
Mythos_Ruler f287a7da12 Elephants can transport aboard Medium and Heavy warships.
This was SVN commit r15140.
2014-05-10 16:15:26 +00:00
sanderd17 da8843127c Fix displaying wrong text when no tooltip was defined, as reported by Kanetaka. Also cleans up the code to make it shorter.
This was SVN commit r15139.
2014-05-10 13:37:38 +00:00
sanderd17 f15160412a Enlarge the ideographic ranges in the word boundaries, fixes Japanese rendering a bit
This was SVN commit r15138.
2014-05-09 12:13:42 +00:00
Mythos_Ruler e79ad6b30b Switch Military Colonies to use the mercenary camp actor.
Update a few tech names (shouldn't affect translations).

This was SVN commit r15137.
2014-05-09 00:18:23 +00:00
mimo a5708873db set the right civ for mace dock
This was SVN commit r15136.
2014-05-08 23:15:01 +00:00
sanderd17 2c1917176a Use untranslated playerState.civ, if the civName 'Gaia' happened to be translated, this resulted in an undefined texture, which was the case in Chinese, and reported by Gameboy.
This was SVN commit r15135.
2014-05-08 14:07:48 +00:00
sanderd17 8cec641156 Replace strictness test by a different one, as the old test wasn't considered non-strict anymore.
This was SVN commit r15134.
2014-05-08 13:26:21 +00:00
sanderd17 955e6e788a Fix counting foundations as concuestCritical.
This was SVN commit r15133.
2014-05-08 11:27:09 +00:00
mimo 8e39a2297d fix delete selection broken (again) in bb65358dac. Code is changed to prevent this to happen again
This was SVN commit r15131.
2014-05-08 08:21:20 +00:00
scythetwirler a620cf8e17 Fixes an issue with unassigned players being functionally ready but not having the green marker
This was SVN commit r15130.
2014-05-08 04:47:57 +00:00
JoshuaJB bb65358dac After discussion with scythetwirler with input from Philip and Mythos, popup dialogs (like for delete, resign, and exit) should have no on the right as we want the user to click no in most of those cases. It's the 'recommended' action. In the case of save/cancel or continue/back, save and continue should always be on the right as that's the 'recommended' action. With some review, this placement seems consistant across operating systems.
This was SVN commit r15129.
2014-05-08 03:43:03 +00:00
historic_bruno c37a8cafc3 Fixes a few building warnings and convention issues from 19ca1e3ebf
This was SVN commit r15128.
2014-05-07 23:33:21 +00:00
sanderd17 db0376fdc2 Temporarily disable the Spidermonkey warnings for release
This was SVN commit r15127.
2014-05-07 19:42:12 +00:00
Gallaecio 83b6175358 Added a script to check translations for URLs that are not in the original strings.
This was SVN commit r15126.
2014-05-07 19:02:17 +00:00
sanderd17 cbeb40a14b Fix foundations changing entity limits. Fixes #2536
This was SVN commit r15123.
2014-05-07 08:24:31 +00:00
sanderd17 19ca1e3ebf Fix locale verification to also allow ICU locales without data, but still don't allow bogus locales. Patch by Yves. Fixes #2533.
This was SVN commit r15122.
2014-05-07 08:14:57 +00:00
mimo c5b184744c stop failed attack in aegis, see #2486
This was SVN commit r15121.
2014-05-07 07:03:21 +00:00
JoshuaJB 27382a7d78 Swap OK and Cancel positions on the AI config GUI page. (Also cleanup the XML a bit)
This was SVN commit r15120.
2014-05-06 19:02:34 +00:00
sanderd17 9fadc2709c Clean up the gate transformation tooltips as it caused problems for mods.
This was SVN commit r15119.
2014-05-06 18:52:05 +00:00
Mythos_Ruler 34a9b8c260 New song by Omri to the Celtic civs.
This was SVN commit r15118.
2014-05-06 12:28:25 +00:00
OmriLahav 93cfdce090 This was SVN commit r15116. 2014-05-06 08:19:45 +00:00
mimo f181a89c34 fixes wrong test
This was SVN commit r15115.
2014-05-05 19:22:54 +00:00
sanderd17 3a008ba532 Mask lobby password so it doesn't appear in any logs
This was SVN commit r15113.
2014-05-05 15:41:17 +00:00
historic_bruno bb43a71460 Updates checkrefs.pl to support skirmish maps
This was SVN commit r15112.
2014-05-05 01:09:53 +00:00
mimo 48bb533895 temporarily disable trader formation, see #2528
This was SVN commit r15111.
2014-05-04 21:38:31 +00:00
sanderd17 06685a3f9b Fix small issue
This was SVN commit r15110.
2014-05-04 20:22:31 +00:00
historic_bruno 44b40a85bb Fixes some broken actor references
This was SVN commit r15109.
2014-05-04 08:08:48 +00:00
historic_bruno ba5e6d9168 Removes duplicate FleeDistance property from template_unit_fauna_decorative (found by checkrefs.pl)
This was SVN commit r15108.
2014-05-04 05:52:51 +00:00
historic_bruno d2ecbecf32 Fixes tex_codec typo that broke BMP writing and big screenshots, fixes #2515
This was SVN commit r15107.
2014-05-04 05:49:31 +00:00
scythetwirler 9b136a45fc Fixes a couple dialog buttons
This was SVN commit r15106.
2014-05-04 02:44:14 +00:00
sanderd17 2eb2845c29 Extra check on the existance of a replacement, be more forgiving in the skirmish replacer.
This was SVN commit r15104.
2014-05-03 17:53:37 +00:00
sanderd17 dd13e01ac6 Extra check on existance of template, to be more forgiving if some template in the productionqueue doesn't exist.
This was SVN commit r15103.
2014-05-03 17:29:22 +00:00
Enrique e70eccf0ca Added Stan's contributor ptol_corral details in Lordgood's model
Added Stan's Cleopatra texture

This was SVN commit r15102.
2014-05-03 13:05:34 +00:00
sanderd17 575cdd7979 A spearman isn't ranged
This was SVN commit r15101.
2014-05-03 13:04:08 +00:00
sanderd17 b09925b27e switch the game setup confirmation buttons and move the welcome screen buttons
This was SVN commit r15100.
2014-05-03 09:21:05 +00:00
sanderd17 542bc1b273 Further fix switched buttons
This was SVN commit r15099.
2014-05-03 09:07:31 +00:00
Yves c1d5f6882c Also switch the button name to disable the correct one.
4e0a588456 only switched the label and the action.

This was SVN commit r15098.
2014-05-03 08:59:31 +00:00
sanderd17 12ec51783d Fix in-game manual display
This was SVN commit r15097.
2014-05-03 08:53:06 +00:00
sanderd17 4e0a588456 Switch more buttons, see 911be4e860
This was SVN commit r15096.
2014-05-03 08:45:19 +00:00
scythetwirler f066549523 Makes the other players default to unassigned instead of Default AI in a sandbox map.
This was SVN commit r15095.
2014-05-03 04:00:14 +00:00
Yves 122dae799b Don't allow returning an invalid locale from the advanced language menu.
This was SVN commit r15094.
2014-05-02 21:14:28 +00:00
sanderd17 99486ed7ab Add camera to the second player, somehow avoids strange errors.
This was SVN commit r15093.
2014-05-02 20:08:48 +00:00
mimo b8e9bae75e fixes Petra trying to keep going with a canceled attack
This was SVN commit r15092.
2014-05-02 11:03:24 +00:00
sanderd17 15f56cd984 Fix armour and attack display of heroes
This was SVN commit r15091.
2014-05-02 10:32:21 +00:00
sanderd17 ace3269768 Fix problem with sprintf errors being thrown when the AI places structures on the wrong places, make the code more uniform. Fixes #2485
This was SVN commit r15090.
2014-05-02 10:09:53 +00:00
sanderd17 a36a0bbd87 Improve my previous fix by throwing error objects instead of strings
This was SVN commit r15089.
2014-05-02 07:34:05 +00:00
sanderd17 aaf92409c9 Fix sprintf error reporting by printing the stack trace, and not trying to translate the calls
This was SVN commit r15088.
2014-05-02 07:27:44 +00:00
mimo 5658bb391b fix delete selection no more working after #15074
This was SVN commit r15087.
2014-05-01 21:06:43 +00:00
Yves 210374d86d Fixes Aegis not training additional units when no starting units are around.
Patch by Teiresias.

Fixes #2460

This was SVN commit r15086.
2014-05-01 13:13:38 +00:00
sanderd17 b9af0ac0e4 Enlarge various elements of the lobby login page to fit other languages.
This was SVN commit r15085.
2014-05-01 12:59:50 +00:00
sanderd17 a64456e6d8 Fix small space issue in the lobby (still some work to do there)
This was SVN commit r15084.
2014-05-01 11:38:53 +00:00
Gallaecio 47fc05d696 String freeze? Who said that?
Fix typo: avalible → available.

This was SVN commit r15082.
2014-05-01 01:22:59 +00:00
Gallaecio d51f2a0c35 Version bump and regeneration of translation templates accordingly.
This was SVN commit r15081.
2014-05-01 00:44:47 +00:00
leper c7b0261860 Fix the numbering in the Terms of Use for the lobby. Reverts 813db55b08.
This was SVN commit r15079.
2014-04-30 23:24:24 +00:00
leper 62f5476dec Add support for adding translation context to XML elements. Patch by Gallaecio.
Add translation context to some lobby headers.

This was SVN commit r15078.
2014-04-30 22:33:08 +00:00
sanderd17 057fa79bdb Revert db6c3f86f2. Changing something like that right before release is dangerous.
This was SVN commit r15077.
2014-04-30 17:53:51 +00:00
JoshuaJB 11865a8865 Revert a hack that snuck into an earlier commit of mine.
This was SVN commit r15076.
2014-04-30 17:22:38 +00:00
JoshuaJB db6c3f86f2 Missing file
This was SVN commit r15075.
2014-04-30 06:29:42 +00:00
JoshuaJB 911be4e860 The convention is confirm button on right, decline button on left (updates some in-game dialogs). Also enables GLSL.
This was SVN commit r15074.
2014-04-30 06:28:57 +00:00
JoshuaJB 90581f366c This was SVN commit r15073. 2014-04-30 05:36:50 +00:00
JoshuaJB e7b4c8b92a Make game automatically resume after closing the options menu. Refs #2507
This was SVN commit r15072.
2014-04-30 05:31:44 +00:00
JoshuaJB a88f1222c0 Update AI descriptions, closes #2500. Also correct some capitalization and developer overlay transparency for #2507.
This was SVN commit r15071.
2014-04-30 05:04:12 +00:00
JoshuaJB 748ebdfdb0 Various GUI fixes and cleanup.
This was SVN commit r15070.
2014-04-30 04:38:53 +00:00
JoshuaJB dfacf5358c New lobby connect/registration page. Not perfect but fixes most of the outstanding issues. Refs #2312
This was SVN commit r15069.
2014-04-30 00:46:57 +00:00
scythetwirler 15e9ffa21b Converts the save dialog to the modern UI. Refs #2507.
This was SVN commit r15068.
2014-04-29 21:45:00 +00:00
leper 29cab5f5ed Also change reveal map to revealed map.
Fix typo in tutorial map. Remove message refering to finite fields.

This was SVN commit r15066.
2014-04-29 14:51:21 +00:00
leper b246017f9f Explore_d_ map.
This was SVN commit r15065.
2014-04-29 13:10:56 +00:00
sanderd17 b3ab49bb30 Really remove the minimum damage of 1, what 37c8e77d8e was supposed to do
This was SVN commit r15064.
2014-04-29 07:15:10 +00:00
JoshuaJB 1e6614918b Initial modern buttons. Lobby/prelobby now only rely on the modern common files.
This was SVN commit r15063.
2014-04-29 00:07:27 +00:00
leper c77826e9aa Translate some message boxes when opening websites.
Fix a typo. Refs #2501.

This was SVN commit r15062.
2014-04-28 22:30:40 +00:00
leper 683170ea19 Enable/disable GenTangents when enabling/disabling PreferGLSL. Fixes #2505.
This was SVN commit r15061.
2014-04-28 22:30:27 +00:00
sanderd17 876d0e4e66 Forgot to fix some strings
This was SVN commit r15060.
2014-04-28 20:19:32 +00:00
sanderd17 e6e5b9f11f Add a link in the main menu to for translators. Patch by Stan, fixes #2501
This was SVN commit r15059.
2014-04-28 20:17:39 +00:00
leper 64d3d0b4b2 Remove falsely attributed quote.
This was SVN commit r15058.
2014-04-28 17:59:02 +00:00
sanderd17 4695f3425b Add the possibility to show the welcome screen on every update, next to the possibility to disable it completely. Patch by Itms, fixes #2116
This was SVN commit r15057.
2014-04-28 17:18:46 +00:00
Gallaecio f26a2917d3 Translate map name in the summary page
This was SVN commit r15056.
2014-04-28 15:54:47 +00:00
sanderd17 b8245da606 Improve disabled technology tooltip. Fixes #2497
This was SVN commit r15055.
2014-04-28 15:17:26 +00:00
sanderd17 a49b359748 Fix formations attacking by adding a combat.approaching state. Fixes #2496
This was SVN commit r15054.
2014-04-28 13:05:47 +00:00
Gallaecio b5dfacbf18 Translated map name in the loading screen, regenerated translation templates and updated translations from Transifex
This was SVN commit r15053.
2014-04-28 12:31:28 +00:00
Gallaecio fb80e29d41 Changes to English tooltips for consistency
Reported by an Italian translator, Fabio, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/13718374
https://www.transifex.com/projects/p/0ad/translate/#it/public/24494405

The periods were added in the main menu (only 2 tooltips without them)
and removed from the options menu (only 1 tooltip with it). In the
future, we might want to be consistent with tooltips through all the
GUI.

This was SVN commit r15052.
2014-04-28 10:11:11 +00:00
JoshuaJB 75713cc101 Don't display 'UNR' in the gamesetup on unranked players. This makes unranked lobby playernames consistant with those of rankless players who join via IP.
This was SVN commit r15051.
2014-04-28 05:39:18 +00:00
JoshuaJB 3014df2280 Disable wireframe mode in ranked games. Fixes #2401.
This was SVN commit r15050.
2014-04-28 05:02:20 +00:00
Mythos_Ruler da7526dbd4 Tweaked button.
This was SVN commit r15049.
2014-04-27 23:48:15 +00:00
scythetwirler e6ec0b2fc9 Add the limit back to provisionality in the rating system.
This was SVN commit r15048.
2014-04-27 23:42:56 +00:00
scythetwirler fde558b4b2 Implements a (hopefully) better rating system with an inflation test.
This was SVN commit r15047.
2014-04-27 23:13:29 +00:00
Gallaecio a8b50a66da Fixes to the lobby internationalization by sanderd17 and me
All strings are now translated at the last point, right before they are
added to the GUI.
Some other fixes are included.

This was SVN commit r15046.
2014-04-27 20:24:48 +00:00
JoshuaJB b3acb5657f Fix moderater prefixes in the lobby.
This was SVN commit r15045.
2014-04-27 19:26:12 +00:00
JoshuaJB 251372a062 Missing var statement.
This was SVN commit r15044.
2014-04-27 19:10:28 +00:00
JoshuaJB cfb72e990b Make gamesetup chat formatting more similar to the lobby and note that all players must be ready before starting a multiplayer game.
This was SVN commit r15043.
2014-04-27 19:06:21 +00:00
Yves 8f53ddd6b9 Unifies some translatable strings on the gamesetup screen.
This was SVN commit r15042.
2014-04-27 19:03:15 +00:00
Yves 2f8487b84b Adds translation support for the "More options" window on the gamesetup screen.
This was SVN commit r15041.
2014-04-27 18:41:56 +00:00
scythetwirler 983abd1952 Updates splashscreen style and adds a background to the scrollbar to match the dropdown
This was SVN commit r15040.
2014-04-27 18:30:40 +00:00
scythetwirler a163ac1c11 Reverts a rogue copy-paste in the last commit.
This was SVN commit r15039.
2014-04-27 18:23:15 +00:00
scythetwirler b8d3ef71f7 Fixes the updated dropdowns for multiplayer clients broken in 65f4c8b0e8
This was SVN commit r15038.
2014-04-27 18:18:05 +00:00
Gallaecio 461a17c95d Reverted d91756b251 after breaking the fix for the lobby that sanders17 had implemented
This was SVN commit r15037.
2014-04-27 17:38:19 +00:00
scythetwirler 65f4c8b0e8 Moves Select number of players to a more fitting and translation-friendly location. Also makes the map selection texts more translation-friendly in terms of space.
This was SVN commit r15036.
2014-04-27 17:24:37 +00:00
scythetwirler f9ccf05aa8 Change the style of dropdowns as per Mythos_Ruler. Also moves the rating list to the right side of the leaderboard (where it is on most rating lists).
This was SVN commit r15035.
2014-04-27 16:28:59 +00:00
Gallaecio 60334f05c8 Fix error introduced in 95b0a8d9bf while fixing a warning
This was SVN commit r15034.
2014-04-27 15:56:10 +00:00
scythetwirler 63bcf2fef6 Don't display I'm ready in single player setup. Refs #2447.
This was SVN commit r15033.
2014-04-27 15:32:22 +00:00
scythetwirler ce0f439817 Adjusts the lobby gamelist and dropdowns to support more translations (space-wise).
This was SVN commit r15032.
2014-04-27 14:52:32 +00:00
Gallaecio 95b0a8d9bf Fixed warnings in ‘gui’ due to the new SpiderMonkey
Refs #2372

This was SVN commit r15030.
2014-04-27 13:51:43 +00:00
Gallaecio 60e1ff59f5 Fix warning about msg.guid not being defined
This was SVN commit r15029.
2014-04-27 13:38:17 +00:00
Gallaecio 341bcb1cf9 Fix unfinished change in accidental commit d4109916a3
This was SVN commit r15028.
2014-04-27 13:37:26 +00:00
Gallaecio d4109916a3 Moved the translation of AI messages to a later point
This avoids attempts to translate messages prefixed with keywords,
such as “/team Message prefixed with a keyword”, and translates them
only after the keyword has been removed. Some keywords may hide the
message, removing the need for a translation altogether.

This was SVN commit r15027.
2014-04-27 13:33:15 +00:00
Gallaecio d91756b251 Moved the translation of map data to the loadMap() function
This avoids the translation of strings that had been previously
translated later in the code.

This was SVN commit r15026.
2014-04-27 13:28:47 +00:00
Mythos_Ruler e344225b72 Tweaked this description.
This was SVN commit r15025.
2014-04-27 13:11:50 +00:00
Mythos_Ruler ad5fb85de3 A bunch of tech tweaks.
Tweaked Belgian Bog environment.

This was SVN commit r15024.
2014-04-27 13:10:38 +00:00
Gallaecio 813db55b08 Fixed the numbering in the terms of user of the lobby
Reported by ‘tema’ (Italian translator) at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/24566468

This was SVN commit r15022.
2014-04-27 10:02:23 +00:00
Gallaecio 243411f0c5 Internationalization of the lobby terms of service and terms of use
This was SVN commit r15021.
2014-04-27 09:13:28 +00:00
sanderd17 0db4cc690e Check for hero attack before querying it. Fixes #2490
This was SVN commit r15020.
2014-04-27 08:03:15 +00:00
JoshuaJB 81883806ec First version of the lobby Terms of Service and Terms of Use.
This was SVN commit r15019.
2014-04-27 05:59:48 +00:00
JoshuaJB 2ad7187f92 Move XMPP polling to the mainloop. Should reduce lobby disconnects. Fixes #2491
This was SVN commit r15018.
2014-04-27 05:37:34 +00:00
scythetwirler fe490df93a Revert an unnecessary part of the last commit (bc9b7f9af3).
This was SVN commit r15017.
2014-04-27 03:26:45 +00:00
scythetwirler bc9b7f9af3 Fixes the tutorial AI and updates the tutorial with the blacksmith.
This was SVN commit r15016.
2014-04-27 03:22:02 +00:00
Gallaecio 98905af6eb Added a context to some very generic strings and regenerated the public mod POT file
This was SVN commit r15015.
2014-04-27 00:23:19 +00:00
scythetwirler 0d3c608b05 Increases title bar width for internationalization support and unsquishes map preview in the lobby
This was SVN commit r15014.
2014-04-27 00:07:27 +00:00
Mythos_Ruler f9dec493fc Changed Ptolemaic and Seleucid Military Colonies to use the merc camp actor for now until proper Military Colony meshes are modeled.
Shrank the size of the gear icon.

Added a "seeds" particle. Doesn't seem to be working though.

This was SVN commit r15013.
2014-04-26 22:49:33 +00:00
scythetwirler aaf5ad1a63 Cosmetic cleanup - Delete full stop and make scrollbar a circle
This was SVN commit r15012.
2014-04-26 22:45:48 +00:00
JoshuaJB 9a809c3131 Revert overlay resizing (forgot about translations) and minor fixes to my last changes.
This was SVN commit r15010.
2014-04-26 19:52:56 +00:00
sanderd17 2ae1e16628 Fix translation of some game setup elements in multiplayer games
This was SVN commit r15009.
2014-04-26 19:52:16 +00:00
JoshuaJB abf12fb503 Enhance the main menu options page and use it to replace the in-game settings page..
This was SVN commit r15007.
2014-04-26 19:31:23 +00:00
scythetwirler d1d7afe46c Implements ready status into gamesetup. Fixes #2447.
This was SVN commit r15006.
2014-04-26 18:34:34 +00:00
Gallaecio 4770e64449 Some i18n fixed on the JavaScript side
Do not try to translate empty strings in translateObjectKeys().
Do not try to translate empty formation tooltips.
Do not translate player names at a point where they are already
translated.

This was SVN commit r15005.
2014-04-26 18:27:53 +00:00
JoshuaJB f5b0fc1076 Swap button placement on options page to be more consistant with other parts of the GUI.
This was SVN commit r15004.
2014-04-26 18:03:29 +00:00
Gallaecio 2b192a4fb5 Do not call Translate() on empty lines
Reported by Yves at Github:
https://github.com/leper/0ad/issues/11

This was SVN commit r15003.
2014-04-26 16:05:41 +00:00
Gallaecio 8fea36cdd0 Made tinygettext’s debug output optional
You can now enable tinygettext’s output from the user.cfg file
(tinygettext.debug).
This enhancement also solved a warning due to the previous workaround,
which was
to uncomment the output line to avoid the debug messages.

This issue was reported by Yves at Github:
https://github.com/leper/0ad/issues/10

This was SVN commit r15002.
2014-04-26 15:32:18 +00:00
Gallaecio baf04bad53 Added support for message extraction from INI files
Refs #2487

This was SVN commit r15001.
2014-04-26 14:06:00 +00:00
Gallaecio 3dd76c84bc Added a translation comment to the ‘Locale:’ string of the language menu
In order to do this, I added support for extracting the ‘comment’
attribute of translatable XML elements.

This was SVN commit r15000.
2014-04-26 12:51:12 +00:00
Gallaecio c82544be9f Use an early return in L10n::GetDictionaryLocale()
Suggested by l777 on the IRC.

This was SVN commit r14999.
2014-04-26 12:29:01 +00:00
Gallaecio d4f701d5f5 Remove MarkToTranslate from the JavaScript interface
The ‘l10n.js’ global JavaScript file already defines this function as
markForTranslation(),
and defines a context-aware twin function as well. Those two functions
are the only ones
currently used in the mod code (as it should be), and there are no
remaining calls to the
engine for that.

This was SVN commit r14998.
2014-04-26 12:26:04 +00:00
Gallaecio d6e37321d5 Removed an obsolete TODO comment in the L10n class implementation
This was SVN commit r14997.
2014-04-26 12:11:08 +00:00
Gallaecio fc793609eb Added API documentation to ‘source/i18n/’
This was SVN commit r14996.
2014-04-26 12:10:15 +00:00
Yves 7acdde5c86 Changes tests to use global g_ScriptRuntime instead of creating a new JSRuntime for each test.
The tests crashed on my Debian systems but not on my Ubuntu system.
The crash happened in line 142 of SpiderMonkey's ThreadLocal.h.

I know that I had to use a workarounnd for contexts to avoid destroying
the context that was created first. I also had in mind that in newer
versions a JS_Init function got introduced which presumably solves this
kind of issues.
Based on this experience I assumed runtimes could have a similar problem
and this patch indeed fixes the issues.
Unfortunately the correct usage of JSRuntimes in that regard is not
documented.
There's only a rater misterious comment in JSAPI.h which hasn't been
cleared up so far and is most likely completely outdated
(https://bugzilla.mozilla.org/show_bug.cgi?id=992641).

This was SVN commit r14995.
2014-04-25 21:19:51 +00:00
Gallaecio 49fc88ff81 Fixed typos on the English strings of the tutorial AI
This was SVN commit r14994.
2014-04-25 19:47:41 +00:00
Enrique 4cbaba418b Improved syntagma animations
Added seeding animation for farms. Only applied in Macedonian women at
the moment.

This was SVN commit r14993.
2014-04-25 14:29:05 +00:00
Gallaecio e92bf0c89d Show translated player name in chat messages
This should only affect player names that users do not define, such as
“Player 2”.
I’ve checked that:
• This change translate the name of the AI player in chat messages of
tutorial scenarios.
• If I name myself “Player 1” and host a multiplayer game, “Player 1” is
not translated.

This was SVN commit r14992.
2014-04-25 04:28:06 +00:00
Gallaecio 7afe0afbca Internationalized the messages of the tutorial AI
This was SVN commit r14991.
2014-04-25 03:41:01 +00:00
Gallaecio abed1b1734 Made the developer overlay wide enough for the Long Strings locale
This was SVN commit r14990.
2014-04-25 03:11:22 +00:00
Gallaecio dc0deb5f52 Fixed bad fix in bc1ed335e2
Note: l777 had given me the right fix (%s), I fixed it wrong for no good
reason…

This was SVN commit r14989.
2014-04-25 02:56:08 +00:00
Gallaecio c1c10667df Improved the internationalization of the construction “Insufficient resources” message
This was SVN commit r14988.
2014-04-25 02:45:19 +00:00
Gallaecio 0c04b90a2d Fixed the extraction of messages with leading spaces from plain text files
This was SVN commit r14987.
2014-04-25 01:55:43 +00:00
Gallaecio 0c88edc2f2 Internationalized rank names
In order to do so, I had to extend the XML message extractor to support
using XML tags as context.
This is because one of the ranks is “Advanced”, which is a pretty common
string.

This was SVN commit r14986.
2014-04-25 01:47:42 +00:00
Gallaecio bc1ed335e2 Fix GCC warning on “source/gui/scripting/ScriptFunctions.cpp”
Reported by JoshuaJB at Github: https://github.com/leper/0ad/issues/27
Fix provided by l777 (who I believe to be leper but I don’t really know)
on IRC.

This was SVN commit r14985.
2014-04-25 00:38:30 +00:00
Yves fd3d335265 Sacrifices a goat to the gods of insanity.
Fixes random crashes on Windows due to differences of STL types on the
binary level between different static libraries.
The differences are caused by the definition of _HAS_ITERATOR_DEBUGGING
and _SECURE_SCL in lib/precompiled.h.
All our engine static libs use precompiled headers but we didn't use
them for tinygettext because they aren't needed (except for these two
defines).
I've decided to add precompiled headers to tinygettext too instead of
just copying these defines. That should cause less headaches in the
future.

This was SVN commit r14983.
2014-04-24 20:05:48 +00:00
sanderd17 0027dcef31 Remove the actual serif fonts from the repo (they're completely unused now, and keeping them makes the package bigger)
This was SVN commit r14981.
2014-04-24 13:36:29 +00:00
sanderd17 73470a3610 Remove all references to serif fonts in the GUI files (see cde72788a2)
Rebuild the sans fonts to include the missing glyph character (fixes
#2483)
Update the pot files

This was SVN commit r14980.
2014-04-24 13:33:15 +00:00
Gallaecio bfa6bbd0e0 Internationalized the wall cost string
Also, added a check for the getCostComponentDisplayName() function, as I
once got an empty string, although I was not able to reproduce it.

This was SVN commit r14979.
2014-04-24 06:16:43 +00:00
Gallaecio 1fa5f13133 Improved the internationalization of the Diplomacy dialog box
You can now translate resource names differently depending on whether
they are in the middle of a sentence or at the beginning.
The Close button in the Diplomacy dialog box is now internationalized.

This was SVN commit r14978.
2014-04-24 05:48:23 +00:00
Gallaecio d2cbda3755 Fixed an English string in the Celtic and Gaul civilization files
Reported by kanetaka, a Japanese translator, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#ja/public/17634039

This was SVN commit r14976.
2014-04-24 04:41:03 +00:00
historic_bruno 92f2a16a88 Suppresses MSVC warning C4005 'macro redefinition' from SpiderMonkey upgrade
This was SVN commit r14975.
2014-04-23 21:12:28 +00:00
sanderd17 0d33f6412d Fixes #2482
This was SVN commit r14974.
2014-04-23 08:22:55 +00:00
sanderd17 311acea712 Fit UI for longer translations
This was SVN commit r14973.
2014-04-23 07:47:46 +00:00
sanderd17 3b571406f8 Enlarge tooltip size to fit all locales
This was SVN commit r14972.
2014-04-22 17:51:56 +00:00
sanderd17 9b9a96382c Fix boolean type
This was SVN commit r14971.
2014-04-22 12:52:49 +00:00
sanderd17 21362de6ac Add workaround for testing long strings with the separate po. ICU wouldn't accept a non-existing language.
This was SVN commit r14969.
2014-04-22 11:38:15 +00:00
Gallaecio 9dd4e71f1d Internationalized some messages
• You can now translate “The production queue is full”.
• Internationalized the “Pause” and “Resume” buttons. Only the initial
label was internationalized, it would switch to English as soon as you
pause the game for the first time.
• Internationalized the “Screenshot written to” message in the engine.

This was SVN commit r14968.
2014-04-22 06:35:51 +00:00
JoshuaJB 5a8bc1158a Add some more GUI graphics settings while fixing some persistence issues. Refs #2310
This was SVN commit r14967.
2014-04-22 05:09:31 +00:00
Gallaecio 93c94e45b7 “All nearby bipedal melee units” → “All nearby soldiers” (suggested by Mythos_Ruler on the IRC)
This was SVN commit r14966.
2014-04-21 14:37:42 +00:00
Gallaecio 46d7d5eb23 Removed trailing spaces detected in translatable strings
This was SVN commit r14965.
2014-04-21 14:35:33 +00:00
Gallaecio 21cb76b9f9 centre → center
This was SVN commit r14964.
2014-04-21 14:32:52 +00:00
Gallaecio e82a9f1a4d Removed a line break to make more space for translations
This was SVN commit r14963.
2014-04-21 14:27:02 +00:00
Yves 510ad15e6c Adds missing libs, fixes some svn properties and a build-problem on Windows.
In 1b3261b8f4 empty text files were committed instead of the libs.
The text files had svn:eol-style properties set and the mime-type was
text.
This removes the eol-style properties, changes the mime type and addes
the content of the files.

This was SVN commit r14959.
2014-04-20 23:47:52 +00:00
Yves 5aab36670c Give some more space to the labels in the advanced localization menu.
This was SVN commit r14958.
2014-04-20 22:38:29 +00:00
Enrique 6b1cde8f52 Added Micket's wolf mesh with Strannik's animations. Thank you guys!
Added two texture variations.

This was SVN commit r14957.
2014-04-20 22:24:37 +00:00
Gallaecio bba60424b0 Moved tinygettext licensing information
Moved from libraries/LICENSE.txt to LICENSE.txt. Reported by l777 on
IRC.

This was SVN commit r14956.
2014-04-20 22:04:16 +00:00
Gallaecio 64d204228a Message extraction and localization
It includes the translation template files (POT) as well as translation
files
(PO) developer through the Transifex platform by our awesome
translators.

It also includes tools to generate the translation template files,
generate a
special translation file with the longest strigns of all translations,
and a
tool to download translations from Transifex into the right game folders
automatically.

Fixes #67

This was SVN commit r14955.
2014-04-20 21:48:23 +00:00
Gallaecio e05c8263c5 Internationalization of the public mod (JavaScript and GUI XML side)
It includes a marvelous language selection menu developed by Yves.

It also includes the introduction of a sprintf implementation for
JavaScript, as well as
translation helper functions that use JavaScript-side translation
caching.

This patch includes code by Yves, sanderd17, leper and Gallaecio.

Ref #67

This was SVN commit r14954.
2014-04-20 20:51:48 +00:00
Gallaecio d6db5a466d Internationalization of the C++ side
Provides the logic to detect the system language, load translations, and
use
loaded translations both in the C++ and the JavaScript side.

This patch includes code by Yves, sanderd17, leper, historic_bruno and
Gallaecio. It’s worth noting that Yves and historic_bruno were also the
main
contributors behind the changes in 1b3261b8f4 as well.

This was SVN commit r14953.
2014-04-20 20:03:57 +00:00
Yves 30d5b572a6 Remove tinygettext from the build-osx-libs.sh file.
That's not needed anymore in the latest i18n branch. We build
tinygettext as a static library with the game now.

This was SVN commit r14952.
2014-04-20 19:30:01 +00:00
Gallaecio 1b3261b8f4 Added third-party libraries for internationalization and localization: ICU and tinygettext
This was SVN commit r14951.
2014-04-20 19:17:32 +00:00
Gallaecio 52c0a9b908 Changes to English strings after reports in Transifex by translators
This was SVN commit r14950.
2014-04-20 19:00:37 +00:00
mimo 130a394e27 a few fixes and some tweaks to petra
This was SVN commit r14949.
2014-04-20 17:19:56 +00:00
Mythos_Ruler f9e980ba5f Trying to blend some old UI assets with the new look.
Darkened the croc texture a bit.

This was SVN commit r14948.
2014-04-20 16:58:47 +00:00
Mythos_Ruler f27640de9b Minor tweaks to some maps.
This was SVN commit r14947.
2014-04-20 14:38:24 +00:00
Mythos_Ruler dde91b8c66 The attack notification should be less frequent.
This was SVN commit r14946.
2014-04-20 14:35:02 +00:00
Mythos_Ruler 2336f97ead Spartans get Oxybeles (but no Lithobolos).
This was SVN commit r14945.
2014-04-20 12:50:59 +00:00
Mythos_Ruler ff77676c60 Fixed auras and tooltips for some heroes.
Added some techs for houses and removed some from the Civic Center.
Makes a lot more sense this way.

This was SVN commit r14944.
2014-04-20 11:36:23 +00:00
Enrique 0bbf43dc5f upgraded sarissa's models
This was SVN commit r14943.
2014-04-20 00:34:48 +00:00
Enrique cf04dc9601 Missing units to use the new pikemen attack animation
This was SVN commit r14942.
2014-04-20 00:09:40 +00:00
Mythos_Ruler 78f8afd912 Changed some formation spacing.
This was SVN commit r14941.
2014-04-20 00:01:50 +00:00
Enrique 4f4455ec3a Added new attack animation for pikemen
This was SVN commit r14940.
2014-04-19 23:56:05 +00:00
Enrique b387458e33 Syntagma formation animations added to all hellenic pikemen.
This was SVN commit r14939.
2014-04-19 23:35:25 +00:00
Mythos_Ruler 2e7e46b399 Moves some blacksmith techs to Village Phase for Celtic civs. Fixes #2473
This was SVN commit r14938.
2014-04-18 11:28:28 +00:00
Mythos_Ruler 831d3ae69f This was SVN commit r14937. 2014-04-16 16:32:15 +00:00
JoshuaJB fe4f17fd73 Only send game report if ranking is enabled.
This was SVN commit r14936.
2014-04-16 14:00:09 +00:00
JoshuaJB a9b34da617 Fix some merge conflicts 9e2d0b9506 missed.
This was SVN commit r14935.
2014-04-16 13:58:56 +00:00
JoshuaJB 9e2d0b9506 Fix #2404. Rating auto-configure TODO (eg 2v2 games do not automatically show as being unrated). See #2276.
This was SVN commit r14934.
2014-04-16 06:03:49 +00:00
leper 47a516df34 Fix some JS warnings. Refs #2372.
This was SVN commit r14933.
2014-04-15 01:12:48 +00:00
sanderd17 e1488fee56 Add an 'explore map' option to the game setup.
This was SVN commit r14931.
2014-04-14 19:52:49 +00:00
sanderd17 a9d0a3bcae Fix how per tech modification affects work + fix the technologies that implement it. Fixes #2366
This was SVN commit r14930.
2014-04-14 16:33:00 +00:00
sanderd17 bb71823aee Make the actor tech-modifiable. Fixes #2243
This was SVN commit r14928.
2014-04-14 15:00:49 +00:00
scythetwirler 1073382e3b Sorts the lobby player list, ignoring case
This was SVN commit r14927.
2014-04-13 18:29:32 +00:00
Pureon b08e364e81 New shipwreck models
This was SVN commit r14926.
2014-04-13 11:16:30 +00:00
Mythos_Ruler 106638a9b8 This was SVN commit r14925. 2014-04-13 09:42:55 +00:00
Mythos_Ruler 01decbcd90 Train time changes.
Unlock champions tech more expensive.

This was SVN commit r14924.
2014-04-13 09:05:02 +00:00
scythetwirler 40e2a1e065 Fixes some javascript warnings in the lobby.
This was SVN commit r14923.
2014-04-13 01:48:24 +00:00
scythetwirler 180aa5c60d Makes the moderator prefix visible in the chatbox.
This was SVN commit r14922.
2014-04-12 23:40:36 +00:00
Mythos_Ruler 5a0c1a799b Some more portraits. Updated the portrait for the Macedonian siege workshop.
Tweaked some sandbox maps.

This was SVN commit r14921.
2014-04-12 14:55:04 +00:00
Mythos_Ruler f02a8a4c59 Some population techs.
Tweaking some training techs.

This was SVN commit r14920.
2014-04-12 13:39:19 +00:00
Mythos_Ruler 5740e22cd5 Fix health for these cavalry spearmen.
This was SVN commit r14919.
2014-04-12 11:52:39 +00:00
Mythos_Ruler c2d1aece02 Fixed female citizen selections.
This was SVN commit r14918.
2014-04-12 10:36:37 +00:00
Mythos_Ruler 08c1c8ed2d Minor tweaks to some particles.
Updated quinquereme tip image and text.

Minor updates to some maps.

Seleucids now use some Ptolemies ship actors temporarily.

This was SVN commit r14917.
2014-04-12 07:13:37 +00:00
sanderd17 ad36c0eb7b Parse entity ids to numbers again
This was SVN commit r14916.
2014-04-11 12:35:50 +00:00
mimo 41b8d06e27 remove forgotten debug printouts
This was SVN commit r14915.
2014-04-10 21:00:40 +00:00
Enrique f41c51359f Mauryan trader actor missing
This was SVN commit r14914.
2014-04-10 20:56:12 +00:00
mimo bb8e14fae1 some minor tweaks to petra ai
This was SVN commit r14913.
2014-04-10 20:25:02 +00:00
sanderd17 7840fd3049 fix capitalisation
This was SVN commit r14912.
2014-04-10 14:00:44 +00:00
sanderd17 7f77bb7cb0 Small improvements to entitycollection + add a serialization method (serialization is never executed though)
This was SVN commit r14911.
2014-04-10 09:51:43 +00:00
sanderd17 ff2979ca68 Save formation rotation when loading a new formation
This was SVN commit r14910.
2014-04-09 18:01:12 +00:00
sanderd17 1f63325ede Rotate entities to the right angle when forming a formation
This was SVN commit r14909.
2014-04-09 11:15:00 +00:00
Enrique 4ddf1ac4dc Added rowing, gathering, 3Idles and death animations for ptolemaic fisherman.
This was SVN commit r14908.
2014-04-06 21:06:17 +00:00
sanderd17 d27dffa31d Now really fix the issue with promoting and formation animations
This was SVN commit r14906.
2014-04-06 18:43:06 +00:00
mimo 833c2bac7a save/restore camera position and orientation in saved games, fixes #2354
This was SVN commit r14905.
2014-04-06 16:27:57 +00:00
leper fbfd87e7f7 Replace hawk with duplicated head bone with fixed version by stanislas69. Fixes #2454.
This was SVN commit r14904.
2014-04-06 16:00:12 +00:00
leper fb1827bee7 Fix ungarrisoning bug caused by promoting garrisoned entities. Fixes #2471.
This now uses the Autogarrsion order as both already work with an
already garrisoned entity.

This was SVN commit r14903.
2014-04-06 03:04:30 +00:00
mimo fd4cd56224 fixed petra map management when not circular
This was SVN commit r14901.
2014-04-05 12:18:37 +00:00
sanderd17 c5e59d02e1 Fix formation animations with promoted units
This was SVN commit r14900.
2014-04-05 09:48:57 +00:00
Mythos_Ruler 1908723188 Testudo for a few more Roman units.
This was SVN commit r14899.
2014-04-05 08:47:29 +00:00
sanderd17 61da102371 Add testudo animations to the right actor files and use it in the formation template
This was SVN commit r14898.
2014-04-04 18:38:13 +00:00
Enrique 776a098a1c Tetsudo formation test animation. Front and middle stances.
This was SVN commit r14897.
2014-04-04 10:17:15 +00:00
mimo d04f035f9a numerous fixes and improvments to petra ai
This was SVN commit r14896.
2014-04-03 20:48:54 +00:00
mimo ac9aaaa369 supplement the ai common-api
This was SVN commit r14895.
2014-04-03 20:31:59 +00:00
Enrique 26fdf74de3 Mauryan trader basic commit with idle and move animations. Needs zebu animation and trader texture or use a mauryan one.
Model and texture by paperkat, move animation by Wijitmaker, blender
exportation by stan

This was SVN commit r14894.
2014-04-03 18:31:56 +00:00
leper 3e03c9d08a Return something valid in a mock function to fix a warning while running tests.
This was SVN commit r14893.
2014-04-02 23:10:07 +00:00
leper b8b3542d25 Fix tests.
This was SVN commit r14892.
2014-04-02 23:09:59 +00:00
Enrique b287cbf805 New ptolemaic sail for merchant ship based on Lion's eagle.
fixes #2236

This was SVN commit r14891.
2014-04-02 02:52:13 +00:00
Enrique 2f12068a8f Ptolemaic merchant ship commit.
Model by Stanislas69 with some fixes.

This was SVN commit r14890.
2014-04-01 20:35:49 +00:00
Mythos_Ruler 55bb33dec8 Particle tweaks.
Mediterranean Cove skirmish map.

This was SVN commit r14888.
2014-03-30 01:56:35 +00:00
Mythos_Ruler 84016df11c Map tweaks and map preview changes.
This was SVN commit r14887.
2014-03-30 01:38:20 +00:00
Mythos_Ruler e715c60942 Cleaning up the scenarios folder.
This was SVN commit r14886.
2014-03-30 00:10:07 +00:00
JoshuaJB a7b2f6ba47 Fix more then one observer by allowing a game to have multiple players with the -1 ID.
This was SVN commit r14885.
2014-03-29 15:09:42 +00:00
sanderd17 22867fa9a3 Further complete the definitition of the entity state
This was SVN commit r14884.
2014-03-29 13:56:03 +00:00
sanderd17 8615f38803 Always define the entire entity state, but initialize it to null
This was SVN commit r14883.
2014-03-29 13:37:48 +00:00
sanderd17 132020f88e Fix some of the undefined warnings reported by the new SpiderMonkey. Initialize the player diplomacy arrays earlier in PlayerManager.
This was SVN commit r14882.
2014-03-29 11:03:00 +00:00
mimo 120f71d944 a couple a bugfixes
This was SVN commit r14881.
2014-03-29 08:51:09 +00:00
Mythos_Ruler b815fa8dd9 Portraits for the Ptolemaic dieres, penteres, and octeres.
Actor and texture for Antiochus the Great.

Histories for the Ptolemaic warships.

This was SVN commit r14880.
2014-03-29 00:16:16 +00:00
Yves e9e05f4efc Second (main) commit for the SpiderMonkey upgrade.
This commit contains all the required changes to our source files and
build scripts (hopefully).
A next commit will remove the old stuff of SpiderMonkey 1.8.5.

Spcial thanks to:
 - H4writer who helped a lot mainly with the performance issues we
had/have, but also with other problems or questions.
 - Leper for the review.
 - Historic_bruno for implementing the build scripts on Mac OS X and
testing on the Mac.
 - The people from the #jsapi channel and from
mozilla.dev.tech.js-engine who answered a lot of questions and helped
solving problems.
 - All the other people who helped

Refs #1886
Fixes #2442
Fixes #2416

This was SVN commit r14877.
2014-03-28 20:26:32 +00:00
Enrique 6f6b841af3 Upgraded ptoemaic quinquereme textures and made the model narrower.
This was SVN commit r14875.
2014-03-28 16:03:32 +00:00
Yves 0d9a7dab6b Works around infinite recursion problem.
This problems occurs with the new SpiderMonkey in debug mode, but it's
not a SpiderMonkey issue.
Unfortunately I couldn't find a clean solution, so I just documented the
problem in an extensive comment block and applied a workaround.
A clean solution would probably require changing the approach for
counting allocations completely.

This was SVN commit r14874.
2014-03-28 11:33:37 +00:00
mimo 0419f5500e another set of petra improvments, main one is a first try to place markets for trade (was random before)
This was SVN commit r14873.
2014-03-27 22:10:03 +00:00
Enrique 0a32b2d687 Ptolemaic trireme commit.
Fixed some texture stretching in the bireme.

This was SVN commit r14872.
2014-03-27 18:13:07 +00:00
mimo bc428e1649 some fixes (i.e.building placement) and cleanings of petra
This was SVN commit r14871.
2014-03-26 21:07:47 +00:00
Enrique 52af5b29a1 Ptolemaic bireme commit.
Fixed error in sparten temple when destroyed found bi Sanderd17

This was SVN commit r14870.
2014-03-26 20:34:54 +00:00
sanderd17 7c0c294814 Move some resources to passable terrain
This was SVN commit r14869.
2014-03-26 18:28:00 +00:00
mimo d5ff29d181 fix a flaw in UnitAI trade management
This was SVN commit r14868.
2014-03-26 09:11:06 +00:00
mimo 3dfa858229 remove some leftover warnings in petra
This was SVN commit r14867.
2014-03-25 19:26:45 +00:00
mimo 5de3b30742 fix previous tag
This was SVN commit r14866.
2014-03-24 22:51:15 +00:00
mimo 97afd25171 commit first version of new ai bot (named Petra)
This was SVN commit r14865.
2014-03-24 22:33:50 +00:00
mimo b03e3644ac add a few usefull functions in ai/common-api
This was SVN commit r14864.
2014-03-24 22:15:40 +00:00
Yves 90b9926ca1 Fixes warning showing up with the new SpiderMonkey.
The changed return value isn't related but returning false makes more
sense there IMO.

Refs #2372

This was SVN commit r14863.
2014-03-22 23:31:40 +00:00
Yves 5372b27142 Silences some warnings that show up on the gamesetup screen with the new SpiderMonkey without changing any behaviour.
Refs #2372

This was SVN commit r14862.
2014-03-22 13:54:10 +00:00
Mythos_Ruler 3fb46640cc Fix civ for Ptol Military Colony.
This was SVN commit r14861.
2014-03-21 22:51:47 +00:00
Mythos_Ruler 907ef01322 Added starting units to Deccan Plateau.
Added some detail to Nile River.

Updated Syria a little bit.

Added Pureons new tech portraits to some techs.

Portrait for Ptol champ elephant.

Gave the Military Settlement system to the Ptolemies. We'll use their
merc camp for a developing merc camp system. Ptol heroes can found civic
centers just like the Sele heroes.

This was SVN commit r14860.
2014-03-21 00:47:23 +00:00
Yves 2eeb7c2ba1 Workaround to reduce the impact of AI performance problems when planning new bases.
When no free territory was left on the map, the AI tried to place a CC
every 10th AI turn.
That's about all 10 seconds and it freezed the game for about a second.
Now when you played against 4 players it freezed aobut 4 seconds every
10 seconds, which is very bad.
I wanted to solve this properly but realized that I'd have to change a
lot in the terrain analysis code that will probably be replaced anyway
when we have a new pathfinder with a proper interface.
Also removes an unused variable (creating a territory map and not using
it can't be good for performance either).

This was SVN commit r14859.
2014-03-20 14:26:15 +00:00
Pureon 6eaad6cbb6 new tech portraits
This was SVN commit r14858.
2014-03-20 00:58:54 +00:00
mimo 1c81a96a50 fix bug in AI
This was SVN commit r14857.
2014-03-18 21:34:23 +00:00
JoshuaJB 63248bdc33 Fix issue with GUI reveal map status display.
This was SVN commit r14856.
2014-03-18 01:13:02 +00:00
mimo 209799aa4c fix 94c02ec33c for AI
This was SVN commit r14855.
2014-03-17 21:23:40 +00:00
Yves 5c4282a21c Fixes a small memory leak in the profiler shutdown code.
This was SVN commit r14854.
2014-03-17 21:16:38 +00:00
sanderd17 cde72788a2 * Add support for fallback fonts in the font builder.
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457.
(Now hope I included all needed files)

This was SVN commit r14853.
2014-03-17 10:13:49 +00:00
Mythos_Ruler c1b839c21b Military Colony's territory weight reduced.
Updated icon for Syria map. Updated nisian war horses portrait from
Pureon.

Reduced the volume of the attack notification a little.

This was SVN commit r14852.
2014-03-17 00:10:13 +00:00
Mythos_Ruler 84ef2c1335 A test for Latin names for animals. Won't complete this until after next alpha.
This was SVN commit r14851.
2014-03-17 00:08:24 +00:00
JoshuaJB 883f307b40 Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69
This was SVN commit r14849.
2014-03-16 23:29:27 +00:00
JoshuaJB 94c02ec33c Revert gather limits to be global instead of per-player. Refs #1387
This was SVN commit r14848.
2014-03-16 20:35:23 +00:00
Mythos_Ruler 19724f7f41 "Syria" skirmish map.
This was SVN commit r14846.
2014-03-15 23:10:06 +00:00
wraitii ffe0faeca4 Move the skybox up per Mythos' ruler recommendation. This should probably be a map setting.
This was SVN commit r14844.
2014-03-15 21:07:02 +00:00
scythetwirler caeaf62723 Adjust widths in the lobby to make the map size dropdown fit.
This was SVN commit r14843.
2014-03-15 20:58:59 +00:00
Mythos_Ruler 722ad7264d Some updated maps. Acropolis Bay especially.
This was SVN commit r14842.
2014-03-15 19:56:51 +00:00
historic_bruno 49b0e1ce42 Eliminates some duplication in build-osx-libs.sh and sets more useful variables
This was SVN commit r14841.
2014-03-14 05:18:40 +00:00
historic_bruno dfa4766dab Reverts [[SVN:14831]] - wasn't a valid fix.
Patches MiniUPnPc to explicitly export symbols for GCC/Clang, fixes
build when -fvisibility=hidden is used, refs #2304.
Fixes incorrect use of CPPFLAGS in build-osx-libs.sh, it should be
CXXFLAGS. CPPFLAGS get passed to the C/C++ preprocessor, CXXFLAGS get
passed to the C++ compiler.

This was SVN commit r14840.
2014-03-14 04:17:42 +00:00
Enrique b18a899287 Added Ptolemaic healer body and head textures. Fixes #2234
This was SVN commit r14839.
2014-03-13 19:46:15 +00:00
wraitii 6ab578a6eb Fix out of date comments in Tex and ITexCodec, Fixes #2458.
This was SVN commit r14838.
2014-03-13 19:00:22 +00:00
Spahbod e17dd1ac12 Applying the new improvements: Gulf of Bothnia.
This was SVN commit r14837.
2014-03-13 09:45:09 +00:00
JoshuaJB ef888367aa Cleanup tex_codec, fixes #2456, patch by IronNerd.
This was SVN commit r14836.
2014-03-13 04:16:20 +00:00
JoshuaJB a5639631ee Texture system refactoring and cleanup, fixes #2455, patch by IronNerd.
This was SVN commit r14835.
2014-03-13 02:37:05 +00:00
Enrique a068935789 Ptolemaic dock upgrade. Fixes #2217
This was SVN commit r14834.
2014-03-12 18:38:16 +00:00
mimo 180b44e565 let the AI know that a unit has no more orders
This was SVN commit r14832.
2014-03-11 22:42:41 +00:00
Enrique 6274c7ffe8 Added ptolemaic quinquereme. Fixes #2232
This was SVN commit r14830.
2014-03-10 13:37:18 +00:00
mimo 9f1bcc2475 fix AI error
This was SVN commit r14829.
2014-03-09 22:26:41 +00:00
scythetwirler 0e0cd65134 Some GUI alignment/sizing improvements.
This was SVN commit r14828.
2014-03-09 19:24:17 +00:00
Yves 0e7c92e1e6 Fixes behaviour change in Atlas' JSON serialization after the switch to JSON Spirit (#2434).
This caused problems setting the starting camera.

Refs #2434

This was SVN commit r14827.
2014-03-09 17:55:54 +00:00
JoshuaJB 8959e63a53 Add back unintentionally removed idle workers button tooltip.
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
Mythos_Ruler e6f7ef78dc Removes legacy "technologies" folder.
This was SVN commit r14824.
2014-03-09 00:10:41 +00:00
Mythos_Ruler 7698e75962 Pyrrhus template.
This was SVN commit r14823.
2014-03-09 00:08:25 +00:00
Mythos_Ruler 0603392f03 Acropolis Bay.
This was SVN commit r14822.
2014-03-09 00:08:00 +00:00
Mythos_Ruler 119849defc Pyrrhus hero.
Some map stuff and actor changes (remove the elephants from Pericles).

This was SVN commit r14821.
2014-03-09 00:07:28 +00:00
Mythos_Ruler d214d8f61c Some map changes.
This was SVN commit r14820.
2014-03-09 00:02:33 +00:00
JoshuaJB fb65288463 Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414
This was SVN commit r14819.
2014-03-07 22:43:57 +00:00
Yves c8bdd993c0 Upgrades cxxtest.
Switches to the already committed new cxxtest sources and deletes the
old sources.
Applies the changes from 6374080b60 and 4a57fed5a7 to the updated
sources.
Replaces the cxxtestgen.exe for Windows. This file was created from
cxxtest's python script using pywin32.
Modifies update-workspace.sh to force a rebuild when cxxtest options
could have been changed during the premake step.
Adds an additional option (--jenkins-tests) to
premake4.lua/update-workspaces.sh to use cxxtest's XmlPrinter which
generates output than can be used by Jenkins.

Fixes #2450

This was SVN commit r14818.
2014-03-07 20:58:17 +00:00
feneur a9368a4463 Updated tooltip to reflect the new max gatherer limit
This was SVN commit r14816.
2014-03-07 12:09:39 +00:00
sanderd17 66942c74fa Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings
This was SVN commit r14815.
2014-03-07 11:11:45 +00:00
sanderd17 32cf46f01c Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style.
This was SVN commit r14814.
2014-03-07 08:27:13 +00:00
JoshuaJB 29f94a759c Fix an issue with lobby registration and a minor wording tweak.
This was SVN commit r14813.
2014-03-07 01:52:06 +00:00
scythetwirler abbd6efef1 Updates outdated/incorrect hotkeys.
This was SVN commit r14812.
2014-03-06 23:57:02 +00:00
scythetwirler 8a98bca9b2 Fixes the last z order (hopefully) and a style inconsistency.
This was SVN commit r14811.
2014-03-06 22:45:13 +00:00
scythetwirler ec26f1de83 Reduces z order to fix ai dialog.
This was SVN commit r14810.
2014-03-06 22:34:15 +00:00
JoshuaJB 8f30e722ab Some inconsequential style adjustments.
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
scythetwirler ef76d24e66 Fixes z order and a capitalization error.
This was SVN commit r14808.
2014-03-06 02:00:12 +00:00
scythetwirler 5f5cfb10ee Fixes a typo and makes naming of the fading consistent with other sprites.
This was SVN commit r14807.
2014-03-05 21:24:48 +00:00
sanderd17 f3714a7075 Fix invalid count for entityMaps
Improve error reporting on failed deserializations
Fixes #2328

This was SVN commit r14806.
2014-03-05 14:58:17 +00:00
JoshuaJB 02024370d8 Fix a warning in Visual Studio 2010 related to some of my recent changes.
This was SVN commit r14805.
2014-03-05 01:06:13 +00:00
scythetwirler 5582409973 Converts most parts of the game to use Pureon's new UI
This was SVN commit r14804.
2014-03-04 02:23:01 +00:00
Yves 1a2f889bb9 7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now.
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).

Refs 2372

This was SVN commit r14803.
2014-03-03 23:01:49 +00:00
Yves 7cba43c9db Fixes warnings printed by the new SpiderMonkey.
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.

Refs #2372

This was SVN commit r14802.
2014-03-03 21:58:15 +00:00
Yves df43e32a59 Second try fixing the eol-styles
This was SVN commit r14801.
2014-03-03 21:36:24 +00:00
Yves 234f2003a3 Fix inconsistent line endings and add svn:eol-style property
This was SVN commit r14800.
2014-03-03 21:13:36 +00:00
Enrique 2d0e996725 Added modified Stanislas69 Pyrrhus helmet with textures.
Added an extra variation for brass and iron textures variations of
ptolemaic_romanized and thracian horned helmets.
Added playercolor to the thracian horned helmet crest.

This was SVN commit r14799.
2014-03-02 10:59:36 +00:00
Yves e290abc40f Should fix the Atlas build issues with the autobuilder.
For some reason the autobuilder does not know uint32_t but my Windows
system with VC2010 and my Linux system both do.

Refs #2434

This was SVN commit r14797.
2014-03-01 14:41:32 +00:00
mimo c2c172271f fix AI error, not reseting all units after a successful attack
This was SVN commit r14796.
2014-03-01 14:36:35 +00:00
Mythos_Ruler 05225a66ac Horned helmet to Thracian cavalry.
This was SVN commit r14794.
2014-03-01 10:37:45 +00:00
mimo 57e995e618 fix AI error, the freeze of this collection prevented promoted and packed units to be updated during attack
This was SVN commit r14793.
2014-03-01 09:35:30 +00:00
wraitii 4e5eeba27b Fix the skybox.
This was SVN commit r14792.
2014-02-28 18:23:24 +00:00
Enrique 999490bbf5 Added playercolor to ptolemaic romanized crest helmet.
This was SVN commit r14791.
2014-02-28 11:46:23 +00:00
Enrique 162a4c42f3 Stan's helmets ptolemaic romanized with and without crest, thracian horned cavalry and perseus hero. Heavily modified.
playercolor in crests still pending. Added brass and iron variations,
more subtle variations to come.

This was SVN commit r14790.
2014-02-28 11:32:23 +00:00
wraitii 02860690eb fix unused parameter warning.
This was SVN commit r14789.
2014-02-26 19:16:44 +00:00
wraitii 3f78042f45 Fix tests and C++11 build.
This was SVN commit r14788.
2014-02-26 19:08:03 +00:00
Mythos_Ruler 3573a6e9a8 Updated some portraits.
Added a Mercenary Thracian Swordsman.

Tweaked some textures.

Added a "gray skin" variation to the Ptolemaic elephant.

Added Saharan Oases skirm map.

This was SVN commit r14787.
2014-02-26 14:29:42 +00:00
Enrique 6b94ae9f59 Added two ptolemaic howdah variations for the champion elephant.
This was SVN commit r14786.
2014-02-26 13:53:36 +00:00
mimo d8903c0c6f fix AI error
This was SVN commit r14785.
2014-02-25 22:43:03 +00:00
wraitii e2f4379e9a Fix an issue with corruption of water data when the actor editor opened in Atlas.
Potential marginal optimizations to the water data creation code.

This was SVN commit r14784.
2014-02-25 06:27:15 +00:00
Yves 17f8f09399 Removes the ScriptInterface and SpiderMonkey dependencies from Atlas.
Replaces the code for JSON parsing and writing with an implementation
using the JSON Spirit library.

Fixes #2434
Refs #1886

This was SVN commit r14783.
2014-02-24 20:22:02 +00:00
mimo 33918a5c41 Fix AI error (with 3eaa9ac4d3) preventing promoted units to stay idle
This was SVN commit r14779.
2014-02-24 14:03:13 +00:00
sanderd17 50d93b4332 Was messed up by b3201acd93
This was SVN commit r14778.
2014-02-24 12:10:38 +00:00
Enrique c5f15a13d0 Modified Stanislas69 Seleucid romanized helmet and thracian helmet with several texture variations and organized in actors with variations.
Applied the romanized brass helmet with crest to the Seleucid heavy
swordman infantry.

This was SVN commit r14777.
2014-02-23 16:51:10 +00:00
mimo 3eaa9ac4d3 fix AI error
This was SVN commit r14776.
2014-02-23 09:51:07 +00:00
Yves 43377fdc5e Fixes an assertion when DEBUG_SERIALIZER_ANNOTATE is set to 1 and you click on "Host Game" from the main menu.
The reason was that CSimulationMessage uses the CBufferBinarySerializer
which did not add debugging annotations and deserialized the created
data with the CStdDeserializer which expects these annotations.
I did not fix the tests which remain broken as before this patch when
annotation is enabled.

This was SVN commit r14775.
2014-02-22 14:30:29 +00:00
Mythos_Ruler e38fc5f861 Increased Fanatic armor.
This was SVN commit r14774.
2014-02-22 13:10:54 +00:00
Mythos_Ruler 554cd510f2 Basic and Advanced Egyptian Pikemen textures.
Spec and norm maps for Mediterranean forest floor terrain.

This was SVN commit r14773.
2014-02-22 12:16:20 +00:00
JoshuaJB a3e1c68b9a Fix #2373. Have player resign if not returning to a networked game. Also notify host of networked game that by leaving all other players will be disconnected. Based off patch by boeseRaupe
This was SVN commit r14772.
2014-02-21 20:02:23 +00:00
Mythos_Ruler 8c21ec4dfd Quilted helms for Egyptian pikemen, based on work by Enrique.
This was SVN commit r14771.
2014-02-21 14:38:09 +00:00
Enrique 42d31da1bb ptolemaic quilted helmet commit.
This was SVN commit r14770.
2014-02-21 14:13:46 +00:00
sanderd17 c44b48bd59 Fix Atlas lag due to Position component that listens to the territoriesChanged message
This was SVN commit r14768.
2014-02-21 13:42:46 +00:00
scythetwirler 0ea3b7b7dd Adds the moderator prefix to the playerlist in the lobby.
This was SVN commit r14767.
2014-02-20 23:26:36 +00:00
JoshuaJB a725266337 Slightly better options menu.
This was SVN commit r14766.
2014-02-20 22:45:43 +00:00
JoshuaJB e182b4ddd2 Fix a valgrind warning about uninitilized variables in the scrollbar code and some comment/style fixes.
This was SVN commit r14764.
2014-02-19 21:59:07 +00:00
Mythos_Ruler facf119241 Farm fields back to 5 workers.
This was SVN commit r14763.
2014-02-19 17:54:34 +00:00
scythetwirler 2429f1e93c Displays ratings on the gamesetup page and formats ratings less than 1000 correctly.
This was SVN commit r14762.
2014-02-19 00:40:35 +00:00
mimo a4ec034bb5 fixes some AI errors
This was SVN commit r14761.
2014-02-18 18:19:33 +00:00
sanderd17 039b06e012 Enable selection of dogs when selecting idle warriors. Patch by tau. Fixes #2436
This was SVN commit r14760.
2014-02-17 21:40:47 +00:00
Mythos_Ruler b5c8faa367 Aura tooltip for Ptolemaic heroes. Auras themselves are not complete.
This was SVN commit r14759.
2014-02-17 15:54:17 +00:00
Mythos_Ruler 41534b1eda Arrow shooting buildings only increase arrows when ranged infantry are garrisoned inside.
Removing some unused textures.

This was SVN commit r14758.
2014-02-17 15:11:47 +00:00
Enrique c3dd79aa22 Ptolemaic mercenary camp commit.
This was SVN commit r14757.
2014-02-17 13:13:25 +00:00
sanderd17 322d78b9a5 remove debug warning
This was SVN commit r14755.
2014-02-16 15:23:50 +00:00
sanderd17 19965ce37a Fix missing territory decay when moving out of territory without changing the actual territory. Add possibility to check movement over territory boders in the JS simulation part. Based on patch by niektb
This was SVN commit r14754.
2014-02-16 15:22:11 +00:00
scythetwirler f92a46330d Anti-disconnect addition to the gamesetup screen. Also fixes typo in the lobby bot README.
This was SVN commit r14753.
2014-02-16 06:22:16 +00:00
scythetwirler be881dc420 Reformat the database to accept the additional summary counters as well as adding a couple summary counters. Also deletes unnecessary welcome message and deletes whitespace. Refs #686.
This was SVN commit r14752.
2014-02-16 06:06:16 +00:00
Enrique ab9a6b6303 Stanislas69' iberian tower modification commit.
This was SVN commit r14751.
2014-02-14 21:46:37 +00:00
Enrique 05bfe7dca0 Ptolemaic market commit
This was SVN commit r14750.
2014-02-14 17:18:29 +00:00
mimo 35f3dd03d9 improve ship behaviour when picking units
This was SVN commit r14749.
2014-02-13 20:21:27 +00:00
Yves 581c7635e1 Makes our favourite example of escaping even more awesome.
Codeblocks 12.11 requires an additional $ sign. This will break 10.05
and I haven't tested it with 13.12 or on other systems than Ubuntu.

This was SVN commit r14748.
2014-02-13 15:21:14 +00:00
Mythos_Ruler a921c5c2fb Portrait for Egyptian Pikeman.
Fixed a thing with the Ptolemies sandbox map.

Tweaked the elite Egyptian pikeman shield.

This was SVN commit r14747.
2014-02-13 15:08:01 +00:00
Mythos_Ruler 14a7e60bd5 Elite Egyptian Pikeman.
This was SVN commit r14746.
2014-02-11 17:51:01 +00:00
mimo e49b1e1ceb fix AI error
This was SVN commit r14745.
2014-02-09 19:54:50 +00:00
mimo d8152f1eda exchange if order otherwise we can't make a trade route with a damaged market
This was SVN commit r14744.
2014-02-09 18:42:06 +00:00
Enrique 44eb336dfe Added 4 stall variations as eyecandy with different cloth textures.
Added material for barley/wheat props.
Modified spec and normal maps of ptolemaic struct (for matching last
edit adding carpets)

This was SVN commit r14743.
2014-02-09 16:51:33 +00:00
Yves 9780d7177d Adds some missing vars.
This was SVN commit r14742.
2014-02-09 16:04:30 +00:00
Mythos_Ruler dea18ed318 4-player Greek Acropolis skirmish map
This was SVN commit r14741.
2014-02-09 13:07:33 +00:00
mimo c5beeb7a02 rename Median Oasis maps, fixes #2425
This was SVN commit r14740.
2014-02-09 09:48:14 +00:00
JoshuaJB df1221e9f5 Correct inverted sprites on modern tickbox and add a default modern tooltip style.
This was SVN commit r14739.
2014-02-09 05:31:25 +00:00
wraitii 01611c1675 Fixes AI error when building a new base, and improves the AI's early game and tendency to grab terrain. Fixes incorrect release of some units by the defense manager.
This was SVN commit r14738.
2014-02-07 18:36:37 +00:00
mimo 05f13bb1d8 fix ai bug
This was SVN commit r14737.
2014-02-07 18:00:41 +00:00
mimo 563768363b clean useless formations
This was SVN commit r14736.
2014-02-07 17:01:01 +00:00
Spahbod a0b0b6d74e Applying the new improvements: Gear, Guadalquivir River.
This was SVN commit r14735.
2014-02-07 09:23:14 +00:00
mimo 7277385891 fix typo
This was SVN commit r14734.
2014-02-07 07:52:10 +00:00
Yves 31e98e5c03 Reverts f25edfd8f1. Structured clones don't support cyclic references in SpiderMonkey v1.8.5.
SpiderMonkey v24 supports it and I'll add this change to #1886 instead.

Refs #2416
Refs #2415
Refs #1886

This was SVN commit r14733.
2014-02-06 13:32:09 +00:00
JoshuaJB fa85527baf Send messages in queue before closing connection, patch by boeseRaupe. Fixes #2420
This was SVN commit r14732.
2014-02-05 02:44:25 +00:00
historic_bruno 035078c317 Disables checks in os_cpu_LargePageSize Windows implementation, since they failed on Vista SP2 with old Xeon CPU, fixes #2346
This was SVN commit r14731.
2014-02-04 22:30:29 +00:00
JoshuaJB 72d306873f Correctly handle the keypad enter in CInput.cpp and make the return key case catch SDLK_RETURN instead of '/r' for consistancy and readability.
This was SVN commit r14730.
2014-02-03 21:46:27 +00:00
Mythos_Ruler 91be7d9bd1 New history blurb for Skiritai by forum contributor Thorfinn.
This was SVN commit r14729.
2014-02-03 16:25:08 +00:00
Mythos_Ruler e408ac46b1 2 player skirmish Median Oasis.
This was SVN commit r14728.
2014-02-03 16:16:31 +00:00
LordGood e329a93978 Ghost commit for fields
This was SVN commit r14727.
2014-02-03 05:12:36 +00:00
sanderd17 9971e3cfab Add formation check
This was SVN commit r14726.
2014-02-02 09:15:34 +00:00
historic_bruno 4be80f9322 Improves error handling in sound manager. Fixes some crashes and errors that could occur when OpenAL failed to init properly, fixes #2183, #2345
This was SVN commit r14725.
2014-02-02 05:58:27 +00:00
Yves f25edfd8f1 Removes ValueCloner.
Fixes #2416
Refs #2415
Refs #1886

This was SVN commit r14724.
2014-02-01 20:37:33 +00:00
wraitii c9aeaa1612 Fix a "big typo" in the attack plans, thanks mimo.
This was SVN commit r14723.
2014-02-01 18:34:24 +00:00
wraitii ddf9d948cf Fix some more debug in the AI.
This was SVN commit r14722.
2014-02-01 18:05:39 +00:00
mimo 5b506ceee3 prevent AI to try to attack its allies, fix #2393
This was SVN commit r14721.
2014-02-01 17:59:29 +00:00
mimo e21f052803 prevent error when an animal changes ownership
This was SVN commit r14720.
2014-02-01 17:55:27 +00:00
Mythos_Ruler 94a240737c Added more territory auras.
Fixed the Theatron for Hellenic civs. It now uses the Hellenization
effect correctly!

This was SVN commit r14719.
2014-02-01 12:09:06 +00:00
Spahbod 1f1a2ead44 Adding the missing cheats from [14712]. Refs #2072
This was SVN commit r14718.
2014-02-01 09:11:38 +00:00
scythetwirler e4e32c8cd7 Fixes a typo from 1d3ac14d35.
This was SVN commit r14717.
2014-02-01 03:55:24 +00:00
wraitii e6cf2f23c5 Fix AI debug mode.
This was SVN commit r14716.
2014-02-01 03:29:55 +00:00
wraitii c3cdf40f33 Somewhat experimental rewrite and simplification of the worker's logic to choose dropsites. Might behave unexpectedly now and then.
Error fixes here and there.

This was SVN commit r14715.
2014-02-01 00:44:12 +00:00
Mythos_Ruler 12aa170c58 Trying different territory weights.
This was SVN commit r14713.
2014-01-31 18:47:08 +00:00
sanderd17 60619dbf3f Add technologies cheat. Fixes #2072. Patch by boeseRaupe
This was SVN commit r14712.
2014-01-31 15:30:16 +00:00
Spahbod 1fad924411 Checking if cmpPlayer is valid.
This was SVN commit r14711.
2014-01-31 14:47:23 +00:00
Spahbod 9fe465884d Implements resource trickle. Allows decimal player resources. Fixes #2413.
This was SVN commit r14710.
2014-01-31 12:01:49 +00:00
JoshuaJB 0157e640cc Make my last commit C++98 compatible.
This was SVN commit r14709.
2014-01-31 01:26:08 +00:00
Enrique c3d9769622 Fixed iberian corral cloth ao texture assigned
This was SVN commit r14708.
2014-01-30 19:36:38 +00:00
Spahbod 708f003df3 Applying the new improvements: English Channel, Fortress
More cleanup and tweaks.

This was SVN commit r14707.
2014-01-30 17:09:45 +00:00
JoshuaJB ff4ed09b6f Backend for special formatting of moderaters in the lobby userlist.
This was SVN commit r14706.
2014-01-30 15:46:19 +00:00
Yves bab3a08643 Fixes a crash introduced in fd187f466f by ensuring that the CScriptValRooted values are destroyed before calling JS_DestroyContext.
I've tested the performance on Combat Demo (Huge) again with the code
from #2394.
It's very close but probably a little bit lower (hard to tell because
it's so close).

Closes #2408
Refs #2394

This was SVN commit r14705.
2014-01-30 13:21:36 +00:00
JoshuaJB b9eea330d0 Strip some whitespace and fix a warning in session.js
This was SVN commit r14704.
2014-01-29 19:00:47 +00:00
sanderd17 1d3ac14d35 Better summary screen. Fixes #686. Patch by Bajter and Kabzerek
This was SVN commit r14703.
2014-01-29 18:30:56 +00:00
sanderd17 459f13e72b Clean up the colorfade code. Patch by boeseRaupe, fixes #2395
This was SVN commit r14702.
2014-01-29 14:49:36 +00:00
Spahbod 7395d9c75a Applying the new improvements: Canyon, Continent, Corinthian Isthmus
Some cleanup and small tweaks.

This was SVN commit r14701.
2014-01-29 14:21:48 +00:00
sanderd17 639b583d31 Fix scatter formation
This was SVN commit r14700.
2014-01-29 14:01:21 +00:00
leper d6f8742f9b Change hawk and boar skeletons so that the root identifiers are unique. Fixes #2332.
Also adjust the DAEs to fit the new identifiers.

This was SVN commit r14699.
2014-01-29 04:14:24 +00:00
sanderd17 f097078d46 Send the move command directly instead of going through the FSM. That way, the failure can be catched earlier on. Should fix #2410
This was SVN commit r14698.
2014-01-28 20:40:38 +00:00
mimo 8953179e1a allow the possibility to define route with waypoints when doing trade, fixes #1207, #1821 and #1822
This was SVN commit r14697.
2014-01-28 18:56:39 +00:00
mimo 23777ba736 fix cbc1c9f0ab
This was SVN commit r14696.
2014-01-27 19:25:38 +00:00
Mythos_Ruler 325f9ca9a9 Sorry Brits. Changed "plough" (British spelling) to "plow" (American/Canadian spelling) after seeing more than one person on Youtube mispronounce the word.
Can only build 1 Juggernaut.

All champion cavalry now cost Food and Metal.

This was SVN commit r14695.
2014-01-27 16:16:32 +00:00
sanderd17 c751500907 Refactor some formation code to let it make use of the prototypes
This was SVN commit r14693.
2014-01-27 12:34:59 +00:00
JoshuaJB 7bcdb9f46d Remove two un-needed string initilizations from my earlier changes.
This was SVN commit r14692.
2014-01-27 05:46:21 +00:00
leper 78ff9a8480 Fix compilation failures with wxWidgets 3.0. Fixes #2375.
This was SVN commit r14691.
2014-01-27 00:02:03 +00:00
historic_bruno 0406c89908 Implements GetMonitorSize for OS X, patch by Echelon9, fixes #2390
This was SVN commit r14690.
2014-01-26 23:03:45 +00:00
mimo cbc1c9f0ab fixes remaining town bell defects, closes #2353, patch by Itms
This was SVN commit r14689.
2014-01-26 20:37:39 +00:00
JoshuaJB c61badb04c Fix typo.
This was SVN commit r14688.
2014-01-26 19:29:21 +00:00
JoshuaJB 2a1240008c Make my previous changes < C++11 compatible.
This was SVN commit r14687.
2014-01-26 19:23:50 +00:00
JoshuaJB 5e70bd3628 Fix and cleanup my recent changes.
This was SVN commit r14686.
2014-01-26 19:01:21 +00:00
mimo cb3a8d868a fix bug when garrisoning under alert and garrisonHolder is full, patch by Itms, see #2353
This was SVN commit r14685.
2014-01-26 18:28:55 +00:00
mimo 3e1fc74add improve alert tooltip, see #2353
This was SVN commit r14684.
2014-01-26 18:17:13 +00:00
mimo 9ed11bc404 keep work orders when in alert, patch by Itms, addresses #2353
This was SVN commit r14683.
2014-01-26 18:01:29 +00:00
sanderd17 09a2729503 fix a fix
This was SVN commit r14682.
2014-01-26 09:40:54 +00:00
sanderd17 f1ab9b8e57 Check isInWorld before asking position
This was SVN commit r14681.
2014-01-26 09:24:32 +00:00
JoshuaJB 5ec0dc8ae8 Fix a bug with one of the lobby settings I added to the options window.
This was SVN commit r14680.
2014-01-26 05:51:48 +00:00
JoshuaJB 39fef5c299 Add the ability to display chat messages when joining the lobby and quickly mostly update the options window to the new UI style.
This was SVN commit r14679.
2014-01-26 05:39:55 +00:00
scythetwirler a8fbe4eedc Centralizes centering rating into one function.
This was SVN commit r14678.
2014-01-26 05:27:00 +00:00
JoshuaJB 041c6ab1b3 More lobby cleanup.
This was SVN commit r14677.
2014-01-26 04:25:35 +00:00
historic_bruno 58a44bfbcb Adds missing comment in build-osx-libs.sh
This was SVN commit r14676.
2014-01-26 03:40:54 +00:00
historic_bruno 5187c6e4a5 Explicitly disables SDL X video driver in build-osx-libs.sh, to fix SDL_VIDEO_DRIVER_X11 definition used in HWDetect.cpp
This was SVN commit r14675.
2014-01-26 03:12:05 +00:00
historic_bruno 937ee8f77c Fixes clang "hidden overloaded virtual function" warning, patch by Echelon9, fixes #2388
This was SVN commit r14674.
2014-01-26 01:20:34 +00:00
JoshuaJB 0db9a18d39 Fix issue where lobby spam was being sent to external clients.
This was SVN commit r14672.
2014-01-25 21:58:22 +00:00
JoshuaJB 851c05a038 Cleanup and spam blocker redesign in lobby.js.
This was SVN commit r14671.
2014-01-25 20:51:01 +00:00
JoshuaJB 41a7c78e62 Fix some stuff in XmppClient.cpp on leper's recommendation.
This was SVN commit r14670.
2014-01-25 20:49:48 +00:00
mimo 28a707f98f small cleaning
This was SVN commit r14669.
2014-01-25 19:58:59 +00:00
scythetwirler 69991cd110 Deletes extra whitespace from last commit.
This was SVN commit r14668.
2014-01-25 19:00:22 +00:00
scythetwirler e183e87333 Adds a message that is triggered whenever the bot's name is mentioned when a user doesn't recognize the bot isn't human (which happens quite a lot)
This was SVN commit r14667.
2014-01-25 18:57:28 +00:00
Enrique 2b407a03eb Added Stanislas69 iberian corral with several fixes.
Fixed iberian struct normal and specmap.

This was SVN commit r14666.
2014-01-25 16:50:21 +00:00
sanderd17 9eb26c2622 Fix infinite loop when attacking a formation without valid targets
This was SVN commit r14665.
2014-01-25 16:27:55 +00:00
Mythos_Ruler 0f5e5fddd6 This was SVN commit r14664. 2014-01-25 14:45:58 +00:00
JoshuaJB 12a691edc2 Make my previous changes support < C++11 and Windows.
This was SVN commit r14661.
2014-01-24 20:31:39 +00:00
Mythos_Ruler 3f00d0cc9c Fix some broken maps. Delete some others.
This was SVN commit r14660.
2014-01-24 20:23:11 +00:00
sanderd17 ecaded076f Improve the Vector prototype with static functions. Replace the usage of the Math vector functions with functions from the Vector class.
This was SVN commit r14659.
2014-01-24 19:51:00 +00:00
JoshuaJB 5d4f509810 Update existing minimap idle button, add minimap idle button highlight and disabled, and some style fixes in session.xml. Refs #823 and refs #2357
This was SVN commit r14658.
2014-01-24 18:40:01 +00:00
Mythos_Ruler 2f145b1578 Iron Spearheads tech now affects all spear units (not just infantry spearmen).
Javelin Thong tech now affects all javelin units (not just infantry
javelinists).

Some shield tweaking.

Some more portraits.

This was SVN commit r14657.
2014-01-24 18:28:26 +00:00
JoshuaJB b46a6de335 Allow using the XMPP room subject to display lobby information to user, make the lobby GUI code more readable, and cleanup the modern styles.
This was SVN commit r14656.
2014-01-24 18:20:15 +00:00
JoshuaJB dd274113bc Fix #2403
This was SVN commit r14655.
2014-01-24 18:15:42 +00:00
Enrique d5609e33a6 Fixed elephant african bush actor and mesh
This was SVN commit r14654.
2014-01-24 15:04:58 +00:00
Spahbod 609e789cea Fixing the bug with the ramp in Cantabrian Highlands.
Applying the new improvements: Archipelago, Atlas Mountains, Cantabrian
Highlands.

This was SVN commit r14653.
2014-01-24 12:28:30 +00:00
scythetwirler f94a1aeac0 Checks for game end after toggling diplomacy. Also adds a comment for clarification to the lobby bot. Refs #2402.
This was SVN commit r14652.
2014-01-24 00:38:08 +00:00
scythetwirler 53900c082b Added some criteria for rated games. Fixes #2402.
This was SVN commit r14651.
2014-01-24 00:22:50 +00:00
scythetwirler e5e634f768 Displays ratings in the userlist. Fixes #2371.
This was SVN commit r14650.
2014-01-23 23:13:13 +00:00
Enrique d82282e358 Added animations for african bush elephant.
This was SVN commit r14649.
2014-01-23 21:41:58 +00:00
Mythos_Ruler cf851a7789 A bunch of naming stuff.
This was SVN commit r14648.
2014-01-23 18:32:21 +00:00
Enrique 35517f2cd6 commited basic_glow.xml material for self-illumination objects.
This was SVN commit r14647.
2014-01-23 17:50:00 +00:00
sanderd17 fd187f466f Add vector prototype to vector-like return values from C++ to JS. Fixes #2394.
This was SVN commit r14645.
2014-01-23 11:32:08 +00:00
sanderd17 d677033c4c Serialise Cost component since the population bonus is tech-modifiable. Fixes #2399
This was SVN commit r14644.
2014-01-23 08:56:22 +00:00
JoshuaJB df0cdf8561 Fix typo in the Lake random map script.
This was SVN commit r14643.
2014-01-23 04:48:52 +00:00
Enrique 8d5c02091a Added greek, arabic and big tents as eyecandy, they will be used in the ptolemaic mercenary camp.
Added Stanislas69's new gaul farmstead with some fixes. (Thanks
Stanislas69!)
Added carpet texture fragments to the ptolemaic struct texture

This was SVN commit r14642.
2014-01-22 22:59:06 +00:00
sanderd17 ef79e8305b An addition to bd3f5a8085, also refs #1964
This was SVN commit r14641.
2014-01-22 20:56:14 +00:00
sanderd17 bd3f5a8085 Removing the AI check for producing un-allowed units. Should be fixed in the AI side with ad8fa37f17. Refs #1964.
This was SVN commit r14640.
2014-01-22 20:47:51 +00:00
wraitii ad8fa37f17 Improve some building placement. May improve dropsite usage slightly.
Should fix #1964

This was SVN commit r14639.
2014-01-22 20:26:45 +00:00
sanderd17 1fedf11e9e Use a filter to pick a new attack target in the same turn, while still avoiding an infinite loop
This was SVN commit r14638.
2014-01-22 18:38:15 +00:00
wraitii a58acb28f0 Style improvements (thanks Leper).
Fix AI building its buildings closer together by properly moving failed
foundations out of the world.

This was SVN commit r14637.
2014-01-22 17:54:20 +00:00
Mythos_Ruler 546a26467f Cavalry Spearmen for Sparta. Gives them a melee cavalry for proper anti-siege.
This was SVN commit r14636.
2014-01-22 16:34:00 +00:00
Mythos_Ruler 01ec56cc0c A bunch of updated portraits. Thinking of going this color-coded route: Blue for citizen-soldiers. Red for champions and heroes. Maybe green for mercenary soldiers.
Tweaked a couple footprints.

This was SVN commit r14635.
2014-01-22 15:42:28 +00:00
sanderd17 32844e9a16 Fix tests + improve behaviour of attacking when not in formation
This was SVN commit r14634.
2014-01-22 15:13:07 +00:00
sanderd17 04aba0e41a Let certain formations stay in formation while attacking
This was SVN commit r14633.
2014-01-22 13:20:55 +00:00
wraitii de02ab2e53 Fix various bugs. Try to make the AI build its buildings closer together (WIP, and it's brute-force).
This was SVN commit r14632.
2014-01-22 03:11:19 +00:00
mimo df3bdcf8ca add back some lines removed unintentionally by previous tag
This was SVN commit r14631.
2014-01-21 22:59:21 +00:00
mimo 41d3366f6a check version and mods before loading a file, fixes #2361 and #2385.
This was SVN commit r14630.
2014-01-21 22:49:42 +00:00
wraitii 7d18fecbcd Fix some errors reported by Gildas, Lion_Kanzen and Gameboy. Prepare for formation fighting in the attack plans by having a more generic "army" component.
This was SVN commit r14629.
2014-01-21 20:24:51 +00:00
sanderd17 e466565c35 Let formations attack other formations (still without keeping their formation position though)
This was SVN commit r14628.
2014-01-21 16:50:58 +00:00
sanderd17 2ca25a6d3e differentiate between formations that can attack, and formations that can only move. Use the differentiation in the range calculation.
This was SVN commit r14627.
2014-01-21 09:10:17 +00:00
leper 453bd6c8a0 Fix typo (Cepio -> Caepio), reported by qwertz.
This was SVN commit r14626.
2014-01-21 00:41:17 +00:00
Spahbod 3955447b5b Applying the new improvements: Alpine Lakes, Anatolian Plateau
This was SVN commit r14625.
2014-01-20 15:44:28 +00:00
sanderd17 7763a22c08 revert having giving the attack state to formation controllers as it caused too much trouble
This was SVN commit r14624.
2014-01-19 18:03:43 +00:00
Spahbod 72ad5467e8 Applying the new improvements: Aegean Sea, Lake, Rivers
This was SVN commit r14623.
2014-01-19 15:38:02 +00:00
Mythos_Ruler 8b2037e5ee Some naming stuff.
Reduced the size of a spec map.

This was SVN commit r14622.
2014-01-19 12:58:18 +00:00
Spahbod 6036b48c1d WIP: Completing the unified random map syntax.
This was SVN commit r14621.
2014-01-19 11:58:24 +00:00
Spahbod d06ab6514b WIP: Setting ground for a unified random map syntax. Might break some current random maps.
Faster generation.
Better mountains.
Larger forests.
Should make it easier to design/tweak random maps.

This was SVN commit r14620.
2014-01-19 06:51:41 +00:00
alpha123 8845910f9c Of course the time I don't test before committing is the time I make a syntax error. I think the RNG hates me.
This was SVN commit r14619.
2014-01-19 02:57:40 +00:00
alpha123 7a520adbf3 Improve the wording of attack tooltips.
This was SVN commit r14618.
2014-01-19 02:01:21 +00:00
historic_bruno 3c04cdb8e0 Updates LICENSE.txt for 29a8df5029, refs #2308.
Sets svn:ignore property on generated cpp from encryption tests.

This was SVN commit r14617.
2014-01-18 23:41:27 +00:00
wraitii f2f0307a25 fix typo.
This was SVN commit r14616.
2014-01-18 21:05:53 +00:00
sanderd17 c2d43b009c Fix asking for non-existing templates of killed units
This was SVN commit r14614.
2014-01-18 20:56:21 +00:00
JoshuaJB 3cde5632ff Fix StoneCrossBox sizing.
This was SVN commit r14613.
2014-01-18 20:29:21 +00:00
wraitii 9330975d54 Fix Athens not researching civ phase. Make the AI adapt automatically to changing the max gatherers on fields.
Fix auto-researched technologies not being properly researched on init.
Fix the tests (amazing!).
GarrisonHolder sends which entities were added or removed (mostly for AI
purposes but could benefit other things).
Streamline AIInterface events.

This was SVN commit r14612.
2014-01-18 20:26:52 +00:00
Mythos_Ruler 76451a297e This was SVN commit r14611. 2014-01-18 20:21:06 +00:00
alpha123 c4643d925d Fix two bugs in attack tooltips. Add an extra Math.round to ensure we don't get huge decimals, and use a building's default arrow count as a minimum in rate calculation.
This was SVN commit r14610.
2014-01-18 19:20:17 +00:00
alpha123 ea526eedd1 Adjust the attack tooltips. Make the formatting for attack rate more consistent and use meters instead of tiles for range.
This was SVN commit r14609.
2014-01-18 18:59:51 +00:00
alpha123 046c5ef74c Make chariots faster, and give them a more consistent (and slightly smaller) obstruction radius.
Citizen chariots are now 15.0 speed (1 faster than cavalry), champion
chariots 16.0, and hero chariots 18.0.

This was SVN commit r14608.
2014-01-18 18:08:02 +00:00
Mythos_Ruler ca6301c399 Reduced number of gatherers for farms from 5 to 3 for testing.
This was SVN commit r14607.
2014-01-18 16:47:04 +00:00
JoshuaJB c02dafec74 Move simulation Vector math to globalscripts/Math.js. Refs #2032.
This was SVN commit r14606.
2014-01-18 15:27:30 +00:00
Mythos_Ruler ae35ed255f For the Celts, moved Blacksmith to the Village Phase. This isn't much of a bonus yet until we get some unique tech trees for the Blacksmith.
This was SVN commit r14605.
2014-01-18 15:04:20 +00:00
Mythos_Ruler 061c5f8ced Fixing pop cost for advanced Persian chariot.
This was SVN commit r14604.
2014-01-18 15:03:08 +00:00
Mythos_Ruler 36edaa5635 Siege Workshop for the Macedonians. Needs a new model.
Persians get the Nisean War Horses tech.

This was SVN commit r14603.
2014-01-18 15:02:16 +00:00
JoshuaJB 29a8df5029 Change the licence of sha.h to match the licence of sha.cpp. Refs #2308
This was SVN commit r14602.
2014-01-18 13:12:29 +00:00
Mythos_Ruler 8c971c4a10 Trying to make elephant attack sounds not so crazy. Unsuccessful.
This was SVN commit r14601.
2014-01-18 12:35:55 +00:00
Mythos_Ruler c316079cc7 Updated names for female citizens.
Updated Seleucid rally banner (still not happy with it).

Fixed name of Nisean War Horses tech.

This was SVN commit r14600.
2014-01-18 12:33:19 +00:00
JoshuaJB 1040cf2034 Add back a new minimap overlay, re-add and implement the original idle button, little whitespace cleanup, and delete some old unused ui images.
This was SVN commit r14599.
2014-01-18 02:38:07 +00:00
JoshuaJB 82ab190c5d Do what my previous commit was supposed to do.
This was SVN commit r14598.
2014-01-18 00:37:00 +00:00
JoshuaJB 9ad01e52fb Add third_party/encryption in premake as required for the lobby.
This was SVN commit r14597.
2014-01-17 23:51:23 +00:00
JoshuaJB 94822b791f Remove automatically generated test .cpp files.
This was SVN commit r14596.
2014-01-17 20:17:56 +00:00
JoshuaJB 32258b2ba3 Move lobby encryption code to third_party/encryption and add tests. Fixes #2308
This was SVN commit r14595.
2014-01-17 20:14:41 +00:00
Yves d80967111d Fixes a problem with the renderpath screen not being displayed.
Refs #2241

This was SVN commit r14593.
2014-01-17 18:40:36 +00:00
Yves 377c780ddd Fixes the problem that functions in globalscripts aren't available from GUI scripts anymore since 4b1297b328.
Refs #2241

This was SVN commit r14592.
2014-01-17 18:21:27 +00:00
historic_bruno c094e72ede Fixes scoping for icons in GUI text, instead of using only the top page on the stack, which caused errors when dialog boxes popped up over text containing icons
This was SVN commit r14591.
2014-01-17 02:54:57 +00:00
scythetwirler c39b541714 Fixes some typoes in the bot README
This was SVN commit r14590.
2014-01-16 23:22:14 +00:00
Mythos_Ruler aba3d8d9d5 Shield tweaking for the Bronze Shield and Gold Shield pikemen.
Adjusted hero health.

Made champions use arrow selections, while citizen soldiers use circles.

A bunch of updated portraits.

Seleucids changes.

Map updates.

New techs.

Roman siege walls a little weaker.

This was SVN commit r14589.
2014-01-16 23:21:57 +00:00
wraitii c1e86161b5 AIs now properly receive aura and technology updates. Fixes #2377, Refs #1520 . Consequently reimplement repairing for AIs.
Fix a few style issues and a bug with the gatherer count.
Still need to fix the entity.js file to handle properly some things as
this uses raw templates values.
Cache the AIinterface in AIProxy.js, please report if this works
properly.

This was SVN commit r14588.
2014-01-16 20:32:44 +00:00
sanderd17 4b828ae6bf Fix gaul fortress death variation. Fixes #2374
This was SVN commit r14587.
2014-01-16 19:26:39 +00:00
sanderd17 4a133264f5 Fix unit tests
This was SVN commit r14586.
2014-01-15 13:36:33 +00:00
wraitii 786afd9fcc Implement the number of gaia gatherers (it probably won't happen but it's safer that way).
Change UnitAI to call "leave" handlers on a conversion, like on a
destruction, so a unit will safely go to idle state on
resignation/conversions. Might fix some very weird bugs that probably
haven't been reported yet.
Reported by AlThePhoenix.
Fixes #2383.

This was SVN commit r14585.
2014-01-15 00:04:25 +00:00
sanderd17 a6dbf6a268 instead of removing members from formations as in e98478b68c, let the members stay in formation, but disable formation rearrangement in those cases.
This fixes issues with queueing orders, and should also fix #2380

This was SVN commit r14584.
2014-01-14 21:32:51 +00:00
wraitii 13105132a4 http://gifrific.com/wp-content/uploads/2012/06/You-Didnt-See-Anything-Madagascar.gif
This was SVN commit r14583.
2014-01-14 20:20:53 +00:00
wraitii d23b7deb98 Various improvements to AI's early game. Simplify some code and improve on other. Add a few different strategies (Rush/normal/boom, quite basic for now, refs #2344).
Aegis should mostly respect tech limitations so I'll ref #1964.
I'm going to go with #2364 is fixed, the AI should be more efficient in
early-game, and late-game is a known problem.
Fixes #2274 and fixes #2379.
Refs #2372 as it should fix several of those warnings for AIs.
Fixes #2256 with a new bartering system, in parts taken from mimo's
patch.

This was SVN commit r14582.
2014-01-14 19:54:31 +00:00
sanderd17 e98478b68c Make sure units in INDIVIDUAL state don't belong to a formation. Should fix #2380
This was SVN commit r14581.
2014-01-14 08:58:11 +00:00
JoshuaJB 0f56dceef2 Give the minimap 20px more on eack side and remove the ugly overlay. Also cleanup some nearby code.
This was SVN commit r14580.
2014-01-14 03:25:12 +00:00
leper 2ca0a20f81 Fix a bug in TestAllMemberFunction and initialize a variable in cmpBattleDetection. Refs #2372.
This was SVN commit r14579.
2014-01-12 23:13:24 +00:00
wraitii a26ab7b1e7 Should fix AI warnings (refs #2372).
Slight configuration changes to improve the early-game slightly, WIP.

This was SVN commit r14578.
2014-01-12 19:12:55 +00:00
sanderd17 0521d936a1 reduce a GuiInterface call for displaying formation tooltip
This was SVN commit r14577.
2014-01-12 18:39:47 +00:00
Yves 34949b0943 Fixes some AI errors and missing VARs.
This was SVN commit r14576.
2014-01-12 17:34:18 +00:00
wraitii 6c3bd4db1e Fix previous AI commit.
This was SVN commit r14575.
2014-01-12 02:40:42 +00:00
wraitii 9d02495a96 Fix a few bugs.
Improve the AI gamestate to make better use of entity collections,
should be very slightly faster, and it's cleaner.
Remove enemy watchers that were no longer used.

This was SVN commit r14574.
2014-01-12 01:07:07 +00:00
Yves 8195e767ef Fixes an occasional crash when hotloading GUI files.
Refs #2241

This was SVN commit r14573.
2014-01-11 20:53:01 +00:00
wraitii bc9b76c86b Fix an error in defense.js (thanks mimo), and an issue in the HQ that made the AI start super slowly on some maps.
This was SVN commit r14572.
2014-01-11 18:51:37 +00:00
wraitii 4ef80d26aa Proper fix for the gatherer count. Fix an AI bug. Thanks to Gameboy and Gildas for reporting.
This was SVN commit r14571.
2014-01-11 18:14:13 +00:00
sanderd17 0e0b4e3057 make population bonus technology modifiable
This was SVN commit r14570.
2014-01-11 14:55:22 +00:00
sanderd17 96448bfa4e * add a (currently useless) attack state to formations
* add a formation attack component that will be used in the future to
coordinate formation attacks
* clean up some related methods, and move some to more appropriate
places

This was SVN commit r14569.
2014-01-11 12:19:43 +00:00
JoshuaJB 20692a26b0 Fix some undefined errors with unknown presences in the lobby and recougnize the 'gone' presence as away.
This was SVN commit r14568.
2014-01-11 03:53:41 +00:00
mimo eee6ed65dc still another fix to the gatherer count
This was SVN commit r14567.
2014-01-10 22:50:13 +00:00
wraitii 82fa27bad4 http://i.imgur.com/iAwfubL.gif
This was SVN commit r14566.
2014-01-10 20:33:47 +00:00
wraitii df9fb05689 Fix the gatherer count per player further and some style niceness.
This was SVN commit r14565.
2014-01-10 20:27:34 +00:00
leper 7606230158 Vars and style fixes.
This was SVN commit r14564.
2014-01-10 20:04:37 +00:00
sanderd17 9f243a3372 Disabling the OFFSET_LINE doesn't change any functionality as far as seen, while it fixes #2368.
This was SVN commit r14563.
2014-01-10 19:56:36 +00:00
Yves 11430cf927 Remove scripting directory from premake4.lua
(I forgot that in cbc0650a79)

This was SVN commit r14562.
2014-01-10 19:52:57 +00:00
Yves cbc0650a79 Removes some unused files
This was SVN commit r14561.
2014-01-10 19:38:34 +00:00
wraitii bd22432fe8 Rename common-api-v3 to common-api.
Fix warnings with the new AI.
Fix an error with the per-player gatherer counts.

This was SVN commit r14559.
2014-01-10 17:46:48 +00:00
sanderd17 87250a79c9 delete groups with a right click. Fixes #2341. Patch by boeseRaupe
This was SVN commit r14558.
2014-01-10 16:51:13 +00:00
sanderd17 f9a2c30a17 fix tests
This was SVN commit r14557.
2014-01-10 16:36:04 +00:00
Yves ee39f21b52 Fixes a problem when messageboxes were called without callback function.
Fixes #2367
Refs #2241

This was SVN commit r14556.
2014-01-10 16:25:09 +00:00
sanderd17 3d23f81696 Show the number of attacks per second to show users some attack speed, without showing the actual timers, or calcualtion of the number of arrows. Fixes #2352
This was SVN commit r14555.
2014-01-10 09:17:40 +00:00
wraitii 72c2853563 Update the tutorial AI (somewhat untested and hacky).
This was SVN commit r14554.
2014-01-10 02:08:59 +00:00
wraitii a6032ddd3f Removes older AIs and APIs.
For the sake of it, we should have a minimal AI sometimes.

This was SVN commit r14553.
2014-01-10 01:48:09 +00:00
wraitii ede4f32bf2 Change the defense system used by Aegis to use more modular armies. This should be faster and easier to extend, though right now it might not be as efficient as before.
Fix a few bugs, including a few bad ones in the economy.
Change the way messages are handled, should be marginally faster in the
later game.
Makes gatherers count limit be per-player (refs #1387 and #643).

This was SVN commit r14552.
2014-01-10 01:46:27 +00:00
sanderd17 22a85b0eb4 add dummy setspeed method to UnitMotionFlying
This was SVN commit r14551.
2014-01-09 12:53:28 +00:00
mimo ec36222b20 add more flexibility to eject units when garrisonHolder is destroyed, fixes #2242
This was SVN commit r14550.
2014-01-08 18:27:58 +00:00
wraitii 2d806f81f0 If at first you don't succeed…
Refs #2359

This was SVN commit r14549.
2014-01-08 18:18:52 +00:00
sanderd17 641c65b1dd Give some explanation to my change in 0c336649e6
This was SVN commit r14548.
2014-01-08 17:57:12 +00:00
sanderd17 0c336649e6 fix repairing buildings
This was SVN commit r14547.
2014-01-08 15:39:32 +00:00
LordGood 774d56af7e Carthaginian farmstead remake
This was SVN commit r14546.
2014-01-08 15:19:35 +00:00
sanderd17 9229cea9cc allow repairing of moving objects
This was SVN commit r14545.
2014-01-08 13:39:33 +00:00
sanderd17 f9b950aa96 improve rearrange of idle formation when units are tasked away from the formation + fix formation-settable idle animations
This was SVN commit r14544.
2014-01-08 10:55:44 +00:00
sanderd17 e8c4031bea Don't disband idle formations anymore, but give the formations a decent idle state. Formationmembers still need to leave the formation to anything other than walking, but this is a small step towards attacking formations.
This was SVN commit r14543.
2014-01-08 09:47:27 +00:00
sanderd17 4585f7322c Make the tooltips and the required members part of the formation template + fix allowing the wedge formation only for cavalry
This was SVN commit r14542.
2014-01-08 08:02:15 +00:00
JoshuaJB bec7cfd520 Another attempt to fix the lobby disconnects.
This was SVN commit r14541.
2014-01-08 04:22:34 +00:00
historic_bruno 7e87211d91 Attempts to fix crash reported on OS X Mavericks by not calling SDL_SetGamma in that case (this patch was included in the A15 bundles), refs #2272
This was SVN commit r14540.
2014-01-08 01:29:04 +00:00
wraitii 0482038af2 Another go at #2359
This was SVN commit r14539.
2014-01-08 00:06:26 +00:00
historic_bruno ad6ed949ee Fixes unreferenced formal parameter warning in MSVC
This was SVN commit r14538.
2014-01-07 23:10:06 +00:00
sanderd17 aadd297cce Implement the ability to switch animations based on the formation position
This was SVN commit r14537.
2014-01-07 20:21:55 +00:00
sanderd17 ff2a7d6bad fix spelling mistakes
This was SVN commit r14536.
2014-01-07 19:43:32 +00:00
sanderd17 83c5d40cfb fix compiling problem caused by 8226d75715
This was SVN commit r14535.
2014-01-07 14:37:02 +00:00
sanderd17 b1e0f1b62a Clean up the mess of different ways to note the formations (capitalised, with spaces, with underscores, concatenated ...) by always referring to the template name.
This was SVN commit r14534.
2014-01-07 13:33:08 +00:00
sanderd17 94907897a7 Fix tests + fix classes Ashoka. Fixes #2362
This was SVN commit r14533.
2014-01-07 09:23:59 +00:00
JoshuaJB 8226d75715 Make PickEntitiesAtPoint faster yielding 1-3% overall performance improvement. Fixes #2358. Also removes some trailing whitespace.
This was SVN commit r14532.
2014-01-07 04:05:10 +00:00
mimo 729a795a44 of course, 7a3b1fe47e can be simplified
This was SVN commit r14531.
2014-01-06 23:23:18 +00:00
mimo 7a3b1fe47e Improve speed of territory computation, fixes #2360
This was SVN commit r14530.
2014-01-06 22:49:57 +00:00
wraitii d0e57cb0ff Change a few things to avoid warnings with gcc. Should fix #2359
This was SVN commit r14529.
2014-01-06 22:14:27 +00:00
leper baf6925b66 Tactical varfare.
This was SVN commit r14528.
2014-01-06 20:55:22 +00:00
sanderd17 8cc1ddf6de Small code style fix
This was SVN commit r14527.
2014-01-06 20:13:55 +00:00
mimo b4fa090435 fix losRangeQuery broken in e096df0070
This was SVN commit r14526.
2014-01-06 19:35:51 +00:00
sanderd17 3406f2f3e8 Fix code style of files committed too soon in f19a8d6b41
Adds blinking overlay to ther hero icon when he's attacked
Adds a health bar to the hero icon
Fixes #1902
Patch by boeseRaupe

This was SVN commit r14525.
2014-01-06 13:48:17 +00:00
sanderd17 f19a8d6b41 Take the box formation out of the special case formations
This was SVN commit r14524.
2014-01-06 13:32:48 +00:00
LordGood 5cde6f7046 small rome tower edit
This was SVN commit r14523.
2014-01-06 12:50:50 +00:00
sanderd17 9989359c46 Small code cleanup + fixed default formation orientation
This was SVN commit r14522.
2014-01-06 10:16:28 +00:00
sanderd17 2f077fd9e1 Remove wedge formation from being a special case in the formation code
This was SVN commit r14521.
2014-01-06 09:10:46 +00:00
historic_bruno 9ccaa42a54 Fixes MSVC warning C4706: assignment within conditional expression
This was SVN commit r14519.
2014-01-06 02:16:09 +00:00
sanderd17 92ed27e3c5 Treat the flank formation as a regular formation, rather than a special implementation.
This was SVN commit r14518.
2014-01-05 18:50:31 +00:00
mimo f814510b2e revise the chase and flee
This was SVN commit r14517.
2014-01-05 18:29:38 +00:00
sanderd17 b8ee766cd3 Remove some hardcoded formation shapes. Some special formations still have a special treatment though. Also implement speed modifiers for formations, so we can have faster and slower formations.
This was SVN commit r14516.
2014-01-05 17:13:22 +00:00
wraitii aa0d485d72 Fix improper disabling of waves.
This was SVN commit r14515.
2014-01-05 16:41:50 +00:00
wraitii 15ec863aec Substantial speed-up of the foam generation code.
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.

Fixes #1743, #1803 (invalid)
Refs #1875, #2114, #48.

This was SVN commit r14514.
2014-01-05 16:15:20 +00:00
mimo d56595c802 Put into alert units trained during an alert, fixes #2342, patch by Itms
This was SVN commit r14513.
2014-01-05 15:12:17 +00:00
Yves 7193e29961 Adds precompiled.h include because Visual Studio checks for that even though the file only contains comments.
Thanks to boeseRaupe for reporting.

Refs #2348

This was SVN commit r14512.
2014-01-05 13:58:38 +00:00
Yves b20955436b I completely missed the header files when disabling the JS debugger.
Refs #2348

This was SVN commit r14511.
2014-01-05 10:26:27 +00:00
sanderd17 d0497c83f1 Split the formation template in different templates. This can be used later to remove hard-coded formation statistics and forms to attributes in those templates
This was SVN commit r14510.
2014-01-05 10:09:42 +00:00
LordGood d4f35f1061 Revised roman tower
This was SVN commit r14509.
2014-01-05 02:11:00 +00:00
Yves 6ca6a5f779 The patch in 4b65f77438 seems to have fixed the crash, but the initData value doesn't match the JSContext's compartment, so it's theoretically wrong.
This should fix it correctly.

#Refs 2241

This was SVN commit r14508.
2014-01-04 21:49:36 +00:00
Yves 4b65f77438 Fixes an occasional crash introduced in #2241 (hopefully).
Refs #2241

This was SVN commit r14507.
2014-01-04 21:36:12 +00:00
Yves 7d516e7e7a Disables the JS debugger.
It's completely broken since 4b1297b328 and will have to be updated for
the new SpiderMonkey API.
I only uncomment it at the moment because I plan to fix/reimplement it
soon after the upgrade.

Closes #2348
Refs #2241
Refs #1886

This was SVN commit r14506.
2014-01-04 20:47:56 +00:00
Mythos_Ruler da1a2eaba6 This was SVN commit r14505. 2014-01-04 20:42:34 +00:00
Mythos_Ruler d8e839daec Reduced armor for Roman siege walls.
This was SVN commit r14504.
2014-01-04 16:53:01 +00:00
sanderd17 58dd223018 Now really fix the temple aura. See d4b2c1285c
This was SVN commit r14503.
2014-01-04 15:43:05 +00:00
sanderd17 9fb6620edd Use an actual flee order to move animals away from the foundation. Fixes #2347
This was SVN commit r14502.
2014-01-04 15:36:20 +00:00
sanderd17 1e33dd1d5e fix targetPosition != null check
This was SVN commit r14501.
2014-01-04 13:15:44 +00:00
Yves 3d5f661447 Fixes assertion failure when opening the ingame manual.
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328.

Refs #2241

This was SVN commit r14499.
2014-01-04 11:48:28 +00:00
Yves 4a11b30b39 Fixes assertion failure when clicking the settings button (aiconfig) on the match setup screen.
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328.

Refs #2241

This was SVN commit r14498.
2014-01-04 11:29:35 +00:00
sanderd17 d4b2c1285c add the ability to exclude props from the selection size + add aura visualisation rings again
This was SVN commit r14497.
2014-01-04 10:41:32 +00:00
Yves 4b1297b328 Removes g_ScriptingHost and implements global to compartment 1 to 1 relation.
Each GUI Page gets its own compartment and all ScriptInterfaces in the
same thread should now use the same JS Runtime.
This is required for the SpiderMonkey upgrade.
Check the ticket for details.

Closes #2241
Refs #1886
Refs #1966

This was SVN commit r14496.
2014-01-04 10:14:53 +00:00
LordGood 743644f5ce Roman tower remake
This was SVN commit r14495.
2014-01-04 04:14:29 +00:00
sanderd17 e096df0070 fix units attacking harmless gaia buildings
This was SVN commit r14494.
2014-01-03 20:24:02 +00:00
JoshuaJB fb8032043b Use pointers instead of copying sprites in the GUI. Fixes #1984. Patch by jP_wanN.
This was SVN commit r14493.
2014-01-03 20:19:43 +00:00
JoshuaJB 28f022993a Fix template typos and inconsistaint whitespace.
This was SVN commit r14492.
2014-01-03 19:55:29 +00:00
Mythos_Ruler e85c3de782 Removed the Cavalry Stables from the Seleucids. Their training buildings started to get unwieldy compared to other civs.
This was SVN commit r14491.
2014-01-03 19:30:25 +00:00
mimo 9a41c588fe prevent traders to cycle between two adjacent markets
This was SVN commit r14490.
2014-01-03 14:03:12 +00:00
sanderd17 1eb5d730fc allow garissoning a small number of support units in houses as protection against early raids. Patch and suggestion from dumbo
This was SVN commit r14489.
2014-01-03 13:11:12 +00:00
sanderd17 f634a8db3e fix units fleeing too far
This was SVN commit r14488.
2014-01-03 12:49:04 +00:00
mimo 6e4adcba52 add missing rallypoint to garrisonholder wonders
This was SVN commit r14487.
2014-01-03 11:24:23 +00:00
LordGood 1c3da82869 New Carthaginian wonder commit
This was SVN commit r14486.
2014-01-03 03:17:53 +00:00
Mythos_Ruler f7c1b73a01 Some more tweaks for the Seleucids.
Updated portraits.

This was SVN commit r14485.
2014-01-02 23:24:18 +00:00
mimo 66de76e026 fixes #2340, patch by itms
This was SVN commit r14484.
2014-01-02 23:11:18 +00:00
sanderd17 8269f0cfd4 Group units in clusters of separate formations when they're too far apart.
This was SVN commit r14483.
2014-01-02 20:04:50 +00:00
wraitii 8b98e2d513 Fix osx libraries build script for WXwidgets and libiconv.
This was SVN commit r14482.
2014-01-02 17:24:48 +00:00
leper e73738d794 Do not pause multiplayer games if one player opens a dialog. Patch by boeseRaupe. Fixes #2275.
This was SVN commit r14481.
2014-01-02 16:30:24 +00:00
leper dd86995f77 Fix some newlines.
This was SVN commit r14480.
2014-01-02 16:22:03 +00:00
leper b3d799d950 Replace inconsistent separators in quotes. Fixes #2247. Patch by boeseRaupe.
This was SVN commit r14479.
2014-01-02 14:46:47 +00:00
mimo 7d26f93666 fix animals taken as target in move-attack after 66770feed6, use the same filter as in AttackEntitiesByPreference
This was SVN commit r14478.
2014-01-02 14:17:46 +00:00
sanderd17 5b2cb0e72f small code fix
This was SVN commit r14477.
2014-01-02 08:40:51 +00:00
JoshuaJB b1422137e5 Cleanup GUI Checkbox C++ code by removing broken, non-obvious internal text rendering.
This was SVN commit r14476.
2014-01-02 03:28:15 +00:00
sanderd17 d8e8f613cd small code cleanup
This was SVN commit r14475.
2014-01-01 19:56:27 +00:00
sanderd17 59525414ee fix automatically attacking buildings caused by 66770feed6
This was SVN commit r14474.
2014-01-01 19:54:15 +00:00
sanderd17 66770feed6 include gaia range query of UnitAI in general range query. Fixes #2156. Patch by dumbo
This was SVN commit r14473.
2014-01-01 18:59:16 +00:00
sanderd17 05baeae5bd fix units not dropping resources when they are already at the resource dropsite (e.g. fields right next to a farmstead). Fixes #2336
This was SVN commit r14472.
2014-01-01 18:17:47 +00:00
sanderd17 9cf55a5ed0 fix productionQueue failing to produce units while the upgrade tech is running
This was SVN commit r14471.
2014-01-01 16:35:49 +00:00
sanderd17 2197b80747 fix oos problem mentioned by Yves on IRC
This was SVN commit r14470.
2014-01-01 16:15:26 +00:00
JoshuaJB 3d171b54c9 New ModernTickBox style for the GUI. Replace the use of StoneCrossBox in the lobby GUI with the new style.
This was SVN commit r14469.
2014-01-01 06:15:06 +00:00
JoshuaJB 67570be8fa Make GUI button-based objects to behave more expectedly when doubleclicked, also some style tweaks.
This was SVN commit r14468.
2014-01-01 06:05:41 +00:00
JoshuaJB 1e522f9b2c Fix bug with rating in lobby bot, remove superfluous GUI typedef, and change the lobby chat autocompletion to use tab.
This was SVN commit r14467.
2014-01-01 00:23:18 +00:00
wraitii 9d9361ae44 Why you should test your code before committing, exhibit A.
This was SVN commit r14466.
2013-12-31 21:45:11 +00:00
wraitii a7cafe75aa "Reveal all player" id back to -1, add some "ensure" to catch invalid player ids and be safer.
This was SVN commit r14465.
2013-12-31 21:30:48 +00:00
wraitii fe2a97b0c9 Change some useless std::map into std::vector for LOS. Player "0" now reveals the LOS for all.
This was SVN commit r14463.
2013-12-31 16:38:11 +00:00
mimo d7f18c10de Add visual indicator when unsetting rally-points, closes #2117
This was SVN commit r14462.
2013-12-31 13:21:06 +00:00
Yves 75b8952d04 Delete help.txt.
I wanted to update it first for some function names I changed.
Then I noticed that nearly all the functions described there don't exist
anymore or have changed. There are much better descriptions at the
places where the functions are declared/implemented.
We should either do it right (and force everyone to update that file for
every change) or don't to it at all. At this stage of development it
doesn't make sense and when we start documenting all the functions at a
central place, there are better locations than this file.

This was SVN commit r14461.
2013-12-31 12:21:56 +00:00
JoshuaJB c0472f0de5 Fix trivial comment typo caught by wraitii.
This was SVN commit r14460.
2013-12-31 11:06:00 +00:00
sanderd17 f8ca47913d fix division by zero for zero-time technologies. Fixes #2334
This was SVN commit r14459.
2013-12-31 09:02:58 +00:00
JoshuaJB c7ff0bb486 Tweak some lobby login UI bits, rework scrollbar mousewheel handling, add ability to scroll through closed dropdowns with scrollwheel, general C++ GUI cleanup, and fix broken random map script 'Unknown Nomad'.
This was SVN commit r14458.
2013-12-31 04:54:16 +00:00
JoshuaJB b3a74e8f72 Add message to help new users register for the lobby.
This was SVN commit r14457.
2013-12-31 01:14:09 +00:00
leper 2008ebc9d6 Use ACLs in the ipstamp module to support multiple lobby bots.
This was SVN commit r14456.
2013-12-31 00:25:33 +00:00
JoshuaJB b2a535d838 Change the lobby registration to the new UI style and try to make it more ergonomic.
This was SVN commit r14455.
2013-12-31 00:01:27 +00:00
JoshuaJB e21464d960 Try to fix some errors in the bot by checking a player id's validity before using it as an index.
This was SVN commit r14454.
2013-12-30 20:48:15 +00:00
leper 1c9965999b Use another muc room for svn/a16.
This was SVN commit r14453.
2013-12-30 19:44:42 +00:00
wraitii dddc9bab7f Fix tests.
This was SVN commit r14452.
2013-12-30 18:55:37 +00:00
sanderd17 4776d85301 use UnitMotionFlying for the hawks
This was SVN commit r14451.
2013-12-30 18:03:01 +00:00
sanderd17 298115f4c5 Fix units chasing each other. Fixes #1537
This was SVN commit r14449.
2013-12-30 16:07:19 +00:00
wraitii ddee36e0a8 Hide map size for skirmish and scenarios. Refs #2301.
Also fix my previous commit because obviously I had committed the wrong
default value.

This was SVN commit r14448.
2013-12-30 15:59:00 +00:00
wraitii 08b44fe647 Fix water rendering (transparent objects now appear correctly when underwater/in reflections)
Add a new config option (renderactors) that, if set to false, will
prevent actors from rendering in-game (grass…)

This was SVN commit r14447.
2013-12-30 15:52:42 +00:00
Yves 4a15ac406b Move debug function and debug flag to API3 and use them from Aegis.
Remove copyPrototype from Aegis because that function is currently not
used and is already in API3.

Refs #2322

This was SVN commit r14446.
2013-12-30 14:28:30 +00:00
wraitii 5febe42aa9 Fix [14444]
This was SVN commit r14445.
2013-12-30 12:50:06 +00:00
wraitii bc136137fc Make hawks selectable in Atlas and alleviate their tendency to congregate in the upper right corner of maps.
This was SVN commit r14444.
2013-12-30 12:43:57 +00:00
wraitii bd2cd235fd Commit Micket's hawk model/rigging, textures using photos by unarmed, add an entity that moves around the map, change maps to use the entity and not the idle actor. Fixes #1228, Fixes #1975.
This was SVN commit r14443.
2013-12-30 11:10:54 +00:00
Yves 533f908f15 Some missing changes in #2322.
Refs #2322

This was SVN commit r14442.
2013-12-30 10:25:50 +00:00
Yves 3362c591f5 Moves AI players to one global using the module pattern.
This avoids wrapping overhead that would otherwise be required because
multiple globals per compartment aren't supported anymore in newer
versions of SpiderMonkey.

Check the ticket for a detailed explanation.

Closes #2322
Refs #2241
Refs #1886

This was SVN commit r14441.
2013-12-30 10:04:59 +00:00
Mythos_Ruler 9a8d5312d4 Removed Civic Center from the Seleucid female. They don't build civic centers (heroes can though). Citizen-Infantry build Military Colonies instead to expand.
This was SVN commit r14440.
2013-12-30 05:47:26 +00:00
Mythos_Ruler 3c630c2e63 Fixed Seleucid thureophoros accidentally calling on the Ptolemaic one.
Made the 4th level of armor techs apply to champions instead of all
infantry.

This was SVN commit r14439.
2013-12-30 05:38:24 +00:00
Mythos_Ruler 91bbc925e2 Completing the playability phase of the Seleucids. Now starts the long road of creating art and balancing and implementing bonuses (hero auras, unique techs, etc.).
This was SVN commit r14438.
2013-12-30 04:25:33 +00:00
leper 5e23445339 Make ConfigDB properly thread-safe.
Replace CreateValue with SetValueString so we don't pass pointers to
internal
 ConfigDB structures around. Refs #1810.
Remove some splash screen related functions since we can achieve the
same
 with the ConfigDB functions exposed to scripts.

This was SVN commit r14437.
2013-12-29 23:56:18 +00:00
JoshuaJB 92fba32c5e Some more C++ GUI cleanup.
This was SVN commit r14436.
2013-12-29 20:46:02 +00:00
JoshuaJB e729f46789 Make button-type GUI elements more responsive and cleanup in IGUIButtonBehavior.cpp
This was SVN commit r14435.
2013-12-29 19:31:48 +00:00
JoshuaJB d756e8d70e Add proper licences to lobby bot files. Also remove extranious config file.
This was SVN commit r14434.
2013-12-29 18:46:00 +00:00
sanderd17 45cfdf47f1 fix carthagian buildings being constructed with garrison flag up. Fixes #2318
This was SVN commit r14433.
2013-12-29 18:16:31 +00:00
leper 3746690f82 Define GLX_MESA_query_renderer functions unconditionally. Fixes #2325.
This was SVN commit r14432.
2013-12-29 17:13:55 +00:00
Mythos_Ruler 517e83b331 New map: Savanna River. Very defensive. Only 1 crossing, unless you cut through the trees around the river.
Tweaked Gambia River for pathing.

Tweaked the obstruction of Farm Fields so that they don't overlap so
much.

Increased build time of Wonders.

This was SVN commit r14431.
2013-12-29 16:36:25 +00:00
sanderd17 2146fa27c8 forgot to rename reference
This was SVN commit r14429.
2013-12-29 12:40:34 +00:00
wraitii 4158283fd4 Take unit obstruction size into account when checking if in range for garrisoning. Reduce CC loading range in consequence. Fixes #2190 .
This was SVN commit r14428.
2013-12-29 10:17:09 +00:00
sanderd17 10e8fb9105 remove debug message
This was SVN commit r14427.
2013-12-29 10:09:58 +00:00
sanderd17 cd125a94e2 fix tests + code style cleanup
This was SVN commit r14426.
2013-12-29 10:01:39 +00:00
wraitii 433293c7b2 Spread is now linearly tied to distance to target. Fixes #2093 .
This was SVN commit r14425.
2013-12-29 08:09:44 +00:00
Enrique 04d0f424df added wonder placeholders for generic hellenes and celts
This was SVN commit r14424.
2013-12-28 17:13:24 +00:00
wraitii ce7235a6aa Various art fixes.
Polynesia map is back to hdr mode.
Improve shark animations, improve crocodile walking animation.
Fix mauryan bamboo bow prop (for some reason it had two models).

This was SVN commit r14423.
2013-12-28 16:34:10 +00:00
wraitii 0029103153 Ptolemy fishing boat (along with props). fixes #2237
This was SVN commit r14422.
2013-12-28 15:59:08 +00:00
Enrique 15b42f0be5 Added wonder placeholders for civs without wonder.
This was SVN commit r14421.
2013-12-28 15:21:11 +00:00
Mythos_Ruler 139a1fd5ca Updated a bunch of civ jsons.
Fixed a few other things.

This was SVN commit r14420.
2013-12-28 15:07:19 +00:00
sanderd17 bf58f04511 add wonder victory condition. Refs #1649
This was SVN commit r14418.
2013-12-28 13:40:39 +00:00
mimo 749c4d5270 change the way to manage trade, closes #2311
This was SVN commit r14417.
2013-12-28 10:44:59 +00:00
Mythos_Ruler 6accb6faf6 Fixed bell icons.
Seleucid Military Reforms.

Fixed inheritance for Ptol healers.

This was SVN commit r14416.
2013-12-28 05:32:16 +00:00
JoshuaJB f254478d1b Revert accidentily committed changes.
This was SVN commit r14415.
2013-12-28 03:34:40 +00:00
JoshuaJB 177a7cd99d Make uninitilized players not show in the lobby leaderboard.
This was SVN commit r14414.
2013-12-28 03:32:31 +00:00
Mythos_Ruler 121345bd6a Name stuff.
This was SVN commit r14413.
2013-12-28 02:35:19 +00:00
Mythos_Ruler b3201acd93 Trimmed the descriptions for most of the random maps, per Josh's request.
This was SVN commit r14412.
2013-12-28 02:17:08 +00:00
Mythos_Ruler 5f1714dd83 Seleucids now have what used to be the Ptolemies' Military Settlement system (now called a Military Colony; needs a new model).
Fixed a few other templates.

This was SVN commit r14411.
2013-12-28 00:34:37 +00:00
Mythos_Ruler 02d38ceecd Fixed elephant stables class element.
This was SVN commit r14410.
2013-12-27 15:21:15 +00:00
sanderd17 bfa7f60251 add outpost skirmish entity, and apply it to the Gambia River skirmish map
This was SVN commit r14409.
2013-12-27 14:48:24 +00:00
sanderd17 659736301a define the limit changing elements together with the limits, so they can be queried by the GUI and the AI. Fixes #2187
This was SVN commit r14408.
2013-12-27 10:58:48 +00:00
wraitii 040e15ed51 Change shark model, skeleton, and change its animations. Add a shark entity that will roam the map and can be attacked, but will not attack and yields no food. Change Polynesia demo map to have a shark.
This was SVN commit r14407.
2013-12-27 10:32:53 +00:00
sanderd17 81f901d473 make the elphant stables count as town phase structure. Mentionned by Zeta1127 on the forums
This was SVN commit r14406.
2013-12-27 09:38:44 +00:00
sanderd17 f33d3193ca fix tests (fixes #2326)
+ small code cleanup
+ move guiInterface call to GetEntityState
refs #2154

This was SVN commit r14405.
2013-12-27 08:49:47 +00:00
Spahbod e4a124e768 WIP: Making the forests in random maps bigger as per people's request.
This was SVN commit r14404.
2013-12-27 08:07:05 +00:00
JoshuaJB dca3393195 Fix 'Carrier Pidgons' technology by checking that rawClasses is not NULL before operating on it.
This was SVN commit r14403.
2013-12-27 04:01:03 +00:00
Mythos_Ruler f42bf782bb Bactria map updated.
This was SVN commit r14402.
2013-12-27 00:47:26 +00:00
Mythos_Ruler c9b48c6e53 Updated a couple African maps with the new crocodiles.
This was SVN commit r14401.
2013-12-26 22:55:48 +00:00
Mythos_Ruler 60bcebf5b6 Fixed crocodile actor.
This was SVN commit r14400.
2013-12-26 22:45:04 +00:00
wraitii e942768b4d Add textured, normal-mapped, animated Nile crocodile to the game. Need to do a female version, possibly a saltwater croc version for mauryan maps?
Add crocodile entity, which is about similar to the lion.
Add a (temporary?) crocodile portrait.
It uses the lion sounds which are probably the closest we have right
now.

This was SVN commit r14399.
2013-12-26 22:33:06 +00:00
JoshuaJB 7688e9c93e Properly round rating calculation in the lobby bot to an integer.
This was SVN commit r14398.
2013-12-26 20:16:43 +00:00
JoshuaJB 4ac5aacc87 Strip some trailing spaces in the lobby bot.
This was SVN commit r14397.
2013-12-26 19:52:07 +00:00
JoshuaJB ad0d81cb8a Various lobby changes and some optimizations in the lobby bot by scythetwirler.
This was SVN commit r14396.
2013-12-26 19:45:20 +00:00
mimo 0780becb8a fix attack-move not working for packed units
This was SVN commit r14395.
2013-12-26 16:09:32 +00:00
Mythos_Ruler e9a269c01c Remove attack from Military Settlement for now.
This was SVN commit r14394.
2013-12-26 16:04:04 +00:00
sanderd17 953e44d9f8 try using footprint instead of obstruction for separation space between formation members + Fix some footprint sizes of siege units
This was SVN commit r14393.
2013-12-26 12:24:52 +00:00
sanderd17 41b3dfc89c Implement town bell
* the icons are temporary, and can be replaced later
* The sounds are created by LAVS, but may also need some polishing, so
the current ones are placeholders too
* The patch code is created by Itms
fixes #2154

This was SVN commit r14392.
2013-12-26 10:43:51 +00:00
sanderd17 9dcc3ee89e fix always picking the same processor core on some systems. Based on code hits by Philip
This was SVN commit r14391.
2013-12-26 10:05:44 +00:00
leper 1de1e2d5ba Fix typo.
This was SVN commit r14390.
2013-12-26 01:05:35 +00:00
JoshuaJB bdeae5d474 Don't send superfluous chat / commands in the lobby, also fix issues with the lobby system messages. Merge from my github branch.
This was SVN commit r14389.
2013-12-25 19:28:53 +00:00
Mythos_Ruler 4658cfa775 Mythos_Ruler's Christmas update for SVN users!
Includes:

- Unit rank upgrades, based on a patch by Sanderd. Not all civs get all
rank upgrades. For instance, Spartans get the Infantry rank upgrades,
but not the cavalry rank upgrades. Conversely, the Persians get the
cavalry rank upgrades, but not the infantry rank upgrades. Carthaginians
get rank upgrades for their mercenaries, but not their native units.
etc.

- Updated and tweaked many of the skirmish maps. Too many tweaks to
mention. But I did add Iberian circuit walls to many of them! New
"Bactria" Skirmish Map. Will continue to tweak this one to make it more
unique. It's based on modern-day Afghanistan, which the ancients called
"Bactria." A 2nd Ptolemies sandbox demo map.

- Moved the Ptolemaic Lighthouse to Town Phase to have more impact for
the Ptolemy player on maps with water.

- New Thureos shield patterns by Enrique for a NEW unit: Mercenary
Thureos Spearman.

- TECHNOLOGIES: Some techs renamed and tweaked. Plus, a new "Iron Armor"
tech for Heroes. A new "Roman Logistics" tech for the Roman Army Camp
and Siege Walls. A new "Battlefield Medics" tech for the temple that
unlocks (slow) health regeneration for units. The portrait for this tech
is placeholder and needs replaced ASAP.

- Cavalry now have oval selection rings. Eventually I will implement a
selection ring system where the citizen-soldiers and support units have
round rings, while champions have arrows, and heroes have stars. This
helps visually differentiate the roles of these 3 classes of units. Not
yet implemented.

- Vision radius for infantry slightly reduced.

- Fixed sounds for Persian Wonder.

- Fixed footprint sizes for a few buildings and Ptolemaic walls.

- Ptolemies now have the "Military Settlement" system in place. But this
system might go to the Seleucids instead later for historical reasons.

- Cost of fields reduced. Gathering rates for grain reduced.

- Fixed some selection group names for some templates. (Double clicking
didn't select them all as it should have).

- Fixed/Changed/Added some unit and building names, specifically for the
Ptolemies, but for some others as well.

- Some new temp portraits for Ptolemaic units. Ongoing task.

Lastly, I hope these changes don't break anything. They are heavily
tested on my end, but I can't promise I caught all bugs.

This was SVN commit r14388.
2013-12-25 15:49:49 +00:00
leper f7e68a4d4c Bot optimizations by scythetwirler.
This was SVN commit r14387.
2013-12-25 15:13:58 +00:00
sanderd17 40d407e8c6 use ptol fortress in random maps with the wall builder
This was SVN commit r14385.
2013-12-18 18:32:25 +00:00
leper 42bc5165ab Add compile time flag to disable use of miniupnpc.
This was SVN commit r14384.
2013-12-18 16:08:56 +00:00
sanderd17 7f5c2c4b83 enlarge the units demo map, so all units can be checked out again
This was SVN commit r14383.
2013-12-18 15:46:09 +00:00
Mythos_Ruler eb7215ecaf This was SVN commit r14381. 2013-12-18 14:14:37 +00:00
Mythos_Ruler 3d9fe04ab5 Added Egyptian names for Ptolemaic buildings.
Deleted a bunch of maps. Added Lorraine Plain skirmish map.

This was SVN commit r14380.
2013-12-18 13:54:30 +00:00
sanderd17 1b17ac50cc remove the aura visualisation from the actors, as it causes selection problems
This was SVN commit r14379.
2013-12-18 10:43:32 +00:00
sanderd17 63f2f85b01 make sure the non-garrisoned variant of the persian models is always picked while constructing
This was SVN commit r14378.
2013-12-18 10:28:32 +00:00
LordGood 6bc5e3f3a5 Ptolemies corral draft commit
This was SVN commit r14377.
2013-12-18 05:29:54 +00:00
alpha123 0b80cbe3ec Hide the password field by default on the lobby login box if there is a remembered password. Since we only store hashed passwords, this avoids potential confusing from seeing a password much longer than the user’s in the field.
This was SVN commit r14376.
2013-12-18 00:56:59 +00:00
alpha123 3c248e7501 Change the "Away" color in the lobby to be much easier to read on the dark background.
This was SVN commit r14375.
2013-12-17 23:58:53 +00:00
alpha123 c8fb750e43 Balance fix for CCs. Decrease build time from 600 to 500 and increase foundation armor from 3h/10p/3c to 5h/15p/3c.
This was SVN commit r14374.
2013-12-17 21:20:31 +00:00
leper c6d454ff2d Make ConfigDB threadsafe.
This was SVN commit r14373.
2013-12-17 19:58:39 +00:00
leper e83f24e3a6 Move UPnP port forwarding to a thread.
Fix some typos.
Do not return the result, as we would need to allocate it, but we never
use it.

This was SVN commit r14372.
2013-12-17 17:03:49 +00:00
JoshuaJB 4df4c0dec0 Try to actually do the threading my previous commit said it did.
This was SVN commit r14371.
2013-12-17 14:57:26 +00:00
JoshuaJB 0ba25e9968 Cache UPnP root URL to try to avoid searching each time. Also make searching asyncronous with the GUI to avoid hanging.
This was SVN commit r14370.
2013-12-17 14:21:49 +00:00
LordGood 60bbb50625 Ptolemaic dock draft commit
This was SVN commit r14369.
2013-12-17 03:17:35 +00:00
LordGood fa03aadaa5 Updated fixed unit icons
This was SVN commit r14368.
2013-12-16 04:09:35 +00:00
LordGood 8c5f583845 Ptolemaic blacksmith draft commit
This was SVN commit r14367.
2013-12-16 02:05:43 +00:00
leper 678d338670 Change bot name.
This was SVN commit r14366.
2013-12-15 21:02:58 +00:00
historic_bruno 2cdef4023c Fixes OS X libs build script
This was SVN commit r14365.
2013-12-15 20:56:58 +00:00
leper d2e671392b Fix bug in ipstamp module.
Sync with server. Refs #2307.

This was SVN commit r14363.
2013-12-15 18:33:01 +00:00
mimo 79252043ae fix the fish gatherer from b91ec9b449
This was SVN commit r14362.
2013-12-15 17:32:20 +00:00
Mythos_Ruler b91ec9b449 Added new Ptolemies track to the Ptolemies civ json.
Removed fishing from land units. However, they still try to go fish
after building a dock. Looks like it needs a deeper fix.

Portrait for Ptol camel archer.

This was SVN commit r14361.
2013-12-15 15:33:35 +00:00
OmriLahav 542861ba36 This was SVN commit r14359. 2013-12-15 14:14:22 +00:00
sanderd17 bcba922893 fix switching between column and other formations
This was SVN commit r14358.
2013-12-15 09:51:13 +00:00
historic_bruno e7d57136ef Updates license files for gloox, MiniUPnPc, and pkcs5_pbkdf2. Refs #2308
This was SVN commit r14357.
2013-12-15 02:49:11 +00:00
historic_bruno 2c3c8737e0 OS X libs build script improvements:
* fixes failed build when using --force-rebuild
* cleans up old build output before starting new builds
* improves separation of libogg and vorbis
* updates wxWidgets to 3.0.0

This was SVN commit r14356.
2013-12-15 02:14:45 +00:00
historic_bruno 99f44ff7a0 Reorganizes extern libs in alphabetical order
This was SVN commit r14355.
2013-12-15 01:34:16 +00:00
historic_bruno 99f90dd6de Adds MiniUPnPc to build-osx-libs.sh
This was SVN commit r14354.
2013-12-15 01:26:55 +00:00
LordGood c2c2177be4 forgot the death particles
This was SVN commit r14353.
2013-12-15 01:10:39 +00:00
historic_bruno 62a10ab938 Fixes Windows build.
Fixes UPnP error handling to be more correct and conventional, refs
#2305

This was SVN commit r14352.
2013-12-15 01:02:26 +00:00
LordGood b1a73d3c0e Ptolemaic market draft commit
This was SVN commit r14351.
2013-12-14 22:14:24 +00:00
JoshuaJB f890856c6d Seperate differently licenced portions of sha.cpp/h into pkcs5_pdkdf2.cpp/h and remove some extra std includes in sha.cpp. Refs #2308
This was SVN commit r14350.
2013-12-14 16:58:21 +00:00
JoshuaJB bf97148ddc Add proper licence header and remove tyedefs in sha.cpp/h. Refs #2308
This was SVN commit r14349.
2013-12-14 16:22:48 +00:00
JoshuaJB 5876ec38d1 Make sure we properly free some UPnP-related variables.
This was SVN commit r14348.
2013-12-14 03:21:21 +00:00
JoshuaJB 551eb3919d Change UPnP lease duration to 0 (permanent) and update comments.
This was SVN commit r14347.
2013-12-14 03:03:22 +00:00
Mythos_Ruler 63622a85d7 Fixed missing elephants in some maps, thanks mimo for catching it.
This was SVN commit r14345.
2013-12-13 19:10:04 +00:00
Mythos_Ruler 44587963e6 Reduced armor for palisade fort.
Tweaked ptolemies sandbox, Alpine Valleys (removed player command of
some deer), and added a Greek Acropolis "Night" map for fun.

This was SVN commit r14344.
2013-12-13 16:26:26 +00:00
Mythos_Ruler 685d37ddfa New Roman emblem.
This was SVN commit r14342.
2013-12-13 14:18:46 +00:00
leper fd47e6caee Name.
This was SVN commit r14341.
2013-12-13 13:30:59 +00:00
leper 619c59fd3f Read the default MUC room from the config file and set it to arena15. Fixes #2306.
Change the jid of xpartamupp to WFGbot to make it work on the new
server. Refs #2307.

This was SVN commit r14339.
2013-12-13 12:14:17 +00:00
Mythos_Ruler 5b9dfaef8f Tweaked Gallic Fields.
Made the palisade spikes not lose health when outside territory.

Changed ptol military settlement actor from Athenian barracks to
Macedonian barracks.

Lowered the height of the farm field status bar slightly.

This was SVN commit r14338.
2013-12-13 11:34:19 +00:00
JoshuaJB 8dab478691 Bundle miniUPnPc with 0AD.
This was SVN commit r14333.
2013-12-13 02:59:35 +00:00
JoshuaJB 667537ee49 UPnP-based automatic port-forwarding using miniupnpc. Breaks windows build at the moment. Refs #2305
This was SVN commit r14332.
2013-12-13 02:23:02 +00:00
Enrique b508fe848a Fixed celtic embassy textures in its actor
This was SVN commit r14331.
2013-12-12 10:09:14 +00:00
wraitii 1efd47c1ad Fix errors when loading a saved game with Aegis by making sure the AI re-inits properly. Still no real saved game support.
This was SVN commit r14329.
2013-12-11 17:10:14 +00:00
Enrique 1c890d64ee Fixed persian gate messed up in previous commit
This was SVN commit r14328.
2013-12-11 15:59:11 +00:00
sanderd17 c6cf074e7a Fix unitAI warning when member left the formation
This was SVN commit r14327.
2013-12-11 15:17:43 +00:00
Enrique 2a824acae6 Made ptolemaic walls thinner. Added door to the gate (no animations yet) fixed some stretched UVs
This was SVN commit r14326.
2013-12-11 01:53:10 +00:00
historic_bruno 8db3ada87f Improves debugging output to help troubleshoot some WSDL bugs, refs #2146, #1733
This was SVN commit r14325.
2013-12-10 18:54:18 +00:00
Mythos_Ruler c661bb01c3 Temp fix for Nubian archer.
This was SVN commit r14324.
2013-12-10 01:27:09 +00:00
alpha123 f3e53bfb7c Reduce splash radius of catapults from the rather ridiculous 20m to 10m.
This was SVN commit r14322.
2013-12-09 19:22:45 +00:00
mimo 683349333b tune the guard behaviour
This was SVN commit r14321.
2013-12-09 18:15:24 +00:00
wraitii a44e88fa42 Check for "Destroy" messages beforehand in the base manager to avoid a rare error.
This was SVN commit r14320.
2013-12-09 16:35:06 +00:00
Enrique ed93cebd28 garrison flag fixing in ptolemaic civic centre, edfu wonder and macedonian temple.
Centered athenian temple, selection and obstruction adjusted.

This was SVN commit r14319.
2013-12-09 14:46:35 +00:00
wraitii c3ef9b3685 Forgot I had renamed a file…
This was SVN commit r14318.
2013-12-09 14:23:56 +00:00
wraitii f9bee5d3ec Slight de-obfuscation of the AI code.
This was SVN commit r14317.
2013-12-09 14:20:11 +00:00
Enrique 9339e658a5 Two new head models for ptolemaic support females. Fixes #2235
This was SVN commit r14316.
2013-12-09 12:38:46 +00:00
Enrique 8351e794fa Added different textures for each ptolemaic camel rank
This was SVN commit r14315.
2013-12-09 02:01:21 +00:00
Enrique a04dfcf836 Camel rider tweaking
This was SVN commit r14314.
2013-12-09 00:33:33 +00:00
Enrique 3c70f25ca4 Final edfu temple normal and spec.
Ptolemaic camel rider fix

This was SVN commit r14313.
2013-12-09 00:21:45 +00:00
sanderd17 208200db28 fix querying unitAI of non-existing members
This was SVN commit r14312.
2013-12-08 19:57:34 +00:00
Yves 966f7c7145 Removes some duplicated code.
This was SVN commit r14311.
2013-12-08 19:23:09 +00:00
wraitii 36334a6fa7 Fix the AI incorrectly trying to place Civil Centres too close to each other.
This was SVN commit r14310.
2013-12-08 16:24:09 +00:00
mimo ad157ad325 fix test broken by #14306
This was SVN commit r14309.
2013-12-08 13:01:59 +00:00
Mythos_Ruler 71d378b7a5 A bunch of stuff.
This was SVN commit r14308.
2013-12-08 13:01:14 +00:00
Enrique 332e23ee9c Edfu temple commit. Needs normal and spec map tweaking (coming soon). Fixes #2220
This was SVN commit r14307.
2013-12-08 11:21:19 +00:00
mimo e173493621 separate gui entityState in two parts to improve gui timing, adresses #2179
This was SVN commit r14306.
2013-12-08 10:02:19 +00:00
wraitii 1f7019f8e6 Might fix an issue on Acropolis where Aegis tried to build a CC too close to his main one.
This was SVN commit r14305.
2013-12-08 09:07:33 +00:00
historic_bruno 3182d6c8ee Reverts 4c9cd2921d fundraiser splash screen now that the fundraiser has ended
This was SVN commit r14304.
2013-12-08 01:35:06 +00:00
Yves f0fe2acdcb Disables JIT compiling of a loop to work around OOS errors in multiplayer games with AI players.
Fixes #2000

This was SVN commit r14303.
2013-12-07 11:49:11 +00:00
sanderd17 ca3f697f9d add iberian monument aura
This was SVN commit r14301.
2013-12-06 18:14:22 +00:00
sanderd17 783907264f cache the offset positions for formations, and only recalculate if the rotation towards a new target is big enough
This was SVN commit r14300.
2013-12-06 10:21:07 +00:00
historic_bruno b1c081e36d Set svn:eol-style=native, fix some inconsistent line endings
This was SVN commit r14299.
2013-12-06 00:42:50 +00:00
sanderd17 8d56504778 fix switching between line and column formation
This was SVN commit r14298.
2013-12-05 20:26:51 +00:00
sanderd17 d3f7da1e27 Let formation attack from the moment the first unit is in range
This was SVN commit r14297.
2013-12-05 19:26:55 +00:00
mimo 9678cf547a cache quantities depending only on the selection, adresses #2179
This was SVN commit r14296.
2013-12-05 18:50:29 +00:00
wraitii 2f3ce82dc3 Fix Aegis no longer building dropsites after the skirmish fix.
This was SVN commit r14295.
2013-12-05 17:34:24 +00:00
Mythos_Ruler 56c805ae93 Texture stuff.
This was SVN commit r14294.
2013-12-05 13:23:22 +00:00
sanderd17 7b82fba8d0 remove distance sorting for formation place assignment, as it made the center of the formation run + remove debug warning in AI code
This was SVN commit r14292.
2013-12-05 12:31:04 +00:00
sanderd17 03d9db0bb7 fix comment
This was SVN commit r14291.
2013-12-05 10:44:39 +00:00
sanderd17 7a1dbca390 make the movement of formations and ships more natural
This was SVN commit r14290.
2013-12-05 10:38:39 +00:00
sanderd17 cf88da5829 improve formations a bit more
* Take obstruction size into account, so bigger units have more space in
formations
* Minimize the maximum walk distance to get in formation by letting the
units far away from the centre pick their positions first

This was SVN commit r14289.
2013-12-05 10:23:49 +00:00
sanderd17 4062e2011f fix tests
This was SVN commit r14288.
2013-12-05 08:53:40 +00:00
wraitii 0ef6397545 Optimize the "Move()" function by removing unnecessary message broadcast. Fixes #2094
This was SVN commit r14287.
2013-12-04 17:38:46 +00:00
wraitii 5f8b6be833 Some additions to the particle system:
This was SVN commit r14286.
2013-12-04 17:21:59 +00:00
wraitii 189ef85538 Fix AI errors on skirmish maps.
This was SVN commit r14285.
2013-12-04 16:52:44 +00:00
sanderd17 60c986c135 * Add method to rangemanager to query around a position instead of an entity
* Use that method in the splash damage calculation
Fixes #2285

This was SVN commit r14283.
2013-12-04 15:30:01 +00:00
sanderd17 367614343b add two files that were deleted by accident in 3afd8e9d9e
This was SVN commit r14282.
2013-12-04 13:15:43 +00:00
sanderd17 3afd8e9d9e better formation place assignments (units run around less)
This was SVN commit r14281.
2013-12-04 13:14:31 +00:00
Mythos_Ruler 3c6045308a Fixing some cursor issues.
This was SVN commit r14280.
2013-12-04 01:56:40 +00:00
Enrique a549d5a08b Fixed aura rays actor
This was SVN commit r14279.
2013-12-04 00:38:09 +00:00
Enrique cd32fafd63 Fixed shader in aura material
This was SVN commit r14278.
2013-12-04 00:35:05 +00:00
Enrique e268c059e5 Healing aura effect placeholder, applied only in athenian temple
This was SVN commit r14277.
2013-12-04 00:25:03 +00:00
Mythos_Ruler bddcd57dea - Fixed a prop typo in the Athenian temple.xml
- Added the first Egyptian music track to the Ptolemies.

- Adjusted the Sacred Band tip text. New pic coming soon.

- Still trying to figure out what to do with "Wasteland" map.

This was SVN commit r14276.
2013-12-04 00:18:52 +00:00
leper a96a333b47 Small cleanup.
This was SVN commit r14274.
2013-12-03 01:01:12 +00:00
quantumstate 68880ca5d5 Make atlas player assignment apply to all of the currently selected units
This was SVN commit r14273.
2013-12-02 22:46:33 +00:00
OmriLahav f09d56fb28 This was SVN commit r14271. 2013-12-02 20:46:25 +00:00
sanderd17 7c3c78f6c9 make sure target has health before taking damage
This was SVN commit r14270.
2013-12-01 20:55:54 +00:00
Mythos_Ruler 3fea8d7c1e Some tips tweaks and new tips.
This was SVN commit r14269.
2013-12-01 18:22:28 +00:00
Mythos_Ruler 168f92e1e9 "Equine Transports" tech for the Persians.
Updated tip images.

This was SVN commit r14268.
2013-12-01 02:49:26 +00:00
Mythos_Ruler d2fccef696 New 4-player skirmish map for Scythetwirler: Watering Holes.
This was SVN commit r14267.
2013-11-30 22:49:54 +00:00
Mythos_Ruler cb7a4fe39c Minor things.
This was SVN commit r14266.
2013-11-30 21:53:56 +00:00
mimo c134108154 remove duplicated code
This was SVN commit r14264.
2013-11-30 18:23:32 +00:00
mimo e88d05e0e4 allow units to guard/escort buildings or units, fixes #2034
This was SVN commit r14263.
2013-11-30 17:30:08 +00:00
sanderd17 1d914c4613 testing visualisation of auras (the elephants need to be replaced with some iconic meshes)
This was SVN commit r14262.
2013-11-30 12:36:48 +00:00
Mythos_Ruler 495716b3ed Reduced the size of a bunch of massive specular maps.
Tweaked some maps.

A new map called "Wasteland". Don't know what to do with it yet.

Dust storm and other particles changes and tweaks.

Tweaks to some maps.

Spec and Norm maps for the Great Pyramid.

New Mace shield prop textures for buildings.

This was SVN commit r14261.
2013-11-30 07:57:29 +00:00
Mythos_Ruler d8362700f0 4 new Successor/Hellenistic shield designs by Enrique. Each has a bronze, silver, bronze player color, and silver player color variation.
Added final Seleucid unit, the Thracian Mercenary Swordsman.

Added spec and normal mapping to the Spartiate shields.

New Seleucid emblem.

This was SVN commit r14260.
2013-11-30 02:58:43 +00:00
Enrique 61c9df2847 Increased ptolemaic barracks size
This was SVN commit r14259.
2013-11-30 01:34:15 +00:00
Mythos_Ruler 44c134e03f Cavalry Archer templates for Seleucids.
This was SVN commit r14258.
2013-11-29 22:24:11 +00:00
Mythos_Ruler 15d87b9ad1 Garrison and Waypoint flags for Seleucids.
Cavalry Archer actors for Seleucids.

This was SVN commit r14257.
2013-11-29 22:23:32 +00:00
JoshuaJB 2e2b1b04ff Fix #2285 by using the original design with additional checks.
This was SVN commit r14256.
2013-11-29 20:34:56 +00:00
Mythos_Ruler 5ce3880d53 Some more Seleucid units.
Tweaked maps.

This was SVN commit r14255.
2013-11-29 19:04:07 +00:00
JoshuaJB 860875c835 Triage #2285. Not the most efficiant, but it works.
This was SVN commit r14254.
2013-11-29 17:46:24 +00:00
sanderd17 25b92ec652 implement spart auras + female boost for males
This was SVN commit r14253.
2013-11-29 13:06:58 +00:00
sanderd17 d18444344c implement pers auras
This was SVN commit r14252.
2013-11-29 12:56:44 +00:00
sanderd17 7bab5421c6 implement mace auras
This was SVN commit r14251.
2013-11-29 12:47:39 +00:00
sanderd17 bb5515a9ee implement hele auras + fix vircengetorix (part 2)
This was SVN commit r14250.
2013-11-29 12:36:18 +00:00
sanderd17 53f376cdc2 implement hele auras + fix vircengetorix
This was SVN commit r14249.
2013-11-29 12:35:58 +00:00
Enrique b0f00d4836 Improved Ptolemaic flag emblem with retouched LionKranzen's eagle
This was SVN commit r14248.
2013-11-29 12:16:15 +00:00
sanderd17 d672c6cf7d make loot tech aware + implement celt and gaul hero auras
This was SVN commit r14247.
2013-11-29 12:13:37 +00:00
sanderd17 ca9944b09c brit + cart hero auras + small code fixes
This was SVN commit r14246.
2013-11-29 10:57:44 +00:00
sanderd17 d403545620 implement all athen auras + add missing files from previous commit
This was SVN commit r14245.
2013-11-29 09:02:41 +00:00
sanderd17 1784e6b9b1 fix some aura typos + implement iphicrates aura
This was SVN commit r14244.
2013-11-29 08:37:15 +00:00
Mythos_Ruler 6c81f23cc8 This was SVN commit r14243. 2013-11-29 04:10:57 +00:00
Mythos_Ruler 7ea031964c A /bunch/ more Seleucid entities and actors. They still need tons of props, textures, and models. Also, not all unit templates are there yet.
Updated the Seleucid civ json.

Tweaked some tooltips to show their unit classes better.

Balancing: Slingers are now 1.5x vs. ranged infantry and 1.25x vs. melee
infantry.

This was SVN commit r14242.
2013-11-29 04:04:10 +00:00
Enrique f54fe9a7d2 Fixed persian and carthaginian camel trader prop position.
Scaled down several AO textures bigger than 1024
Ptolemaic barracks commited

This was SVN commit r14241.
2013-11-29 02:25:47 +00:00
mimo 351468dbe5 fix initialisation of developper overlay for saved games
This was SVN commit r14240.
2013-11-28 18:08:41 +00:00
Mythos_Ruler 65f5fffd9e Partial commit of Seleucid entities and actors.
Testing cost balance for cav skirms.

Reduce Town Phase cost to 800/800.

A bunch of other minor things.

This was SVN commit r14239.
2013-11-28 15:52:18 +00:00
sanderd17 a6ec62c85d fix ptol cav archer upgrade. Fixes #2282
This was SVN commit r14238.
2013-11-28 12:54:28 +00:00
Mythos_Ruler 64c9f84f10 Tweaked Alpine Valleys.
This was SVN commit r14237.
2013-11-28 01:30:18 +00:00
historic_bruno acf1c420c1 Moves management of GL viewports to CRenderer, letting it store the current viewport; calling code can retrieve and restore it later (instead of using deprecated glPush/PopAttrib, previously removed for GLES compatibility by 7dec618898)
This was SVN commit r14235.
2013-11-28 00:57:39 +00:00
mimo 8b0f1c3f1f cleaning
This was SVN commit r14234.
2013-11-27 16:30:14 +00:00
JoshuaJB 43c2219b22 Fix my fix.
This was SVN commit r14233.
2013-11-26 21:38:48 +00:00
JoshuaJB 10b9ace654 Add missing line.
This was SVN commit r14232.
2013-11-26 20:01:09 +00:00
JoshuaJB 4b7ab63172 Fix #1496 with a revised version of my patch. Also moves damage-related functions from Attack.js to a seperate file in the global namespace.
This was SVN commit r14231.
2013-11-26 18:33:42 +00:00
sanderd17 7345d27c84 Summon planes back from the emptyness
This was SVN commit r14230.
2013-11-26 15:12:16 +00:00
JoshuaJB 433b32bdcd Various XpartaMuPP cleanup.
This was SVN commit r14229.
2013-11-25 04:05:41 +00:00
leper c3ebb50711 Fix ratings and print rating changes in the lobby.
Fix game listings.
Fix non-hosts unregistering games.
Patch by scythetwirler.

This was SVN commit r14228.
2013-11-25 02:55:47 +00:00
LordGood d6a9489ccb Ptolemaic walls commit
This was SVN commit r14227.
2013-11-25 00:34:31 +00:00
Mythos_Ruler 2db4f3fe40 A few new portraits from Pureon.
This was SVN commit r14226.
2013-11-24 23:53:29 +00:00
Mythos_Ruler ff0eb70f4a Portrait tweaks for NAF Ele and Tiger.
Added tigers to these maps.

This was SVN commit r14225.
2013-11-24 23:19:41 +00:00
Enrique b08b478403 tweaked tiger animations ratio
This was SVN commit r14224.
2013-11-24 23:07:11 +00:00
Enrique dc8cea3fa4 New tiger mesh, texture and animations
This was SVN commit r14223.
2013-11-24 21:38:36 +00:00
Mythos_Ruler 9fc30533d4 This was SVN commit r14222. 2013-11-24 15:29:23 +00:00
Mythos_Ruler 7109c34297 Observer Hack attempt.
Tweaks to Alpine Valleys and Greek Acropolis.

This was SVN commit r14221.
2013-11-24 15:27:03 +00:00
mimo 6a58044cc6 add missing protection to previous fix, fixes #1052
This was SVN commit r14220.
2013-11-24 10:37:23 +00:00
Mythos_Ruler b7c3efac50 Ptol camel archer a little faster.
Brand new Alpine Valleys skirm map. My take on it anyway. 1v1.

This was SVN commit r14219.
2013-11-23 21:34:03 +00:00
mimo d930244f02 update RallyPoint targets when renamed, fixes #1052
This was SVN commit r14218.
2013-11-23 19:32:59 +00:00
Mythos_Ruler 26c2ded9c5 New specific name for "Hellenization" = Exellinismós
More accurate names for Spartiate and Spartan Woman.

Tweaked some maps.

This was SVN commit r14217.
2013-11-23 15:50:15 +00:00
mimo 3d75d4e69c do not show carrying resources animation in attack-move
This was SVN commit r14216.
2013-11-22 17:43:26 +00:00
leper 5da63764e0 Fix compilation with wxWidgets 3.0.
This was SVN commit r14215.
2013-11-20 19:29:10 +00:00
mimo 09d5507ecb clean some useless code
This was SVN commit r14214.
2013-11-19 21:27:23 +00:00
mimo e8d8673734 let non-fighting units flee when attacked even if the attacker is not visible
This was SVN commit r14213.
2013-11-19 21:20:25 +00:00
Enrique 95d5a25be1 Fixed carry_meat animations for mauryan elephant archers and ptolemaic camel rider
This was SVN commit r14212.
2013-11-18 03:43:36 +00:00
historic_bruno 5ce8de1f0a Removes unused var from JS debugger, from patch by Markus. Fixes #1852
This was SVN commit r14211.
2013-11-17 23:41:19 +00:00
historic_bruno d672d9625d Changes update-workspaces.bat to not generate a vc2013 workspace by default, since the game won't successfully build yet, refs #2271
This was SVN commit r14210.
2013-11-17 23:11:56 +00:00
Enrique c1609697d7 camel armature rider fix.
This was SVN commit r14209.
2013-11-17 22:48:03 +00:00
Mythos_Ruler e397993dae Deleting a bunch of scenarios.
Made peacock easier to hunt.

Fixed elite Ptolemaic slinger promotion.

Reduced the health of basic ranged citizen soldiers slightly.

Updated Deccan Plateau with moar forestry.

Fixed Athenian Marine specific name.

This was SVN commit r14207.
2013-11-17 20:16:57 +00:00
leper e881099d43 Use functions to change variables. Remove broken branding of cheating player.
This was SVN commit r14206.
2013-11-17 18:24:09 +00:00
leper 3a24eab0f0 Cache technology modifiers based on original value. Patch from sanderd17 based on work by Spahbod. Fixes #2045.
This was SVN commit r14205.
2013-11-17 18:24:04 +00:00
mimo 0d876adc13 add some var
This was SVN commit r14204.
2013-11-17 12:28:26 +00:00
Yves 294aa142d8 Fixes compiling with the flag "--without-lobby".
Refs #2267

This was SVN commit r14203.
2013-11-17 11:52:11 +00:00
Mythos_Ruler 7595ea4534 2 player Badlands skirmish.
This was SVN commit r14202.
2013-11-17 01:40:39 +00:00
Mythos_Ruler d5e7c1c44a Fixed Ptolemies and Macedonians death variations in these actors. They were previously throwing an error.
Champion spearmen -> 80 metal instead of 80 wood.

This was SVN commit r14201.
2013-11-16 23:30:34 +00:00
Yves 6fba293088 In #2241 I'm going to change the GUI to have one ScriptInterface for each GUI page because that will be required for the Spidermonkey upgrade (#1886).
The Multiplayer lobby needs some changes to avoid compartment
mismatches. Instead of initializing it with a ScriptInterface and
storing script values at different locations, it takes a ScriptInterface
argument in the functions that really need to read or write some script
values and avoids storing values as script values with an associated
compartment where possible.
The scripting interface of the lobby is also adjusted to use
JSInterface_Lobby.h/cpp files as other components instead of adding all
functions to ScriptFunctions.cpp. This makes it a bit more clearly
arranged IMO.

Fixes #2267
Refs #2241
Refs #1886

This was SVN commit r14199.
2013-11-16 18:38:40 +00:00
Mythos_Ruler 451e801f6a Minor things.
This was SVN commit r14198.
2013-11-16 18:36:35 +00:00
Mythos_Ruler 1f677c17b1 Fixed deccan plateau.
This was SVN commit r14197.
2013-11-16 17:37:13 +00:00
Mythos_Ruler 30c2abd529 Hannibal now rides an Asian elephant.
This was SVN commit r14196.
2013-11-16 17:26:30 +00:00
Mythos_Ruler 6794bc5258 Made tropic forest floor darker.
Tweaked Deccan Plateau skirmish map.

Tweaked Sahel skim map.

This was SVN commit r14195.
2013-11-16 17:24:28 +00:00
Spahbod bde9d19b7a Adding wbg to more maps.
This was SVN commit r14194.
2013-11-16 16:11:43 +00:00
Spahbod d7ef47959d Sahel random map.
This was SVN commit r14193.
2013-11-16 15:17:18 +00:00
Enrique 7ab15cb721 Building animation for mauryan support elephant
This was SVN commit r14192.
2013-11-16 15:05:55 +00:00
Enrique b8e9f74070 Added animations to gaia asian elephant male.
Maur support elephant is now asian, it has new texture.
Added normal texture for the skin of all asian elephants. (only armors
before)

This was SVN commit r14191.
2013-11-16 13:03:58 +00:00
LordGood 19bd71af5d fixed unecessary prop point
This was SVN commit r14190.
2013-11-15 23:52:28 +00:00
LordGood 51b1de2dee Carthaginian Fortress commit!
This was SVN commit r14189.
2013-11-15 23:44:02 +00:00
Yves 3ab983f8a1 Some "varfare" again plus a call to initMusic because that will be needed for the Spidermonkey upgrade.
This was SVN commit r14188.
2013-11-15 18:35:19 +00:00
Mythos_Ruler 54fcb3b4ca Updated (and completed) Sahel skirmish map.
This was SVN commit r14187.
2013-11-15 16:41:05 +00:00
Mythos_Ruler 1cd4e6ffdd Round footprint for lighthouse.
Some spec and normal maps for some shields.

Updated some skirmish maps.

This was SVN commit r14186.
2013-11-15 15:26:57 +00:00
Spahbod 9dbd8dbb26 Fixing the broken water on gulf of bothnia.
This was SVN commit r14185.
2013-11-15 14:42:18 +00:00
Enrique 5dc7d8dc9f missing lighthouse files
This was SVN commit r14184.
2013-11-15 13:52:57 +00:00
Spahbod ca0575e422 Increasing thIncreasing the generation speed of the maps: Phoenician Levant
This was SVN commit r14183.
2013-11-15 08:57:32 +00:00
Enrique 98638a2d2f Ptolemaic lighthouse and LordGood's new carthaginian defense tower.
Fixed ptolemaic fortress garrison flag

This was SVN commit r14182.
2013-11-15 02:52:04 +00:00
leper 47b26e56d3 Remove unused VideoRecorder from Atlas.
This was SVN commit r14181.
2013-11-14 23:05:07 +00:00
alpha123 d459e97d33 Remove unnecessary Territory element from the fortress and defense tower templates.
This was SVN commit r14180.
2013-11-14 21:58:49 +00:00
alpha123 9266d30e17 Build on cf4f7d18a7 based on discussion on IRC. Allow fortresses, towers, and wall towers to attack siege again, but debonus them 0.5x against it. Bonus catapults 1.25x vs fortresses, but reduce their attack vs buildings slightly in order to make them effective against all buildings but slightly better against fortresses' huge HP. They still have far less DPS than rams, even against fortresses, but are more flexible and are ranged. Enforce a minimum distance of 60 between fortresses, meaning that fewer can fire on siege weapons at once, and turtling is slightly less effective in general. Minor stat changes dealing with range of towers, fortresses, and catapults. Increase catapult splash radius and decrease splash damage, to make catapults more effective as semi-static defense against large numbers of infantry.
This was SVN commit r14179.
2013-11-14 21:49:02 +00:00
alpha123 a3a7f1cd22 Adjust siege ram.
- Decrease attack from 50c with 2x vs buildings (3x vs gates) to 80c
with 1.5x vs gates.
- Increase charge attack from 40c with 2x vs buildings (3x vs gates) to
100c with 1.5x vs gates.

This was SVN commit r14178.
2013-11-14 21:15:51 +00:00
Ykkrosh 8ecfbd0899 Remove unused includes of tr1/unordered_map etc.
They cause build errors with libc++, and we always use
boost::unordered_map instead.

This was SVN commit r14177.
2013-11-14 20:47:59 +00:00
alpha123 cfba68f8d2 Increase Advanced Siege tech from +3 crush to +5 crush.
This was SVN commit r14176.
2013-11-14 20:36:05 +00:00
alpha123 cf4f7d18a7 Buff catapults slightly.
- Add 'Siege' to the RestrictedClasses of towers, wall towers, and
fortresses. A fortress by itself should not be able to shoot down a
catapult, it should require some defense. This also nerfs building a ton
of towers and fortresses, which was previously very difficult to
penetrate and led to long, boring wars of attrition.
- Increase armor from 2h/10p/5c to 2h/30p/10c (matches siege rams).
- Increase attack from 30h/0p/30c to 0h/20p/35c. Would like to add techs
to increase damage further.
- Reduce splash damage to 0h/15p/30c from 40h/0p/40c.
- Increase maximum range from 68 to 75. May increase this more or add
techs.
Motivation is that siege catapults are relatively weak late-game, as
they have great difficulting penetrating fortified positions, leading to
both sides turtling. Additionally, this makes them roughly as strong as
siege rams, having less damage output than rams but having the ability
to attack from a distance. This balances out the civs without rams and
gives the ones with both rams and catapults an additional choice to
make.

This was SVN commit r14174.
2013-11-14 20:30:00 +00:00
Spahbod a04cc9f01b Increasing the generation speed of the maps: Northern Lights, Rhine Marshlands
This was SVN commit r14173.
2013-11-14 18:58:55 +00:00
Yves 8dedf7bc3d Fixes a graphics issue on Linux (probably a driver bug) by scaling the images from 1x1024 px to 4x1024 px.
Fixes #2265

This was SVN commit r14172.
2013-11-14 17:19:49 +00:00
Enrique b4174664c6 hellenic walltower door fixed
This was SVN commit r14171.
2013-11-14 16:26:46 +00:00
Spahbod 0170db4a53 Adding advanced graphical features into random maps. Fixes #2262.
This was SVN commit r14170.
2013-11-14 14:33:55 +00:00
Spahbod 11c471273c Committing the fix for undefined civs in atlas, and the problem with ptolemics in Fortress map by FeXoR. Fixes #2258.
This was SVN commit r14169.
2013-11-14 12:27:56 +00:00
mimo 321e61617b Improve MoveToTarget when the target is moving, fixes #2253
This was SVN commit r14168.
2013-11-14 07:25:56 +00:00
leper 4915116ccc Fix glooxwrapper build on gcc 4.2 and warning on clang.
This was SVN commit r14167.
2013-11-14 00:32:28 +00:00
leper 4c395f4bf2 Remove Trigger and Cinematic sections from Atlas.
This was SVN commit r14166.
2013-11-14 00:10:04 +00:00
Ykkrosh bd900362ea Rebuild premake4.exe with VC++ 2008 again, so that it works on WinXP/2003
This was SVN commit r14164.
2013-11-13 21:16:06 +00:00
leper e58fa107cc Fix skeleton caching.
This was SVN commit r14163.
2013-11-13 20:05:57 +00:00
Spahbod 49721cff33 Increasing the generation speed of the maps: Unknown Land
This was SVN commit r14162.
2013-11-13 14:30:27 +00:00
Spahbod 62551be685 New Random Map: Mainland. A simple map without any body of water. Also the space between the forests is increased. Optimizing the map for relatively lag-free games.
This was SVN commit r14161.
2013-11-13 13:36:47 +00:00
Spahbod 0d323c020b Increasing the generation speed of the maps: Archipelago, Gulf of Bothnia, Lorraine Plain
This was SVN commit r14160.
2013-11-13 13:17:22 +00:00
Spahbod 5dac329c78 Increasing the generation speed of the maps: Aegean Sea
This was SVN commit r14159.
2013-11-13 10:20:22 +00:00
Spahbod 65bd13ac1e Increasing the generation speed of the maps: Syria
This was SVN commit r14158.
2013-11-13 08:07:05 +00:00
Enrique 4acbf86ffb Trying to fix crazy elephant armature
This was SVN commit r14157.
2013-11-12 21:30:25 +00:00
Enrique 2f0d6ee1e8 Upgraded asian elephant animations.
This was SVN commit r14156.
2013-11-12 19:13:45 +00:00
sanderd17 17fdb515f4 fix error when selecting multiple elephants
This was SVN commit r14155.
2013-11-12 19:03:12 +00:00
historic_bruno 7cb4c0dcfc Partial fix of minimap rendering for GLES.
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
modifies shaders as needed.

This was SVN commit r14153.
2013-11-12 01:31:52 +00:00
historic_bruno 7dec618898 Some attempts to fix GLES build in smooth LOS and post proc manager.
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
replaces glPush/PopAttrib by resetting the viewport manually.
Adjusts GLSL shaders for these changes.

This was SVN commit r14152.
2013-11-12 01:30:17 +00:00
historic_bruno f1613a3c90 Fixes fancy waves build on GLES (replaces GL_QUADS with GL_TRIANGLES)
This was SVN commit r14151.
2013-11-12 01:25:32 +00:00
historic_bruno 81eabfc934 Fixes basic water rendering on GLES (replaces GL_QUADS with GL_TRIANGLES).
Sets SDL2 to use correct profile for GLES.
Cleans up some old SDL 1.3 version checks.

This was SVN commit r14150.
2013-11-12 01:24:04 +00:00
historic_bruno 5771bee032 First pass at fixing GLES build - more to come
This was SVN commit r14149.
2013-11-12 01:17:16 +00:00
historic_bruno 0682c23fe3 Replaces BGRA textures with RGBA textures supported by GLES
This was SVN commit r14148.
2013-11-12 01:11:08 +00:00
Enrique 54abce1a3c hellenic walltower rotated 180 to match the droppoint with the wall RMS
This was SVN commit r14147.
2013-11-12 00:05:26 +00:00
mimo df1d5d2260 fix tag 2102648f7c which had unwanted changes
This was SVN commit r14146.
2013-11-11 16:29:44 +00:00
Mythos_Ruler 0e74e3a521 Removed Ostorius.
This was SVN commit r14145.
2013-11-11 16:09:00 +00:00
mimo 2102648f7c Allows autogarrison of newly trained units, fixes #1044
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
mimo fad8f7fce0 adds some needed protection
This was SVN commit r14143.
2013-11-11 15:03:22 +00:00
historic_bruno 3d8865f10b Adds gloox to OS X libs build script, with patch to fix build (fixed upstream in 5de9ed7444).
Fixes lobby build on OS X.
Fixes zlib not building as static lib.

This was SVN commit r14142.
2013-11-11 04:41:44 +00:00
historic_bruno 29ef5f3ce9 Adds patch for SDL 1.2 build on OS X 10.9 (Mavericks), CGDirectPaletteRef was deprecated and has now been removed. See https://bugzilla.libsdl.org/show_bug.cgi?id=2085
This was SVN commit r14141.
2013-11-11 01:19:55 +00:00
historic_bruno 45a7f577d3 A bunch of OS X SDK-related fixes.
Adds runtime support for 10.5 APIs: display modes, bundle paths, system
paths, pasteboards. Previously this was compile-time support only, which
prevented building on later SDKs while targeting earlier APIs.
Adds hardcoded version for pre-10.6 builds, to avoid messing with
deprecated Gestalt or having to add a 10.5 non-dispatch singleton (Grand
Central Dispatch didn't exist in 10.5)

This was SVN commit r14140.
2013-11-11 00:11:25 +00:00
historic_bruno 011cbb5725 Fixes OS X STL incompatibilities when building against later SDKs and targeting 10.5 (fixes stringstream build errors in these conditions)
This was SVN commit r14139.
2013-11-11 00:09:16 +00:00
historic_bruno 5c2c7248b1 Adds zlib, curl, iconv and libxml2 to OS X libs build script, to avoid using the non-backward-compatible versions provided by Apple.
Adds patch for zlib configure to pick up CFLAGS/LDFLAGS, to better
support SDK builds.
Cleans up OS X libs build script, hides some extraneous output.

This was SVN commit r14138.
2013-11-11 00:04:07 +00:00
leper 4406be3a69 Fix crash when trying to join the lobby again if the host disconnected in the game setup screen.
This was SVN commit r14137.
2013-11-10 22:42:48 +00:00
alpha123 f070bf9d1e Prohibit the user from picking the 'system' lobby name, as that's reserved for special messages.
This was SVN commit r14136.
2013-11-10 21:52:38 +00:00
alpha123 e01445818a Nerf/rebalance siege towers.
- Armor changed from 2h/20p/10c to 5h/20p/2c
- Attack changed from 25p to 10p/5c
- Bonus added: 2x vs structures
- Ranged reduced from 65 to 55
- Elevation bonus of 10 added
- PreferredClasses is now 'Structure'
- Ungarrisoned arrow count decreased to 0 from 2
- Build time increased to 60 from 50
- BuffHeal is now 0 (decreased from 1)
- Health reduced from 800 to 500
- Walking speed reduced to 5 from 6

The idea is for siege towers to be useful for siege, but also for
cleaning out large numbers of units. Previously they were very good at
the latter and useless for the former. They should still be very
powerful units, but not uncounterable and massing siege towers
(previously unbeatable if enough were acquired) should no longer be
feasible.

This was SVN commit r14135.
2013-11-10 20:21:50 +00:00
Mythos_Ruler 2811d4c367 Fixed this map.
This was SVN commit r14134.
2013-11-10 19:22:24 +00:00
Mythos_Ruler 912e485a64 Elephant changes and tweaks.
This was SVN commit r14133.
2013-11-10 19:08:38 +00:00
Enrique 85e9a2b0ce Added 3 idle animations and attack, death and walk animations for all asian elephants.
Maurya hero howdah added with normal and specular maps

This was SVN commit r14132.
2013-11-10 17:39:04 +00:00
Spahbod a2477f9d40 Increasing the generation speed of the maps: Alpine Lakes
This was SVN commit r14131.
2013-11-10 17:29:40 +00:00
Ykkrosh a96ed190a5 Add GLX_MESA_query_renderer support to hwdetect
This was SVN commit r14130.
2013-11-10 16:24:03 +00:00
Ykkrosh d178f32698 Fix Unicode in JS print() on Linux
This was SVN commit r14129.
2013-11-10 16:13:40 +00:00
JoshuaJB c27c663697 Print a traceback after an exception in the bot.
This was SVN commit r14128.
2013-11-10 04:28:18 +00:00
JoshuaJB 59da5fad2a Fix some spidermonkey lobby complaints when run in strict mode.
This was SVN commit r14127.
2013-11-10 04:09:03 +00:00
historic_bruno 174f636fd2 Fixes tests
This was SVN commit r14126.
2013-11-10 03:24:29 +00:00
leper 37cedb8133 Make filters work and add a skirmish map filter.
This was SVN commit r14125.
2013-11-10 00:45:19 +00:00
leper 4fb6896fd8 Fix warning when the hosted game is a random rms.
This was SVN commit r14124.
2013-11-09 23:57:31 +00:00
Ykkrosh d7ec8c47a6 Fix Unicode support in lobby.
Fix EncryptPassword being called with the wrong argument order, and
encrypting username instead of password. (This will break all existing
lobby accounts.)

Fix EncryptPassword not using all of salt_base.

This was SVN commit r14123.
2013-11-09 23:26:17 +00:00
Ykkrosh 35d48d2fe8 ...and increase HDATA_USER_SIZE so OglTex actually fits
This was SVN commit r14122.
2013-11-09 18:49:35 +00:00
Ykkrosh 1ad9d5424a Fix error at startup on 64-bit builds.
OglTex had a size_t added, which pushed it over HDATA_USER_SIZE.
Use u32 instead to minimise the difference between platforms.

This was SVN commit r14121.
2013-11-09 18:39:45 +00:00
Spahbod dcb3c0ad7a Increasing the generation speed of the maps: Continent
This was SVN commit r14120.
2013-11-09 16:00:01 +00:00
Mythos_Ruler d3fade285b Basic Nubian archer textures.
Map preview for Corsica and Sardinia.

This was SVN commit r14119.
2013-11-09 14:42:32 +00:00
sanderd17 2d2853dd6f Fix problems with EndGameManager in Atlas by waiting for the first turn
This was SVN commit r14118.
2013-11-09 10:09:28 +00:00
historic_bruno 9cc172b164 Fixes --without-lobby for MSVC and clang, refs #2249.
Cleans up some whitespace.
Removes obsolete PCH files.

This was SVN commit r14117.
2013-11-09 02:57:10 +00:00
Ykkrosh 3c47b12cbe Display texture memory usage in profiler's renderer stats
This was SVN commit r14116.
2013-11-09 01:03:23 +00:00
mimo 3a278df3f7 Move ship to shoreline when tasking units to garrison inside, fixes #1391
This was SVN commit r14115.
2013-11-08 23:22:59 +00:00
leper 5dfc3746e3 Remove old and unused archive stats.
This was SVN commit r14114.
2013-11-08 17:27:21 +00:00
leper 81cf02cc13 Fix building with --without-lobby. Fixes #2249.
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
leper 0f8d3e23db ;
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
RedFox 1a32a10f52 Updated premake to support VS2013. Also changed platform toolsets to vc110_xp and vc120_xp for VS2012 and VS2013 respectively. This way the builds will also work on WinXP.
This was SVN commit r14111.
2013-11-08 14:08:16 +00:00
sanderd17 da6abe630a Fix error message on starting game due to missing global variable.
This was SVN commit r14110.
2013-11-08 09:52:48 +00:00
Spahbod 7547dae0e2 Fixing the revert by the previous commit.
This was SVN commit r14109.
2013-11-08 08:04:35 +00:00
Spahbod f88b5be079 Increasing the generation speed of the maps: Islands, Lake.
This was SVN commit r14108.
2013-11-08 08:02:32 +00:00
JoshuaJB bb28e0eb70 Fix some system message/spam filter bugs in the lobby.
This was SVN commit r14107.
2013-11-08 00:57:58 +00:00
Ykkrosh 1138419017 Remove broken build script
This was SVN commit r14106.
2013-11-07 22:20:38 +00:00
JoshuaJB 62b92af925 Fix lobby registration errors.
This was SVN commit r14105.
2013-11-07 22:07:26 +00:00
Ykkrosh f53bd8974c Add autobuilder support for glooxwrapper
This was SVN commit r14103.
2013-11-07 21:45:59 +00:00
Yves 93cffe9deb Remove the old and no longer used archive builder that rebuilt the archive while the game is running.
This approach isn't used anymore. Now we start the archive building with
parameters to pyrogeneis.

Refs #2241 (the code used g_ScriptingHost which is going to be removed)

This was SVN commit r14102.
2013-11-07 21:06:18 +00:00
JoshuaJB 87e9c5694e Change the LOGWARNING when a config setting doesn't exist to a LOGMESSAGE.
This was SVN commit r14101.
2013-11-07 21:02:22 +00:00
JoshuaJB 8d5d66e57b Fix error that slipped into the lobby commit.
This was SVN commit r14099.
2013-11-07 20:10:59 +00:00
JoshuaJB bffe917914 Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby.
This was SVN commit r14098.
2013-11-07 20:07:24 +00:00
JoshuaJB d7121f4f55 glooxwrapper by Philip to support building gloox on Windows.
This was SVN commit r14097.
2013-11-07 19:38:09 +00:00
JoshuaJB 10e23c173d Add gloox library files.
This was SVN commit r14096.
2013-11-07 19:04:30 +00:00
Spahbod fe0510c079 Again increasing the generation speed of Islands random map by using the new chain placer. As a side effect, the map is more beautiful.
This was SVN commit r14095.
2013-11-07 19:02:09 +00:00
JoshuaJB b416de9b7c Remove the unused crypto++ library files.
This was SVN commit r14094.
2013-11-07 18:50:52 +00:00
JoshuaJB 3298dce158 Remove the unused crypto++ library.
This was SVN commit r14093.
2013-11-07 18:49:43 +00:00
sanderd17 3743e58f9a allow enabling the game clock as a persistent setting
This was SVN commit r14092.
2013-11-07 18:06:52 +00:00
Spahbod 6d62b3bf40 Added a new "placer" function for the rmgen library.
This new placer generates terrain features that are less "predictable".
It also increases the map generation time considerably.

Currently it is only implemented on Persian Highlands random map.

This was SVN commit r14091.
2013-11-07 14:50:16 +00:00
Spahbod b7751a277c Cleanup
This was SVN commit r14090.
2013-11-07 12:38:41 +00:00
Spahbod 5ec4962184 Decreasing the generation time of Islands random map to about 2/3 of the original.
This was SVN commit r14089.
2013-11-07 12:00:04 +00:00
mimo 9b98585275 Remember the last market for back-to-order trading, fixes #2248
This was SVN commit r14088.
2013-11-06 21:07:19 +00:00
sanderd17 9ffe235b2f Clean up EndGameManager. Fixes #2130
This was SVN commit r14087.
2013-11-05 19:40:50 +00:00
sanderd17 68fa9f4631 Fix building contstruction, but still don't allow positive regenrate for unhealable entities
This was SVN commit r14086.
2013-11-05 17:45:39 +00:00
Mythos_Ruler 24bc451852 Corsica and Sardinia skirmish map. Needs Iberian circuit wall.
This was SVN commit r14085.
2013-11-05 16:12:58 +00:00
sanderd17 8540740b35 disallow healing of unhealable entities via all ways
This was SVN commit r14084.
2013-11-05 07:07:10 +00:00
mimo 6fae05b5f6 fix
This was SVN commit r14083.
2013-11-03 17:41:59 +00:00
mimo 0362453035 test some components before use, adresses #2206
This was SVN commit r14082.
2013-11-03 17:18:43 +00:00
Mythos_Ruler 53a270347a Map preview for Zagros Mtns.
Changed preview for Greek acrpolis.

Fixed quote attribution. Thanks anfialro.

This was SVN commit r14081.
2013-11-03 16:39:28 +00:00
Mythos_Ruler f1100f10c1 Standardized Cav Spearmen animations.
This was SVN commit r14080.
2013-11-03 14:17:33 +00:00
sanderd17 c62cc3ee44 rename technology modifier 'multiplier' to 'multiply' for consistency with auras, and it looks better next to the existing 'add'
This was SVN commit r14079.
2013-11-03 14:09:32 +00:00
Mythos_Ruler e4f2ddb738 Renamed a bunch of maps.
This was SVN commit r14078.
2013-11-03 14:06:49 +00:00
Mythos_Ruler 5dc553bf91 More shield changes.
Tweaked number of 5-pop houses on Sicilia skirmish map.

New "Sahel" Skirmish map.

This was SVN commit r14077.
2013-11-03 14:01:45 +00:00
Mythos_Ruler 34e09220a4 Normal and spec maps for a bunch of shields.
This was SVN commit r14076.
2013-11-03 13:36:16 +00:00
sanderd17 e0161bd355 small code style fix
This was SVN commit r14075.
2013-11-03 13:15:44 +00:00
sanderd17 6dca6910c3 Recursively count garrisoned units to avoid overcapacity
This was SVN commit r14074.
2013-11-03 13:13:30 +00:00
Ykkrosh 72e11a2dea Fix VS2013 build errors, warnings
This was SVN commit r14073.
2013-11-03 12:46:07 +00:00
Mythos_Ruler 37f5aa5351 Standardized animations for cavalry swordsmen. Will do the same for cavalry spearmen. This is to help the player differentiate the unit types better.
This was SVN commit r14072.
2013-11-03 10:31:57 +00:00
Mythos_Ruler 768c821f13 Acropolis 7 scenario renamed to "Acropolis Night."
Cycladic Archipelago 06 and Deccan Plateau 01 scenarios deleted.

Gambia River skirmish map (still needs 2 out of 3 Iberian wall
circuits).

This was SVN commit r14071.
2013-11-03 10:14:43 +00:00
Mythos_Ruler 096fc43f9e Three new skirmish maps. 2 need Iberians walls though.
Deleted a couple of scenarios.

This was SVN commit r14070.
2013-11-03 09:51:16 +00:00
Mythos_Ruler f4bd08427c Trader speed tech!
This was SVN commit r14069.
2013-11-03 05:40:43 +00:00
Ykkrosh 29e4b1a17c Update Android support
This was SVN commit r14068.
2013-11-02 23:05:38 +00:00
Ykkrosh 8aa6485d78 Fix shader errors with OpenGL ES
This was SVN commit r14067.
2013-11-02 22:58:38 +00:00
Mythos_Ruler ba5b572ccc Iberian walls for Caspian Sea skirmish map.
Rubble for these houses.

This was SVN commit r14066.
2013-11-02 16:54:15 +00:00
Mythos_Ruler c1c45bd7c8 Caspian Sea skirmish map.
Clouds.

This was SVN commit r14065.
2013-11-02 15:28:33 +00:00
Ykkrosh 1fa2fc9739 CClientArea parsing test
This was SVN commit r14064.
2013-11-02 14:39:08 +00:00
mimo ce7c97b79f Improve back to work behaviour (queues taken into account), fix #2206, patch from Itms
This was SVN commit r14063.
2013-11-01 22:00:06 +00:00
mimo 358e8f5992 Remove ResourceGatherer for animals
This was SVN commit r14062.
2013-10-31 19:37:42 +00:00
Mythos_Ruler 552a4527ca Iberian walls for Deccan Plateau skirmish map.
Specific Name for Mauryan maiden guards (Visha Kanya).

Clarified the Iberian json a bit.

Some tooltip tweaking.

This was SVN commit r14060.
2013-10-31 17:21:10 +00:00
sanderd17 543ec3a8c7 Fix launching skirmish maps without selecting a civ
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
sanderd17 60fb5ed1c3 - Fix garisson and formation aura types
- Implement tech mods for UnitMotion speeds, Fixes #1958, based on patch
by wraitii
- Implement athen_hero_themistocles ship speed aura as a test

This was SVN commit r14058.
2013-10-30 16:12:53 +00:00
Ykkrosh 2d1be3d47e Improve correctness of hotkeys at low framerates.
SDL queues up all the input events received in a frame. When the hotkey
system saw a key up/down event, it immediately updated its
HotkeyIsPressed state and then pushed a hotkey event onto the end of the
queue.

If the initial queue was e.g. [key-down shift, key-press Z, key-up
shift], the hotkey event triggered by Z would be processed after the
key-up shift had updated the HotkeyIsPressed state, so the handler of
the Z hotkey would not think the shift hotkey was pressed.

If the initial queue was e.g. [key-press Z, mouse-click], the hotkey
triggered by Z would be processed after the mouse-click event, so it
could apply to the wrong building selection.

Fix by pushing the hotkey events onto a special queue that gets
processed before any subsequent SDL input events.

Also update the HotkeyIsPressed status when the HOTKEYDOWN/HOTKEYUP
events are processed, not when they are generated, to guarantee they are
consistent with the DOWN/UP events.

Fixes #1869.

This was SVN commit r14057.
2013-10-30 01:38:32 +00:00
Gallaecio 11c7c44a0b Fixed typos reported in Transifex by qwertz and Loki.
This was SVN commit r14056.
2013-10-29 23:22:09 +00:00
Gallaecio b67c411b33 Fix typos in template files. Refs #2185.
This was SVN commit r14055.
2013-10-28 20:26:35 +00:00
Gallaecio 15f09f7005 Fix typos in civilization files. Refs #2185.
This was SVN commit r14054.
2013-10-28 20:21:27 +00:00
Gallaecio 538c250d67 Fix typos in descriptions of random maps. Refs #2185.
This was SVN commit r14053.
2013-10-28 20:19:09 +00:00
Gallaecio dd7445262c Typo: enemey → enemy.
This was SVN commit r14052.
2013-10-28 20:01:51 +00:00
leper fcde137b30 Viriato.
This was SVN commit r14051.
2013-10-28 14:35:25 +00:00
JoshuaJB e2f475b86a Make the *nix ARM support a little sturdier, Fixes #2121
This was SVN commit r14050.
2013-10-27 21:06:15 +00:00
leper 3173722099 Copy this.entites in GarrisonHolder before passing and modifying it. Patch by mimo. Fixes #2238.
This was SVN commit r14049.
2013-10-27 16:37:51 +00:00
Mythos_Ruler 31e79e6709 Reorders the game setup drop list for maps.
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
Mythos_Ruler 30af350e31 New Neareastern Badlands skirmish map and it's awesome with Whizbang Graphics (WBG) enabled.
Tweaked some stuff on a few maps.

Fixed Iberian Walls for Nile River skirmish.

Changed names for Ptolemaic warships.

A couple of technology portraits for Advanced and Elite upgrades (these
techs are not implemented, but planned).

This was SVN commit r14047.
2013-10-26 15:10:15 +00:00
OmriLahav 597da2ff9d Alpha 14 remake
This was SVN commit r14045.
2013-10-26 11:10:21 +00:00
Mythos_Ruler a45b074b07 Renamed the Arabian Oasis maps to Libyan Oasis, because the Egyptian eye candy assets insinuate the Libyan Desert instead of the Arabian Desert.
Changed Nile River maps to "naval" maps because the AI gets stuck trying
to cross the river.

Renamed the "ptol" statue ruins to "egyptian" statue ruins. Makes them
more generically "Egyptian".

Ensured siege engines can only be built in City Phase.

This was SVN commit r14044.
2013-10-26 10:31:52 +00:00
Mythos_Ruler 64dc783a18 Simplified the Spartan population penalty.
Changed costs on a few units.

New tooltips and hero auras for Carthaginian heroes Hannibal, Hamilcar,
and Maharbal. (see: wiki civ profile)

Fixed specificname for some Carthaginian units.

Added a field entity for "skirmish" maps.

This was SVN commit r14043.
2013-10-26 09:40:21 +00:00
Mythos_Ruler fe6d508a82 Punjab skirmish map.
Some map tweaks.

This was SVN commit r14042.
2013-10-26 03:07:03 +00:00
Mythos_Ruler 1ee4c52779 All 4 players on Nile River skirmish map now have Iberian walls.
This was SVN commit r14041.
2013-10-25 09:00:46 +00:00
Mythos_Ruler 10ddc2aed6 Fixed starting unit for Ptolemies.
Nile River skirmish map (still needs Iberian walls for 2 of the
players).

New map preview for Arabian Oasis.

Moved Civic Center back to Town Phase, but made it take twice as long to
build.

Fixed elephant template.

Fixed up Persian Highlands skirmish map based on some notes from
Alpha123.

This was SVN commit r14040.
2013-10-25 08:02:55 +00:00
OmriLahav 14166af0ac This was SVN commit r14038. 2013-10-24 09:46:26 +00:00
leper 4e86b00a05 Remove inconsistencies in the manual. Refs #2185.
Fix player name.
Make log messages when saving games use quotes around paths.

This was SVN commit r14037.
2013-10-23 22:18:40 +00:00
Yves 20ed5b118c Unify script conversions and remove JSInterface_Vector3D.
Because it was historically grown, we have some duplicated code for
converting script types to native types.
This patch removes the file JSConversions.cpp and moves some code to
ScriptConversions.cpp.
The places using JSConversions.cpp are changed to use the
ScriptInterface's conversion functions in ScriptConversions.cpp.
I also removed JSInterface_Vector3D because it had additional
requirements to the conversion code that no other code has and because
it's currently not used. I think it doesn't make sense to maintain code
just because it could possibly be used again later.

Closes #2213
Refs #1886

This was SVN commit r14036.
2013-10-20 17:13:53 +00:00
Ykkrosh a4cd90ddfc Avoid non-ASCII characters in source code, since tools don't decode them consistently.
Fixes #2198.

This was SVN commit r14035.
2013-10-20 09:27:44 +00:00
leper d6f6d2b145 Remove useless error messages.
This was SVN commit r14034.
2013-10-20 01:47:16 +00:00
Mythos_Ruler 2117f77812 Fixed some resource placement.
This was SVN commit r14033.
2013-10-20 01:18:59 +00:00
Mythos_Ruler 50a2bddf77 Fixed some goats.
This was SVN commit r14032.
2013-10-20 01:10:02 +00:00
Mythos_Ruler 34d927f25c These two skirmish maps are now complete with walls for Iberians.
This was SVN commit r14031.
2013-10-19 23:52:28 +00:00
Mythos_Ruler 15f565f316 Corinthian Isthmus and Persian Highlands skirmish maps (wip).
This was SVN commit r14030.
2013-10-19 20:54:41 +00:00
leper 742c489353 Fix typos, remove BOMs and add newlines before EOF. Refs #2185. Patch by Gallaecio.
This was SVN commit r14029.
2013-10-19 20:13:48 +00:00
leper 71a41ba401 Line endings. Refs #2185.
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
Mythos_Ruler 45d4e92782 Fixed building requirements for Town Phase.
Changed Brit Wonder to the new Stonehenge model. :)

Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092

This was SVN commit r14027.
2013-10-19 18:20:25 +00:00
Yves b9892bc73a Remove ScriptableObject/CJSObject
Since all remaining uses of ScriptableObject/CJSObject have been
removed, the related files can now also be removed.
Closes #2212
Refs #2126
Refs #2137
Refs #1886

This was SVN commit r14026.
2013-10-19 10:14:08 +00:00
Ykkrosh 024dd82209 Fix non-PCH build
This was SVN commit r14024.
2013-10-19 01:11:20 +00:00
Ykkrosh ac335f37c8 Fix some Clang warnings about unused private members
This was SVN commit r14023.
2013-10-19 00:53:58 +00:00
leper c0b628bcac Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210, #2211.
This was SVN commit r14022.
2013-10-18 20:33:08 +00:00
Ykkrosh 701508922f Use CStrIntern for font names to reduce lookup cost
This was SVN commit r14020.
2013-10-18 16:15:42 +00:00
Ykkrosh 91169c82c7 Optimise rendering of scrollable text boxes by clipping
Add optional clipping rectangle to CTextRenderer. Strings that are
printed
outside the vertical extent of the clipping rectangle will be
immediately
skipped. This greatly reduces the cost of large scrollable text boxes.

This was SVN commit r14019.
2013-10-18 16:05:02 +00:00
Ykkrosh 751558d894 Optimise text rendering by batching
When CTextRenderer is given multiple strings with no differences other
than position, render them in a single glDrawElements call to reduce
driver overhead.

Also avoid some unnecessary copies of std::wstrings.

This helps performance a bit with large GUI text boxes.

This was SVN commit r14018.
2013-10-18 16:02:48 +00:00
Ykkrosh b6c7c0d799 Optimise glyph lookup in text renderer
std::map lookup was a major cost when rendering large amounts of text.
Replace it with a more efficient 2-level array.

This was SVN commit r14017.
2013-10-18 15:56:12 +00:00
Ykkrosh 5778484a77 Refactor text renderer
Replace unifont with CFont and CFontManager, since the h_mgr interface
was
needlessly inconvenient.

Load the font textures through CTextureManager, to support dynamic
reloading (e.g. when resetting GL state - see #741).

Add CFontMetrics as a convenient wrapper for code that just wants to
measure text.

Fixes #1117.

This was SVN commit r14016.
2013-10-18 15:53:07 +00:00
Ykkrosh 8799bd98b0 Support 8bpp textures
When textures.xml specifies format="alpha", the input is expected to be
an
8-bit greyscale PNG, and the output will be an 8-bit uncompressed
alpha-only DDS.

Add format override to CTextureProperties, to select between e.g.
GL_ALPHA
and GL_LUMINANCE for 8-bit textures.

This is needed so fonts can use the new texture system.

This was SVN commit r14015.
2013-10-18 15:36:31 +00:00
leper 6a2fac7a58 Add hotkeys for JSDebugger commands. Patch by sathyam. Fixes #2208.
This was SVN commit r14014.
2013-10-18 14:41:08 +00:00
Enrique 9802adf92f celt_stonehenge with normal and spec maps. Fixes #2053
This was SVN commit r14013.
2013-10-18 14:29:10 +00:00
sanderd17 f3968c0d4c fix some flaws in the preferred classes. Patch by Jammus, Fixes #1985
This was SVN commit r14011.
2013-10-16 19:08:01 +00:00
sanderd17 e6d9094c98 Remove InitSavedGame, but keep the rallypoint problem it solved. Fixes #1762, Patch by mimo.
This was SVN commit r14010.
2013-10-16 17:58:12 +00:00
OmriLahav 6c3c6cfd3a This was SVN commit r14009. 2013-10-16 14:08:47 +00:00
Ykkrosh a2f836c393 Prevent bogus -Wmaybe-uninitialized warnings in GCC
This was SVN commit r14008.
2013-10-16 12:22:50 +00:00
Mythos_Ruler eb33d0fd61 New unit for Romans: "Italian Allied Cavalry" which can help counter archers.
Persians and Mauryans still have uber archers, but must first pay for
them by researching "Archery Tradition" at the Barracks for 200F 300W.
This technology adds +10 meters to the range of all bow-using units,
plus makes archer units train faster (but have less health).

This was SVN commit r14007.
2013-10-16 01:04:55 +00:00
Mythos_Ruler 8456d50015 Found a couple more. (removing stonewall attack restriction).
This was SVN commit r14006.
2013-10-15 22:43:59 +00:00
Mythos_Ruler 8053cbd474 Remove the attack restriction for units against stone walls. May add it back for ranged units like archers and javelinists, after some discussion. I also feel it would be kind of weird to "charge" a stone wall (except for battering rams and elephants). So, we'll have to talk about it some more. But for now, let's test this out.
This was SVN commit r14005.
2013-10-15 22:43:06 +00:00
Enrique 40db79df33 greek docks do not show warships in the foundation until construction is finished.
Different actor variations of the building can be displayed while
construction naming their variation to "scaffold"

This was SVN commit r14004.
2013-10-15 21:24:20 +00:00
sanderd17 2bbbcff811 fix tests, breaking caused by renaming files.
This was SVN commit r14003.
2013-10-15 16:10:06 +00:00
sanderd17 5f5eedc513 Rename technology related files, methods and messages so their names represent the shared data flow between technologies and auras (and maybe future components). Implement the C++ part of auras through these generalised files. Fixes #2154
This was SVN commit r14001.
2013-10-15 10:05:08 +00:00
sanderd17 a4ce8dac34 fix technologies broken by 379a7b208f
This was SVN commit r14000.
2013-10-14 20:36:57 +00:00
sanderd17 379a7b208f Implement the js side of auras. Refs #2048. Patch with the help of Alpha123. Only the temple aura is added as example, all other aura components are removed from the templates to be created from scratch again.
This was SVN commit r13998.
2013-10-14 15:51:21 +00:00
Mythos_Ruler 57d47f23c9 This was SVN commit r13997. 2013-10-13 18:11:54 +00:00
Enrique 417e2455a0 Added ptolemaic ptolemaic storehouse and Lordgood's new cart temple and ptolemaic defense tower with little fixes.
This was SVN commit r13996.
2013-10-13 15:26:43 +00:00
Ykkrosh ce5c43fe03 Fix typo
This was SVN commit r13995.
2013-10-13 11:41:30 +00:00
historic_bruno 3a28caed03 Rebuilt premake4.exe with VC++ 2008 to avoid VC++ 2012 issues targeting XP
This was SVN commit r13994.
2013-10-12 23:47:09 +00:00
Enrique 41de5440e0 Added and applied normal and spec maps for ptolemaic struct, paintings and statues, added ptolemaic temple and farmstead. Fixed ptolemaic CC footprint + little fixes
This was SVN commit r13993.
2013-10-12 21:33:21 +00:00
Mythos_Ruler 7335c32c7e Some updated sounds from LAVS.
This was SVN commit r13992.
2013-10-12 01:27:10 +00:00
leper 9b8667a9aa Really add special starting unit.
This was SVN commit r13991.
2013-10-11 23:37:04 +00:00
leper 4f03550adf Create a special starting unit entity for skimish maps.
This was SVN commit r13990.
2013-10-11 23:36:02 +00:00
leper 396bd844dd Remove duplication between getActionInfo and determineAction. Allow setting rally points if not all selected buildings can do so. Patch by mimo. Fixes #2189.
This was SVN commit r13989.
2013-10-11 22:43:22 +00:00
leper 801cac87dd Properly queue rally points when setting them via the minimap. Patch by mimo. Fixes #2203.
This was SVN commit r13988.
2013-10-11 21:50:45 +00:00
sanderd17 c5669e2c4e Add a back to work button. Patch by Itms. Fixes #799
This was SVN commit r13987.
2013-10-11 19:11:07 +00:00
Ykkrosh e2d28c8894 Add AppData file, for use by some Linux package installers.
Fixes #2202.

This was SVN commit r13986.
2013-10-11 18:55:46 +00:00
OmriLahav 7791c4c61d This was SVN commit r13985. 2013-10-11 11:01:55 +00:00
OmriLahav f22e47a743 This was SVN commit r13984. 2013-10-11 11:01:06 +00:00
historic_bruno 644135b9f3 Fixes variable name conflict in session UI, patch by Itms, fixes #2199
This was SVN commit r13982.
2013-10-11 00:22:27 +00:00
historic_bruno f5eeed9cf7 Clears selections when loading saved game, patch by RefinedCode (fixes buggy selection behavior when using quicksave/quickload), fixes #2178
This was SVN commit r13981.
2013-10-10 23:58:29 +00:00
historic_bruno a00e57df72 Fixes hypothetical mem leak in network code (and an error in Cppcheck), patch by Riemer, fixes #2122
This was SVN commit r13980.
2013-10-10 23:46:42 +00:00
alpha123 f6c9db33d6 Focus on the building a hero is garrisoned in when the hero button is double-clicked. Patch by mimo. Fixes #2131
This was SVN commit r13978.
2013-10-10 21:23:19 +00:00
Mythos_Ruler c7e3c1499f Fixed typo.
This was SVN commit r13977.
2013-10-09 20:07:36 +00:00
Mythos_Ruler cd5a2aa527 Ptolemy IV.
Ptolemaic heroes added to Ptolemaic Fortress.

Seleucid Romanized Infantry Champion.

This was SVN commit r13976.
2013-10-09 13:42:34 +00:00
sanderd17 5c3ff86219 add different skirmish structures + skirmish demo map containing all skirmish templates so far
This was SVN commit r13975.
2013-10-08 18:02:35 +00:00
sanderd17 f3d83e0616 add skirmish defense tower and houses
This was SVN commit r13974.
2013-10-08 09:13:55 +00:00
historic_bruno f3d088dd5c Fixes JS debugger, fixes VS 2013 build error, re-fixes #2127, #2175
This was SVN commit r13973.
2013-10-07 22:55:30 +00:00
RedFox 8464777759 Fixed premake4 build incorrectly ignoring vs2010 action.
fixes #2191

This was SVN commit r13972.
2013-10-07 22:45:08 +00:00
RedFox a97cd73cf8 Adds EnableSSE2 for Visual Studio builds on windows.
Adds optional "--with-c++11" flag for GCC/ICC builds. For possible
future C++11 migration.
refs #2191

This was SVN commit r13971.
2013-10-07 22:39:13 +00:00
RedFox 055ea57468 ref #2191
Adds VS2012 support for premake4. Also adds
update-workspace-with-atlas.bat for VS2012 builds that need to compile
AtlasUI.dll, too.

This was SVN commit r13970.
2013-10-07 22:10:16 +00:00
Mythos_Ruler 79af6fb17f Newly updated Ptolemaic champion cavalry.
This was SVN commit r13969.
2013-10-07 20:47:06 +00:00
historic_bruno b9268fbdcd Fixes error logging in the JS debugger, based on patch by RefinedCode. Fixes #2175
This was SVN commit r13967.
2013-10-07 02:10:41 +00:00
historic_bruno d3e0fb4f84 Fixes crannóc spelling, thanks to GunChleoc
This was SVN commit r13966.
2013-10-07 00:46:58 +00:00
historic_bruno 1408a0be83 This was SVN commit r13965. 2013-10-06 23:29:03 +00:00
historic_bruno 74216a5825 Reverts field limits from f4abcd2ef9 until we can fix AI and UI problems, refs #2187
This was SVN commit r13964.
2013-10-06 23:25:55 +00:00
historic_bruno 6d67957db2 Prevents buildings from getting attack-move orders and implements attack-move rally points, patch by mimo. Fixes #2171
This was SVN commit r13963.
2013-10-06 22:50:30 +00:00
historic_bruno 35fa527814 Adds attacking player's name to attack notification messages.
Cleans up some duplicate username/color code in messages.js

This was SVN commit r13962.
2013-10-06 22:07:55 +00:00
Mythos_Ruler 7d92b3459b Turns on Attack notification text.
This was SVN commit r13961.
2013-10-06 21:17:56 +00:00
Mythos_Ruler 573215dad8 Fixed the player names on this map.
This was SVN commit r13960.
2013-10-06 20:51:30 +00:00
Mythos_Ruler 4cfee05c31 New skirmish templates for Brit war dog and Maur Worker Elephant. Added to current Skirmish maps.
This was SVN commit r13959.
2013-10-06 20:23:21 +00:00
Mythos_Ruler efc84a9cce Adjusting time costs for these Ptol buildings.
This was SVN commit r13958.
2013-10-06 19:13:20 +00:00
Mythos_Ruler 5fc888fdcf Some more player names for Carthage.
Player names for Seleucids.

Fixed names for Celtic docks and merchant ships.

Fixed cavalry health for a few units.

Name stuff for ships, specifically Carthage. Fixes #2106.

Started work on some Ptolemaic units, specifically the Cav Spearman.

Added LordGood's Sacred Band Cavalry portrait.

This was SVN commit r13957.
2013-10-06 18:28:10 +00:00
Mythos_Ruler b9b923be11 Fixes #2149
This was SVN commit r13956.
2013-10-06 14:58:26 +00:00
Mythos_Ruler 14b51afc39 Fixes #2152
This was SVN commit r13955.
2013-10-06 06:57:50 +00:00
Mythos_Ruler f4e4247f06 Fixed Gallic Outpost name. Fixes #2167.
Fix Ptol civ center footprint.

This was SVN commit r13954.
2013-10-06 06:53:32 +00:00
historic_bruno 50782c1c1c Fixes non-PCH build
This was SVN commit r13953.
2013-10-06 05:15:54 +00:00
historic_bruno 754e794f9b Implements attack notifications based on patch by madmax and zoot, fixes #1719
This was SVN commit r13951.
2013-10-06 04:49:38 +00:00
historic_bruno 2418ae190d Fixes some erroneous documentation in EntityLimits.
Removes previously implemented LimitsPerCivCentre from AI states.
Removes hardcoded categories from TrainingRestrictions

This was SVN commit r13950.
2013-10-06 03:13:46 +00:00
Mythos_Ruler c21953b434 Added some Iberian walls to a couple of skirmish maps.
Rethought the naming scheme of the skirmish maps.

This was SVN commit r13949.
2013-10-05 21:58:42 +00:00
Spahbod a1ceda4012 Polishing the Random Maps: The last batch...
This was SVN commit r13948.
2013-10-05 18:29:44 +00:00
leper fecfda29f6 Remove civ code hardcoding from SkirmishReplacer component. Refs #1198.
This was SVN commit r13947.
2013-10-05 17:54:41 +00:00
leper 3624c591bd Fix compilation failure without PCH.
This was SVN commit r13946.
2013-10-05 16:22:51 +00:00
leper 85253ca3c8 Let corpses cast shadows again. Refs #1771.
This was SVN commit r13945.
2013-10-05 16:22:46 +00:00
alpha123 ff6b80305c Rearrange hotkeys a bit. Queue the 8th unit is now Comma, and select idle warrior is forward slash (replacing camera-follows-mouse, which is available by holding middle mouse anyway). Fix #2181.
This was SVN commit r13944.
2013-10-04 23:31:24 +00:00
alpha123 433b29d6dc Fix description of Belgian Bog skirmish map.
This was SVN commit r13943.
2013-10-04 23:14:52 +00:00
Mythos_Ruler 76d9893123 New skirmish maps.
Fixed some things.

This was SVN commit r13942.
2013-10-04 18:11:13 +00:00
Mythos_Ruler 2283aedc3c The first Skirmish maps.
Temporary selection and complete sounds for Theater, Elephant Stables,
Cavalry Stables, Blacksmith, and Wonder. Sounds by LAVS. He is working
on improving them.

This was SVN commit r13941.
2013-10-04 13:17:21 +00:00
alpha123 939898c47d Nerf Iberian champion cavalry a bit.
This was SVN commit r13940.
2013-10-04 04:01:58 +00:00
historic_bruno 7901ed51d4 Implements skirmish maps, based on patch by sanderd17, fixes #1198. Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type.
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631, #889.
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872. Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745.
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.

This was SVN commit r13938.
2013-10-04 02:29:16 +00:00
historic_bruno 5c35690309 Fixes broken statue ruins template and replaces old statue treasures with ruins
This was SVN commit r13937.
2013-10-04 01:15:16 +00:00
historic_bruno 6a97bbd4c3 Fixes dropdowns opening with empty list, caused assertion failure about vector subscript range in MSVC debug build
This was SVN commit r13936.
2013-10-04 00:31:36 +00:00
Enrique b0e2f6b368 Added obelisks to ptol_cc
This was SVN commit r13935.
2013-10-03 18:41:07 +00:00
Ykkrosh e700937fd3 Fix non-SSE x86 builds
This was SVN commit r13934.
2013-10-03 18:22:10 +00:00
Enrique 398a32a6ff Added ptolemiac civic centre with ao and custom decal dirt_7x5
This was SVN commit r13933.
2013-10-03 17:18:57 +00:00
Enrique 739ed00b5e Added ptolemaic fortress with ao. Updated ptolemaic struct texture
This was SVN commit r13932.
2013-10-02 21:29:44 +00:00
Mythos_Ruler e382967e34 Updated a bunch of things.
New waypoint and garrison flags for Ptolemies. New texture for Ptolemies
woman. Fixed footprint for statues ruin. etc.

This was SVN commit r13931.
2013-10-02 18:51:49 +00:00
Mythos_Ruler bb78b4c931 Replacing these statue "treasures" with "ruins." Instead of getting the resources immediately, ruins allow the player to "mine" the resources at a fast rate.
This was SVN commit r13930.
2013-10-02 16:54:13 +00:00
Enrique e0d50b6137 added seleucid thureos texture by request
This was SVN commit r13929.
2013-10-02 14:53:59 +00:00
Enrique 60200f8dbb fixed ptolemaic statues base.
This was SVN commit r13928.
2013-10-02 13:41:53 +00:00
Enrique 2e24c9f2b7 ptolemaic houses and statues with ao. Added ptolemaic struct texture and 4 ptolemaic round shields variations
This was SVN commit r13927.
2013-10-02 12:18:10 +00:00
Enrique 26af70ec7b Fixed ptolemaic thureos mesh shape
This was SVN commit r13926.
2013-10-01 15:15:39 +00:00
Ykkrosh 9f5635085e Fix #1833: animals spin around needlessly while roaming.
Patch from mimo.

This was SVN commit r13924.
2013-09-30 23:52:22 +00:00
Ykkrosh e449364408 Recompute system shader defines immediately when the relevant inputs change, instead of delaying until ReloadShaders.
This fixes an error with autostart and smoothlos=true, where the system
defines were being accessed before the first rendered frame.

This was SVN commit r13923.
2013-09-30 22:39:06 +00:00
historic_bruno 8cf5f61885 Avoids ugly layering of GUI pages when entering match setup
This was SVN commit r13922.
2013-09-30 20:51:19 +00:00
Enrique cbe103bdfe ptolemaic galatian shields for basic, advanced and elite with specular maps.
This was SVN commit r13921.
2013-09-30 19:03:09 +00:00
Enrique 1f032b7c59 Added Lordgood's new britons barracks and defense tower with minimal tweaking
This was SVN commit r13917.
2013-09-30 08:14:10 +00:00
historic_bruno e24ce51029 Adds DynamicArena allocator that grows by fixed chunk size, fixes #2142.
Changes fixed size arenas to new dynamic arenas with reasonable chunk
sizes (may require tuning), refs #1842

This was SVN commit r13916.
2013-09-30 01:22:44 +00:00
historic_bruno fbee618ac8 Fixes memory leak in sound manager
This was SVN commit r13915.
2013-09-30 01:09:16 +00:00
Yves 238b7f84d8 Changes the ConfigDB to expose global functions to scripts instead of properties and custom objects.
Fixes #2172
Refs #1886

This was SVN commit r13914.
2013-09-29 18:56:50 +00:00
Mythos_Ruler 2ea0620abb Reduce the health drain of the Nubian Archer.
Fixed the Lighthouse to not have the Library special tech.

Ptol Military Settlement has better sounds and a different portrait.

Increased defense tower limit since they now have a min distance limit.

Tweaked Ptolemies demo map.

This was SVN commit r13913.
2013-09-29 16:29:38 +00:00
leper 022393a0c6 Spelling fixes from the translation work by Gallaecio and Loki72. Fixes #2150, #2170.
This was SVN commit r13912.
2013-09-29 16:14:40 +00:00
Ykkrosh c2583e42da Reduce memory allocations in the renderer
Use an arena allocator in ShaderModelRenderer::Render, to reduce
the allocation cost in STL containers.

Avoid unnecessary copying of std::vectors.

This was SVN commit r13911.
2013-09-29 14:48:11 +00:00
Ykkrosh 6b0a0e83eb Fix profiler malloc count in debug mode on Windows
wdbg_heap_NumberOfAllocations doesn't work without the wdbg_heap
leak detector, which is disabled since it's slow and broken.
Use a simple hook via _CrtSetAllocHook instead to count allocations.

This was SVN commit r13910.
2013-09-29 14:43:14 +00:00
Mythos_Ruler f4abcd2ef9 Gauls get: Tavern and Naked Fanatic.
Britons get: Rotary Mill.

So, now all Celts get Rotary Mill, but also a unique unit-producing
building.

Britons now have a better demo "sandbox" map.

Ptolemies now play like they are intended. Just need tons of new
artwork. ;) Try them out on the demo map: Sandbox - The Ptolemaic
Egyptians.

Some highlights: Their Nubian Archers train very fast, but have a finite
life. The Lighthouse can be built on the shoreline (but looks like a
library). Their Military Settlement works as intended (can be built in
neutral territory, but min distance of 80 meters).

Testing out: Farm field limits (+8 per Farmstead, +2 per civ center).

This was SVN commit r13909.
2013-09-29 14:37:26 +00:00
Ykkrosh eceae8be5c Fix crash when setting rally point
This was SVN commit r13908.
2013-09-29 14:02:47 +00:00
wraitii d663dae2d8 New version of Aegis. Huge rewrite for WIP naval support (still very, very buggy at this point.) Features a few bugfixes and might be more efficient than the former version.
NEEDS TESTING.

This was SVN commit r13907.
2013-09-29 13:32:52 +00:00
Ykkrosh 994ebd9836 Add a list of statically-constructed CStrIntern strings
Switch all the constant strings in graphics code to use the new
variables.
This avoids the cost of instantiating CStrInterns at runtime every
frame.

This was SVN commit r13906.
2013-09-29 13:19:52 +00:00
Mythos_Ruler 08f431fa0d Ptolemaic entity templates for Enrique.
This was SVN commit r13905.
2013-09-29 03:08:59 +00:00
Ykkrosh 4e9570cd0f Fix unnecessary CShaderConditionalDefines copy, and inline some functions
This was SVN commit r13904.
2013-09-29 02:05:02 +00:00
Ykkrosh f075571502 Fix slightly expensive GetSystemShaderDefines()
Only recompute when any relevant parameters have changed, then return
the cached value.

This was SVN commit r13903.
2013-09-29 01:00:11 +00:00
Ykkrosh 555deea136 Fix conditional defines to not construct new CShaderDefines frequently
CShaderDefines is designed to be efficient to copy and compare, but not
to construct. Conditional defines were constructing new CShaderDefines
for many models every frame.

Precompute all the possible conditional combinations of CShaderDefines
when a material is first loaded, so they can be looked up at no cost
when rendering.

This was SVN commit r13902.
2013-09-29 00:30:58 +00:00
Ykkrosh 22f0f2b232 Set _NO_DEBUG_HEAP=1 in VS2010 projects
The debug heap has a high performance cost, even in release mode,
when running inside a debugger, which is surprising to people trying
to measure performance. It doesn't seem very useful at finding bugs
either.

Add a NoDebugHeap flag to Premake, to set that environment variable
when running in the VS2010 debugger.

This was SVN commit r13901.
2013-09-28 14:35:28 +00:00
Mythos_Ruler 2d1b7914a6 This was SVN commit r13900. 2013-09-28 11:58:05 +00:00
Mythos_Ruler b8a5acfd9e Preview image for The Gauls demo map.
This was SVN commit r13899.
2013-09-26 18:44:45 +00:00
RedFox 28ce5f3458 It might be better to issue a LOGWARNING when Spatial queries are too large. Opening the crash window seems a bit too much for something that can be recovered from.
This was SVN commit r13898.
2013-09-24 21:50:46 +00:00
sanderd17 e370af8d4e Fix rally point rendering on saved games. Fixes #1762. Patch by mimo
This was SVN commit r13897.
2013-09-24 20:27:18 +00:00
Mythos_Ruler 6880fd214f Fixed name of this map.
This was SVN commit r13896.
2013-09-24 18:41:19 +00:00
Enrique 895f927ff0 Celts corral props missing fix
This was SVN commit r13895.
2013-09-24 16:26:26 +00:00
Mythos_Ruler 59c8e9e6dc Big gameplay experiment: Moved Civic Centers from Town Phase to City Phase to see what it does to multiplayer match ups.
New "sandbox" demo map for the Gauls.

Renamed "Night's Watch" to "Sentries."

This was SVN commit r13894.
2013-09-24 15:55:35 +00:00
historic_bruno cd51540725 This was SVN commit r13892. 2013-09-22 18:13:19 +00:00
historic_bruno 2a613f8236 Removes mostly useless video memory detection, fixes another crash with Nvidia Optimus on Windows, fixes #2145, #2138
This was SVN commit r13891.
2013-09-22 18:07:33 +00:00
Mythos_Ruler e488ed09f5 This was SVN commit r13890. 2013-09-22 11:30:24 +00:00
Mythos_Ruler ae4ccfe050 3D farm fields for all factions.
Fixed tooltips for a bunch of units.

Increases pierce armor for elephants.

This was SVN commit r13889.
2013-09-22 08:07:29 +00:00
RedFox 5287af8967 Increased SpatialQueryArray max results from 1024 to 2048. This is a temporary fix until the Search and Prune solution is implemented.
This was SVN commit r13888.
2013-09-22 04:37:46 +00:00
sanderd17 5afb18dda4 fix units ejecting on destroying structure
This was SVN commit r13887.
2013-09-21 19:41:13 +00:00
sanderd17 4f6ddfe894 fix theatron build limit
This was SVN commit r13886.
2013-09-21 19:05:59 +00:00
Enrique 636f09053b celt tavern update
This was SVN commit r13885.
2013-09-21 15:24:56 +00:00
Yves 9781b67cf4 Changes the Console to expose global functions to scripts instead of properties.
Fixes #2140
Refs #1886

This was SVN commit r13884.
2013-09-21 14:48:19 +00:00
Mythos_Ruler bb506fb578 Spec maps and new player color texture for Greek females.
This was SVN commit r13883.
2013-09-21 12:41:05 +00:00
Mythos_Ruler 21639ce5ea Normal map and Specular map for warship sails.
Fixed Cav Sword tooltip.

Updated the product logo a little bit.

This was SVN commit r13881.
2013-09-21 11:50:04 +00:00
Mythos_Ruler 0233bb4877 Temporary Ptolemies emblem.
This was SVN commit r13880.
2013-09-21 09:23:21 +00:00
Mythos_Ruler ccc873d9d5 Tech complete sound slightly louder.
This was SVN commit r13879.
2013-09-21 09:22:31 +00:00
Mythos_Ruler ec66e59150 Fixed some civ json stuff. Fixed Ptolemaic json.
This was SVN commit r13878.
2013-09-21 09:21:48 +00:00
Yves 12e2428495 Changes the Renderer to expose global functions to scripts instead of using CJSObject.
Fixes #2137
Refs #1886

This was SVN commit r13877.
2013-09-21 08:24:45 +00:00
Mythos_Ruler c0b84fb41f Added build limits for Theater, Council Chamber, and Library.
Added Ptolemies civ json file. I am getting a javascript error in-game
though. Need help trouble shooting it.

This was SVN commit r13876.
2013-09-21 07:33:22 +00:00
Mythos_Ruler 9d2f59e80a Tweaking the Athenian field.
Tweaking 0 A.D. logo.

Fixed tooltip for Slinger.

Fixed name for Carthaginian wonder.

This was SVN commit r13874.
2013-09-21 03:58:54 +00:00
Ykkrosh d252e245ef Optimise fixed multiplies on MSVC x86
On MSVC, casting i32 to i64 then multiplying gets compiled into a call
to __allmul, which is slow. Use the __emul intrinsic instead.

GCC 4.6+ appears optimise this case automatically and doesn't need any
special handling.

This reduces the cost of ComputeShortPath by about 50% (testing AI vs AI
on Oasis 01).

This was SVN commit r13873.
2013-09-20 20:17:54 +00:00
Enrique 5a8cfb738b Commited experimental field for athenians (propped farm field)
This was SVN commit r13872.
2013-09-19 15:29:01 +00:00
Enrique 4b7c1a915d Celtic corral upgraded. Added more playercolor to gaullic civic centre.
This was SVN commit r13871.
2013-09-19 13:58:48 +00:00
historic_bruno bfe0b79b91 Better fix of Grid memory leak, refs #1842
This was SVN commit r13869.
2013-09-18 01:21:36 +00:00
alpha123 e10c4ebaae Amend 553875ea83: Forgot to include new hotkey in the config.
This was SVN commit r13868.
2013-09-17 00:31:18 +00:00
alpha123 553875ea83 Allow the use of Enter in addition to the OK button in the Join Game dialog.
This was SVN commit r13867.
2013-09-17 00:30:11 +00:00
historic_bruno 9f2a850a95 Fixes buggy operators and memory leak in Grid class, refs #1842
This was SVN commit r13866.
2013-09-17 00:28:22 +00:00
RedFox 5d9b2b95b0 Ticket #2127 - Performance and style improvements in scriptinterface.
No real behavior changes, only code maintenance.

Fixed signed/unsigned mismatch in EntityMap.h

This was SVN commit r13865.
2013-09-16 19:10:06 +00:00
historic_bruno 97912dd545 This was SVN commit r13864. 2013-09-16 16:56:26 +00:00
Enrique 16b615db79 Celt walls upgraded
This was SVN commit r13863.
2013-09-16 12:25:03 +00:00
sanderd17 a770ad9467 small code style fixes
This was SVN commit r13862.
2013-09-16 09:14:16 +00:00
RedFox 1b6a5fa802 This was SVN commit r13861. 2013-09-15 21:37:05 +00:00
RedFox 2a5ec404d1 Further reverted RangeManager sorting to stable_sort, since possibly with different STL implementations, the order of entities might change and cause OOS.
Overflowing elements in SpatialQueryArray are now reported with
debug_warn, but can be ignored and the program will continue working,
but further entities will be truncated.

This was SVN commit r13860.
2013-09-15 21:11:20 +00:00
Enrique bb799bdd53 upgraded gaul defense towers and celtic storehouse
This was SVN commit r13859.
2013-09-15 21:11:14 +00:00
Enrique 5fe43a0f21 removed non-used duplicated meshes
This was SVN commit r13858.
2013-09-15 19:56:13 +00:00
sanderd17 9eedd22b9a fix garrisoned units count for some special cases. Refs #2096. Patch by mimo
This was SVN commit r13857.
2013-09-15 16:47:40 +00:00
Enrique 65bddb7fa5 Celtic docks, kennel, farmstead and temple upgrades
This was SVN commit r13856.
2013-09-15 16:09:23 +00:00
Enrique bdeb358c44 Upgraded britons market and added new gaul market
This was SVN commit r13855.
2013-09-15 14:09:25 +00:00
RedFox 9694eec8b8 As per ticket #1707. Some minor improvements to spatial subdivision. Makes way for future changes in RangeManager.
Right now merely improves memory usage.

This was SVN commit r13854.
2013-09-15 14:03:53 +00:00
sanderd17 6644f224cd remove warn messages. Now really fixes #2102
This was SVN commit r13853.
2013-09-15 09:33:45 +00:00
sanderd17 b16b52492d change build distance restrictions to work with classes. Fixes #2012.
This was SVN commit r13852.
2013-09-15 09:29:16 +00:00
Mythos_Ruler 3016765766 All new techs for the blacksmith.
This was SVN commit r13851.
2013-09-15 08:55:28 +00:00
sanderd17 f213761912 let entities change entity limits. Fixes #2076
This was SVN commit r13850.
2013-09-15 08:19:50 +00:00
Mythos_Ruler de68973191 Changed the phase up sound.
Added a new "tech complete" sound for ALL techs.

Added some new armor techs for infantry and spearmen.

This was SVN commit r13849.
2013-09-15 07:53:01 +00:00
Mythos_Ruler 466900b898 Minor template stuff.
This was SVN commit r13848.
2013-09-15 05:55:16 +00:00
Mythos_Ruler db39fd059c Some tooltip tweaks.
Further attempts to balance archers. (ongoing)

This was SVN commit r13847.
2013-09-15 04:57:58 +00:00
Mythos_Ruler 08849ae6f6 Balance changes after playtesting with Alpha123.
This was SVN commit r13846.
2013-09-15 00:28:07 +00:00
Mythos_Ruler 4f138eaa12 Made the time icon slightly smaller.
Archers have less attack and cost slightly more.

Defense Towers now have a minimum build distance and are weaker.

This was SVN commit r13845.
2013-09-14 23:19:36 +00:00
historic_bruno 729e744c2f Removes yucky hard-coded categories from BuildRestrictions
This was SVN commit r13844.
2013-09-14 22:31:41 +00:00
Ykkrosh dd60c3a3e2 Restore textures.xml to make grid_subdiv terrain less ugly
This was SVN commit r13843.
2013-09-14 18:36:40 +00:00
Enrique a9cb79b108 celtic fortresses actor and barracks actor errors fixing reported by Sanderd
This was SVN commit r13842.
2013-09-14 13:59:43 +00:00
Ykkrosh 126e550d68 Delete bogus file
This was SVN commit r13841.
2013-09-14 12:19:22 +00:00
historic_bruno ea75cda095 Special case getEntityNamesFormatted to avoid messing with getEntityNames
This was SVN commit r13838.
2013-09-14 00:32:50 +00:00
alpha123 e7fa9a58de Remove the Costs: prefix from tooltips entirely.
This was SVN commit r13837.
2013-09-14 00:07:08 +00:00
alpha123 e646cf19bf Fix bug due to some technologies not having separate generic/specific names.
This was SVN commit r13836.
2013-09-14 00:00:47 +00:00
alpha123 c28151c1c1 Put tooltips on a diet.
This was SVN commit r13835.
2013-09-13 23:49:46 +00:00
Enrique 04b4e6af4b gaul fortress fix
This was SVN commit r13834.
2013-09-13 21:44:49 +00:00
Enrique 014acac9ed Upgraded britons and gaullic fortresses.
This was SVN commit r13833.
2013-09-13 21:41:24 +00:00
Enrique 532c9dce3e brit_civic_centre, celt_barracks and brit_crannog upgrade
added non-transparency with AO material and non-transparency-parallax-ao
material

This was SVN commit r13832.
2013-09-13 18:46:33 +00:00
Enrique 5023ff449e Gaul_civic_centre updated.
This was SVN commit r13831.
2013-09-13 14:18:27 +00:00
Enrique 8b9a0e3919 Added gaul houses, fixed brit houses and added a new variation. New effects applied.
Added Ludo's new stonehenge model.

This was SVN commit r13830.
2013-09-13 13:50:19 +00:00
Mythos_Ruler 77ca745637 Updated the logo.
Updated some Roman words.

This was SVN commit r13829.
2013-09-13 12:07:39 +00:00
historic_bruno 82fb0ce6be Improve game setup GUI performance by switching from main menu instead of pushing the page on top of the stsck
This was SVN commit r13828.
2013-09-12 15:12:08 +00:00
Mythos_Ruler 176cc55547 Fixing some Roman names. Thanks Robbob (on the forum).
Added Organic "preferredClass" to Fortresses, Wall Towers, and Defense
Towers, so that they prefer to shoot at enemy units rather than enemy
structures.

This was SVN commit r13827.
2013-09-12 13:53:00 +00:00
Yves 5304bc9d6a Changes GameView to expose global functions to scripts instead of using CJSObject.
Fixes #2126
Refs #1886

This was SVN commit r13826.
2013-09-12 12:40:05 +00:00
Ykkrosh 05422ad545 Avoid slightly-expensive QueryInterface() calls
Add CEntityHandle which wraps an entity_id_t and also has a pointer to a
per-entity array of IComponents. QueryInterface/CmpPtr on a handle just
involve a couple of pointer dereferences instead of a map lookup.

This requires sizeof(void*) per registered interface type per entity,
which is currently ~0.5KB per entity, which shouldn't be a problem.

This was SVN commit r13825.
2013-09-11 20:41:53 +00:00
sanderd17 87753bf3fd forgot to commit extra change for 508cc0d4c7
This was SVN commit r13824.
2013-09-11 18:59:51 +00:00
sanderd17 508cc0d4c7 Add preferred classes to BuildingAI. Patch by jammus. Fixes #1985
This was SVN commit r13823.
2013-09-11 17:50:49 +00:00
Mythos_Ruler 43df87e56f This was SVN commit r13822. 2013-09-10 22:05:12 +00:00
stwf b1bd61938e add file notification to Mac ticket 514, also change name of class FileInfo to CFileInfo to ease Mac development
This was SVN commit r13821.
2013-09-10 14:17:04 +00:00
sanderd17 d037d97d55 disable querying of local entities with a component. Avoids OOS problems. Patch thanks to historicbruno. Fixes #2119
This was SVN commit r13820.
2013-09-10 12:27:59 +00:00
sanderd17 d51217f718 Fix gazelle in deep water starting position on Oasis 9. Fixes #2123
This was SVN commit r13819.
2013-09-10 09:36:27 +00:00
leper 04ed87bf28 Display error messages instead of breaking into the debugger when we don't have rights to save a map in Atlas. Fixes #1941.
This was SVN commit r13818.
2013-09-09 23:31:22 +00:00
Ykkrosh b2862f14da Avoid continual libxml2 memory leak in simulation-test mode
This was SVN commit r13817.
2013-09-09 20:22:42 +00:00
Mythos_Ruler 3c29c2dccf Tweaked farm decal color.
This was SVN commit r13816.
2013-09-09 18:46:45 +00:00
sanderd17 c3f7a929e0 better garrison flag handling. Refs #2096.
This was SVN commit r13815.
2013-09-09 18:27:20 +00:00
sanderd17 e7ccc28cbc Enable sound notifications with technology upgrades. Based on patch by mpmoreti. Fixes #2021
This was SVN commit r13814.
2013-09-09 12:50:05 +00:00
sanderd17 a406863e0e fix bridge edge obstruction size and rotation of hele bridge edge
This was SVN commit r13813.
2013-09-09 12:11:34 +00:00
sanderd17 f051426a76 fix garrisonHolder flags when units are ejected
This was SVN commit r13812.
2013-09-08 19:51:16 +00:00
sanderd17 08514f68be small clean up of GarrisonHolder code
This was SVN commit r13811.
2013-09-08 18:46:29 +00:00
sanderd17 d1a376fd06 fix ejection of garrisoned units on resign. Fix ejection or killing on ownership and deplomacy changes. Patch by mimo. Fixes #2096
This was SVN commit r13810.
2013-09-08 16:02:41 +00:00
sanderd17 bc40534777 fix spread technology modifications. Fixes #2110
This was SVN commit r13809.
2013-09-08 15:20:54 +00:00
historic_bruno 7a0e91ab23 Fixes undefined behavior in Atlas error display, fixes #2115
This was SVN commit r13808.
2013-09-08 03:35:05 +00:00
leper ca1665dde1 Fix some typos in the civ json files. Patch by Gallaecio.
This was SVN commit r13807.
2013-09-07 17:40:50 +00:00
sanderd17 f588181004 use better technology script in guiInterface
This was SVN commit r13805.
2013-09-07 15:23:03 +00:00
sanderd17 24a4ceb89a fix carthagian technology. Fixes #2107
This was SVN commit r13804.
2013-09-07 09:26:56 +00:00
leper 819a1e7823 Save initial herd position and update the last known position of the hunted animal when hunting. Patch by mimo. Fixes #2047.
This was SVN commit r13803.
2013-09-06 19:47:48 +00:00
Ykkrosh 16c9724c24 Fix release build scripts
Exclude dev.cfg from the Windows installer.
Use the correct filename for the Windows installer.
Update some paths to match the new EC2 build process.

This was SVN commit r13802.
2013-09-06 19:43:45 +00:00
Mythos_Ruler 63f28f1a43 Increased build limit of Embassies to 2. This means you can build 2 of the same entity or 2 different out of the 3 available.
This was SVN commit r13801.
2013-09-06 19:26:49 +00:00
Mythos_Ruler d6ec0f6dbd Updated installer image.
This was SVN commit r13800.
2013-09-06 19:16:33 +00:00
stwf e19b470a42 fix music glitchyness when game loses focus trac #2090
This was SVN commit r13799.
2013-09-06 02:46:13 +00:00
Mythos_Ruler a7132dc66a Updated Macedonians sandbox demo map.
Fixed Carthaginians special tech "Colonization."

Fixed Carthage json file.

This was SVN commit r13797.
2013-09-02 16:26:19 +00:00
historic_bruno 4c9cd2921d Replaces splash screen with fundraiser message
This was SVN commit r13796.
2013-09-01 23:56:50 +00:00
leper 53a5781c66 Increase simulation script runtime size again. Refs #1436, #1966 and #2035.
This was SVN commit r13794.
2013-09-01 23:29:21 +00:00
Mythos_Ruler 6070cd01fa Reduced "grazing" time for whales.
This was SVN commit r13793.
2013-09-01 22:06:23 +00:00
Mythos_Ruler c3dcde7e34 Alpha version number.
This was SVN commit r13792.
2013-09-01 20:47:02 +00:00
Mythos_Ruler 3774b2051d This was SVN commit r13790. 2013-09-01 04:22:28 +00:00
Enrique 4ac19dff05 fixed maur_struct
This was SVN commit r13789.
2013-08-31 22:08:48 +00:00
Mythos_Ruler 4dd1397e15 Mauryans and Britons now start with a cav skirm in addition to their special starting unit (Worker Elephant and War Dog respectively).
Fixed a unit availability thing for Macedonians.

This was SVN commit r13788.
2013-08-31 19:27:37 +00:00
Mythos_Ruler cc08c81faf Tweaks to barracks and blacksmith tips.
This was SVN commit r13787.
2013-08-31 19:23:16 +00:00
Mythos_Ruler 0bd22649f0 Tweaked Army Camp tip text.
Adjusted max gatherers for pyramid ruins.

New 'Blacksmith' loading tip.

This was SVN commit r13786.
2013-08-31 12:26:17 +00:00
Mythos_Ruler 66ab19086a Updated Stoa tip image.
Updated Persian Architecture tip text.

Adjusted upward the number of max gatherers for small mines and the
unfinished Greek temple ruin.

Tweaked Cycladic Archipelago 6 (fixed fish and treasure positions).

Tweaked Gold Oasis 1 (made it possible to build a civic center in the
middle of the "Gold Patches."

Adjusted the Spartan House history entry, based on text by contributor
Thorfinn the Shallow Minded.

This was SVN commit r13785.
2013-08-30 22:35:15 +00:00
stwf df190cbbd1 fix issues with menu mode and playlist, harden code and clear out ambient noises at game end, fixes #2066
This was SVN commit r13784.
2013-08-29 13:20:55 +00:00
Mythos_Ruler 3047470858 Reduced volume for fishing boat movement sound and construction hammering sounds.
This was SVN commit r13783.
2013-08-29 12:46:48 +00:00
wraitii de85408e3b Fix fishing boats not being able to gather from whales. Reported on the forums by Gildas.
This was SVN commit r13782.
2013-08-29 11:26:02 +00:00
Enrique 24ff1371b8 Upgraded greek temples an assigned one variation per civ.
This was SVN commit r13780.
2013-08-27 23:48:22 +00:00
historic_bruno 15586778bb Disables frame-pointer omission in VC++ 2008 projects, fixes stack dump in release build, fixes #2078
This was SVN commit r13779.
2013-08-27 02:42:56 +00:00
Enrique 56d535b7c5 Effects added to hellenic stoas. Only temples to go yay!
This was SVN commit r13778.
2013-08-27 00:04:05 +00:00
Enrique c6d361a76f added effects and upgraded greek docks for each greek civ
This was SVN commit r13777.
2013-08-26 23:19:35 +00:00
sanderd17 89e69af987 let maurian elephant corpse sink fast, temporary fix until there is a real corpse
This was SVN commit r13776.
2013-08-26 17:42:09 +00:00
sanderd17 e79c2aa953 make all Iberian buildings available in the sandbox map (add walls, blacksmith and fire ship)
This was SVN commit r13775.
2013-08-26 11:38:41 +00:00
Enrique 0b670f88af Updated spart syssiton, mace lybrary and helenic market with effects and little fixes
This was SVN commit r13774.
2013-08-26 08:29:18 +00:00
alpha123 89430de468 Okay, do what f5ab6255d0 was supposed to do.
This was SVN commit r13773.
2013-08-26 04:17:26 +00:00
alpha123 b10a01645f Revert f5ab6255d0. I accidentally somehow committed my whole working tree on this computer....
This was SVN commit r13772.
2013-08-26 04:15:36 +00:00
alpha123 f5ab6255d0 General scrollbar improvements. Patch by Josh. Fixes #2080.
- Don't show the scrollbar when the contents aren't overflowing the
visible area.
- Fix bugs in minimum bar sizing.
- Add capability to set a maximum bar size.
- Correct outdated/incorrect comments.

This was SVN commit r13771.
2013-08-26 03:06:08 +00:00
leper 2dc0c40ff0 Fix some errors.
This was SVN commit r13770.
2013-08-26 01:26:35 +00:00
Mythos_Ruler e75765faae Fixed some Greek corral prop problems.
Fixed Storehouses tip.

Fixed the names for ALL Iberian units and buildings.

Added a build restriction for the Iberian Monument.

This was SVN commit r13769.
2013-08-25 22:20:09 +00:00
leper ff6b3e5725 Properly fix #2079.
This was SVN commit r13768.
2013-08-25 22:05:41 +00:00
sanderd17 7a96a3161b fix whale altitude (no floating whales). See aa95f3420d.
This was SVN commit r13767.
2013-08-25 18:59:36 +00:00
Mythos_Ruler 035d33dc33 'Crop Rotation' tech for the Gallic Rotary Mill.
This was SVN commit r13766.
2013-08-25 17:57:20 +00:00
Mythos_Ruler 7c0dfc0d82 Fixed a couple tips.
This was SVN commit r13765.
2013-08-25 17:36:55 +00:00
Mythos_Ruler acf899bb47 Fixed some Corral errors.
Fixed some Persian building stuff.

This was SVN commit r13764.
2013-08-25 17:36:34 +00:00
Mythos_Ruler 292ce925c6 Cast Shadow flag enabled on this actor.
This was SVN commit r13763.
2013-08-25 11:04:14 +00:00
Enrique 2c66383461 Added effects to athen_prytaneion
This was SVN commit r13762.
2013-08-25 10:24:34 +00:00
wraitii 52f947fd77 Check that we still have build orders for our attack plan. Temporarily fixes #2082 for A14.
This was SVN commit r13761.
2013-08-25 08:20:40 +00:00
Enrique 589e8d2ae8 Updated and added effects to greek gymnasion, storehouse, corral and epic temple (athenian wonder parthenon)
This was SVN commit r13760.
2013-08-25 01:02:22 +00:00
Mythos_Ruler ce9432bf3d Proper selection ring for whales.
Edited Mauryan civ info.

Added preview image for Cycladic Archipelago 6.

This was SVN commit r13759.
2013-08-24 22:30:28 +00:00
Mythos_Ruler d49476ac8d Increased armor for promoted Skirmish Cavalry. Previously this was neglected or missed.
This was SVN commit r13758.
2013-08-24 21:11:59 +00:00
sanderd17 247e45a6b5 fix quinquereme splash damage
This was SVN commit r13757.
2013-08-24 16:07:03 +00:00
sanderd17 11f663d761 fix history description to match with in-game numbers. Reported by scythetwirerler. Part 2
This was SVN commit r13756.
2013-08-24 15:33:59 +00:00
sanderd17 087e5f9c3e fix history description to match with in-game numbers. Reported by scythetwirerler
This was SVN commit r13755.
2013-08-24 15:30:52 +00:00
Ykkrosh 14a73204dd Disable distance-sorting for most transparent objects
Distance-sorting of the alpha-blend pass of objects like trees and grass
is quite expensive (partly the cost of sorting, partly the cost of being
unable to batch efficiently), and the effect on visual quality is
typically very hard to see (the alpha-test pass does most of the work
for
objects that aren't fully translucent). That's not a good tradeoff, so
turn it off.

Leave distance sorting enabled for e.g. waterfalls since it might make a
more noticeable difference for them.

This was SVN commit r13753.
2013-08-24 14:48:02 +00:00
wraitii f106d7714a Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results.
Allows to oversaturate in Atlas' HDR settings.

This was SVN commit r13752.
2013-08-24 14:44:38 +00:00
leper 9d933087b3 Fix #2079.
This was SVN commit r13751.
2013-08-24 14:24:37 +00:00
wraitii 957c51727b Improve on-water shadows. Fix an issue with foam looking static. Add anisotropic filtering (x4) to the water normal texture for testing.
This was SVN commit r13750.
2013-08-24 14:12:39 +00:00
Mythos_Ruler aa95f3420d Cleaned up and fixed the whale templates. Still need a custom selection ring.
Made Carthaginian Sacred Band Infantry and Cavalry cost metal instead of
wood.

Updated Cycladic Archipelago 6.

This was SVN commit r13749.
2013-08-24 13:31:25 +00:00
sanderd17 40af0917ca let gaul and brit healers upgrade to their local templates instead of the generic celtic templates. Fix double-click to select all healers after one of the healers upgraded.
This was SVN commit r13748.
2013-08-24 13:09:53 +00:00
wraitii 630301918c Fix the command line -autostart-aidiff to default to 2 (new medium)
This was SVN commit r13746.
2013-08-24 09:55:06 +00:00
Enrique ced59bcfa1 Updated hellenic defense tower with new effects.
This was SVN commit r13745.
2013-08-24 00:19:52 +00:00
alpha123 6963f8c067 Adjust cavaly swordsmen advanced and elite stats. Change attack from 21 -> 12 and 22 -> 14 (since the basic rank's attack is 10), and change armor from 4 -> 6 and 6 -> 7 (since the basic rank's armor is 5).
This was SVN commit r13744.
2013-08-23 18:46:18 +00:00
Enrique 1544bad62a Updated greek theatron for all greek civs. (AO + normal + spec)
This was SVN commit r13743.
2013-08-23 18:05:56 +00:00
Enrique efda9d5e33 Updated greek farmstead
This was SVN commit r13742.
2013-08-23 12:36:04 +00:00
janwas c1dcbe4176 update TLB table
refs #2074

This was SVN commit r13741.
2013-08-23 06:42:48 +00:00
Enrique e19bffa88f hele fortress gate textures
This was SVN commit r13740.
2013-08-22 14:57:14 +00:00
Enrique 5050dcf261 Upgraded and cleaned up hellenic fortress. Shield props now displays depending on faction. (AO + normal + spec)
This was SVN commit r13739.
2013-08-22 14:56:11 +00:00
Mythos_Ruler 18c0b17126 Fixes #2069.
This was SVN commit r13738.
2013-08-22 13:10:38 +00:00
historic_bruno 0a0bd83cf0 Adds L4 cache detection for some new Haswell CPUs, fixes #2074
This was SVN commit r13736.
2013-08-21 23:18:35 +00:00
Enrique 3174d16256 Updated greek civs barracks, added ao, spec and normals
This was SVN commit r13735.
2013-08-21 22:58:31 +00:00
Ykkrosh deb64d36fc Fix rendering artifacts with novbo=true gentangents=true
glDrawRangeElements needs to know the range of vertexs that are used
by the index array. With VBOs it doesn't really matter if the range
is wrong (all the vertexes are in GPU memory anyway), but with CPU
vertex arrays the driver has to memcpy the given range of data, so
incorrect bounds will result in garbage data being rendered.

With gentangents, the rendered mesh can have more vertexes than the
original CModelDef, but was rendered with the CModelDef's vertex count.

Use the correct vertex count instead.

Refs #2050.

This was SVN commit r13734.
2013-08-21 21:01:32 +00:00
sanderd17 9c4801e107 add splash damage to quinquereme
This was SVN commit r13733.
2013-08-21 19:52:50 +00:00
Enrique 73773e61d0 Spart CC small fix
This was SVN commit r13732.
2013-08-21 17:48:59 +00:00
Mythos_Ruler 827ec20b1f Made the Cart trade ship avail in Village phase as a kind of "sea trade" bonus for them.
This was SVN commit r13731.
2013-08-21 17:27:28 +00:00
Enrique d94e1d8ed3 Spartan CC modified. Doric columns adjusted
This was SVN commit r13730.
2013-08-21 17:03:47 +00:00
Mythos_Ruler 70dfd1f803 Cavalry Swordsmen stats rebalanced.
This was SVN commit r13729.
2013-08-21 15:55:13 +00:00
Mythos_Ruler 081707039a Updated Cycladic Archipelago 6. Both sides now playable.
This was SVN commit r13728.
2013-08-21 15:20:27 +00:00
sanderd17 035542e76c revert wrong changes to support and female_citizen template
This was SVN commit r13727.
2013-08-21 09:55:42 +00:00
sanderd17 605852fccf Fix function that decides which units can have which formations, and remove formations for animals and the maurian worker elephant
This was SVN commit r13726.
2013-08-21 09:53:59 +00:00
historic_bruno 52d6a8036d This was SVN commit r13725. 2013-08-21 05:37:28 +00:00
historic_bruno f947fa6afe Fixes stack overflow in stack dump logic, by special-casing boost::unordered types, fixes #1813.
Adds INIT_HAVE_DISPLAY_ERROR init flag to correctly override
ah_display_error in Atlas (InitVfs was overriding it again), but don't
use it because it's ugly and broken, refs #1729

This was SVN commit r13724.
2013-08-20 21:07:42 +00:00
Enrique 3843ae6bb0 Greek houses upgrade. (eyecandy, ao, normal, spec)
This was SVN commit r13723.
2013-08-20 16:41:10 +00:00
sanderd17 c5296b9246 Fix maurian elephants being unable to build stuff. Caused by enlarging the elephant obstruction radius.
This was SVN commit r13721.
2013-08-20 09:39:01 +00:00
wraitii ee877a46c7 Switch X and Z loops in the foam generation, possible speed improvement.
This was SVN commit r13720.
2013-08-20 08:55:33 +00:00
historic_bruno e3b9f17c19 Removes useless "old maps" filter from match setup, refs #2071
This was SVN commit r13719.
2013-08-20 02:28:49 +00:00
historic_bruno 68822e3418 Adds more information to construction command debugging
This was SVN commit r13717.
2013-08-19 23:18:18 +00:00
leper 54bbbb9797 Boost 1.54 deprecates Boost.Signal. Use Boost.Signal2 for >= 1.54.
This was SVN commit r13716.
2013-08-19 22:11:54 +00:00
historic_bruno 0b4fe2ef94 Tweaks game speed dropdown more, refs #2046
This was SVN commit r13715.
2013-08-19 20:00:26 +00:00
Ykkrosh 1739a381c1 Fix crash when editing terrain near map edges.
The values in CMessageTerrainChanged can be overestimates that exceed
the normal map boundaries, and should be clamped before looping over
them.

This was SVN commit r13714.
2013-08-19 19:19:34 +00:00
leper 0ca841b92b Suppress unused local typedef warnings when including SpiderMonkey headers.
This was SVN commit r13713.
2013-08-19 18:26:44 +00:00
Mythos_Ruler 4d9b81f40e This was SVN commit r13712. 2013-08-19 18:09:09 +00:00
Mythos_Ruler 30c194a804 Starting units re-adjusted.
This was SVN commit r13711.
2013-08-19 15:42:46 +00:00
wraitii 3783d0e14c Fix flying unit not crashing in water when they should. Patch by scythewirler. refs #2067
This was SVN commit r13710.
2013-08-19 14:44:15 +00:00
leper 0c16980408 Fix tests.
This was SVN commit r13709.
2013-08-19 10:55:35 +00:00
wraitii 03bf727d9a Fix deactivation of HQ waviness causing the specular effect to go crazy.
This was SVN commit r13708.
2013-08-19 10:19:21 +00:00
historic_bruno b770c41f0b Removes shadow casting and receiving on preview entities, patch started by ericb, fixes #1771
This was SVN commit r13706.
2013-08-18 22:17:57 +00:00
Pureon 63a0b4ae98 projectile point for mauryan elephant archer
This was SVN commit r13705.
2013-08-18 20:42:42 +00:00
Enrique 2637540ce2 Spart CC centre upgrade with doric capitels +AO and effects
This was SVN commit r13704.
2013-08-18 18:02:18 +00:00
Enrique ab6d15c414 Macedonian CC mesh and AO fix
This was SVN commit r13703.
2013-08-18 16:16:53 +00:00
Ykkrosh 0888cf6c23 Fix Linux build
This was SVN commit r13701.
2013-08-18 11:28:52 +00:00
RedFox bf7cd1fcbd Undo-d the commit due to general panic about GLSL.
This was SVN commit r13700.
2013-08-18 11:15:29 +00:00
wraitii 29b5021f97 Fix my previous commit because obviously I had forgotten something.
This was SVN commit r13699.
2013-08-18 09:42:02 +00:00
wraitii a4707bcc16 Change the water manager so incremental updates to the water information is possible. Streamline a few things (and removes a not-really-used calculation to speed things up further). Fixes #2063 , refs #1743.
This was SVN commit r13698.
2013-08-18 09:27:11 +00:00
sanderd17 557c1fc067 fix (dis)allowing of garrisoning by other components. Refs #2067
This was SVN commit r13697.
2013-08-18 08:23:36 +00:00
historic_bruno 92f4391f51 Adds tech template support to checkrefs.pl
This was SVN commit r13696.
2013-08-18 02:52:05 +00:00
historic_bruno 791d392797 Fixes and improves terrain scanning of checkrefs.pl.
Removes some useless old actors.

This was SVN commit r13695.
2013-08-18 01:57:37 +00:00
alpha123 a18262e7b1 Make planes about 20% cooler. Fixes #2067.
This was SVN commit r13694.
2013-08-17 22:55:16 +00:00
historic_bruno abce308281 Renames confusing grass1_spring.png terrain texture, used for fancy grass effect, refs #2069
This was SVN commit r13693.
2013-08-17 22:16:01 +00:00
sanderd17 f25bbda672 fix typo for garrisoned archer classes. Reported by scythetwirler.
This was SVN commit r13692.
2013-08-17 20:34:28 +00:00
Enrique 90b75c95ea Macedonians CC upgraded with corinthian capitel + AO and normals
This was SVN commit r13691.
2013-08-17 18:32:41 +00:00
Mythos_Ruler a6c28ae461 Altered footprint of some elephant units.
This was SVN commit r13690.
2013-08-17 16:16:37 +00:00
Enrique fdc1f3a043 increased mauryan blacksmith size
This was SVN commit r13689.
2013-08-17 14:47:44 +00:00
Mythos_Ruler 3a2eec841c Adjusted max gatherers for these trees.
This was SVN commit r13688.
2013-08-17 14:26:43 +00:00
Mythos_Ruler 998dc21676 Removed old Aegis folder.
This was SVN commit r13687.
2013-08-17 14:12:25 +00:00
Enrique 42d77129cc rome blacksmith fix
This was SVN commit r13686.
2013-08-17 14:07:48 +00:00
Enrique 9763b9076c Upgraded roman blacksmith
This was SVN commit r13685.
2013-08-17 14:04:08 +00:00
sanderd17 a9c71e39a4 make new elevation tool more drastic + add RMB action
This was SVN commit r13684.
2013-08-17 14:02:18 +00:00
wraitii bcf7115b5c Fix Aegis to work properly for A14, also rename the folder from "qbot-wc" to "aegis" (thus apparent huge number of changes). Adds a "sandbox" difficulty setting that will never attack, collect resources 50% slower, and is pop-capped at 70 for beginners.
This was SVN commit r13683.
2013-08-17 13:59:53 +00:00
Mythos_Ruler 38b52f9ff0 Fixed a broken texture link.
This was SVN commit r13682.
2013-08-17 12:51:11 +00:00
Enrique 723a3ec8b5 Fixed kart_embassy_italiote.dae
This was SVN commit r13681.
2013-08-17 12:41:37 +00:00
Mythos_Ruler 2d4c3d72c6 Removed the old dds file from these actors.
This was SVN commit r13680.
2013-08-17 12:18:50 +00:00
Mythos_Ruler cdd2c74d44 Superfluous textures deleted.
This was SVN commit r13679.
2013-08-17 11:38:49 +00:00
RedFox 960615aa53 PreferGLSL = true as long as GenTangents = true.
This is for GLSL migration in the long run.

This was SVN commit r13678.
2013-08-17 11:13:36 +00:00
Mythos_Ruler b818a54b06 Tweaked some maps.
Updated some "tips" images.

Tweaked civ center radius and town phase radius boost.

Added some clarification language to the Farm Field tooltip.

This was SVN commit r13677.
2013-08-17 10:15:38 +00:00
sanderd17 b5888f4e45 generalise kill vs eject garrisoned entities on death of garrisonHolder
This was SVN commit r13676.
2013-08-17 09:26:17 +00:00
historic_bruno d37d3be5d0 Fixes Attack component schema
This was SVN commit r13674.
2013-08-17 06:02:31 +00:00
sanderd17 b820f6e6ae Add a pike elevation tool to make sharp pointed mountains. Fixes #2059
This was SVN commit r13672.
2013-08-16 14:46:54 +00:00
sanderd17 fe0ec1c720 fix coding style for buildingAI. Refs #2010
This was SVN commit r13671.
2013-08-16 12:17:18 +00:00
sanderd17 fd2245c53c Improved building AI. Refs #2010
This was SVN commit r13670.
2013-08-16 11:17:36 +00:00
Enrique cc0ba8e246 Missing maur blacksmith struct_b
This was SVN commit r13669.
2013-08-16 04:50:44 +00:00
sanderd17 d66edf5958 fix a bug that ignored resetting XZ rotation to zero, reported by sythetwirler
This was SVN commit r13668.
2013-08-15 22:16:51 +00:00
sanderd17 81b29bf18d fix line wrapping when big number of gatherers on one resource
This was SVN commit r13667.
2013-08-15 20:00:55 +00:00
sanderd17 675b3c40be fix bouncing projectiles, patch by Markus. Fixes #769
This was SVN commit r13664.
2013-08-15 19:01:10 +00:00
historic_bruno 7ff167e7de Removes more unused variables, based on patch by Markus, refs #1852.
Adds TODOs to use POT textures in fancy water rendering.

This was SVN commit r13663.
2013-08-15 18:25:32 +00:00
Enrique 6d3901faf7 Added mauryan blacksmith with AO. Updated mauryan struct textures
This was SVN commit r13662.
2013-08-15 17:17:25 +00:00
sanderd17 6b316f6ce1 fix tests breaking caused by 4421787281. Refs #2062
This was SVN commit r13661.
2013-08-15 08:56:14 +00:00
sanderd17 4421787281 interpollate y offset for smooth climbing and landing of flying objects. refs #2062
This was SVN commit r13660.
2013-08-15 08:44:06 +00:00
historic_bruno 1712b0f42d Increases simulation script runtime to 32 MB to reduce OOM errors, refs #1436, #1966, #2035
This was SVN commit r13659.
2013-08-15 05:15:54 +00:00
alpha123 4e709f2c9c Implement landing and go-around for UnitMotionFlying. Patch by scythetwirler. Fixes #2062.
This was SVN commit r13658.
2013-08-15 03:10:04 +00:00
sanderd17 b6fe589ae3 fix health regeneration for negative values (reported by Mythos_Ruler)
This was SVN commit r13657.
2013-08-14 08:33:29 +00:00
alpha123 2307509088 Remove the old diminishing returns formula (I accidentally left it as a comment). Also, I forgot to credit scythetwirler (who came up with the new formula) in the previous commit.
This was SVN commit r13656.
2013-08-14 05:16:09 +00:00
alpha123 cc02eabdd0 Change the formula for diminishing returns to something less flawed. Also add a lot of comments explaining how it works.
This was SVN commit r13655.
2013-08-14 05:14:20 +00:00
sanderd17 598c05e056 clean UnitAI move to attack range code + fix possible bug
This was SVN commit r13654.
2013-08-13 15:11:17 +00:00
Mythos_Ruler ba244b509c Fixed the portrait for this tech.
Adjusted water a little bit for these scenarios.

This was SVN commit r13653.
2013-08-13 00:55:47 +00:00
historic_bruno c709105355 Clarifies control group HotKeys
This was SVN commit r13652.
2013-08-12 23:50:18 +00:00
Mythos_Ruler 6925d493fe This was SVN commit r13651. 2013-08-12 23:40:24 +00:00
alpha123 d74ed3f1ae Increase farming speed by 46% for females and 42% for males. Combined with diminishing returns it was waaay too slow prior to this commit.
This was SVN commit r13650.
2013-08-12 23:17:30 +00:00
alpha123 3d1e693148 Enable diminishing returns for farms.
(Yeah yeah, somehow I forgot this when I committed the actual
functionality.)

This was SVN commit r13649.
2013-08-12 23:11:39 +00:00
Mythos_Ruler c44efe6c8c Spartan tech "Agoge" altered. Moved to Syssiton from Civ Center.
Unit tooltips cleaned up a bit. Made to look neater in-game.

This was SVN commit r13648.
2013-08-12 21:53:53 +00:00
sanderd17 1aaca7e6e3 health regeneration
This was SVN commit r13647.
2013-08-12 17:45:18 +00:00
alpha123 96cef624e3 Fix compiling tests on ARM. Patch by Josh.
This was SVN commit r13646.
2013-08-12 03:12:57 +00:00
historic_bruno 1ffb74b336 Adjusts session game speed dropdown, fixes #2046
This was SVN commit r13645.
2013-08-11 20:49:41 +00:00
Pureon 066c542e36 Template tweaks to palace
This was SVN commit r13644.
2013-08-11 12:09:10 +00:00
Pureon a552a3cb8b Persian Palace structure
This was SVN commit r13643.
2013-08-11 12:02:36 +00:00
Enrique b8fb2e1697 Added helle_struct_b parallax/normal map and specular. Applied on greek blacksmith. Improved helle_struct specular map
This was SVN commit r13642.
2013-08-11 08:49:15 +00:00
Mythos_Ruler 46f091a154 Added the Athenian civ bonus "Silver Owls" which gives them +10% metal gathering rates when upgrading phases.
Made "Delian League" (faster building ships) a team bonus. Need some new
code to make it apply to allies too.

Made farming slower.

This was SVN commit r13641.
2013-08-09 22:37:05 +00:00
Spahbod 3f0354943f Polishing thePolishing the Random Maps: Archipelago, English Channel, Islands, Lake, Lorraine Plain, Migration, Neareastern Badlands, Northern Lights, Oasis, Persian Highlands.
This was SVN commit r13640.
2013-08-09 12:30:59 +00:00
Mythos_Ruler c8b8dd24e6 This was SVN commit r13639. 2013-08-09 00:03:51 +00:00
Mythos_Ruler b0ceef39b9 Hellenic building bonus deleted from templates and moved to a tech.
Some updated portraits.

This was SVN commit r13638.
2013-08-08 23:55:13 +00:00
alpha123 93abbae435 Fix build issues on ARM. Patch by Josh. Fixes #2049.
This was SVN commit r13634.
2013-08-07 05:00:46 +00:00
leper dc722d76f3 Fix tests. Refs #1960.
This was SVN commit r13632.
2013-08-06 22:32:46 +00:00
Spahbod bff070c6cb Polishing the Random Maps: Gulf of Bothnia, Hyrcanian Shores, Islands, Kerala, Lake, Latium.
This was SVN commit r13630.
2013-08-04 12:31:43 +00:00
historic_bruno 4a805fb05c Updates keys.txt with new keynames, refs #2043
This was SVN commit r13628.
2013-08-03 20:39:15 +00:00
historic_bruno 5a1ddd7cf9 Improves hotkey support for non-QWERTY keyboards, patch by lsdh, fixes #2043
This was SVN commit r13627.
2013-08-03 20:09:29 +00:00
alpha123 8c74df2acd Give an elevation advantage to ranged units. Patch by sanderd17. Fix #1960.
This was SVN commit r13626.
2013-08-03 19:20:20 +00:00
Spahbod 3b294d3ad4 Revised Persian names.
This was SVN commit r13625.
2013-08-03 16:14:17 +00:00
Enrique 4f7ba84fd6 Modified athens CC to have Ionic columns and AO map.
Added normal and spec maps for several greek struct and props textures.

This was SVN commit r13624.
2013-08-02 23:03:55 +00:00
Mythos_Ruler c8830ea769 Specific Name for Mauryan blacksmith.
This was SVN commit r13623.
2013-08-01 22:00:20 +00:00
Spahbod 17fd4fab94 Polishing the Random Maps: Fortress, Gear, Guadalquivir River
This was SVN commit r13622.
2013-08-01 17:58:51 +00:00
leper 70d072577b ;
This was SVN commit r13621.
2013-07-31 22:25:24 +00:00
leper f6e0c4c5a4 Split up cheats into multiple files. Patch by lsdh/ldsh. Fixes #2019.
Replace buggy hasAllies with the inlined check if we have a team at all.
Fix setting of starting resources (broken in 58fa0c7c58).

This was SVN commit r13620.
2013-07-31 22:22:12 +00:00
Spahbod c438a1eb82 Polishing the Random Maps: Alpine Valley, Archipelago, Cantabrian Highlands, Canyon, Continent, Corinthian Isthmus, English Channel
This was SVN commit r13619.
2013-07-31 10:05:48 +00:00
Spahbod f3823847b0 Polishing the Random Maps: Archipelago, Ardennes Forest, Atlas Mountains, Cantabrian Highlands
This was SVN commit r13618.
2013-07-30 11:09:40 +00:00
Spahbod 477855fbf5 Polishing the Random Maps: Alpine Valley, Anatolian Plateau, Archipelago
This was SVN commit r13617.
2013-07-30 07:56:09 +00:00
alpha123 344a149a66 Infinite farms with diminishing returns (but no farmland). Refs #1318.
This was SVN commit r13616.
2013-07-30 06:04:53 +00:00
alpha123 857ae2dd3e - Fix a bug from 20e7d2224a where the player ID would always be set to 1.
- Make the developer overlay a tad taller.

This was SVN commit r13614.
2013-07-29 20:01:09 +00:00
Spahbod 70e67af87f Polishing the Random Maps: Alpine Valley
This was SVN commit r13613.
2013-07-29 14:22:54 +00:00
Spahbod 4dfe1d6df9 Polishing the Random Maps: Alpine Valley
This was SVN commit r13612.
2013-07-29 13:50:20 +00:00
Spahbod 992a8ee0b8 Polishing the Random Maps: Aegean Sea and Alpine Valley
This was SVN commit r13611.
2013-07-29 12:52:31 +00:00
Mythos_Ruler 629492625f Some touching up.
This was SVN commit r13610.
2013-07-29 12:35:05 +00:00
alpha123 f3b0417aac Don't try to interpret Enter as a mouse click in message boxes (makes it really annoying to chat at the end of a game).
This was SVN commit r13608.
2013-07-29 05:04:28 +00:00
Spahbod e3c42a204e Fixing a bug
This was SVN commit r13607.
2013-07-29 04:30:03 +00:00
alpha123 20e7d2224a Implement a developer overlay command to change the current player ID (very useful for AI development).
This was SVN commit r13606.
2013-07-29 00:53:44 +00:00
Spahbod 53074c7715 Polishing the random maps: Aegean Sea, Alpine Lakes
This was SVN commit r13605.
2013-07-28 16:58:09 +00:00
Mythos_Ruler 63f766bb2a Nerfed Hellenization a bit.
Changed the portraits of the Cart merc techs.

This was SVN commit r13604.
2013-07-28 16:21:43 +00:00
Mythos_Ruler 0774730e2f -Made starting units start at Elite rank (just for fun and testing).
-Some new tech portraits for Divine Offerings and Agoge.
-Fertility Festival technology increased cost.
-New special technology for all Hellenic factions: Hellenization,
researched at the Theatron, increases territory influence for all
buildings +50%. This is a temporary technology until the real
Hellenization effect can be implemented.
-New special technology for the Mauryan and Iberian blacksmiths: Woot
Steel and Toledo Steel respectively.

This was SVN commit r13603.
2013-07-28 13:38:04 +00:00
Enrique 28db824982 iberian, hellene, roman and celtic blacksmiths with AO maps added.
This was SVN commit r13602.
2013-07-28 13:14:42 +00:00
Mythos_Ruler f0310cce58 Reduced Food cost of cavalry from 100 to 80.
Reduced Food cost of elephants from 200 to 150.
Reduced Metal cost of elephants from 200 to 150.
Reduced Stone cost of Mauryan elephant stables from 300 to 200.
Reduced Metal cost of Persian chariot archers from 100 to 0.

This was SVN commit r13601.
2013-07-28 10:20:07 +00:00
Mythos_Ruler a146a8ad3b Fixed some things.
This was SVN commit r13600.
2013-07-27 18:52:28 +00:00
quantumstate fd428cf45b Fix bug when randomly picking a unit to attack for AI's. Fix from bmwiedemann.
This was SVN commit r13599.
2013-07-27 15:08:45 +00:00
Spahbod 0263f17bcc Polishing the random maps: Aegean Sea
This was SVN commit r13598.
2013-07-27 12:13:46 +00:00
historic_bruno a684f7646b Fixes crash when hotloading main menu while splash screen shown (don't alter GUI page stack in init functions), refs #2042
This was SVN commit r13597.
2013-07-26 01:35:01 +00:00
Pureon db5c54c7c6 Persian dock update
This was SVN commit r13596.
2013-07-25 23:02:51 +00:00
Mythos_Ruler 70a3c6c8b4 Supremely blue water on Cycladic Archipelago 2. Enable high graphics and take a look at the depth rendering and specular effect.
This was SVN commit r13595.
2013-07-25 17:45:40 +00:00
Mythos_Ruler 5bfff54bcb Unit promotion animation and invulnerability reduced from 4 seconds to 2.8 seconds.
This was SVN commit r13594.
2013-07-25 13:57:54 +00:00
wraitii e5a9b0eab4 And of course I forgot a file.
This was SVN commit r13593.
2013-07-25 08:58:15 +00:00
wraitii 1f55280fa2 AI-related changes to the AI interface and Command.js, to facilitate debugging of upcoming new version of Aegis.
This was SVN commit r13592.
2013-07-25 08:57:07 +00:00
Mythos_Ruler 0d8b9b15e1 All animals now visible in Fog of War (FOW). Should help a lot with hunting.
Hack armor increased for most buildings.

This was SVN commit r13591.
2013-07-24 18:11:03 +00:00
Mythos_Ruler 697b88562c Game Speeds adjusted.
This was SVN commit r13590.
2013-07-24 13:08:45 +00:00
leper 6ed814354e Fix the fix of the fix. Refs #1914.
This was SVN commit r13589.
2013-07-23 18:48:25 +00:00
Mythos_Ruler 9681606d05 Non civ center units that are available at the village phase barracks are now not available until Town phase.
House-trained females take 30 seconds to train now.

This was SVN commit r13588.
2013-07-23 15:39:24 +00:00
wraitii efc1a678ed Change my fix from revision [13586] to use something faster. Still Refs #1914
This was SVN commit r13587.
2013-07-23 10:37:43 +00:00
wraitii dc3c39fd93 Fix a rare issue where units could get stuck in Individual.Gather.Gathering state forever because of worker limits. Refs #1914 (might even fix it).
This was SVN commit r13586.
2013-07-23 09:46:49 +00:00
wraitii d01d58f70f Fake randomization of the ship sinking animation to make it look better with ship formations. Refs #1921
This was SVN commit r13584.
2013-07-22 10:17:00 +00:00
leper 86a8dd7e6f Small cleanup.
This was SVN commit r13583.
2013-07-21 23:25:15 +00:00
Mythos_Ruler bff7c53a14 Some new hero portraits.
This was SVN commit r13582.
2013-07-21 05:53:53 +00:00
Mythos_Ruler 3aa9e2f6e0 Technology research time tweaks, and fixes.
This was SVN commit r13581.
2013-07-21 02:16:45 +00:00
historic_bruno e0ea53a8ee Adds saved game descriptions and in-game save dialog, based on patch by Crynux, fixes #2030
This was SVN commit r13579.
2013-07-21 00:23:57 +00:00
Mythos_Ruler 311403d5ef Barracks buildable in Village Phase.
Fish can now be seen through the fog of war (but not in shroud of
darkness, of course).

This was SVN commit r13578.
2013-07-20 12:01:56 +00:00
Mythos_Ruler 9f7a0348bd New portraiture by LordGood.
This was SVN commit r13577.
2013-07-20 07:35:54 +00:00
historic_bruno f5e60157bf Optimizes GetPercentMapExplored by caching explored vertices per player, patch by scroogie, fixes #2012
This was SVN commit r13576.
2013-07-20 00:50:40 +00:00
Pureon fc9b19ab47 Pers corral and storehouse updates
This was SVN commit r13575.
2013-07-18 22:59:14 +00:00
Pureon 439603e3fd Persion civic ao update
This was SVN commit r13574.
2013-07-17 23:45:24 +00:00
Pureon 1a20d47cfb Updates to the Persian civ centre model
This was SVN commit r13573.
2013-07-17 23:26:40 +00:00
historic_bruno 38cdc38bba Fixes a build error with SDL2, refs #2041
This was SVN commit r13572.
2013-07-17 06:33:11 +00:00
historic_bruno 39c0498811 Changes terrain anchoring to use faster CalcExactNormal instead of CalcNormalFixed, refs #1988, #2039
This was SVN commit r13571.
2013-07-17 05:42:16 +00:00
Pureon 1cca648b6d Persian blacksmith building
This was SVN commit r13570.
2013-07-16 21:57:49 +00:00
leper 2ea7fb18ea Backport c011875c5a to the older APIs and allow for empty buildable entites token list.
This was SVN commit r13569.
2013-07-16 21:22:05 +00:00
wraitii df2458aa39 Allow setting of prop min/max height in the actor Edit. By sanderd17.
This was SVN commit r13568.
2013-07-16 13:13:41 +00:00
historic_bruno da4d1916dc Implements shared trade gain with allies, patch by mimo, fixes #1691
This was SVN commit r13567.
2013-07-16 05:59:48 +00:00
historic_bruno f302faf8e4 Implements entity terrain anchoring as a visual effect, based on patch by sanderd17, fixes #1988.
Sets cavalry and quadrupedal animals to 'pitch' anchoring. Cleans up
mine templates.

This was SVN commit r13565.
2013-07-16 03:46:30 +00:00
Pureon 9a0ab14cf3 Carthaginian blacksmith building
This was SVN commit r13564.
2013-07-16 00:00:57 +00:00
wraitii c011875c5a Fixes an issue with Aegis and the iberians
This was SVN commit r13563.
2013-07-15 19:47:59 +00:00
wraitii de5b584cbf Fixes #2037
This was SVN commit r13562.
2013-07-15 05:54:46 +00:00
historic_bruno 047992e61a Fixes possible memory leaks by only allocating wave vertex buffers once and only when needed, and releasing them before re-allocating (in case CreateSuperfancyInfo is called multiple times).
Checks if wave vertex buffers were allocated before rendering, fixes
#2017

This was SVN commit r13561.
2013-07-15 03:26:48 +00:00
Pureon 6d284e4e56 Applying stwf's sound attribute to ballista + pers fortress decals added
This was SVN commit r13560.
2013-07-14 15:41:49 +00:00
Mythos_Ruler c9193b0302 Fix a few templates and techs.
This was SVN commit r13559.
2013-07-14 15:01:22 +00:00
Pureon 5eb670ef82 Med Cove and Persian sandbox map tweaks
This was SVN commit r13558.
2013-07-14 13:58:36 +00:00
wraitii 595c964d77 Make water specular more visible and fixes a few cases where it would actually hardly appear when it should.
Adds the ability to access an element in a dropdown box by typing the
first letters (Refs #1532).

This was SVN commit r13556.
2013-07-14 12:17:07 +00:00
wraitii 408c30e061 Probably fixes #2021. Optimization for foam generation while I'm at it (it's faster now, but there's a new temporary array of the size of the map)
This was SVN commit r13555.
2013-07-14 08:06:07 +00:00
Mythos_Ruler 071c976693 Sahel. wide open 2v2 scenario.
This was SVN commit r13554.
2013-07-13 01:50:46 +00:00
historic_bruno 63c19af5dc Fixes assignment operator warning on MSVC by making CObjectEntry NONCOPYABLE, refs #2033
This was SVN commit r13552.
2013-07-12 03:46:40 +00:00
historic_bruno 5fb89ac6bc Fixes prop bugs due to uninitialized variables on MSVC build, refs #2033
This was SVN commit r13551.
2013-07-12 03:32:14 +00:00
leper 91effd1ad1 ...
This was SVN commit r13550.
2013-07-11 23:58:54 +00:00
leper d5897854be Allow terrain aligned props. Patch by sanderd17. Fixes #2033.
This was SVN commit r13549.
2013-07-11 22:53:31 +00:00
leper 6cffdacb40 Small cleanup.
This was SVN commit r13547.
2013-07-10 00:08:05 +00:00
leper d1af7ea0ef Include mod path in the cache path.
This was SVN commit r13546.
2013-07-10 00:08:01 +00:00
Pureon fb0c1e6cc6 Update to the Carthaginian wonder/mausoleum
This was SVN commit r13545.
2013-07-09 23:51:23 +00:00
leper 27086be9c3 Split skeleton definitions into multiple files, adds hotloading support for skeleton files. Fixes #190.
This was SVN commit r13544.
2013-07-08 20:25:06 +00:00
alpha123 041855e547 Allow building walls along the shore. Patch by sanderd17. Fix #1610.
This was SVN commit r13542.
2013-07-07 22:44:47 +00:00
alpha123 d479f373aa Display current/max gatherers or builders when a resource or foundation is selected. Based on a patch by mimo. Fix #1871.
This was SVN commit r13541.
2013-07-07 22:13:58 +00:00
alpha123 ed3afce81e - Round attack numbers in the GUI. Patch by scythetwirler. Fix #1997.
- Adjust the siege attack tech to add an integer instead of multiply by
a percentage.
- Fix the siege armor tech so the tooltip and the added value match up.

This was SVN commit r13540.
2013-07-07 21:04:36 +00:00
leper 93e8ccda64 Fix crash in VC++11 debug builds. Fixes #2028. Patch by RedFox.
This was SVN commit r13539.
2013-07-07 20:02:20 +00:00
Pureon efc6263cc4 Tech icon tweaks
This was SVN commit r13538.
2013-07-07 15:55:35 +00:00
Pureon 41f1485997 Fixing some missing texture links caused by 80b0106502
This was SVN commit r13537.
2013-07-07 15:36:27 +00:00
historic_bruno 8aa016a884 Changes graphics card name detection on Windows to use OpenGL, as a workaround for certain WMI related crashes on Nvidia Optimus and netbook systems. Fixes #1952, #1575
This was SVN commit r13536.
2013-07-06 18:30:29 +00:00
Mythos_Ruler 30f8d6dae2 Tweaks to some templates and tech portraits.
This was SVN commit r13534.
2013-07-06 03:35:03 +00:00
Pureon 3824b3f89d Silver shield tech icon
This was SVN commit r13533.
2013-07-05 22:26:34 +00:00
leper 4ab38f81f7 Remove player owned sheep when committing the foundation.
This was SVN commit r13531.
2013-07-05 15:33:39 +00:00
Pureon 453389b53a Generic shield icons
This was SVN commit r13530.
2013-07-04 22:40:02 +00:00
stwf 485bd75abe apply patch from ticket 1944 added sound attribute to animations to optionally differentiate sound starting point
This was SVN commit r13529.
2013-07-02 11:44:46 +00:00
Mythos_Ruler 377cae15f8 Technology to unlock female training at the house.
Sacred Band infantry is now a spearman instead of pikeman.

This was SVN commit r13528.
2013-07-02 07:11:01 +00:00
Mythos_Ruler cd7b56faa4 Updated the name of "Porus" on Punjab 1.
Updated some Blacksmith templates with histories.

Made a new "pikeman" template to use with pike units. Made pikemen have
extra high armor, but pretty low attack. Basically they'd be used as the
ultimate meat-shield.

Cleaned up some stuff.

Made us of Pureon's new technology portraits.

This was SVN commit r13527.
2013-07-02 00:04:05 +00:00
leper 24b6fb7c3e Clean up cheat handling a bit. Use setter and getter for cheatTimeMultiplier.
This was SVN commit r13526.
2013-07-01 23:46:03 +00:00
Pureon 78d4a24fba Hero tech icon
This was SVN commit r13525.
2013-07-01 23:42:51 +00:00
Pureon 40660606aa Corinthian crest helmet tech icon
This was SVN commit r13524.
2013-07-01 21:46:24 +00:00
historic_bruno 9565c60a14 Adds UI sounds for buttons, dropdowns, lists, and checkboxes, fixes #948
This was SVN commit r13521.
2013-07-01 04:15:09 +00:00
leper ef66f73a84 Recalculate trader gain when garrisoned entities change. Patch by mimo. Fixes #2018.
This was SVN commit r13520.
2013-06-30 22:19:41 +00:00
Pureon c04f887676 Mauryan civ uses Omri's track. Cart sandbox map update
This was SVN commit r13519.
2013-06-30 11:06:35 +00:00
Pureon 2a2daf84e0 Small boats move around quieter than large ships
This was SVN commit r13518.
2013-06-30 10:40:59 +00:00
OmriLahav d213f2ba91 This was SVN commit r13516. 2013-06-30 09:24:43 +00:00
historic_bruno 0933925d49 Adds JS implementations of Math.pow, exp, and log, by sanderd17, refs #1193.
Fixes #1990 (OOS caused by Math.pow).
Adds tests and documentation for Math functions.

This was SVN commit r13515.
2013-06-30 05:16:20 +00:00
historic_bruno d79ba004da Fixes OS X build failing to find Boost libs, refs #1938
This was SVN commit r13514.
2013-06-30 00:48:34 +00:00
historic_bruno 8bccecdb8d Updates Premake Windows binary
This was SVN commit r13513.
2013-06-29 23:36:56 +00:00
leper bbcfa93dc4 Use os.findlib to find boost. Patch by Markus. Fixes #1938. Refs #1518.
This was SVN commit r13512.
2013-06-29 22:25:50 +00:00
leper c6348538ea Show combined costs in the gate conversion tooltip. Based on patch by Jgwman. Fixes #1591.
This was SVN commit r13511.
2013-06-29 20:55:53 +00:00
historic_bruno 123d08eb82 This was SVN commit r13510. 2013-06-29 04:12:17 +00:00
Mythos_Ruler 4c22d4631a Carthaginians can now only build 1 embassy at a time.
Each embassy comes with new technology pairs. Metal Costs vs. Training
Time.

Structure pierce armor adjusted upward.

This was SVN commit r13509.
2013-06-29 02:17:33 +00:00
alpha123 2b02f983a6 Replace decimal with nonNegativeDecimal. Refs #1633
This was SVN commit r13508.
2013-06-29 01:59:46 +00:00
alpha123 37c8e77d8e Use floats for health. Fix #1633
This was SVN commit r13507.
2013-06-29 00:43:08 +00:00
Mythos_Ruler 4b3f4c0a1d This was SVN commit r13506. 2013-06-27 12:00:23 +00:00
leper 623f5d9a9f Small garrison code clean-up
This was SVN commit r13505.
2013-06-26 19:24:56 +00:00
leper 6cbdc13e08 Clarify usage of CheckPlacement. Check if the losRangeQuery exists before disabling it.
This was SVN commit r13504.
2013-06-26 18:41:06 +00:00
leper 5e289f51c2 Make attack type a property of the order.
This was SVN commit r13503.
2013-06-26 14:15:03 +00:00
leper d5e081d55f Fix inconsitency between AttackEntityInZone and ShouldAbandonChase for units in defensive stance. Patch by mimo. Fixes #1866.
This was SVN commit r13502.
2013-06-26 13:24:03 +00:00
leper 2fcd52b657 Let states execute their leave handlers on OnDestroy. Fixes #1999. Patch by mimo.
This was SVN commit r13501.
2013-06-25 21:49:54 +00:00
historic_bruno 49b3b0ee9a Reverts interpolation changes from a7bc7ab50c, 71ae5a19d8, 1778e685ac, c6043779f6, 8777f68aa0, 21f13f9683. Refs #1846, #1858, #1865, #1906
This was SVN commit r13500.
2013-06-25 01:09:43 +00:00
historic_bruno 699d5c5d79 Fixes possible overflow in terrain position/normal calculation, based on patch by sanderd17. Fixes #1986
This was SVN commit r13499.
2013-06-25 00:57:42 +00:00
historic_bruno a981890ab9 Fixes PSA converter to detect broken animations/skeletons.xml slightly better, based on patch by Markus. Fixes #1478
This was SVN commit r13498.
2013-06-23 22:58:17 +00:00
historic_bruno ce8457e195 Fixes map name in pathfinder performance test
This was SVN commit r13497.
2013-06-23 00:50:24 +00:00
historic_bruno 4fc15a9b08 Renames mill to storehouse
This was SVN commit r13496.
2013-06-22 02:28:54 +00:00
Mythos_Ruler e5c35beefe Blacksmith smoke.
Persian and Carth blacksmith actors.

This was SVN commit r13495.
2013-06-21 00:16:52 +00:00
Mythos_Ruler 5f78bb7318 For most civs, made it so that Champions are unlocked by default in the Fortress at City Phase, but then also available for training at the Barracks, but after they are unlocked with a tech.
Removed the minrange for all ranged units until minimum range bugs are
fixed. To fix it will require a multi-pronged approach that will need
discussed and Trac tickets created.

This was SVN commit r13494.
2013-06-21 00:14:00 +00:00
historic_bruno 14990ea390 Fixes another possible NaN when invulnerable units are attacked, refs #1881
This was SVN commit r13493.
2013-06-18 20:20:37 +00:00
Mythos_Ruler fca1f4c3a7 Persians and Carthaginians receive blacksmiths.
This was SVN commit r13492.
2013-06-18 14:20:15 +00:00
historic_bruno 1a5d5eb808 Sets remaining unit trained and building completed sounds to HeardBy owner only, refs #1965
This was SVN commit r13490.
2013-06-18 05:06:22 +00:00
historic_bruno a7bc7ab50c Fixes units not rotating correctly during e.g. attacks, patch by sbte, fixes #1906
This was SVN commit r13489.
2013-06-18 03:42:06 +00:00
historic_bruno 95b51188fa Fixes possible undefined value returned by CmpHealth, leading to a NaN and serialization test failure. Refs #1881
This was SVN commit r13488.
2013-06-18 03:26:08 +00:00
stwf 00e21a9898 change 'restricted' flag to 'heardby' in SoundGroup xml files
This was SVN commit r13487.
2013-06-17 15:46:28 +00:00
stwf 36dec0e789 add restricted flag to SoundGroup xml for sounds thatonly the owning player should hear
This was SVN commit r13486.
2013-06-17 02:30:40 +00:00
historic_bruno 02b98f3acd Fixes build with x11 and SDL2
This was SVN commit r13485.
2013-06-17 01:43:57 +00:00
leper f918c9b074 Prevent formation controllers from showing up in range queries. Fixes #1796.
This was SVN commit r13484.
2013-06-16 23:10:01 +00:00
historic_bruno 5f90371a1c Cleans up some float constants and math from #1921
This was SVN commit r13482.
2013-06-15 00:42:07 +00:00
alpha123 9d27cccbcd Fix Visual Studio build issues.
This was SVN commit r13481.
2013-06-15 00:20:40 +00:00
historic_bruno e75877b52f Adds comment about xorg-x11's glXGetProcAddress not returning NULL for unsupported functions, closes #171
This was SVN commit r13480.
2013-06-14 23:49:20 +00:00
leper c01c8fb2fc Stop generating VS2005 project files. Refs #1951.
This was SVN commit r13479.
2013-06-14 23:46:12 +00:00
alpha123 98cac1a10f Improve ship sinking. Patch by wraitii. Fix #1921
This was SVN commit r13478.
2013-06-14 19:19:13 +00:00
leper 9ea830c855 Handle empty token list gracefully.
This was SVN commit r13477.
2013-06-14 16:13:59 +00:00
stwf bcf99e2a13 make sound code return faster, code cleaner
This was SVN commit r13476.
2013-06-14 16:05:57 +00:00
stwf da17e4329b cleanup SOundManaer component
This was SVN commit r13475.
2013-06-14 00:24:51 +00:00
stwf 26dbac8d57 fixes to SoundManager external interface, clean up ifdef situation, and SoundGroup playin
This was SVN commit r13474.
2013-06-13 12:12:44 +00:00
historic_bruno b3653cfe16 Updates bundled Valgrind headers to 3.8.1 and fixes test build, patch by Markus, fixes #1971
This was SVN commit r13473.
2013-06-12 03:38:37 +00:00
leper 2567fee329 Write mod data correctly. Fixes #1940.
This was SVN commit r13472.
2013-06-11 20:50:09 +00:00
Mythos_Ruler 15e75cdfbd Updated some building tooltips.
Removed wall techs from Iberians for balance.

This was SVN commit r13471.
2013-06-11 16:28:42 +00:00
historic_bruno facd447d0f Hopefully fixes GCC warning about narrowing conversion in C++11, fixes #1851
This was SVN commit r13470.
2013-06-11 02:40:49 +00:00
leper b3391ebe39 Fix build warnings. Patch by Markus. Refs #1851.
This was SVN commit r13469.
2013-06-11 00:05:57 +00:00
Mythos_Ruler 2ed10ec033 Changed names and histories for Roman civ center and market.
Fixed elephant heroes.

This was SVN commit r13468.
2013-06-10 15:33:18 +00:00
stwf ada7702bec add UI sound channel, clean up external interface and javascript calls
This was SVN commit r13467.
2013-06-10 13:58:43 +00:00
leper 29549561e1 Add flag to VisualActor for entities that should only be visible in Atlas. Patch by KareemErgawy. Fixes #1411.
This was SVN commit r13465.
2013-06-09 23:18:21 +00:00
alpha123 5246e9a576 Update description of ESC key in the manual. Refs #1928.
This was SVN commit r13464.
2013-06-09 20:38:57 +00:00
alpha123 6f3a0e1378 Implement location hotkeys. Fix #1882.
This was SVN commit r13463.
2013-06-09 20:21:19 +00:00
Mythos_Ruler 356adb1216 Nicer looking particles for Roman Temple. Fixes #1498.
More shield and helmet stuff.

This was SVN commit r13462.
2013-06-09 17:28:46 +00:00
Mythos_Ruler 80b0106502 Brand new Macedonian/Ptolemaic shield patterns by Enrique.
This was SVN commit r13461.
2013-06-09 15:57:29 +00:00
historic_bruno b40a738c87 Adds Omnipresent flag to more alarm sounds
This was SVN commit r13460.
2013-06-08 22:46:26 +00:00
Mythos_Ruler d151a6a304 Fixed war elephants. They can attack walls now.
This was SVN commit r13459.
2013-06-08 13:42:49 +00:00
Mythos_Ruler 8eae65be2b Fixed elephants. Can now attack walls.
This was SVN commit r13458.
2013-06-08 12:51:15 +00:00
Mythos_Ruler 633eab6080 Median Oasis 6 & 7.
Updated blowing sand texture.

This was SVN commit r13457.
2013-06-06 14:47:50 +00:00
stwf 71b25d5bd4 big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references
This was SVN commit r13455.
2013-06-06 11:13:57 +00:00
historic_bruno 1341b88468 Adds VBO support to minimap entity rendering to improve performance, patch by kuranes. Refs #1923
This was SVN commit r13454.
2013-06-06 00:10:58 +00:00
leper d20849d1c4 Add some checks for the sound manager. Fixes the segfault when using -quickstart.
This was SVN commit r13453.
2013-06-05 22:10:11 +00:00
leper 5b1f5dd2c1 Display expected trading gain (GainMultiplier = 1) for market foundations when setting rally points. Fixes #1963.
This was SVN commit r13452.
2013-06-05 21:35:31 +00:00
historic_bruno b2f6a1260e Sets Distanceless flag on most selection sound groups.
Adds new sound groups for gates.

This was SVN commit r13451.
2013-06-04 03:17:46 +00:00
historic_bruno 43d2c8be8c Converts a bunch of stereo sound effects to mono, to fix sounds ignoring entity position, fixes #1956, refs #1929.
Will require sound group XML updates in some cases.

This was SVN commit r13450.
2013-06-03 21:42:48 +00:00
Mythos_Ruler 4d5187bf40 Building completion and unit training sounds are now ubiquitous, meaning you'll hear them even if they are off-screen.
This was SVN commit r13449.
2013-06-03 02:50:10 +00:00
leper 8026685a06 Don't display the rally point tooltip for trading for enemy markets.
This was SVN commit r13448.
2013-06-02 20:17:44 +00:00
historic_bruno 2ef6ec3f73 Rounds trader gain to avoid fractions with garrisoned traders in a merchant ship, patch by Markus, fixes #1954
This was SVN commit r13447.
2013-06-01 21:28:31 +00:00
Pureon eebe7972df Lighting tweaks to Mauryan emblem
This was SVN commit r13446.
2013-06-01 12:09:34 +00:00
stwf 5af503405f last bunch of ogg files not converted from wav correctly
This was SVN commit r13445.
2013-06-01 02:56:31 +00:00
Mythos_Ruler b6e0661b8f New BRASIDAS Spartan hero.
"The Agoge" tech for Spartans.

Fixed Leonidas' selection ring.

This was SVN commit r13444.
2013-06-01 02:33:58 +00:00
stwf 67b42210aa mono ogg sounds rendered from original wav files recommitted
This was SVN commit r13443.
2013-06-01 02:30:05 +00:00
stwf 004eaf9e75 log warning when stereo sounds are played at position
This was SVN commit r13442.
2013-06-01 01:52:05 +00:00
Mythos_Ruler 4882aac409 New techs for Carthage: Mercenary Captains, reduce metal costs for merc units, based on ethnicity.
Melee cav more starting pierce armor.

This was SVN commit r13441.
2013-05-31 02:52:06 +00:00
stwf 690619ce5e many fauna sounds in stereo converted to mono so the OpenAL can locate them
This was SVN commit r13440.
2013-05-31 02:50:47 +00:00
stwf b21de66e40 address issue 1929 Ubiquitous Sound Effects, fixes a bug in determining which units are onscreen, also plays distant items softly if at all
This was SVN commit r13439.
2013-05-31 01:03:07 +00:00
Mythos_Ruler d3e40792ff Added a "wooden structures" civ bonus for the Celtic civs. Their buildings are 20% weaker, but they construct 20% faster than other cultures.
Fixed health for "Greek" walls.

Adjusted "preferredclasses" stuff on some templates.

This was SVN commit r13438.
2013-05-30 00:58:07 +00:00
Mythos_Ruler 085e9c620d Tweaked armor stats for battering ram and siege tower.
Fixed "rollover" tag to "history".

This was SVN commit r13437.
2013-05-29 23:39:13 +00:00
historic_bruno 7a8c8e439b Fixes warning in VC2012 build (C4706: assignment within conditional expression)
This was SVN commit r13434.
2013-05-28 01:23:43 +00:00
historic_bruno d2b0d25457 Fixes macro redefinition of FACILITY_VISUALCPP in VC2012 (it's defined in winerror.h).
Removes obsolete hack for old Boost and VC2005 (broke VC2005 build with
modern Boost).

This was SVN commit r13433.
2013-05-28 01:14:41 +00:00
Mythos_Ruler 4a8c7e72b5 Lowered crush armor for these buildings.
This was SVN commit r13431.
2013-05-27 18:21:57 +00:00
stwf 93d0084266 incorporate patch from ticket 1937, fix memory leak in SoundManager
This was SVN commit r13430.
2013-05-27 13:36:17 +00:00
historic_bruno 88c4e5bdd0 Extends binary serializer to support some standard JS classes: Number, String, Boolean. Fixes #406.
Extends binary serializer to support typed arrays.
Extends binary serializer to support custom JS prototype objects in AIs,
fixes #407.
Allows full serialization of AIs (not yet implemented). Refs #1089,
#1886
Increases binary serializer script backref arena from 8 MB to 16 MB,
refs #1842

This was SVN commit r13429.
2013-05-26 21:57:24 +00:00
Mythos_Ruler e58fe92892 Tweaked Walls stats and costs.
Carthaginians' 'Triple Walls' civ bonus moved from wall templates to
auto-researching (free) tech. It just cleans things up quite a bit.

Changed sound groups for "special buildings."

This was SVN commit r13428.
2013-05-25 23:10:16 +00:00
Mythos_Ruler 97b28e7343 Some sound file changes to hopefully add more aural variation.
Cavalry blacksmith techs moved from City to Town.

Trying to give the female citizen the order_build soundgroup, but it
doesn't seem to work. The game seems to use order_repair for both
repairing and building. These are two different actions so should
support two different sound groups.

This was SVN commit r13427.
2013-05-25 18:07:29 +00:00
wraitii 2c52099ddd Fix previous commit because of course there was test code in there. Make Aegis build more farms because of recent changes.
This was SVN commit r13426.
2013-05-25 16:24:05 +00:00
wraitii f372f9184c Fix Aegis breaking the profiler after some time (Fixes #1945. Fix typo (Fixes #1947). Patches by Markus.
Also one other fix for something attack related (probably, code is old
and I can't recall).

This was SVN commit r13425.
2013-05-25 15:56:11 +00:00
historic_bruno 17bb997e0e Fixes memory leak in CVertexBuffer::Release, patch by Markus, fixes #1933
This was SVN commit r13423.
2013-05-23 23:16:36 +00:00
leper bc8d461b81 Display rally point lines when setting rally points using the minimap. Patch by TrinityDeath. Fixes #1848.
This was SVN commit r13422.
2013-05-23 20:34:15 +00:00
historic_bruno a8a968d32c Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
historic_bruno 72a8b88b7d Fixes some unconventional assignment operators, patch by Markus, refs #1852.
Fixes typo in test_ShaderManager

This was SVN commit r13420.
2013-05-22 22:04:58 +00:00
historic_bruno 94c57085e9 Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
historic_bruno d7dcd3b26c Use prefix increment operator for iterators (for consistency), refs #1852, #1064
This was SVN commit r13418.
2013-05-22 18:41:13 +00:00
stwf 3ce14e3f4b fix memory leak in SoundManager, patch taken from ticket #1934
This was SVN commit r13417.
2013-05-22 12:13:21 +00:00
leper 56a4d6417c Small cleanup.
This was SVN commit r13416.
2013-05-21 23:50:42 +00:00
leper e5523754b3 Check if a building is already at full health when trying to repair it. Fixes #1930.
This was SVN commit r13415.
2013-05-21 23:45:20 +00:00
leper 4356badfa9 Pause production if the producing entity is garrisoned. Fixes #1931.
This was SVN commit r13414.
2013-05-21 23:01:53 +00:00
leper 3f00d4d997 Change some size() > 0 to Based on patches by kuranes and Markus. Refs #1852, #1923.
This was SVN commit r13413.
2013-05-21 22:11:47 +00:00
leper 013fc9558a Fix typo. Fixes #1935.
This was SVN commit r13412.
2013-05-21 22:11:15 +00:00
wraitii 136f1891c1 Fixes a fix about a fix on the waterManager. Fixes #1891
This was SVN commit r13411.
2013-05-21 08:55:49 +00:00
Mythos_Ruler 346df43a43 Persian Apadana build limit.
This was SVN commit r13410.
2013-05-19 08:24:36 +00:00
Mythos_Ruler 67d072108b Bloody dead camel.
New wall technologies (research at Wall Tower, since for now techs can't
be researched at wall segments).

Adjusted default BatchTrainModifier from 0.7 to 0.8 in all buildings
since the new training techs were making unit batches train insanely
fast.

Added 'Naval Architects' batch training tech to the Dock (and Carth
Super Dock).

Attempting to add "Apadana" build limit, with no success. Need help
here. I thought BuildRestrictions.js and EntityLimits.js were the files
I needed to change, but it's not working (there should be a build limit
of 1 for the Persian Apadana).

Tweaked the levy techs.

Fixed Hero elephant unit RequiredTechnology.

This was SVN commit r13409.
2013-05-19 08:19:16 +00:00
leper 09108e6a97 Some more vars
This was SVN commit r13408.
2013-05-16 16:17:37 +00:00
Mythos_Ruler 1ea0bac280 New train time techs. For most factions, you choose either faster training infantry or faster training cavalry (either one unlocks Conscription, which boosts batch training considerably). For Persians, you get to research both at the barracks and stables, which unlocks conscription techs for both buildings. For Persians, I also moved the champion unlock tech to their Palace (Apadana), which now unlocks the "Immortals" technology (the tech that makes the Anusiya train twice as fast).
This was SVN commit r13407.
2013-05-15 08:11:20 +00:00
Mythos_Ruler ccb4ecc9f2 Renamed this tech.
This was SVN commit r13406.
2013-05-15 04:07:07 +00:00
Mythos_Ruler 9ceab639f3 Bloody dead sheep.
Unlocking tech for champions.

Champions trainable in barracks (after unlocking tech).

Farm Field yield increased from 2000 food to 5000 food. Max gatherers: 5
per field.

This was SVN commit r13405.
2013-05-14 09:48:37 +00:00
leper de5d4491ab var-fare
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
Mythos_Ruler f5f0bc701a Completely changed the "Stockbreeding" tech.
Fixed the 'Conscription' tech. It should work as advertised now.

Added some classes to the structures.

Reduced archer bonus vs. cav spears by 50%.

Moves Iphicratean Reforms from the Athenian Trireme to the Athenian
Dock.

This was SVN commit r13403.
2013-05-12 21:30:01 +00:00
Mythos_Ruler 2aa3ab8b03 conscription tech fix
This was SVN commit r13402.
2013-05-12 16:59:54 +00:00
leper 3bec6ced85 Fix hero button for heroes without attack
This was SVN commit r13401.
2013-05-12 16:02:53 +00:00
Mythos_Ruler daf572eb43 Temporary Blacksmith structures for prototyping and playtesting.
Lots of new techs. Healing techs. Vision for outpost. "Conscription"
tech boosts batch training speed. Implemented Macedonian "Hellenistic
Metropolis" special tech.

Testing placing Champions in the barracks (unlocked with a tech). Try
this out with the Macedonians.

Reduced archer attack damage. Reduced cost of healer.

Lots of other stuff.

This was SVN commit r13400.
2013-05-12 07:23:05 +00:00
Mythos_Ruler 209d8c4fd4 Made death screams slightly quieter. We actually need new male death/battle sounds.
This was SVN commit r13399.
2013-05-09 16:36:49 +00:00
Mythos_Ruler eae28bad5a Gold Oasis 3. Iberians vs. Mauryans.
This was SVN commit r13398.
2013-05-06 00:40:40 +00:00
Mythos_Ruler 57644fba50 Some art stuff: Scaffolds to other foundations, tweaking some Mauryan animations, new turban for maiden guards, etc.
This was SVN commit r13397.
2013-05-05 21:07:40 +00:00
Mythos_Ruler d49cc6fc8b Some armor changes. Also adds hero training restriction to hero elephant template. Fixes #1927.
This was SVN commit r13396.
2013-05-05 19:25:33 +00:00
leper 47e9431d29 Check if one of the technologies in a pair is already in progress. Fixes #1820.
This was SVN commit r13395.
2013-05-05 13:54:00 +00:00
leper cb7964a1db Make some gather techs work.
This was SVN commit r13394.
2013-05-05 13:13:38 +00:00
leper 56fa123718 Fix error when constructing with the first selected entity being a building.
This was SVN commit r13392.
2013-05-04 21:44:32 +00:00
leper fc5e2d27c7 Cancel building placement or reset selection on Esc. Patch by Josh. Fixes #1928.
This was SVN commit r13391.
2013-05-04 21:02:11 +00:00
leper 0d09f290d9 Allow setting rally points for foundations. Patch by Josh. Fixes #902.
This was SVN commit r13390.
2013-05-02 20:29:22 +00:00
stwf bf959e1c46 fix build when using --without-audio
This was SVN commit r13389.
2013-05-02 13:58:28 +00:00
leper 683f22cdb1 Display entity limits for buildings. Patch by Josh. Fixes #1924.
This was SVN commit r13388.
2013-05-01 19:25:55 +00:00
leper f42b77919d Future-proof the code for civ specific non-peace tracks.
This was SVN commit r13387.
2013-05-01 16:48:55 +00:00
wraitii 9a0749f3c9 Make sure to actually prevent Atlas from trying to render coastal waves. Fixes #1925
This was SVN commit r13386.
2013-05-01 06:47:49 +00:00
stwf ac3e9d8bc7 clear peace tracks before reloading music from civ files
This was SVN commit r13385.
2013-05-01 01:51:30 +00:00
Mythos_Ruler 67ff52a07f More armor adjustments.
This was SVN commit r13384.
2013-04-30 08:36:47 +00:00
leper 181db44ab5 Enforce technology restrictions when training units.
This was SVN commit r13383.
2013-04-29 21:51:14 +00:00
Mythos_Ruler 35daf00336 Snuck through without armor changes. Fixed now.
This was SVN commit r13382.
2013-04-29 18:33:03 +00:00
Mythos_Ruler e0a2e5790d Exponential Armor patch by Alpha123, with new updated armor values.
Needs a ton of testing.

This was SVN commit r13381.
2013-04-29 07:51:51 +00:00
Mythos_Ruler 4493f2986f Wonder support for civs currently with Wonders.
This was SVN commit r13380.
2013-04-29 02:46:13 +00:00
Mythos_Ruler 0686c6a553 Resetting 'default' maps.
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
leper 5a88f0fce0 Fix entity limits for buildings.
This was SVN commit r13378.
2013-04-29 00:36:21 +00:00
Mythos_Ruler f4e0007733 Cavalry are a bit faster.
Attempting to add Wonders, but no success (need help). Adding files here
to see if someone can fix what I've started.

This was SVN commit r13377.
2013-04-28 22:51:08 +00:00
historic_bruno d9540ad7f6 Fixes MSVC build error and warning
This was SVN commit r13375.
2013-04-27 22:43:22 +00:00
wraitii 4233acfa36 Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support.
This was SVN commit r13374.
2013-04-27 12:20:42 +00:00
stwf 092108b304 Must notify sound manager sources are now available
This was SVN commit r13372.
2013-04-26 23:13:11 +00:00
stwf c30f7a40e0 no need to check errors after destroying context, clean up some OpenAL interface calls
This was SVN commit r13371.
2013-04-25 10:48:34 +00:00
stwf 8324e0f665 add missing music list files
This was SVN commit r13369.
2013-04-24 19:27:16 +00:00
stwf 71486bd57d SoundManager supports playlists
This was SVN commit r13368.
2013-04-24 12:03:42 +00:00
leper 6115c3fc13 Remove some duplication from ProcessCommand.
This was SVN commit r13367.
2013-04-22 17:50:25 +00:00
Mythos_Ruler 62f24af68d Some new portraits by LordGood.
This was SVN commit r13366.
2013-04-21 18:47:11 +00:00
leper 3758b64916 Remove hardcoding of path from desktop file and launcher script. Patch by vincent. Fixes #1424.
This was SVN commit r13365.
2013-04-21 16:47:36 +00:00
leper 75f332ce20 Stop hotkey. Patch by alpha123. Fixes #1870.
This was SVN commit r13364.
2013-04-18 19:20:29 +00:00
leper cd6a76bcaa Gates now handle allies made using diplomacy.
This was SVN commit r13363.
2013-04-18 18:18:34 +00:00
leper 18a2b7d093 Fix roman merchant ship trading distance. Fixes #1874.
This was SVN commit r13362.
2013-04-18 18:18:31 +00:00
leper dc9889c190 Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915.
This was SVN commit r13361.
2013-04-18 18:18:29 +00:00
leper a362b41029 Fix grouping of garrisoned units. Patch by mimo. Fixes #1918.
This was SVN commit r13360.
2013-04-18 18:18:24 +00:00
stwf 503b481468 handle initialization errors cleanly, clean stuff up
This was SVN commit r13359.
2013-04-18 03:24:20 +00:00
leper b22320a85f Fix tests. Refs #1807.
This was SVN commit r13358.
2013-04-14 00:52:00 +00:00
leper d0a695f7fb Allow mutual allies to garrison in each others buildings. Patch by mimo. Fixes #1807.
This was SVN commit r13357.
2013-04-14 00:34:14 +00:00
stwf 2a3f1cb412 eliminate most warnings produced by Cppcheck
This was SVN commit r13356.
2013-04-12 03:10:54 +00:00
leper 7562c79e89 Change target for all orders on EntityRenamed. Patch by mimo. Fixes #1903.
This was SVN commit r13355.
2013-04-10 22:48:02 +00:00
leper 95a10e7f42 Reduce duplicate GuiInterfaceCalls some more. Patch by sbte. Fixes #1878.
This was SVN commit r13354.
2013-04-10 21:05:46 +00:00
stwf 0cad19ecec double check that the sound manager has been created before using
This was SVN commit r13353.
2013-04-10 12:03:17 +00:00
stwf b301d5c84d fades music in and out when switching to background, also honors g_PauseOnFocusLoss
This was SVN commit r13352.
2013-04-10 11:51:42 +00:00
Mythos_Ruler 19ce9657bc This was SVN commit r13351. 2013-04-10 09:11:08 +00:00
Mythos_Ruler 3074b930cc Tech.
This was SVN commit r13350.
2013-04-08 08:27:30 +00:00
Mythos_Ruler 789991c5d2 New food gathering tech for village phase.
Adjusted some food gather rates.

Adjusted some tech costs.

This was SVN commit r13349.
2013-04-08 07:59:57 +00:00
Mythos_Ruler 5429052b06 Lots of normal maps and spec maps. Ongoing project.
Added camel death scream (lol) to camel units.

Added sheep sounds to sheep.

Changed over the Mauryan elephant unit actors.

This was SVN commit r13348.
2013-04-07 22:28:36 +00:00
stwf c9a5d5cee5 pause music and ambient sounds when game pauses
This was SVN commit r13347.
2013-04-07 04:13:15 +00:00
leper 555f06acbe Fix errors when the hero is garrisoned. Patch by alpha123. Refs #1802.
This was SVN commit r13346.
2013-04-06 19:32:07 +00:00
historic_bruno c71ddae359 Adds forgotten OpenLogsFolder.vbs to Windows uninstaller
This was SVN commit r13345.
2013-04-05 21:40:49 +00:00
historic_bruno 2af37c3590 Adds player color to rubble entities, thanks to ericb for the patch, fixes #1887
This was SVN commit r13344.
2013-04-05 02:52:01 +00:00
historic_bruno 161d6c1ba7 Improves SDL 2.0 support
This was SVN commit r13343.
2013-04-05 02:39:30 +00:00
historic_bruno 7f9b486a48 This was SVN commit r13341. 2013-04-03 23:28:29 +00:00
historic_bruno 16de5c75ac Adds game speed option to match setup, adds in-game control for single player games, fixes #785.
Refactors some GUI utility functions.

This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
leper 62dc594a71 Hero button. Based on patch by Malcom and edits to that by alpha123. Fixes 1802.
This was SVN commit r13339.
2013-04-03 17:27:55 +00:00
Mythos_Ruler f2da77ff72 "Oh myyyyy" -- George Takei. Lots of stuff:
- Town Phase cost increased to 1000 Food, 1000 Wood (from 500 of each).
This makes Village Phase longer and more interesting. Still need to
test.

- Lots of new normal maps and spec maps (for a bunch of desert terrains
and cretan date palms). This is an ongoing project.

- Fixed some spec maps for being too 'bright.'

- Changed the attack of melee spear units from a combo of pierce and
hack to just hack. Per discussion with Quantumstate. Needs testing.

- Changed the Median Oasis 1 scenario to include Mauryans and
Carthaginians.

This was SVN commit r13338.
2013-04-03 06:48:38 +00:00
historic_bruno a317cd9cba Fixes memory leak and removes unused code in WaterManager, fixes #1891, refs #1852
This was SVN commit r13337.
2013-04-03 03:30:10 +00:00
leper f82adf3ef3 Don't call GetSimulationState too often. Patch by sbte. Fixes #1878.
This was SVN commit r13336.
2013-04-02 21:06:20 +00:00
Mythos_Ruler 3c693245bd Portraits for the Mauryan healer and Chanakya.
This was SVN commit r13335.
2013-04-02 17:06:15 +00:00
Mythos_Ruler edea5d04e7 Portraits for Mauryan healer and Chanakya.
This was SVN commit r13334.
2013-04-02 17:05:51 +00:00
Ykkrosh 74df28f952 Fix --without-pch build
This was SVN commit r13333.
2013-04-02 15:44:42 +00:00
historic_bruno 329b3e3d28 Adds notice of saved game issues to Aegis' description
This was SVN commit r13332.
2013-04-01 15:03:31 +00:00
Enrique 0535cab26f Added mauryan healer skin and head.
Added roman army camp rubble with AO
Added AO map and normal map to roman army camp

This was SVN commit r13331.
2013-04-01 00:48:18 +00:00
historic_bruno afde8b04fd Deletes "obsolete and rubbish" textureconv
This was SVN commit r13330.
2013-03-31 23:53:53 +00:00
wraitii 3b5ab7ab51 Fixes #1884 . Should Fix #1883 .
This was SVN commit r13328.
2013-03-30 07:30:54 +00:00
historic_bruno c2ca0209fa Fixes multiplayer crash when host disconnects while clients are still loading.
Improves client disconnect handling slightly.

This was SVN commit r13327.
2013-03-25 05:01:36 +00:00
wraitii 475c722327 Fix serialization issues with Aegis.
This was SVN commit r13326.
2013-03-24 09:10:32 +00:00
historic_bruno 6f78224f8d Fixes tooltip in Atlas' locked teams checkbox.
Adds scrollbar to environment panel and reorganizes controls.

This was SVN commit r13324.
2013-03-23 19:22:11 +00:00
historic_bruno 71ae5a19d8 Fixes visual actor interpolation, handling position changes more cleanly, based on patch by sbte.
Fixes rally point lines not updating, fixes #1865

This was SVN commit r13323.
2013-03-23 17:59:54 +00:00
historic_bruno 6f33003f30 Fixes serialization test failure caused by CmpFoundation's buildMultiplier property sometimes being NaN (which can assume different internal values in Spidermonkey). For now, NaN cannot be reliably serialized. Fixes #1828, refs #1879
This was SVN commit r13322.
2013-03-22 22:23:50 +00:00
Enrique 0d069954b7 waterfall textures reduced 50%
This was SVN commit r13321.
2013-03-22 00:37:33 +00:00
Enrique 3d94f3a5be Added 4 geology waterfalls variations.
Added water splash particle effect.

This was SVN commit r13320.
2013-03-22 00:24:46 +00:00
Enrique 4560bb62b0 Updated contributor Paperkat merch ship texture
This was SVN commit r13319.
2013-03-19 09:58:06 +00:00
historic_bruno 78d1548753 Fixes (un)packing siege units responding to attacks in violent stance, by ignoring attacks while (un)packing. Fixes #1751, refs #1752
This was SVN commit r13318.
2013-03-19 00:53:47 +00:00
Enrique 807985ac08 Added a base with flowers and playercolor to mauryan pillars.
Added contributor Paperkat merchant ship.

This was SVN commit r13317.
2013-03-18 12:34:55 +00:00
Enrique e031d71b78 Added chakra wheel to ashoka pillar 4 lions variation-
This was SVN commit r13316.
2013-03-18 01:46:44 +00:00
Mythos_Ruler 1bcb6140b0 Skirms bonus vs. elephants reduced from 1.5x to 1.25x.
Some new elephant templates. Elephant unit entities adjusted.

Spartan female citizen now has a bonus attack vs. siege weapons.

This was SVN commit r13315.
2013-03-18 01:33:20 +00:00
Enrique 063fa52252 removes chandragupta normal texture line from his actor
This was SVN commit r13314.
2013-03-17 23:16:40 +00:00
Ykkrosh a7343420f2 Disable fancy water rendering on all Intel devices, since it appears to be very slow.
Also recognise Haswell chipsets on Mesa.

This was SVN commit r13313.
2013-03-17 14:27:47 +00:00
Enrique cfbde115b8 Maur hero Ashoka skin tone change
This was SVN commit r13312.
2013-03-17 12:46:24 +00:00
Enrique e367cf0d7e maur barracks death variation semi-fix
This was SVN commit r13311.
2013-03-17 12:34:03 +00:00
Enrique 6a1a1c16cb maur market stalls cloth small fix
This was SVN commit r13310.
2013-03-17 12:27:15 +00:00
Pureon 49f52500de Mauryan ship icons
This was SVN commit r13309.
2013-03-17 11:53:09 +00:00
Pureon 25c800e9c4 Chanakya hero template
This was SVN commit r13308.
2013-03-17 10:10:49 +00:00
wraitii f8a7692d92 A few final fixes to some AI logic in attack and defense.
This was SVN commit r13307.
2013-03-17 08:55:46 +00:00
Enrique 3f28ade5c6 Hero ashoka added. Fixed maiden holding parasol in chariot.
Added hero turban prop
Hero Chanakya now uses elite healer template

This was SVN commit r13306.
2013-03-17 00:39:43 +00:00
Pureon 9e46759ada Mauryan actor indent cleanup
This was SVN commit r13305.
2013-03-16 16:05:53 +00:00
Pureon fc3b5637c8 Ambient occlusion for Mauryan houses
This was SVN commit r13304.
2013-03-16 15:53:20 +00:00
wraitii 03c3b1daa3 Fixes a few changes in my previous commit. Makes "Medium" the default difficulty setting.
This was SVN commit r13303.
2013-03-16 12:55:03 +00:00
Pureon 77999f6b42 Ashoka pillar variations and footprint fix
This was SVN commit r13302.
2013-03-16 11:18:33 +00:00
Pureon e78da0b3e4 Mauryan mill ambient occlusion
This was SVN commit r13301.
2013-03-16 11:00:24 +00:00
Pureon 5ba7153541 Placeholder Mauryan merchant ship
This was SVN commit r13300.
2013-03-16 10:30:29 +00:00
wraitii b0f1afa994 Change Punjab 1 water settings.
Fix a little mess-up on my last commit.

This was SVN commit r13299.
2013-03-16 10:16:41 +00:00
wraitii d709fe50ed Clean-up of Aegis scripts. Most deprecated functions have been removed, some comments updated. Also makes resource maps 8-bit to save a little memory.
Fix the placement of the "civ info" button to avoid overlapping on
1024*768.

This was SVN commit r13298.
2013-03-16 09:59:43 +00:00
Pureon d70db48173 Mauryan ship footprints
This was SVN commit r13297.
2013-03-16 09:56:22 +00:00
Enrique 0fc8dba671 Fixed mauryan market stall color.
This was SVN commit r13296.
2013-03-16 01:06:51 +00:00
Enrique fd74292f2b Added specular map for Chanakya hero.
Fixed defense tower shields when destroyed.
Added Chandragupta texture with spec.
Fixed wall tower projectile and garrisoned prop-points.

This was SVN commit r13295.
2013-03-16 00:32:04 +00:00
historic_bruno 3958c03dbc Changes default scenarios to Punjab 1
This was SVN commit r13294.
2013-03-15 23:06:16 +00:00
historic_bruno 4bcbd14f71 Resets most land scenarios to default AIs, so they'll use Aegis Bot.
Removes AIs from some demo maps.

This was SVN commit r13293.
2013-03-15 23:02:29 +00:00
historic_bruno a96869851c Replaces force attack hotkey with Ctrl+Alt (AltGr isn't available on US keyboards)
This was SVN commit r13292.
2013-03-15 21:59:36 +00:00
wraitii 4769481796 Makes sure to remove the entity from the Gatherer array of the resource it was gathering from when dying. Fixes #1867 (if all goes well).
This was SVN commit r13290.
2013-03-15 18:12:17 +00:00
wraitii 5af7544918 Bug fixes and small improvements to Aegis. Change the "C" button into a "Settings" button. Fix to -autostart-aidiff.
This was SVN commit r13289.
2013-03-15 12:35:16 +00:00
wraitii 066cfa5893 Improve workers' reactions when they find out that the resource they gathered from is full. Refs #1387
This was SVN commit r13288.
2013-03-15 10:26:46 +00:00
wraitii d40a66f310 Fix particle to correctly display in the FOW, and to adapt slightly to sunColor settings (both on ARB and GLSL).
This was SVN commit r13287.
2013-03-15 10:22:24 +00:00
Pureon 26cc813cf5 Update for release trailer recording
This was SVN commit r13286.
2013-03-14 23:24:53 +00:00
Pureon afe87f720a Mauryan Corral AO
This was SVN commit r13285.
2013-03-14 23:13:31 +00:00
quantumstate c23181a1e0 Make towers weaker by reducing range fro 80 to 70 and decreasing the arrow tech multiplier to 40% more arrows from 100%.
This was SVN commit r13284.
2013-03-14 22:57:59 +00:00
stwf 4edbd21714 elimate small memory leaks in SoundManager
This was SVN commit r13283.
2013-03-14 02:59:31 +00:00
Enrique 9dac1bf89b Fixed inverted green channel in elephants normal maps (fixed normals)
This was SVN commit r13282.
2013-03-14 00:48:31 +00:00
Enrique 1cf1707ce7 Added mauryan hero chanakya and mauryan elephants static meshes.
This was SVN commit r13281.
2013-03-14 00:05:46 +00:00
Pureon 163fc7cbfd Mauryan farmstead AO stuff
This was SVN commit r13280.
2013-03-13 23:58:38 +00:00
wraitii 25293ce0cc Many small bugfixes for AIs. Adds support for difficulty (and along with that, some behind-the-door architecture for a handicap system).
Adds -autostart-aidiff to set the difficulty from the command line from
testing.

This was SVN commit r13278.
2013-03-13 20:44:48 +00:00
wraitii 8ac9f1d8ea Limit the number of gatherer per resource, as described in #1387. Based on work by crezax. Fixes #1387
This was SVN commit r13277.
2013-03-13 20:10:46 +00:00
leper 844f71681a Add notification for missing resources when tributing. Patch by alpha123. Fixes #1839.
This was SVN commit r13276.
2013-03-13 18:37:06 +00:00
leper 637abf8167 Stop following units into FoW. Patch by crezax. Fixes #1827.
This was SVN commit r13275.
2013-03-13 18:17:58 +00:00
leper 56784aceab Fix signed/unsigned comparison warning.
This was SVN commit r13274.
2013-03-13 16:23:27 +00:00
stwf b75183eba2 remove log entries concerning sound manager distress mode
This was SVN commit r13273.
2013-03-13 03:55:36 +00:00
Enrique 60a91cb032 fixes death variation for mauryan walls, fortress, defense tower, and temple.
This was SVN commit r13272.
2013-03-12 23:06:20 +00:00
wraitii 2bcb03f049 Fix messages.js for "/team" messages when no teams were set.
Change to AI logic, makes Aegis more efficient with a better attack,
eco, and defense. Bugfixes.

This was SVN commit r13271.
2013-03-12 21:58:25 +00:00
Pureon e37012a9fd Added Omri's latest track to the Hellenic civs
This was SVN commit r13270.
2013-03-12 21:55:33 +00:00
Pureon 21f4a94242 New Mauryan emblem
This was SVN commit r13269.
2013-03-12 21:48:42 +00:00
wraitii 3f6702075b Fix my previous commit where if you had enough units buildings would never construct (rounding issue).
This was SVN commit r13268.
2013-03-12 10:07:53 +00:00
wraitii 791a901df9 Fix a bug with the foundation changes that caused buildings to be built too fast with multiple units.
This was SVN commit r13267.
2013-03-12 08:22:45 +00:00
wraitii 9b1b8cc8fd A few bugfixes, slight change in logic for smoother play. Makes Aegis gather with cavalry. Allows it to send chat messages to warn about attacks.
This was SVN commit r13266.
2013-03-11 19:58:29 +00:00
historic_bruno ca40764dc6 Fixes bug in map reader that caused actor variations to default to seed 0. Fixes #1861.
Fixes maps that were affected by this bug.

This was SVN commit r13264.
2013-03-11 16:42:41 +00:00
wraitii dab9175f30 Foundations now require 100% health for construction to be completed. Progress now linked with health. Patch by Malcom. Fixes #1853
This was SVN commit r13263.
2013-03-11 15:47:16 +00:00
OmriLahav c6eea186e8 New Hellenic track - The Hallespont, A13.
This was SVN commit r13261.
2013-03-11 12:15:02 +00:00
Mythos_Ruler 6431eb63a5 Mauryans now have a cavalry swordsman.
This was SVN commit r13260.
2013-03-11 02:29:19 +00:00
Mythos_Ruler ba38a22abe Renamed some wonder templates. Let us know if it breaks anything.
This was SVN commit r13258.
2013-03-11 01:08:48 +00:00
Pureon 0e6d764162 Mauryan long wall template edit
This was SVN commit r13257.
2013-03-11 01:06:45 +00:00
Pureon 9e511134e6 Updated sandbox with latest Mauryan units
This was SVN commit r13256.
2013-03-11 00:48:36 +00:00
Mythos_Ruler 0ec860651a This was SVN commit r13255. 2013-03-11 00:35:33 +00:00
Mythos_Ruler 7dda41f693 Mauryan walls cost wood and have roughly 25% less health than stone walls.
This was SVN commit r13254.
2013-03-11 00:10:24 +00:00
leper 0d7e6b7880 Use pimpl idiom for ThreadDebugger.
This was SVN commit r13253.
2013-03-10 23:08:01 +00:00
wraitii eda2802f6d Simplify construction of the transformation matrix in GetInterpolatedTransform. Patch by sbte. Fixes #1854
This was SVN commit r13252.
2013-03-10 20:31:53 +00:00
wraitii 1778e685ac Improve detection of when a component needs to be interpolated. Patch by sbte. Fixes #1858.
This was SVN commit r13251.
2013-03-10 20:28:01 +00:00
Pureon f3eab4127e caliper icon and Mauryan wall tweak
This was SVN commit r13250.
2013-03-10 16:12:10 +00:00
Pureon d2e5d63039 Animations for Mauryan wall gate
This was SVN commit r13249.
2013-03-10 12:04:56 +00:00
wraitii 1368aa4ae9 Fix bugs in the attack manager, fix reparations in enemy territory, change readme.txt to document the new -autostart-civ function.
This was SVN commit r13248.
2013-03-10 07:37:05 +00:00
wraitii 2c17ab70ac Add support for -autostart-civ to set civilizations when quickstarting.
Put the AI memory heap back to 32 MB to avoid OOM errors with numerous
AIs in late game.
Fix a bug that made ProductionQueue not broadcast progress.
Fix many issues with Aegis in defense, pathfinding, foundation
construction, training building choice, strength calculations, building
placement and mostly attack. Aegis should be much more aggressive.

This was SVN commit r13247.
2013-03-09 14:09:06 +00:00
leper 0572ffd3d2 Add support for mauryan walls to the rmgen wall builder. Patch by FeXoR. Fixes #1855.
This was SVN commit r13246.
2013-03-08 23:46:36 +00:00
leper 8c756b507a Fix non-pch build. Maybe use pimpl idiom instead.
This was SVN commit r13245.
2013-03-08 23:46:32 +00:00
quantumstate c6043779f6 Better fix for the angle interolation issue. Thanks sbte for spotting it. Refs #1846.
This was SVN commit r13244.
2013-03-08 20:01:12 +00:00
quantumstate 8777f68aa0 Fix rotation interpolation. Refs #1846.
This was SVN commit r13243.
2013-03-08 19:34:55 +00:00
wraitii d76f570a69 Fix the defense system (it now works as expected, that doesn't mean well). Fix a bug in dropsite placement that caused AIs to go awry. Slight changes here and there to the strategy. Optimizations when running many workers at once. Fix some pathfinding not working. Units in attack plans should be slightly less dumb.
This was SVN commit r13242.
2013-03-07 21:33:57 +00:00
Enrique 940ecd29e8 Mauryan walls added with AO. No gate animation yet.
This was SVN commit r13241.
2013-03-07 21:05:33 +00:00
Yves d892e1887a My modifications to the jsdebugger's web GUI. Adds a few features and makes it compatible with the current server-side code. Closes #410
This was SVN commit r13240.
2013-03-07 14:41:03 +00:00
Yves 28200e6a04 The original web GUI for the jsdebugger from contributor mmayfield45. I only removed the jquery demo directory and added some licensing information. This is for an older version of the debuggers server-side part, so it doesn't work anymore. The required modifications will be committed soon. Refs #410
This was SVN commit r13239.
2013-03-07 14:27:34 +00:00
Yves 73951b75fc Adds the server-side part of the javascript debugger. Refs #410
This was SVN commit r13238.
2013-03-07 13:49:49 +00:00
historic_bruno f5be596ee8 Fixes use of invalid pointer from temporary string (caused some invalid read warnings in Valgrind)
This was SVN commit r13237.
2013-03-07 03:54:41 +00:00
Pureon ff97d550b8 Added Omri's 2 other new tracks to the relevant civs
This was SVN commit r13236.
2013-03-06 22:09:10 +00:00
Mythos_Ruler ee85e942e1 Mauryan civ json changed to use new Mauryan music track.
This was SVN commit r13235.
2013-03-06 19:27:24 +00:00
Mythos_Ruler 59be67d27e Portrait for Wonders.
This was SVN commit r13234.
2013-03-06 18:16:41 +00:00
OmriLahav dfd1abeab9 A13 - first Mauryan Indian peace track
This was SVN commit r13232.
2013-03-06 15:27:05 +00:00
wraitii 081721c679 Fix the build and stops the AI from creating tons of AI dump images for no good reason.
This was SVN commit r13231.
2013-03-06 14:33:15 +00:00
wraitii a45a926aeb Fix an issue that caused a crash on serialization. Prepare the AI manager a little more for serialization.
Fix bugs with tests. Fix some other issues in the AI (attack plans deal
with walls better, choose better paths, target selection is better. Dock
building won't be tried hundreds of times if it fails.)
Changes the Oasis random map to only put a path in the middle 50% of the
time.

This was SVN commit r13230.
2013-03-06 11:52:41 +00:00
OmriLahav f0db42e34e A13 track - Gaulic early peace.
This was SVN commit r13228.
2013-03-06 10:54:03 +00:00
Pureon c3944097a7 Small nerf to bolt shooters
This was SVN commit r13227.
2013-03-06 00:21:38 +00:00
wraitii e33d4a52e9 AI API V3 along with a new version of Aegis. Support for a JS shared component that can be used or not for each AI.
This was SVN commit r13225.
2013-03-05 22:52:48 +00:00
Pureon c29a8d8ac0 Tech icons
This was SVN commit r13224.
2013-03-05 21:27:29 +00:00
quantumstate 21f13f9683 Only use interpolation for moving objects in VisualActor. Patch by sbte. Fixes #1846.
This was SVN commit r13223.
2013-03-05 20:02:16 +00:00
Pureon 121fb35f72 Bolt shooter accuracy tech
This was SVN commit r13222.
2013-03-04 23:30:50 +00:00
quantumstate 7461e4a3c1 Add technology support for ranged unit spread
This was SVN commit r13221.
2013-03-04 21:52:44 +00:00
Pureon 7df4fd6919 helmet variations and tweak to ballista template
This was SVN commit r13220.
2013-03-04 21:27:45 +00:00
ShieldBearer b8322fa6bb Zebu model
This was SVN commit r13219.
2013-03-04 14:16:08 +00:00
stwf efd42ef490 fixes windows compile error and some nuused param warnings
This was SVN commit r13217.
2013-03-03 22:28:26 +00:00
Pureon 3bce7cafba Updated Mauryan corral and some sound tweaks
This was SVN commit r13216.
2013-03-03 22:09:26 +00:00
Pureon e4e4ae9ede Mauryan maceman helmet
This was SVN commit r13215.
2013-03-03 18:19:10 +00:00
Pureon 7e2d54d2ef Gaia portraits
This was SVN commit r13214.
2013-03-03 14:31:49 +00:00
Pureon 99c0497f23 Model and texture changes to some Mauryan units
This was SVN commit r13213.
2013-03-03 11:58:55 +00:00
wraitii 9b03e0d572 Darkens icons that are unavailable to train/build/research to make it more obvious than only the grayscaling in some cases.
Improves the red overlay showing a lack of resource for technologies.
Makes tech pair show a red cross instead of a red overlay when hovering
over a pair to make it less confusing.

This was SVN commit r13212.
2013-03-03 10:27:37 +00:00
Mythos_Ruler 2c1a3ee892 Adjusting starting units for all civs.
Added "Wonder" structural template.

This was SVN commit r13211.
2013-03-03 00:57:30 +00:00
stwf ed8746e798 remove log message
This was SVN commit r13210.
2013-03-01 14:23:28 +00:00
stwf e4a9312c46 newest soundmanager patch, should give better battle sequences, and handle low resource situations correctly.
This was SVN commit r13209.
2013-03-01 14:22:28 +00:00
Deiz c16b93794a Support decrementing training batches, show batch size on icons.
This was SVN commit r13208.
2013-02-28 00:20:16 +00:00
quantumstate 3c50352134 Use attack move icon as a cursor. Refs #1847.
This was SVN commit r13207.
2013-02-27 18:18:59 +00:00
Pureon 7ff4538414 Attack move icon
This was SVN commit r13206.
2013-02-27 00:39:29 +00:00
Pureon 1bcb07af64 Improved animal attack sounds
This was SVN commit r13205.
2013-02-26 22:33:14 +00:00
historic_bruno 284e9cd230 Improves frame rate counter to give smoother results, patch by sbte. Fixes #1016
This was SVN commit r13204.
2013-02-26 21:50:38 +00:00
historic_bruno e283e75d84 Updates example component documentation
This was SVN commit r13203.
2013-02-26 19:58:51 +00:00
Enrique 6c7543c044 Added Mauryan birreme from contributor Ndragu.
Added details to Mauryan Great Stupa fence.

This was SVN commit r13202.
2013-02-26 15:32:03 +00:00
leper cb890ad876 Add shift-clicking to tribute multiples of 500. Patch by alpha123. Refs #1839.
This was SVN commit r13201.
2013-02-25 22:59:04 +00:00
quantumstate 18ee932a01 Adds attack move bound to the Ctrl hotkey. Patch from mimo. Refs #1001.
This was SVN commit r13200.
2013-02-25 21:56:24 +00:00
Pureon ac32c7266e Mauryan farmstead
This was SVN commit r13199.
2013-02-25 21:56:09 +00:00
leper 94f2c2d912 Add insufficient population count to production queue tooltip. Patch by zoot. Fixes #1659.
This was SVN commit r13198.
2013-02-25 20:30:02 +00:00
Mythos_Ruler a66ac54bbb Fix slinger tooltip.
This was SVN commit r13197.
2013-02-25 02:35:52 +00:00
Mythos_Ruler aa36718217 Balancing for slingers and elephants: Slinger attack and cost small nerf. Elephant speed slightly reduced.
Fixed range bug for Celtic faction slingers.

This was SVN commit r13196.
2013-02-25 02:33:44 +00:00
historic_bruno 10373892be Adds support for Apple command/meta hotkeys by grouping them with unified "Super" hotkey (not bothering to handle the distinction which is only relevant to Apple keyboards and SDL 1.2).
Adds Super+Q hotkey to close the game on OS X.

This was SVN commit r13195.
2013-02-24 21:42:21 +00:00
Enrique ee7e135900 Added bigger Ashoka pillar variation with 4 lions. Textures modified.
This was SVN commit r13194.
2013-02-24 15:17:38 +00:00
historic_bruno 9e163500c5 Don't use Number, parseInt, etc. per coding conventions (use the +operator instead)
This was SVN commit r13192.
2013-02-24 00:25:13 +00:00
historic_bruno ca92e50048 Adds notification tooltips for building placement, fixes #921.
Tweaks info tooltip borders and padding to improve readability.

This was SVN commit r13191.
2013-02-24 00:12:41 +00:00
Enrique 6e6a25dbce Updated Mauryan Ndragu mauryan trireme with his fix. Modified Mauryans sandbox map.
This was SVN commit r13189.
2013-02-23 16:04:43 +00:00
Pureon e5291d267d Horse sound effects by Evan Bogunia
This was SVN commit r13186.
2013-02-23 15:12:37 +00:00
Enrique 344645dbae Added mauryan wonder "Great Stupa" with AO. Mauryan market AO texture scaled down.
This was SVN commit r13185.
2013-02-23 13:19:42 +00:00
historic_bruno 92fdbb49b6 Moves particle interpolation to its own simulation component.
Fixes inconsistency between Atlas and in-game particle rendering during
pauses.
Fixes some issues related to Atlas simulation test and map loading.

This was SVN commit r13184.
2013-02-22 23:20:59 +00:00
Pureon 9e1b4a4370 Some animal sound effects
This was SVN commit r13183.
2013-02-22 23:10:16 +00:00
historic_bruno a87019ea5a Render initial game view during loading screen, to begin loading assets and eliminate ugly terrain blending artifacts. Refs #1663
This was SVN commit r13181.
2013-02-22 07:32:22 +00:00
leper 1e3bdc439b Fix MSVC warning. Refs #1838.
Remove special support for removed internal mod.

This was SVN commit r13180.
2013-02-21 19:59:39 +00:00
Enrique 5e9c408c01 Added mauryan market with ao
This was SVN commit r13179.
2013-02-21 16:08:33 +00:00
OmriLahav 3d7bf1dc54 This was SVN commit r13177. 2013-02-21 11:35:29 +00:00
leper c09d390656 Notify the player on receiving a tribute. Patch by alpha123. Refs #1839.
This was SVN commit r13176.
2013-02-20 15:56:55 +00:00
leper 67202eabc8 Only focus on idle units instead of following them. Patch by zoot. Fixes #1835.
This was SVN commit r13175.
2013-02-20 15:56:42 +00:00
danschub 3acba819b0 Fixed Parallax mapping for the Mauryan roofs.
This was SVN commit r13174.
2013-02-16 17:58:52 +00:00
danschub 708cdd9c91 Improved normal/spec maps. Added parallax support for the Mauryans.
This was SVN commit r13173.
2013-02-16 16:07:47 +00:00
historic_bruno 7cf7ae769c Suppresses noisy Boost header warnings on OS X by including them as system headers, refs #1076.
Bumps default SDK in build-osx-bundle.sh to 10.7 (newer Xcode doesn't
include 10.6).
Fixes using xml2-config from SDK when needed.
Fixes more linker warnings about symbol visibility by compiling libs
with fvisibility=hidden.
Updates some comments in the build scripts.

This was SVN commit r13172.
2013-02-15 22:43:28 +00:00
danschub ee4b2ccab4 Added normal, parallax and spec maps for all Mauryan buildings - except for those who aren't done yet.
Added normal, parallax and spec maps for the Mauryan ships.
~Gen.Kenobi

This was SVN commit r13171.
2013-02-15 01:29:32 +00:00
historic_bruno 22a5bff3a0 Adds more dependency options to NVTT CMake scripts.
Disables more unneeded NVTT libs in build-osx-libs.sh (avoids link error
with MacPorts' libtiff installed)

This was SVN commit r13170.
2013-02-14 23:37:04 +00:00
historic_bruno 6ce1e46138 Deletes internal mod (see SVN history if needed)
This was SVN commit r13169.
2013-02-14 22:32:17 +00:00
Pureon 88c10f5af1 Mauryan Corral model
This was SVN commit r13168.
2013-02-14 01:26:19 +00:00
leper 2f19cf86d3 Fix mod priority. Add user mod support. Fixes #1838.
This was SVN commit r13167.
2013-02-14 00:40:02 +00:00
historic_bruno efd6030ec7 Fixes OS X lib script to build SDL without X11 (caused error on Mountain Lion)
This was SVN commit r13165.
2013-02-12 21:52:13 +00:00
Pureon 4817fd5dbb Fixes #1781 SPQR signs
This was SVN commit r13164.
2013-02-12 01:10:30 +00:00
quantumstate cd5e5882ee Improvements to battle detection. Patch from zoot. Fixes #1425.
This was SVN commit r13163.
2013-02-11 20:38:13 +00:00
Pureon a91bbdd714 Head gear variations for Mauryan archer and swordsman units
This was SVN commit r13162.
2013-02-11 19:17:33 +00:00
Pureon a281fa5bdc Reduced placeholder texture size for the onager
This was SVN commit r13161.
2013-02-11 01:22:52 +00:00
Pureon 5748b1d72a More wild ass. Committed old onager files last time by mistake
This was SVN commit r13160.
2013-02-11 01:17:09 +00:00
Pureon 87c901f140 Update to Britons sandbox map. Added missing buildings
This was SVN commit r13159.
2013-02-11 00:07:23 +00:00
leper ab4db58e82 Fix build restrictions for neutral players.
This was SVN commit r13158.
2013-02-10 20:13:37 +00:00
Pureon 06a3bf9e99 Mauryan Farmstead wip
This was SVN commit r13157.
2013-02-10 15:08:12 +00:00
historic_bruno f9bbd97dde Adds startup warning(s) about removing fixed renderpath, fixes #1795
This was SVN commit r13156.
2013-02-09 22:55:42 +00:00
Pureon ac11cf30a5 Mauryan head gear and faces
This was SVN commit r13155.
2013-02-09 16:28:10 +00:00
Pureon 9c2e4c93a0 Siege Onager model and animations. Texture is placeholder.
This was SVN commit r13154.
2013-02-09 16:22:36 +00:00
Enrique d1dd979800 Added contributor Ndragu mauryan trireme
This was SVN commit r13153.
2013-02-09 12:10:42 +00:00
historic_bruno cac2d08353 Fixes corpse variation not matching living entity, fixes #1007
This was SVN commit r13152.
2013-02-09 07:10:50 +00:00
historic_bruno b1178d30e3 Adds missing native eol-style property
This was SVN commit r13151.
2013-02-04 00:42:53 +00:00
leper 5cbd9f0314 Add tribute stats to the summary screen. Patch by alpha123. Fixes #1831.
This was SVN commit r13149.
2013-02-03 23:49:49 +00:00
historic_bruno 14f1917a34 NOTE: Requires update-workspaces!
Adds build script for OS X dependencies, fixes #1112. OS X builds no
longer use MacPorts/Homebrew, check BuildInstructions.
Adds build script for OS X bundles. Adds OS X icon and DMG background
image.
Moves bundled libraries to libraries/source.
Moves most headers and precompiled static libs for Windows to
libraries/win32.
Updates Premake and packaging scripts to support this.

This was SVN commit r13148.
2013-02-03 23:49:29 +00:00
Spahbod b96009dafc Fixing the weird line bug in gulf variation of unknown maps.
This was SVN commit r13147.
2013-02-03 17:40:05 +00:00
wraitii abd98ad581 Re: disable foam and coastal waves in Atlas until properly optimized (this time with 100% more it-does-not-bug). Refs #1743
(sorry about the last time, should not blindly commit).

This was SVN commit r13146.
2013-02-03 15:49:41 +00:00
historic_bruno 1f7e6cb2ba Adds actor seed support to scenario XML data, optionally used in place of entity ID.
Fixes Atlas previews not matching placed entity.
Fixes in-game building previews not matching final entity (except
walls).

This was SVN commit r13144.
2013-02-03 02:16:52 +00:00
historic_bruno 31be9cd0de Adds building previews that rise during construction, fixes #1174, refs #21.
Adds scaffold support for foundations, includes two examples for 3x3 and
4x4, fixes #1581.
Extends CmpVisualActor and CUnit to support random variant seeds.
Fixes bug in actor hotloading.
Fixes serialization failure caused by destroying entities in OnDestroy
handlers.

This was SVN commit r13143.
2013-02-03 02:08:20 +00:00
leper e4fcddaf73 Some template fixes from qwertz/kosmo.
This was SVN commit r13142.
2013-02-02 22:44:51 +00:00
Mythos_Ruler 3cbb403685 Neareastern Badlands 2 scenario. 2v2.
The 'Cappadocia' region of Central-Eastern Anatolia. All players start
on one end of the map, with a vast unclaimed wilderness lying open
before them ripe for conquest and depredation.

This was SVN commit r13141.
2013-02-02 08:12:23 +00:00
historic_bruno 03cc1b3a6b Fixes minor bugs in reference checker script.
Fixes missing template in pathfinding terrain demo

This was SVN commit r13140.
2013-02-01 00:26:23 +00:00
Enrique 1761a6253f Little fix I forgot to commit for mauryan docks
This was SVN commit r13139.
2013-02-01 00:13:30 +00:00
historic_bruno f51e129628 Temporary revert of revert from 38b0c0eb72 to fix water maps in Atlas, refs #1743
This was SVN commit r13138.
2013-01-31 23:03:09 +00:00
OmriLahav 449eceb7e8 This was SVN commit r13136. 2013-01-31 20:17:59 +00:00
Enrique 60c328302b Added Mauryan fishing boat from contributor Ndragu
This was SVN commit r13135.
2013-01-31 12:56:26 +00:00
Spahbod 5bea1e7b87 New random map: Kerala
This was SVN commit r13134.
2013-01-31 09:00:44 +00:00
Mythos_Ruler 305a654ae1 AO textures added to the metal slabs and rock quarries.
This was SVN commit r13133.
2013-01-29 06:37:06 +00:00
leper 7e60f07df5 Ensure that animals that aren't visible when the order is executed are killed before being gathered from. Fixes #1826.
This was SVN commit r13132.
2013-01-28 22:19:06 +00:00
Enrique f503dd4e3e Fixed Mauryan dock selection square and obstruction size
This was SVN commit r13131.
2013-01-28 13:22:13 +00:00
Enrique 9438000616 Added UV coords for AO to geo_mineral_01, 02 and geo_stonemine_large.
Added AO textures for them.

This was SVN commit r13130.
2013-01-28 12:38:38 +00:00
Mythos_Ruler 66bc206a78 Persian Assyrian Ram +50hp.
Celt Fanatic uses round shield instead of buckler.
Neareastern Badlands map preview image.
Rubbles added for Roman market and army camp (though, Army Camp could
use its own custom rubble).
Cavalry meat gathering reduced from 10/sec to 5/sec.
War Dog -20hp.
Gathering rates adjusted for women and men.
Another texture variant for the Mauryan woman.

This was SVN commit r13129.
2013-01-28 01:25:05 +00:00
Mythos_Ruler 05695aba36 Updated Neareastern Badlands and another Oasis map, this time with Mauryans.
This was SVN commit r13128.
2013-01-27 23:36:05 +00:00
Enrique b577f07e6c Added missing .xml for water troughs in mauryan stables
This was SVN commit r13127.
2013-01-27 18:19:08 +00:00
Enrique 4e7c2807b2 Added Mauryan docks with AO map
This was SVN commit r13126.
2013-01-27 18:10:59 +00:00
historic_bruno 1fdaca5cec Attempts to fix StringifyJSON by clearing pending exceptions from JS API
This was SVN commit r13125.
2013-01-27 01:38:43 +00:00
historic_bruno 25928f1a8b Updates and organizes main LICENSE.txt.
Adds new LICENSE.txts for /libraries and /source/tools. Refs #1682

This was SVN commit r13121.
2013-01-26 21:36:18 +00:00
wraitii 38b0c0eb72 Reverts some changes: Atlas now won't recompute the water foam on terrain change, thus reducing the lag until I properly optimize it. refs #1743
This was SVN commit r13120.
2013-01-26 17:10:12 +00:00
Mythos_Ruler c1f2572006 Fauna elephants for sounds now too.
This was SVN commit r13119.
2013-01-25 07:13:33 +00:00
Mythos_Ruler 66750ad681 New "badlands" cliff textures.
This was SVN commit r13118.
2013-01-25 06:58:41 +00:00
historic_bruno 2f8fa898df This was SVN commit r13117. 2013-01-24 22:17:11 +00:00
historic_bruno a0e6283889 Deletes some duplicate textures
This was SVN commit r13116.
2013-01-24 22:03:10 +00:00
leper 26f616aba7 Save player name when hosting.
This was SVN commit r13115.
2013-01-24 20:12:12 +00:00
leper 2ceeb3231f Fix distance restrictions.
This was SVN commit r13114.
2013-01-24 18:08:35 +00:00
leper aebecd1204 Make territory build restriction tech modifiable.
This was SVN commit r13113.
2013-01-23 22:50:11 +00:00
leper fc835bdedb Only call FinishOrder on MoveCompleted if we didn't get an error. Fix #1823.
This was SVN commit r13112.
2013-01-23 16:02:37 +00:00
leper 3e8bdebc6d Add Clang detection and add BSD to the collected stats.
This was SVN commit r13111.
2013-01-23 16:01:17 +00:00
Mythos_Ruler 684f117560 Fortresses and Docks build about 25% faster.
This was SVN commit r13110.
2013-01-23 08:11:05 +00:00
Enrique b146b3666a Fixed african elephant UVs, added turret to temporary mauryan support elephant.
This was SVN commit r13108.
2013-01-22 18:52:18 +00:00
Pureon e543da5565 Activate battle music tracks
This was SVN commit r13107.
2013-01-21 23:18:53 +00:00
historic_bruno a65db5ca41 Ensures max population is integral by rounding
This was SVN commit r13106.
2013-01-21 22:03:35 +00:00
OmriLahav b9faead8eb This was SVN commit r13103. 2013-01-21 21:28:57 +00:00
OmriLahav c7123140bb This was SVN commit r13102. 2013-01-21 21:26:11 +00:00
Ykkrosh 75a23856cf Fix some static analysis warnings
This was SVN commit r13101.
2013-01-21 20:33:25 +00:00
Ykkrosh c037e3f78e Add detection of Win8 in wversion, to help stats collection
This was SVN commit r13100.
2013-01-21 20:32:07 +00:00
Enrique a9294b0491 added props for mauryan stables
This was SVN commit r13099.
2013-01-21 07:29:24 +00:00
Mythos_Ruler 484faf3bc0 Balancing.
This was SVN commit r13098.
2013-01-21 04:11:59 +00:00
Mythos_Ruler a4e9c7a223 Tweaks.
This was SVN commit r13097.
2013-01-21 01:22:45 +00:00
Mythos_Ruler fe3465cf0c Fixed indentation for Quantumstate. ;)
This was SVN commit r13096.
2013-01-21 00:07:27 +00:00
Mythos_Ruler 7947f87c97 War Dogs now have their own template.
This was SVN commit r13095.
2013-01-21 00:04:07 +00:00
quantumstate 064c687f0e Balance changes, decrease build times for houses and mills, increase train times and non food gather rates for women. Patch from TheMista.
This was SVN commit r13094.
2013-01-20 23:40:41 +00:00
quantumstate e3bc8d1c87 Actually add the battle detection code. Refs #1425.
This was SVN commit r13093.
2013-01-20 23:36:08 +00:00
Mythos_Ruler 786386f9f0 Test Ptolemaic elephant for Enrique.
This was SVN commit r13092.
2013-01-20 22:58:24 +00:00
quantumstate 3715985f1a Add battle detection support to the simulation. Refs #1425 (Patch by Zoot)
The audio code does not yet support actually playing battle music.

This was SVN commit r13091.
2013-01-20 22:47:59 +00:00
Pureon 2d6e3f8ca4 Gather capacity wheelbarrow tech icon
This was SVN commit r13090.
2013-01-20 22:34:05 +00:00
Pureon 679978310f handcart icon for tech
This was SVN commit r13089.
2013-01-20 21:20:59 +00:00
Pureon 272d6798d2 Military Engineers tech icon
This was SVN commit r13088.
2013-01-20 00:04:31 +00:00
Mythos_Ruler 1421b21f82 Added spec and normal mapping to Crannog.
This was SVN commit r13087.
2013-01-19 08:22:58 +00:00
Pureon 369050bdcb Crannog settlement for the Britons
This was SVN commit r13086.
2013-01-17 23:47:00 +00:00
Enrique 062c1aba6c Added playercolor to mauryan stables, decal changed.
This was SVN commit r13085.
2013-01-17 21:11:42 +00:00
Pureon c46d964afb metalworker tech icon
This was SVN commit r13084.
2013-01-17 20:50:30 +00:00
Enrique 24ec6b8040 Added decal to Mauryan stables
This was SVN commit r13083.
2013-01-17 19:07:52 +00:00
Enrique 36eacbfd06 Added Mauryan stables with AO map
This was SVN commit r13082.
2013-01-17 18:27:28 +00:00
Mythos_Ruler 46841bc963 New shield textures by Lion.
This was SVN commit r13081.
2013-01-16 19:07:15 +00:00
Pureon defe8f8b98 Military Engineers, Artillery Instructors, and Metalworker techs
This was SVN commit r13080.
2013-01-16 01:05:26 +00:00
leper 31fe58db82 Stop formation members from sliding. Fixes #1823. Thanks to zoot for the test case!
This was SVN commit r13079.
2013-01-15 18:53:19 +00:00
Pureon 96d389dee2 Mauryan mill model
This was SVN commit r13078.
2013-01-15 00:39:59 +00:00
leper 25de88a68b Take distance between attacker and target into account when fleeing. Patch by mimo. Fixes #1723.
This was SVN commit r13077.
2013-01-15 00:21:25 +00:00
myconid 21a70c0399 Bloom shader rewrite.
This was SVN commit r13076.
2013-01-14 16:57:09 +00:00
Enrique 9cd647a2a0 Fixed Mauryan temple selection ring size and obstruction
This was SVN commit r13075.
2013-01-14 12:41:27 +00:00
Enrique 63fa3d5ea1 Mauryan temple with AO added. Fixed mauryan fortress garrison flag
This was SVN commit r13074.
2013-01-13 23:55:52 +00:00
leper 56db7fa945 Don't use the carrying animation when a unit is ungarrisoned and it dropped of the resources while garrisoning. Patch by zoot. Fixes #1759.
This was SVN commit r13073.
2013-01-13 20:55:55 +00:00
leper 02ac06e293 Allow ungarrisoning units even if they cannot be built due to tech requirements. Patch by mimo. Fixes #1808, #1672.
Fix batch training tooltip if we have more units than the entity limit
allows for.

This was SVN commit r13072.
2013-01-13 19:39:11 +00:00
leper aec8d6ff96 Stop foundation health from jumping. Fixes #1809.
This was SVN commit r13071.
2013-01-13 17:37:26 +00:00
historic_bruno 637fb6d258 Fixes a bug in player assignment and prevents starting games with no assigned human players, fixes #1054
This was SVN commit r13070.
2013-01-12 05:39:04 +00:00
historic_bruno a074eb814a Adds blinking cursors with configurable rate, based on patch by kingadami. Fixes #876
This was SVN commit r13068.
2013-01-12 01:20:01 +00:00
historic_bruno 1f8d0cacdc Adds manual to in-game menu, based on patches by _vincent and grillaz. Fixes #1338
This was SVN commit r13067.
2013-01-12 00:09:42 +00:00
historic_bruno 5968e3cb63 Adds xcode4 workspace for OS X, from Premake 4.4-beta4
This was SVN commit r13066.
2013-01-11 21:31:38 +00:00
historic_bruno de3a28557c Fixes Boost libs being linked under compiler settings by accident, caused linker errors in Xcode
This was SVN commit r13065.
2013-01-11 20:49:33 +00:00
stwf 0be4a49c3f get my name in the contributors file in alphabetical order
This was SVN commit r13064.
2013-01-11 18:40:13 +00:00
stwf 8aa62da454 get my name in the contributors file
This was SVN commit r13063.
2013-01-11 18:38:18 +00:00
historic_bruno 17181e5a73 Fixes incorrect working directory for Windows installer shortcuts
This was SVN commit r13062.
2013-01-11 01:51:05 +00:00
leper bec33070ea Change attack animation naming to allow for multiple attacks. Patch/script by dvagennip. Fixes #1686.
This was SVN commit r13060.
2013-01-09 14:39:25 +00:00
leper fd274a6e70 Add template helper function. Fix some errors. Refs #1692.
This was SVN commit r13059.
2013-01-09 13:25:11 +00:00
Pureon ca41c22b71 New Mauryan house models
This was SVN commit r13058.
2013-01-09 00:10:45 +00:00
historic_bruno d4572e555e Fixes tests
This was SVN commit r13057.
2013-01-08 15:45:39 +00:00
quantumstate 5caddcdd20 Make technology code cleaner with helper functions. Refs #1692.
This was SVN commit r13056.
2013-01-08 00:00:21 +00:00
stwf 670deaef2a added variable sleep time depending on load an seperate mutex for deleting old items
This was SVN commit r13055.
2013-01-07 21:02:22 +00:00
leper d29f6c5c49 Fix dicrepancy in the settings dialog when using hotkeys. Patch by kingadami. Fixes #1817.
This was SVN commit r13054.
2013-01-07 15:19:10 +00:00
historic_bruno e89193d66d Fixes serialization test failure from CmpVisualActor not setting initial animation state with graphics disabled, fixes #1812
This was SVN commit r13053.
2013-01-06 07:37:22 +00:00
historic_bruno 8a2baec240 Fixes multiline text alignment, fixes #723. Patch by kingadami.
Adds text alignment to tooltips, fixes text alignment for dropdowns.

This was SVN commit r13051.
2013-01-06 01:46:44 +00:00
historic_bruno 50fcbc1fc5 Fixes some alignment issues in the match setup UI
This was SVN commit r13050.
2013-01-06 00:34:21 +00:00
Mythos_Ruler 1549e1c91c Fixed Mauryan Civ Centre footprint.
This was SVN commit r13049.
2013-01-05 22:33:13 +00:00
Mythos_Ruler 179df7e173 Elephant archer tweaks.
This was SVN commit r13048.
2013-01-05 22:05:28 +00:00
Mythos_Ruler 0cd3f74a62 New Mauryan shields by Lion.Kanzen.
New Carthage War Elephant texture.

Work in progress Mauryan elephant archer.

This was SVN commit r13047.
2013-01-05 21:38:27 +00:00
Enrique 0ef172db74 New Mauryan civic centre with ao added
This was SVN commit r13046.
2013-01-05 21:15:28 +00:00
quantumstate a2aa4b77fa Change watermark hotkey to Alt-K to prevent accidental presses.
This was SVN commit r13045.
2013-01-04 20:12:32 +00:00
quantumstate 58fa0c7c58 Fix errors when using autostart to launch a game. Use setters instead of accessing cmpPlayers properties directly.
Tidy the formatting in Player.js

This was SVN commit r13044.
2013-01-04 19:50:54 +00:00
historic_bruno dc6c0e483b Fixes unhandled enumeration warning in some compilers
This was SVN commit r13043.
2013-01-04 05:46:35 +00:00
historic_bruno 8e382d98a2 Fixes cost spacing in wall construction tooltips, refs #1675
This was SVN commit r13042.
2013-01-04 00:52:21 +00:00
quantumstate be63de5a7c Add fps counter to game setup. Fixes #1264. Patch by kingadami.
This was SVN commit r13041.
2013-01-03 23:01:54 +00:00
quantumstate 0d204037b6 Added right click selection removal. Fixes #1028. Thanks to kingadami and GerbilOfDoom for the patch.
This was SVN commit r13040.
2013-01-03 22:53:46 +00:00
quantumstate ba94247744 Added unordered map serialization
This was SVN commit r13039.
2013-01-03 22:33:04 +00:00
Enrique 8ef7e45a0a Mauryan barracks re-centered and ao maps fixed
This was SVN commit r13038.
2013-01-03 22:11:14 +00:00
historic_bruno d65c7751a5 Updates bundled libpng to v1.5.13, built with VC2008 - requires update-workspaces. Refs #864
This was SVN commit r13035.
2013-01-03 17:22:14 +00:00
leper 276f0a41a0 New Year's clean-up.
Throw a warning if a invalid (not present) AI is specified in a map.
Replace the last occurences of jubot with qbot.
Exclude the common siege templates from the Units Demo map.
Fix an error with flying units.
Replace CFG_GET_SYS_VAL with CFG_GET_USER_VAL and rename it to
CFG_GET_VAL to reflect its behaviour better.
Fix linker error with clang 3.2. Refs 1588.
Remove some useless includes.

This was SVN commit r13031.
2013-01-01 18:33:53 +00:00
Pureon 4764af695a Update to Mauryan structure texture b
This was SVN commit r13030.
2012-12-30 15:52:41 +00:00
danschub cbfffbe32f Fireworks!
This was SVN commit r13029.
2012-12-29 22:38:56 +00:00
Pureon a223b986e4 New corral and sheep icons
This was SVN commit r13028.
2012-12-29 15:26:40 +00:00
Mythos_Ruler 4c5ff9579b This was SVN commit r13027. 2012-12-27 23:39:03 +00:00
Mythos_Ruler ab9463e13f Miscellaneous Mauryan structure based on Eggbird's old Civ Centre.
This was SVN commit r13026.
2012-12-27 23:27:41 +00:00
Pureon 478de5b001 elephant stables icon update
This was SVN commit r13025.
2012-12-27 23:02:29 +00:00
Mythos_Ruler 02d95b99ff Adjusting Mauryan barracks footprint and obstruction.
This was SVN commit r13024.
2012-12-27 21:38:52 +00:00
Pureon eee68581b8 new fortress icon
This was SVN commit r13023.
2012-12-26 23:10:23 +00:00
leper adc4012944 Save last multiplayer server. Based on patch by Aurium. Fixes #1778.
Fix bug in ConfigDB: Creating a value could result in changing a value
in a different namespace.

This was SVN commit r13021.
2012-12-25 22:49:18 +00:00
Enrique b1a606eb08 Increased Mauryan barracks size
This was SVN commit r13020.
2012-12-24 11:10:27 +00:00
Mythos_Ruler 0df7a67ad1 Reordered unit roster for Mauryan barracks.
This was SVN commit r13019.
2012-12-24 01:34:46 +00:00
Mythos_Ruler a685541d52 Portraits for some Mauryan unit. Celtic Fanatic is now a spearman (more historically accurate). Fixed some other things.
This was SVN commit r13017.
2012-12-24 00:40:49 +00:00
Enrique b33ff333dd Added two Mauryan barracks variations with AO
Fixed garrison flag type in mauryan defense tower

This was SVN commit r13016.
2012-12-24 00:23:10 +00:00
Mythos_Ruler f4da84f15a Some Mauryan unit textures and spec maps.
This was SVN commit r13015.
2012-12-23 22:34:33 +00:00
leper 18b532a195 Remove current targets when changing ownership. Fixes #1794.
This was SVN commit r13014.
2012-12-23 20:03:00 +00:00
wraitii 61734c48d4 Fix a logic error that lead to reflections always being rendered. Might ref #1744
This was SVN commit r13013.
2012-12-23 10:50:30 +00:00
wraitii 9fa7273c2c Backport from API v3 to API v2 that should fix a bug happening with sheeps. fixes #1754
This was SVN commit r13012.
2012-12-23 10:31:39 +00:00
Mythos_Ruler 74cce87692 Nerfed heroes and Champion Archer.
This was SVN commit r13011.
2012-12-22 23:39:18 +00:00
historic_bruno 00c1766907 Adds and updates some hotkeys in the game manual
This was SVN commit r13009.
2012-12-22 22:00:27 +00:00
Mythos_Ruler 0322f2ea59 Hannibal is a bit slower.
This was SVN commit r13008.
2012-12-22 21:10:37 +00:00
Yves ebb2dc3a15 A quick fix for the assertion failure that happens when trying to access profiling data using profiler2.html.
This was SVN commit r13007.
2012-12-22 16:36:20 +00:00
quantumstate f19dbcdc7b Increase cavalry health (70 for melee, 30 for ranged) and pierce armour (3 for melee, 1 for ranged). Also increase melee cavalry speed by 1. Thanks to alpha123 for his stats changing script.
Fix some minor validation errors in some other templates

This was SVN commit r13006.
2012-12-22 01:28:10 +00:00
leper b27d4c26b0 Work around the sheep bug on Acropolis 7. Refs #1754, #1793.
This was SVN commit r13005.
2012-12-21 19:11:31 +00:00
Spahbod 9c34b1ffed Major random map bugfixes:
Fixes the chicken problem
There are no more unreachable trees around the map (hopefully)
Fixed the bug that caused edges of the map ruin the layout of painters
(One of the best examples to look is archipelago, before and after this
revision).
Fixed those out of memory errors caused by pathplacer (Mostly noticeable
in alpine valley and corinthian isthmus)
And some other minor tweaks.
Fixes #1577

This was SVN commit r13004.
2012-12-21 09:48:36 +00:00
leper 9a2dfa3fc0 Read default multiplayer server name/IP address from config. Patch by Aurium. Refs #1778.
This was SVN commit r13003.
2012-12-20 21:44:56 +00:00
Mythos_Ruler 6ab0ab586a Gates added for Iberian player on Acropolis 7.
This was SVN commit r13002.
2012-12-20 19:31:26 +00:00
historic_bruno c5e597d5c4 Fixes some Atlas build warnings about hidden overloaded virtual functions when using wxWidgets 2.9
This was SVN commit r13001.
2012-12-20 03:57:17 +00:00
leper 573d47d9a9 Disable diplomacy settings when player is defeated. Fixes #1764.
This was SVN commit r13000.
2012-12-19 20:19:54 +00:00
Pureon 4d6d514029 New icons for dock, mill, stoa, theatron, and monument structures.
This was SVN commit r12999.
2012-12-19 19:28:51 +00:00
historic_bruno e7ef6a57ad Fixes some build errors from the OS X 10.5 SDK, refs #1768
This was SVN commit r12998.
2012-12-18 22:58:34 +00:00
historic_bruno 5c94761c3e Fixes use of NULL for non-pointer type, fixes #1765
This was SVN commit r12997.
2012-12-18 22:52:55 +00:00
Mythos_Ruler 9665a17f7a Removes "root" attribute from the Mauryan elephant stables.
This was SVN commit r12996.
2012-12-18 18:43:51 +00:00
leper 188a60315b Update release name.
This was SVN commit r12995.
2012-12-14 19:56:58 +00:00
Mythos_Ruler 1c97d819d8 Updated some tips images.
This was SVN commit r12994.
2012-12-14 19:38:20 +00:00
historic_bruno 0da37326d6 Fixes bug that caused training icons for unavailable units to not be greyed out
This was SVN commit r12993.
2012-12-14 19:22:08 +00:00
Mythos_Ruler 9ca9a88bfa Beefed up hero health since you can only have one alive at a time.
This was SVN commit r12992.
2012-12-14 19:02:45 +00:00
historic_bruno 29ac57409e Adds warning about incorrect use of time warp mode, refs #1409
This was SVN commit r12990.
2012-12-14 13:41:25 +00:00
stwf 012e1585b1 fix for ticket 1758, not fixing the underlying problem but will limit the error messages to 1 per failed allocation and shouldn't crash anymore
This was SVN commit r12989.
2012-12-14 03:10:03 +00:00
historic_bruno 60987d46cf Fixes memory leak in sound manager, refs #1736
This was SVN commit r12987.
2012-12-12 22:43:57 +00:00
Enrique dd69fac774 Added generic stone rubbles for sizes 4x2, 4x4, 4x6, 5x5 and 6x4 with AO and their respective destruct decals.
Modified several templates to spawn its correct rubble on death.

This was SVN commit r12985.
2012-12-12 19:06:58 +00:00
Mythos_Ruler 683ce0a176 Fixing sheep on this map.
This was SVN commit r12984.
2012-12-12 19:06:26 +00:00
Mythos_Ruler 8eb7ac7094 Adjusting sheep.
This was SVN commit r12983.
2012-12-12 18:56:16 +00:00
stwf cdaab29d2b make sure file was opened successfully before processing
This was SVN commit r12982.
2012-12-12 13:59:36 +00:00
Yves 39910affd0 Changes various urls to point to the new website and fixes some broken forum urls.
This was SVN commit r12980.
2012-12-11 23:04:03 +00:00
quantumstate 095566c126 Serialize the armour component so that the temporary invulnerability from promotion is synchronised.
This was SVN commit r12978.
2012-12-11 22:01:10 +00:00
Pureon ea36dc5b3d Elephant sounds created by EvanBogunia
This was SVN commit r12977.
2012-12-11 00:44:41 +00:00
leper a3ca29138e Check for all cases. Really fix #1753.
This was SVN commit r12976.
2012-12-10 23:55:16 +00:00
leper 6fd6295644 Check whether the attack/gather target is visible and if not abort. Fixes #1662 and #1753.
This was SVN commit r12975.
2012-12-10 23:35:09 +00:00
Pureon 03e10011ad Balance tweaks to Ram WalkSpeed, House cost, Herd Buildtime, Melee Cavalry, Hannibal
This was SVN commit r12974.
2012-12-10 23:17:29 +00:00
historic_bruno d616a86c7a Fixes unit promotions triggering a selection sound, based on patch by zoot. Fixes #1713
This was SVN commit r12973.
2012-12-10 21:35:52 +00:00
Mythos_Ruler 47275d9416 Updated some terrains. Adds a 2v2 Median Oasis 5.
This was SVN commit r12972.
2012-12-10 02:30:44 +00:00
historic_bruno 2779512c6e Removes user feedback message from main menu. Adds "Report a Bug" button instead, with link to ReportingErrors.
Updates URLs to new website play0ad.com

This was SVN commit r12971.
2012-12-10 01:29:02 +00:00
Mythos_Ruler 1ed2d70e2d Added normal and spec maps for these 3 terrains.
This was SVN commit r12970.
2012-12-09 23:36:05 +00:00
leper 1cd2c48e0b Fix entity limits error on ownership change/destruction.
This was SVN commit r12969.
2012-12-09 21:40:51 +00:00
Mythos_Ruler d7f418c82c Updated pers stables portrait.
This was SVN commit r12968.
2012-12-09 21:20:06 +00:00
Mythos_Ruler e43d1f35e4 Some map updates.
This was SVN commit r12967.
2012-12-09 21:16:41 +00:00
leper 2a3f221d11 Check if cmpFormation is set (which should be as we're a formation member)
This was SVN commit r12966.
2012-12-09 17:52:44 +00:00
quantumstate 53397d1b9d Show hidden AIs when they are used by a map. Fixes #1748.
This was SVN commit r12965.
2012-12-09 14:40:43 +00:00
Pureon b3d3d3f5b9 Some texture work on Mediterranean Cove map
This was SVN commit r12964.
2012-12-08 23:43:56 +00:00
Pureon 3d72291d19 Update to user interface background textures
This was SVN commit r12963.
2012-12-08 20:32:57 +00:00
Mythos_Ruler 032692e14e Tweaked chariot texture.
This was SVN commit r12962.
2012-12-08 20:21:32 +00:00
Mythos_Ruler b2bc5268a7 Mauryan chariot tweaks.
This was SVN commit r12961.
2012-12-08 20:04:57 +00:00
Yves 2e37bf10bc Fixes #1700 (Increasing max-health by tech)
This was SVN commit r12960.
2012-12-08 19:17:48 +00:00
Enrique 8cbb7bb674 Maur_champion chariot and hero chariot with animations added
This was SVN commit r12959.
2012-12-08 18:26:08 +00:00
Mythos_Ruler de4adca0f0 Heroes only trainable in City Phase.
This was SVN commit r12958.
2012-12-08 18:21:11 +00:00
Mythos_Ruler 24b6e690b2 Adds "Long Walls" tech for Athenians.
Adds "Village Phase" requirement to Palisades templates.

This was SVN commit r12957.
2012-12-08 08:53:34 +00:00
Mythos_Ruler abdfcadbbf This was SVN commit r12956. 2012-12-07 19:30:31 +00:00
Mythos_Ruler b20e727ca5 This was SVN commit r12955. 2012-12-07 19:05:30 +00:00
Mythos_Ruler d1e22a09d1 Theatron description isn't so chauvinistic in the Hellenic civ descriptions.
Changed Athenian her Xenophon (a Laconophile) to Iphicrates (a patriot)
after discussion on the forums.

This was SVN commit r12954.
2012-12-07 19:00:34 +00:00
Mythos_Ruler 95f7858a24 Delian League bonus given to the Athenians.
This was SVN commit r12953.
2012-12-07 18:39:23 +00:00
leper 875aa1235b Civ history changes by Jeru.
This was SVN commit r12952.
2012-12-07 17:26:36 +00:00
Mythos_Ruler f08eaea533 This was SVN commit r12950. 2012-12-06 22:35:04 +00:00
leper 8c931bfa52 Add animation override to VisualActor to fix carrying resource animations. Patch by Deiz. Fixes #1260, #1741.
This was SVN commit r12949.
2012-12-06 19:46:13 +00:00
leper d18b9dd2dc Check if the renderer is initialised. Fixes crash in replay mode.
This was SVN commit r12948.
2012-12-06 19:23:31 +00:00
Spahbod 11d0b5ffdb New portrait for anusyia.
This was SVN commit r12947.
2012-12-06 10:10:29 +00:00
historic_bruno 186224612c Fixes tests by checking CConfigDB is initialized before using CFG_GET_USER_VAL
This was SVN commit r12946.
2012-12-05 18:27:42 +00:00
Pureon f528e58983 Macedonian library scroll icon
This was SVN commit r12944.
2012-12-04 23:10:36 +00:00
historic_bruno 555e54f088 Workaround for game settings window being hidden behind session UI
This was SVN commit r12943.
2012-12-04 21:41:30 +00:00
historic_bruno 35c8df02c6 Adds support for Pack/Time tech modification
This was SVN commit r12942.
2012-12-04 21:13:27 +00:00
leper a923cdd139 Fix serialization failure.
This was SVN commit r12941.
2012-12-04 16:59:08 +00:00
leper 5e6c845f4d Fix a test failure caused by eb4805d73d.
This was SVN commit r12940.
2012-12-04 13:21:52 +00:00
Spahbod f705a2910d Fixing a bug in wall_builder by FeXoR:
This was SVN commit r12939.
2012-12-04 13:07:49 +00:00
historic_bruno 610623f010 Fixes small bug introduced by aa68198747.
Clarifies new serialization test options in readme.txt.

This was SVN commit r12938.
2012-12-04 01:48:05 +00:00
historic_bruno aa68198747 Factors out common properties from siege templates, refs #1718. Simplifies pack-related tooltips.
This was SVN commit r12937.
2012-12-04 00:28:28 +00:00
historic_bruno b4b1f521b5 Fixes incorrect siege templates
This was SVN commit r12936.
2012-12-03 22:47:10 +00:00
historic_bruno c02fca79c6 Adds garrison auto-packing for siege units, refs #1718
This was SVN commit r12935.
2012-12-03 22:00:19 +00:00
leper 6562cbea7e ... Refs #1746.
This was SVN commit r12934.
2012-12-03 21:57:28 +00:00
leper b06452bf0f Try to fix some warnings. Refs 1746.
This was SVN commit r12933.
2012-12-03 21:53:37 +00:00
Pureon 53ae87de93 Mauryan elephant stables ui icon
This was SVN commit r12932.
2012-12-03 20:56:06 +00:00
quantumstate ef5cde9f97 Add unit training hotkeys to in game manual.
This was SVN commit r12931.
2012-12-03 20:16:47 +00:00
historic_bruno eb4805d73d Adds command-line and config options for OOS log and serialization test modes: -ooslog and -serializationtest
This was SVN commit r12930.
2012-12-03 20:06:58 +00:00
gregory 6f4b1ec5a1 eihrul's shadow filter patch, fixes ticket #1738.
This was SVN commit r12929.
2012-12-03 19:34:43 +00:00
historic_bruno 17a50c8d93 Fixes crash when using serialization test mode
This was SVN commit r12928.
2012-12-03 19:00:20 +00:00
historic_bruno e91a918164 Fixes race condition in EnsureMonotonic on 32-bit builds, which was causing unreliable timer behavior, fixes #1729
This was SVN commit r12927.
2012-12-03 13:24:12 +00:00
historic_bruno ad3fbc543d Increases garrison loading range for fortresses and army camp, as workaround for siege engines being larger
This was SVN commit r12926.
2012-12-03 05:01:52 +00:00
Mythos_Ruler e91d8a0c47 Toona tree sways now.
This was SVN commit r12925.
2012-12-03 00:38:44 +00:00
Mythos_Ruler 9bff9b3b6d Spartan woman defends herself. This is still a work in progress. Not quite right yet.
This was SVN commit r12924.
2012-12-03 00:37:58 +00:00
historic_bruno feca7e0be7 Updates Polynesia map as a demo with appropriate description
This was SVN commit r12923.
2012-12-03 00:23:43 +00:00
leper c3c655aaa5 Display time cost for walls. Fixes #1740.
This was SVN commit r12922.
2012-12-02 23:45:34 +00:00
leper 26a22a7bcb Make hunting units disband earlier.
Fix formation disbanding.

This was SVN commit r12921.
2012-12-02 23:11:55 +00:00
Pureon 37109f5c70 Packed siege unit icons
This was SVN commit r12920.
2012-12-02 22:33:40 +00:00
leper 2004fb5e62 Fix error caused by unit dying while attacking.
This was SVN commit r12919.
2012-12-02 22:02:36 +00:00
Mythos_Ruler 94c7a0dcf6 Tweaking map settings.
This was SVN commit r12918.
2012-12-02 21:29:39 +00:00
leper 116c4674b3 Handle undefined team setting properly.
This was SVN commit r12916.
2012-12-02 17:29:32 +00:00
leper 5806ed94e1 Fix bug with gather-near-position.
Use the max range for attacking.

This was SVN commit r12915.
2012-12-02 17:25:23 +00:00
quantumstate a4f27dc3e0 Add "score" tab in post-game summary. Patch from EMontana. FIxes #1721.
This was SVN commit r12914.
2012-12-02 15:55:06 +00:00
quantumstate 232dee5a9c Don't show slaughter attack in tooltips and hide the tutorial AI. Patch from zoot. Fixes #1732
This was SVN commit r12913.
2012-12-02 15:22:15 +00:00
Pureon 5e8993fd8f Rome rock packed model fix
This was SVN commit r12912.
2012-12-02 13:50:05 +00:00
leper 5800be1334 Formation order queueing. Fixes #592, #593 and #1716.
Allow changing the formation, while under attack. Fixes #1624. Patch by
Simikolon.

This was SVN commit r12911.
2012-12-02 01:52:27 +00:00
leper ddd8c36d6f Fix tests.
This was SVN commit r12910.
2012-12-01 23:04:49 +00:00
Yves 9d0da11eab Fixes compile error introduced in 3787f17e4d
This was SVN commit r12909.
2012-12-01 20:34:35 +00:00
janwas 308db6627a fix synchronization of TimerState (refs #1729)
This was SVN commit r12908.
2012-12-01 06:33:30 +00:00
janwas 3787f17e4d merge with local codebase: fix PopulationCount
This was SVN commit r12907.
2012-12-01 03:06:24 +00:00
janwas 9001cba02c fix: remove unnecessary failure check concerning window class atom. fixes #1729
This was SVN commit r12906.
2012-12-01 02:34:19 +00:00
leper e7ef4796ee Group civs in info screen by culture. Fixes #1734.
This was SVN commit r12905.
2012-12-01 00:39:26 +00:00
historic_bruno 6fd99e34ce Implements siege packing. Closes #1718.
Adds templates for packed and unpacked siege units - needs stat
tweaking.

This was SVN commit r12904.
2012-12-01 00:34:03 +00:00
leper 090e2a74cf Sync with upstream. Refs #1518.
This was SVN commit r12903.
2012-11-30 21:35:48 +00:00
historic_bruno f7608bf270 Attempted fix to prevent strange timer-related bug in Atlas (fails to start when opened from the game's main menu), refs #1729
This was SVN commit r12902.
2012-11-30 21:34:33 +00:00
Enrique 0e7e6e88e0 Added mauryan scout tower with ao
This was SVN commit r12901.
2012-11-29 23:49:07 +00:00
Pureon 3e7e8d1528 Icons for siege packing/unpacking/cancelling
This was SVN commit r12900.
2012-11-28 20:46:50 +00:00
stwf 3e531b7571 removed improper comparison warning
This was SVN commit r12899.
2012-11-28 04:31:52 +00:00
Mythos_Ruler ad13ded9a5 Some normal and spec maps for these terrains.
This was SVN commit r12898.
2012-11-27 18:59:10 +00:00
fcxSanya fdd2b92723 Simplify formatBatchTrainingString function a bit: remove always true condition/unreachable code. Refs #1432
This was SVN commit r12897.
2012-11-27 15:57:45 +00:00
historic_bruno a4a060cd86 Fixes build warning and cleans up a few things
This was SVN commit r12895.
2012-11-26 02:28:35 +00:00
Mythos_Ruler b2efabdf66 This map -> Demo.
This was SVN commit r12894.
2012-11-26 01:43:43 +00:00
Pureon 5142c2e9bd Added operator infantry unit to the siege scorpio
This was SVN commit r12893.
2012-11-25 22:39:12 +00:00
Mythos_Ruler 9654715773 Swaying grass. Most noticeable with the tall grass sprites on maps like Punjab.
Environmental settings edited on a bunch of maps.

Belgian Bog Night added.

This was SVN commit r12892.
2012-11-25 21:52:39 +00:00
Mythos_Ruler 91fbcf7eb6 This was SVN commit r12891. 2012-11-25 21:26:39 +00:00
Mythos_Ruler dc70751fc8 Made this map a "demo" map.
This was SVN commit r12890.
2012-11-25 21:13:28 +00:00
leper 1f2047f04e Consider the unit's build time in the calculation.
This was SVN commit r12889.
2012-11-25 21:01:03 +00:00
Mythos_Ruler f6e1e15a5d Fixed an icon error.
This was SVN commit r12888.
2012-11-25 20:36:20 +00:00
Mythos_Ruler f9fce9d43a This was SVN commit r12887. 2012-11-25 20:33:59 +00:00
Mythos_Ruler 0a622c0454 Mausoleum has normal and spec maps.
This was SVN commit r12886.
2012-11-25 20:30:12 +00:00
Pureon 6de4300c01 Packed Roman ballista and Packed Carthaginian rock thrower
This was SVN commit r12885.
2012-11-25 19:28:18 +00:00
myconid f456112492 Shadowmapping bugfixes and tweaks.
This was SVN commit r12884.
2012-11-25 18:35:59 +00:00
leper 1052cb9ee0 Rename property. Refs #1717.
This was SVN commit r12883.
2012-11-25 16:23:59 +00:00
leper a6f1620621 Add nop rendering technique to water and waterfall to stop crashes in fixed and arb mode when those are used.
This was SVN commit r12882.
2012-11-25 15:26:09 +00:00
Pureon cdcd3e504b Hele siege rock thrower packed and four wheel wagon
This was SVN commit r12881.
2012-11-25 14:40:23 +00:00
Pureon 86293398eb Roman siege scorpio packed donkey
This was SVN commit r12880.
2012-11-25 13:58:42 +00:00
leper 2ab8c8b874 Fix technology pair affordable mask.
This was SVN commit r12879.
2012-11-25 13:18:01 +00:00
Pureon 3674524c6c Carthaginian mausoleum icon
This was SVN commit r12878.
2012-11-25 12:36:45 +00:00
leper 5f2d30c7f7 Make batch time factor tech modifiable and a template property.
Fix unit test map.

This was SVN commit r12877.
2012-11-25 02:52:13 +00:00
leper 27ae648d9c Show cost in tooltips for batches. Closes #1717, patch by zoot.
This was SVN commit r12876.
2012-11-24 22:04:29 +00:00
leper a326aa63a9 Add check to the hotkeys. Fix #1726.
This was SVN commit r12875.
2012-11-24 20:19:13 +00:00
leper f0493e7060 Spelling fixes. Fixes #1727, patch by zoot.
This was SVN commit r12874.
2012-11-24 19:47:36 +00:00
Pureon f96aeb1bd8 2 wheeled wagon and hele spear packed. Wooden wagon texture
This was SVN commit r12873.
2012-11-24 17:42:42 +00:00
leper ed98320acc Fix non-pch build.
This was SVN commit r12872.
2012-11-24 17:15:07 +00:00
Mythos_Ruler b1720ebdbc This was SVN commit r12871. 2012-11-24 00:51:57 +00:00
Mythos_Ruler 250ba9a3ed Fireflies particle.
This was SVN commit r12870.
2012-11-24 00:32:09 +00:00
Mythos_Ruler ea2626106e This was SVN commit r12869. 2012-11-24 00:29:46 +00:00
Pureon 21b4f33184 Animated Roman bireme
This was SVN commit r12868.
2012-11-24 00:12:29 +00:00
Pureon 39eba0928b Carthaginian mausoleum building
This was SVN commit r12867.
2012-11-23 22:24:00 +00:00
stwf 909956f8c3 fixed possible null access crash
This was SVN commit r12866.
2012-11-22 03:20:51 +00:00
quantumstate 081c846ff1 Network synchronise the projectile id to prevent out of sync errors. Fixes #1681
This was SVN commit r12865.
2012-11-20 23:46:23 +00:00
stwf a23d245405 volume roilloff returned to standard with bug fixed. Added hints to help stereo playback
This was SVN commit r12864.
2012-11-18 22:39:20 +00:00
wraitii 355bdfb748 Updates the water settings of many scenarios. Most should have been updated now. Refs #1706
This was SVN commit r12863.
2012-11-18 15:23:19 +00:00
wraitii 8c86beb0fa Made silhouettes display correctly in the fog.
This was SVN commit r12862.
2012-11-18 12:34:42 +00:00
quantumstate 89217603a1 Unit training hotkeys from mammadori. Fixes #1226.
This was SVN commit r12861.
2012-11-17 18:27:31 +00:00
historic_bruno bd6a39961a More updates to contributors.txt, adds forum usernames for WFG programmers
This was SVN commit r12860.
2012-11-15 00:18:00 +00:00
Mythos_Ruler 9df9d24a26 Fixing the rubble.
This was SVN commit r12859.
2012-11-14 18:28:35 +00:00
historic_bruno 1cb2a0ba69 Partial update of contributors.txt, based on WFG programmers who contributed to source/ and whose names are publicly visible in their profile (if you contributed and don't see your name on the list, please add it)
This was SVN commit r12858.
2012-11-14 17:52:52 +00:00
Enrique 51f5025b96 Added custom docks rubbles with ao for each civ except Mauryans.
Fixed Hellenic dock origin
Added custom decal for celt docks

This was SVN commit r12857.
2012-11-14 04:24:59 +00:00
gregory 7ea7b7cd44 Added peacock two death animations, one for when it's showing off, one for when it's not.
This was SVN commit r12856.
2012-11-13 17:08:07 +00:00
quantumstate 89ced839f2 Added "Starting Economy Walkthrough" as a demo map.
This was SVN commit r12855.
2012-11-12 22:21:20 +00:00
quantumstate 742b265209 Added a couple moremediterranean dirt textures
This was SVN commit r12854.
2012-11-12 20:33:07 +00:00
quantumstate 4006a00012 Added Introductory Tutorial
Removed some buggy optimisation from common-api-v2

This was SVN commit r12853.
2012-11-12 19:55:11 +00:00
ShieldBearer b3f08869ff This was SVN commit r12852. 2012-11-12 18:53:08 +00:00
OmriLahav 180a66f9f4 This was SVN commit r12850. 2012-11-12 12:43:19 +00:00
ShieldBearer c00cfa2e5d Roman Bireme fixed.
This was SVN commit r12849.
2012-11-12 04:36:37 +00:00
leper 7125e72e52 Add build/research/train time to tooltips.
This was SVN commit r12848.
2012-11-11 23:08:44 +00:00
Mythos_Ruler fe45a2b046 Small "time" icon for tooltips. (build time/research time/train time)
This was SVN commit r12847.
2012-11-11 21:25:22 +00:00
Mythos_Ruler 55be4f8d0e Made houses construct 20% faster.
Made the Mauryan "Warrior" into a siege dude.

Started switching over the Mauryan cav jav to Mauryan textures and
actors.

This was SVN commit r12846.
2012-11-11 21:16:50 +00:00
leper 93b0048576 Replace resource names with icons in tooltips. Based on patch by zoot. Fixes #1675.
This was SVN commit r12845.
2012-11-11 15:35:01 +00:00
Enrique beff7a187d Fixed mauryan civic centre projectile attach point and AO added
This was SVN commit r12844.
2012-11-11 04:34:21 +00:00
Enrique cd153ad0c8 Mauryan fortress size increased. Added custom iber_civil_centre rubble
This was SVN commit r12843.
2012-11-11 03:38:57 +00:00
gregory ca5a09ff65 Made round roof normal maps more strawish.
This was SVN commit r12842.
2012-11-10 20:31:23 +00:00
Mythos_Ruler be0beacd1a Brit War Dog nerf.
This was SVN commit r12841.
2012-11-10 19:14:16 +00:00
ShieldBearer 3f334bbdb3 This was SVN commit r12840. 2012-11-10 16:44:12 +00:00
Spahbod 33cb23afa5 New random map: "Corinthian Isthmus"
This was SVN commit r12839.
2012-11-10 16:35:36 +00:00
wraitii d4ea031334 Fix a warning, a bug, and modifies the setting for the Cycladic Archipelagos maps.
This was SVN commit r12838.
2012-11-10 07:48:43 +00:00
Enrique cd3a727cd4 Added custom civic centre rubbles for each faction except Iberians.
This was SVN commit r12837.
2012-11-10 03:50:00 +00:00
fcxSanya 4cf5703125 Return back the focus on rally point button mistakenly replaced with an additional delete button in a21e01150a
This was SVN commit r12836.
2012-11-09 09:16:20 +00:00
fcxSanya 3a02bc296c Fix setupUnitPanel usage broken in 7e21db08d5. Refs #1432
This was SVN commit r12835.
2012-11-08 03:54:00 +00:00
historic_bruno 116281f830 Fixes Atlas and Collada dylib loading on OS X, for non-bundled binaries. Thanks to wraitii for the suggestion.
This was SVN commit r12834.
2012-11-08 01:57:50 +00:00
historic_bruno fa56c11820 Removes JuBot AI which is no longer maintained and has been superseded by qBot. The latest code will remain on Trac for reference.
This was SVN commit r12833.
2012-11-07 21:11:50 +00:00
fcxSanya 7e21db08d5 Training limits. Limit heroes to one living per player. Allow heroes to be trained again. Closes #1432
This was SVN commit r12832.
2012-11-07 17:56:14 +00:00
wraitii 669b7e6e2c Fixes #1714. Also updates the Mediterranean Cove map water settings.
This was SVN commit r12831.
2012-11-07 15:40:34 +00:00
wraitii c722fbd93f Change hwdetect to handle slightly more cases with the water detection.
Updates a few more maps with new settings.

This was SVN commit r12830.
2012-11-07 10:53:37 +00:00
leper 10752c798d Prevent attacking yourself (caused by splash damage).
This was SVN commit r12829.
2012-11-06 14:58:34 +00:00
leper d57926fa5b Adjust diplomacy according to irc discussion. Refs #7.
This was SVN commit r12828.
2012-11-05 20:16:35 +00:00
leper e969340b6c Fix diplomacy for atlas.
This was SVN commit r12827.
2012-11-05 19:34:21 +00:00
wraitii c1da925786 Change some scenario water settings. Refs #1711.
This was SVN commit r12825.
2012-11-05 17:31:28 +00:00
Enrique 9ebdeff90e mauryan fortress small fix
This was SVN commit r12824.
2012-11-05 16:30:57 +00:00
Enrique d52cac9c1a Mauryan fortress commited, second mauryan texture (maur_struct_b.png) commited.
This was SVN commit r12823.
2012-11-05 16:15:15 +00:00
wraitii 76676b1e38 Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ.
This was SVN commit r12822.
2012-11-05 12:14:04 +00:00
leper 1e3c885f45 Allow trading with neutral players.
This was SVN commit r12821.
2012-11-04 23:01:12 +00:00
wraitii d8f22c860d Fix when not using shadows.
This was SVN commit r12820.
2012-11-04 20:39:01 +00:00
wraitii e633196698 Updates the Belgian Bog settings. Changes the water shader to have refraction look more similar between different quality levels.
This was SVN commit r12818.
2012-11-04 18:07:41 +00:00
wraitii ed7c66eb82 Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas.
This was SVN commit r12817.
2012-11-04 15:54:36 +00:00
historic_bruno 7848f4edef Fixes Roman Mars temple by dvangennip, adds garrison prop point and fixes collada warning (unknown polygons set input). Fixes #1708
This was SVN commit r12816.
2012-11-03 21:08:17 +00:00
Enrique 1048ab4a1d Fixed water color in Belgian_Bog_night.xml, fixed normals in maur_long_sword.dae
This was SVN commit r12815.
2012-11-03 14:00:06 +00:00
historic_bruno b90a4ef776 Fixes some typos in civ json files, patch by grillaz. Fixes #1168
This was SVN commit r12814.
2012-11-02 23:07:42 +00:00
wraitii 21e284f8eb Adds the Belgian Uplands random map, and the Polynesia (Water Demo) demo scenario.
This was SVN commit r12813.
2012-11-02 21:18:46 +00:00
leper a0e13d9625 Fix tests. BuildingAI now handles DiplomacyChanged messages.
This was SVN commit r12812.
2012-11-02 17:20:32 +00:00
wraitii d75ae52f56 Particles now correctly update with the fog. Refs #276 .
This was SVN commit r12811.
2012-11-02 16:31:27 +00:00
leper 9930500661 Diplomacy is now mutual. Refs #7.
This was SVN commit r12810.
2012-11-02 13:44:35 +00:00
wraitii a3ddd7b1b3 Fix for some problems when using shadows with the superfancywater.
This was SVN commit r12809.
2012-11-02 13:08:58 +00:00
wraitii 114593b9ad Fix the "Advanced water" box from being ticked when then it shouldn't be on loading.
This was SVN commit r12808.
2012-11-02 09:59:15 +00:00
Enrique f63b795906 Fixed Mauryan shields origin and thickness, fixed mauryan club and spiked mace
This was SVN commit r12807.
2012-11-01 15:31:01 +00:00
wraitii cf23990192 Updates random maps with new settings for the new water shader. Type ambiguity tweaks in WaterManager.
This was SVN commit r12806.
2012-11-01 10:17:54 +00:00
historic_bruno 79f2fc1ac1 Fixes build error on MSVC, use of sqrt was ambiguous. Refs #1572
This was SVN commit r12804.
2012-10-31 20:59:43 +00:00
wraitii f3984a6c0e Forgot the waves shader.
This was SVN commit r12803.
2012-10-31 18:54:10 +00:00
wraitii fb035d08e3 fixes #1572 and fixes #932
Changes the water rendering in game to support higher quality effects
and to look nicer.

This was SVN commit r12802.
2012-10-31 18:42:17 +00:00
myconid 97b46d402c Removing GL3 dependency from GPU skinning code.
This was SVN commit r12801.
2012-10-30 21:57:00 +00:00
Mythos_Ruler 608e01a5b2 Iberian walls and Roman gate use normal/parallax mapping now.
This was SVN commit r12800.
2012-10-30 18:31:05 +00:00
Mythos_Ruler c5fae74ac7 Normal mapping for Craterus.
This was SVN commit r12799.
2012-10-30 17:34:40 +00:00
historic_bruno 7c1b03d031 Fixes MSVC warnings of truncation from double to float
This was SVN commit r12797.
2012-10-30 02:03:40 +00:00
historic_bruno 5b7564da37 Adds moved mikktspace source files to premake4.lua.
Mentions mikktspace licensing in LICENSE.txt

This was SVN commit r12796.
2012-10-30 00:56:24 +00:00
myconid 367c67d6ad GPU-skinned tangent-space effects for non-instanced units, plus a bit of cleanup.
This was SVN commit r12795.
2012-10-29 13:20:21 +00:00
Mythos_Ruler ae4b3cc9b6 Fixed player color for Mauryan shields.
Made a "Boudicca swordswoman" for fun.

This was SVN commit r12794.
2012-10-29 00:46:33 +00:00
Mythos_Ruler 0353177a94 This was SVN commit r12793. 2012-10-28 23:19:19 +00:00
Mythos_Ruler 37d3adcf23 Females now have an attack animation.
"Short hair" female head texture, ready for a turban prop.

This was SVN commit r12792.
2012-10-28 22:08:45 +00:00
Mythos_Ruler 8f573c9aae New Mauryan shields.
New Mauryan weapons.

Mauryan champion infantry is now a mace man.

Resized Mauryan swordsman textures.

This was SVN commit r12791.
2012-10-28 00:34:03 +00:00
leper 22b2343192 Fix name/color in diplomacy messages.
This was SVN commit r12790.
2012-10-27 23:31:16 +00:00
Mythos_Ruler cb8123ffc9 Maiden Guard Archer, until we can combine them into one unit.
This was SVN commit r12789.
2012-10-27 22:52:08 +00:00
Mythos_Ruler 5d960a136a Bactrian archer cav.
Tweaked HQDOF settings.

This was SVN commit r12788.
2012-10-27 22:18:29 +00:00
gregory cd79b8e57b Changed DOF size and position.
This was SVN commit r12787.
2012-10-27 21:26:33 +00:00
Spahbod 5ef6d1f92b Adds "English Channel" random map.
This was SVN commit r12786.
2012-10-27 13:03:34 +00:00
gregory 97554bd726 Made sampling code remove blurring from around fully-focused foreground objects and cleaned up some of the code a bit.
This was SVN commit r12785.
2012-10-26 05:25:50 +00:00
Mythos_Ruler 7bd5872dd7 Fixed info in Rome civ json
This was SVN commit r12784.
2012-10-25 16:28:13 +00:00
Mythos_Ruler 749b685c64 Mauryans selectable in random map.
Fixed animations for Mauryan sword dudes.

Added placeholder Mauryan heroes.

This was SVN commit r12783.
2012-10-25 07:42:31 +00:00
Mythos_Ruler 9dc1724e57 Mauryan Maiden Guard.
This was SVN commit r12782.
2012-10-24 18:32:50 +00:00
stwf 402ea61581 don't set location info by default, music and sounds should not have it set
This was SVN commit r12781.
2012-10-24 13:12:55 +00:00
leper ca4dedbc3e Improve neutral and ally combat handling. Refs #7.
This was SVN commit r12780.
2012-10-23 23:13:39 +00:00
fcxSanya c98a97924d Fix some inconsistent newline characters from 902fc4a541 in unit_commands.js via unix2dos. Refs #1432
This was SVN commit r12779.
2012-10-23 20:42:03 +00:00
leper a21e01150a Basic diplomacy. Refs #7.
This was SVN commit r12778.
2012-10-23 16:31:07 +00:00
Mythos_Ruler 8208b52faf Testing new hero selection ring.
This was SVN commit r12777.
2012-10-21 22:30:04 +00:00
Mythos_Ruler 932bb87046 New spec and normal maps for some Mediterranean terrains.
This was SVN commit r12776.
2012-10-21 22:28:04 +00:00
quantumstate 4a8e14004c Make markets and traders non conquest critical (from alkazar).
This was SVN commit r12775.
2012-10-21 20:59:54 +00:00
gregory 9698b67400 Made manual DOF scale with focus.
This was SVN commit r12774.
2012-10-20 23:39:56 +00:00
quantumstate 347b5e18cf Aviv's adjustment to the tooltips for trading.
This was SVN commit r12773.
2012-10-20 21:36:36 +00:00
gregory 753d151959 Added comments listing the changes from the original shader by Martinsh.
This was SVN commit r12772.
2012-10-18 20:06:25 +00:00
gregory e963b43dcc Made bokeh DOF blur stronger, made it use the postproc manager's zNear and zFar values, and moved its settings into its effect XML file.
This was SVN commit r12771.
2012-10-18 18:52:52 +00:00
Mythos_Ruler 0981911542 Test strat map city.
This was SVN commit r12770.
2012-10-18 18:18:10 +00:00
Mythos_Ruler cc88d057ee This was SVN commit r12769. 2012-10-18 18:17:56 +00:00
Spahbod ec8b49e822 Fixing a small bug suggested by FeXoR.
This was SVN commit r12768.
2012-10-18 18:03:01 +00:00
Spahbod 2cb81bc87a Adding a new cheat
This was SVN commit r12766.
2012-10-18 13:13:41 +00:00
Spahbod 742a68d055 Adding Syria random map. Updating the preview of Unknown random maps.
This was SVN commit r12765.
2012-10-18 06:34:14 +00:00
gregory 2c292798bc Changed sample count on high-quality DOF to increase performance.
This was SVN commit r12764.
2012-10-18 01:31:13 +00:00
gregory 43ad3569e1 Added higher-quality DOF postproc filter.
This was SVN commit r12763.
2012-10-18 01:21:24 +00:00
historic_bruno 7fafeec767 Fixes splash screen to display only once at startup. Fixes #1701.
Adds some spacing between splash screen icons and text.

This was SVN commit r12762.
2012-10-17 20:33:50 +00:00
Enrique 8e48beeeef Added Belgian_Bog_night map
This was SVN commit r12761.
2012-10-17 16:32:34 +00:00
Mythos_Ruler 71b27dd281 Post processing updates to these maps.
This was SVN commit r12760.
2012-10-16 18:10:20 +00:00
historic_bruno bc1efba1dc Moves water rendering update to CCmpWaterManager and uses sim time instead of real time. Fixes water not animating in Atlas and incorrectly animating while the game is paused.
This was SVN commit r12758.
2012-10-15 19:36:04 +00:00
gregory 092498f961 (hopefully) fixed errors with the boar skeleton.
This was SVN commit r12757.
2012-10-15 19:30:29 +00:00
Spahbod 9177683653 Match setup GUI revamp. Adds pop-cap and starting resource options. Refs #802
This was SVN commit r12756.
2012-10-15 15:19:24 +00:00
myconid 1fb7889539 Postproc manager
This was SVN commit r12755.
2012-10-15 10:34:23 +00:00
gregory 538286054a Just some floating barrels.
This was SVN commit r12754.
2012-10-15 03:38:47 +00:00
Mythos_Ruler cb3e94a746 New wood gathering tech (iron axes) at the Mill, paired with a capacity tech (wheelbarrows).
New special technologies for the Carthaginian faction: Colonisation
(research at the Civ Centre) and Exploration (research at the Super
Dock).

New special technology for the Macedonians: Hellenistic Metropolis
(research at the Library).

Athenian special tech Iphicratean Reforms now unlocks Cretan archers for
the Athenian Triremes.

Sandbox scenario for Macedonians.

This was SVN commit r12753.
2012-10-15 03:11:17 +00:00
Mythos_Ruler 93c21d8965 Reordering these sandbox maps by renaming them.
This was SVN commit r12752.
2012-10-15 01:54:15 +00:00
Mythos_Ruler b581e54185 This was SVN commit r12751. 2012-10-15 00:59:05 +00:00
quantumstate 51496f1d40 Restructured phase_city techs so that phase_city is auto researched.
This means that there can be civ specific techs for phase_city, but
phase_city is always researched so can be used as a requirement.
Added phase_city_generic which is the tech which will actually be
researched from the building.

This was SVN commit r12750.
2012-10-14 16:12:22 +00:00
Mythos_Ruler dd462c5b8f Moved these civ bonus techs to their civ folders.
This was SVN commit r12749.
2012-10-13 20:51:12 +00:00
Mythos_Ruler 57a8fcc724 -Mauryan population cap bonus (+10%)
-Persian population cap bonus (+10%)

-"Immortals" technology for Persians. Reduces training time for Anusiya
by half. This is their "special" for now, since they are otherwise
unchanged from the default Champion Spearman.

-"Persian Architecture" technology for Persians (removes the inherent
health bonus and makes it a "special tech" instead).

-Added the Spartan City Phase civ bonus. Spartan citizen-soldiers now
promote directly from Basic to Elite after one kill. Pop cap is reduced
by -10% at the City Phase to balance.

-Updated civ JSON files (and their civ profiles on Trac).

-Adds map preview image for Acropolis 7.

This was SVN commit r12748.
2012-10-13 20:38:40 +00:00
Spahbod 7f8adcf8cb Adding the demo Unknown-Nomad map.
This was SVN commit r12747.
2012-10-11 15:32:10 +00:00
Mythos_Ruler 6fd4a75312 This was SVN commit r12745. 2012-10-08 18:10:29 +00:00
Mythos_Ruler fa6ce56fde This was SVN commit r12744. 2012-10-08 17:42:47 +00:00
Mythos_Ruler a27ef1c4b4 Adjusted some destruction dust to better hide the building->rubble transition.
This was SVN commit r12743.
2012-10-08 17:36:57 +00:00
Enrique a9417be899 Set some buildings to spawn stone_rubble 2x2, and added custom decals sizes for wall segments rubbles.
This was SVN commit r12742.
2012-10-08 00:51:24 +00:00
Enrique 6f4b3b6e5c This was SVN commit r12741. 2012-10-07 23:10:18 +00:00
Mythos_Ruler 3a816f0616 This was SVN commit r12740. 2012-10-07 22:21:20 +00:00
quantumstate 7d0e660fbb Added Player/MaxPopulation for technologies.
This was SVN commit r12739.
2012-10-07 22:19:03 +00:00
Mythos_Ruler cc34cf169c Nerfed stone throwers based on gameplay and discussion with quantumstate. More game testing will be needed.
Tweaked some rubble stuff.

This was SVN commit r12738.
2012-10-07 21:19:01 +00:00
quantumstate 6a100996bf Added civ requirement for technologies.
This was SVN commit r12737.
2012-10-07 20:34:37 +00:00
Mythos_Ruler 14d74055ef Lowered the cost of 5 pop houses after discussion with quantumstate.
This was SVN commit r12736.
2012-10-07 18:05:36 +00:00
Yves 5ce5ef9286 Adds a splashscreen that appears on startup and informs the player about the status of the game (bugs, missing features). The splashscreen can be disabled for future startups by unckecking a checkbox on the splashscreen.
This was SVN commit r12735.
2012-10-07 12:43:08 +00:00
Enrique fc294e5ff9 Added rubble_stone_6x6 and set to CC deaths
This was SVN commit r12734.
2012-10-06 14:04:18 +00:00
Enrique 45de2907ea Added prop points for falmes to rubble_stone_3x3.dae
This was SVN commit r12733.
2012-10-06 11:21:13 +00:00
Mythos_Ruler 06d0c05a31 Spec and Normal maps for Mediterranean grass terrains.
This was SVN commit r12732.
2012-10-06 06:49:11 +00:00
Mythos_Ruler 868c5488b1 Added mountains and mountain passes to Oasis 11.
This was SVN commit r12731.
2012-10-05 18:09:17 +00:00
Mythos_Ruler 35b1a5305d Enrique's stone rubble mesh and actor for 3x3 footprints (large houses).
This was SVN commit r12730.
2012-10-05 18:07:30 +00:00
stwf 65c0f3efc5 removed extra whitespace
This was SVN commit r12728.
2012-10-03 15:14:20 +00:00
myconid 9e328e6b9f Changing sky manager to render sky using cubemaps, to avoid duplication of sky textures in memory.
This was SVN commit r12727.
2012-10-03 12:40:01 +00:00
historic_bruno 5cff74f4e7 Replaces FAM file monitoring with inotify on Linux, based on patch by noKid. Fixes #1316, refs #1687.
Removes FAM dependency.

This was SVN commit r12726.
2012-10-02 00:03:14 +00:00
Mythos_Ruler 222256bd59 This was SVN commit r12725. 2012-10-01 01:47:01 +00:00
Mythos_Ruler 85c8fa9aec A test normal map for units. Causes error though.
This was SVN commit r12724.
2012-10-01 00:01:46 +00:00
Mythos_Ruler 7c7ab773a7 Normal map for destroyed farm field rubble actor.
Defense Towers added to Oasis 1 for a little variation.

This was SVN commit r12723.
2012-09-30 02:34:06 +00:00
Mythos_Ruler 01e36d1756 Added heroes to Persians Sandbox.xml
New farm field "rubble" actor. Looks pretty good. May need a normal map
to look excellent.

This was SVN commit r12722.
2012-09-30 00:55:52 +00:00
Mythos_Ruler 6820ee1fc3 Spec and normal maps for farm fields.
This was SVN commit r12721.
2012-09-30 00:05:42 +00:00
Mythos_Ruler c4267fb3f8 This was SVN commit r12720. 2012-09-29 21:45:04 +00:00
Mythos_Ruler 439f67b5d8 3x3 Destruction mesh for example purposes. Others will need to make other rubble meshes based on this example.
Place and "delete/destroy" a Greek house to see in action.

This was SVN commit r12719.
2012-09-29 21:43:55 +00:00
historic_bruno 03261b8ade Adds rubble entities to most structures. This and bf55acadaa based on patch by quonter. Refs #1166
This was SVN commit r12718.
2012-09-28 22:06:07 +00:00
historic_bruno bf55acadaa Implements SpawnEntityOnDeath property for entities (i.e. rubble). Fixes #1166.
Adds some placeholder rubble entities. They currently reuse foundation
actors until proper rubble models are created.

This was SVN commit r12717.
2012-09-28 22:02:13 +00:00
historic_bruno 772c10801c Fixes missing Atlas selection rings for decorative actors
This was SVN commit r12716.
2012-09-28 19:16:32 +00:00
historic_bruno 7d8dc05c68 Fixes actor viewer bug where view was obstructed by map's water level. Fixes #1562.
Adds water plane option to actor viewer.

This was SVN commit r12715.
2012-09-28 18:20:36 +00:00
Spahbod 9fadd9017f Fixing the name of tamarix tree.
This was SVN commit r12714.
2012-09-27 08:15:53 +00:00
Spahbod 59f3f1830c This was SVN commit r12713. 2012-09-27 06:23:53 +00:00
Spahbod fb6493d33c This was SVN commit r12712. 2012-09-27 06:23:19 +00:00
Spahbod a9ae4e2c80 This was SVN commit r12711. 2012-09-27 06:15:28 +00:00
Spahbod 4c8159d47f Adding cultures to the civs. Fixing the recent problem with random maps.
This was SVN commit r12710.
2012-09-27 06:12:25 +00:00
stwf 44821da620 new threaded soundmanager and proper distance roll off
This was SVN commit r12709.
2012-09-27 02:42:03 +00:00
historic_bruno e72b603cce Implements Vision/Range tech modification
This was SVN commit r12707.
2012-09-24 22:27:32 +00:00
quantumstate ef81521dc9 Stop a technology from being queued multiple times.
Also fixed formatting in Attack.js

This was SVN commit r12706.
2012-09-24 20:20:14 +00:00
quantumstate 94f469e705 Added a Slaughter attack type which instantly kills all herdable animals with a melee attack. Fixes #1652.
This was SVN commit r12705.
2012-09-24 19:31:31 +00:00
Spahbod e464332c74 Fixing a bug in "random" map selection.
This was SVN commit r12704.
2012-09-24 11:13:37 +00:00
historic_bruno 4c37e8de95 Adds hotkey for forcing unit attack (useful for destroying enemy farms), based on patch by quonter. Fixes #1489
This was SVN commit r12703.
2012-09-24 01:14:21 +00:00
historic_bruno 60f9fece29 Fixes build on GNU/kFreeBSD, patch by vincent. Fixes #1322
This was SVN commit r12702.
2012-09-24 00:41:35 +00:00
historic_bruno de6653e255 Adds max attack range to training tooltip and unit details panel for ranged units.
Adds attack type to unit details panel. Refs #1657

This was SVN commit r12700.
2012-09-23 20:50:23 +00:00
historic_bruno b8baa54722 Implements Health/Max tech modification
This was SVN commit r12699.
2012-09-23 19:24:43 +00:00
historic_bruno 7064e0673c Adds TechnologyModification message for newly created entities, so they are notified of previously researched techs (this will streamline implementation of certain techs). Fixes #1410
This was SVN commit r12698.
2012-09-23 19:19:57 +00:00
myconid db4b08d1ad Slight changes to the cubemap stuff in the sky manager, to make it behave better after archivebuild.
This was SVN commit r12697.
2012-09-21 20:22:23 +00:00
Mythos_Ruler 8a57ed2e7b Updated Persian stables portrait.
This was SVN commit r12696.
2012-09-20 17:43:39 +00:00
Mythos_Ruler 4b7ff6f375 Higher health for the Persian gardens.
This was SVN commit r12695.
2012-09-20 17:19:51 +00:00
Mythos_Ruler d6ffba5e43 Updated Persian sandbox demo map.
This was SVN commit r12693.
2012-09-20 17:10:42 +00:00
Mythos_Ruler 9340e0bf8a Fixed texture typo.
This was SVN commit r12692.
2012-09-20 17:04:31 +00:00
Mythos_Ruler 7cab4f2bce Persian gardens template. Some normal and spec maps for Persian structures. Someone else please redo them, as they suck.
This was SVN commit r12691.
2012-09-19 18:13:11 +00:00
Enrique bead0319ab Fixed gardens_water to no longer cast shadows. Updated gardens_struct and waterfall
This was SVN commit r12690.
2012-09-18 23:28:58 +00:00
Enrique 94c15987d6 added prop points to gardens_struct
This was SVN commit r12689.
2012-09-17 23:49:55 +00:00
Enrique 811a0aa5a2 Fixed pers_gardens_waterfall.dae
This was SVN commit r12688.
2012-09-17 22:37:25 +00:00
Mythos_Ruler 4b1df39d55 Macedonian Library template.
This was SVN commit r12687.
2012-09-17 17:51:22 +00:00
myconid bf5b7938f4 First attempt at adding waterfall splashes...
This was SVN commit r12686.
2012-09-17 12:22:21 +00:00
Spahbod bdab01b381 Making the "random" option in the map selection dropdown orange. Refs #1668
This was SVN commit r12685.
2012-09-17 08:24:04 +00:00
Spahbod 91f3463bd3 Adding the "Random" option in map selection. Fixes #1668
This was SVN commit r12684.
2012-09-17 02:58:47 +00:00
historic_bruno a03ce4d904 Removes skeletal animated pine tree
This was SVN commit r12683.
2012-09-17 01:05:54 +00:00
historic_bruno b8e0f02b31 Updates remaining actors to new format
This was SVN commit r12682.
2012-09-17 00:55:45 +00:00
historic_bruno 987d677072 Cleaning up some unused/duplicate files
This was SVN commit r12681.
2012-09-17 00:54:21 +00:00
Enrique 7153c50d10 Mace_library, spart_sissyton and pers_gardens commited. New waterfall and gardens_turf textures added.
This was SVN commit r12679.
2012-09-16 18:05:28 +00:00
Pureon 3dd887a193 Roman army camp icon
This was SVN commit r12678.
2012-09-16 16:53:52 +00:00
myconid 11b1c59397 A minor change to water rendering on models.
This was SVN commit r12677.
2012-09-16 11:39:04 +00:00
Deiz bdde574ade Wall build orders shouldn't always be queued. Fixes #1673.
This was SVN commit r12676.
2012-09-15 05:45:49 +00:00
Deiz c4c65c02ac Need to explicitly return values to silence warnings.
This was SVN commit r12675.
2012-09-14 20:55:49 +00:00
Deiz 27c390cdf2 Always abort the FSM transition when failing to enter a state. Fixes #1669.
This was SVN commit r12674.
2012-09-14 20:00:03 +00:00
Deiz f91111aec8 Load default MP player name from the config.
This was SVN commit r12673.
2012-09-14 05:38:29 +00:00
Deiz 8bd54eef71 Handle nested garrison holder death properly.
This was SVN commit r12672.
2012-09-13 22:47:47 +00:00
historic_bruno 71cfdec62b Removes obsolete reference to wxjs and adds Mongoose to LICENSE.txt
This was SVN commit r12671.
2012-09-13 19:03:48 +00:00
Mythos_Ruler f732fd801e A bunch of stuff.
This was SVN commit r12670.
2012-09-13 18:22:09 +00:00
Mythos_Ruler 710ed7adb6 Some AI name stuffs.
This was SVN commit r12669.
2012-09-13 17:24:47 +00:00
Mythos_Ruler c78ab91740 This was SVN commit r12668. 2012-09-13 17:13:17 +00:00
Spahbod 064c28408d Fixing some tooltips from changeset 513876ffd6
This was SVN commit r12667.
2012-09-13 06:21:01 +00:00
Spahbod 4365cc639d Default ai player names patch: Codes. Fixes #1582.
This was SVN commit r12666.
2012-09-13 06:18:01 +00:00
Spahbod 513876ffd6 Default ai player names patch: Names
This was SVN commit r12665.
2012-09-13 06:17:03 +00:00
Deiz 41e5f88aae Support appending and global selection via the 'find idle' keys.
This was SVN commit r12664.
2012-09-12 21:37:04 +00:00
Deiz 958fce0438 Prevent naval gatherers from trying to reach land drop sites.
This was SVN commit r12663.
2012-09-11 21:03:08 +00:00
Deiz 7ff34fedc4 Turn formation Gather orders into GatherNearPosition if necessary.
This was SVN commit r12662.
2012-09-11 00:56:23 +00:00
Mythos_Ruler 820d6856ee Map updates. Made "Reservoir" a demo map.
This was SVN commit r12661.
2012-09-10 17:21:09 +00:00
myconid 34b9bd4bca Reservoir test map.
This was SVN commit r12660.
2012-09-09 21:15:54 +00:00
Pureon fdc3322eec New treasure icon
This was SVN commit r12659.
2012-09-09 20:46:54 +00:00
Yves fef2bdf39b Removed unused file
This was SVN commit r12658.
2012-09-09 19:41:32 +00:00
Deiz 0784d75dfe Removed out-of-date, often-forgotten civilization count.
This was SVN commit r12657.
2012-09-09 18:52:47 +00:00
myconid 37cdcdc6fa Removing use of textureGrad function in shaders, as it requires too new a version of OpenGL.
This was SVN commit r12656.
2012-09-09 14:53:34 +00:00
leper 6528751875 Fix non-pch build. Fixes #1664.
This was SVN commit r12655.
2012-09-09 13:51:04 +00:00
Spahbod 25682da568 Improving the layout of "Unknown" random map. Improving the random biome system. Adding "Unknown Land" random map.
This was SVN commit r12654.
2012-09-09 08:38:36 +00:00
Spahbod 7618625884 Tweaking Persian Highlands random map.
This was SVN commit r12653.
2012-09-09 07:19:11 +00:00
Spahbod 8e71ae35e7 Fixing the texture parameter of iceberg.
This was SVN commit r12652.
2012-09-09 04:28:35 +00:00
Deiz 7d8ef7a2ef Add support for non-integer GarrisonHolder regen rates; round health up in the GUI. Refs #1633.
This was SVN commit r12651.
2012-09-09 00:52:10 +00:00
Mythos_Ruler 502311fe5c Normal and spec maps for Tropic Cliff B.
This was SVN commit r12650.
2012-09-08 23:39:47 +00:00
Pureon 2797cacd21 Ship tech and temple tech tweaks
This was SVN commit r12648.
2012-09-08 21:50:07 +00:00
Pureon 5456e75761 New background textures
This was SVN commit r12647.
2012-09-08 21:44:29 +00:00
Pureon 8c1b51bdda Garrison healing tech for temples
This was SVN commit r12646.
2012-09-08 20:22:31 +00:00
Pureon 411884f607 Small nerf to all warships. Less attack and range
This was SVN commit r12645.
2012-09-08 19:48:35 +00:00
Pureon ae3c9fb318 Three new technologies for ships
This was SVN commit r12644.
2012-09-08 19:20:26 +00:00
myconid 779a33ee30 Water and waterfall shaders, materials and examples.
This was SVN commit r12643.
2012-09-08 18:56:13 +00:00
Deiz 1fec7c382b Respect the queued flag for garrison orders.
This was SVN commit r12642.
2012-09-08 16:17:25 +00:00
Spahbod 3c6bce057e Fixing the buggy passageMaker function. Smoothing the edges of the passes.
This was SVN commit r12641.
2012-09-08 10:04:20 +00:00
Spahbod 326e4a75d6 Committing FeXoR's new fortress arrangement for Fortress random map. Fixes #1654.
This was SVN commit r12640.
2012-09-08 08:20:27 +00:00
stwf 1fce30839f zero out buffers before loading sounds
This was SVN commit r12639.
2012-09-08 02:54:49 +00:00
stwf df0c4559ad silence repeated errors when buffers don't allocate, fix up reference counting
This was SVN commit r12638.
2012-09-07 12:05:29 +00:00
myconid d04f737c5e Putting a check for bad texture references, in case anyone tries to use old-style texture tags in actors.
This was SVN commit r12637.
2012-09-06 21:05:34 +00:00
Deiz ef2c9e338d LeaveFoundation should put formation members into a discrete state to avoid prematurely disbanding.
This was SVN commit r12636.
2012-09-04 23:27:06 +00:00
historic_bruno b3d85df2fd Adds notes about a few currently useless special buildings
This was SVN commit r12634.
2012-09-04 19:56:27 +00:00
Deiz 323d7b207e Completely hide deprecated AIs for now.
This was SVN commit r12633.
2012-09-04 17:41:46 +00:00
myconid 3efb235725 And re-enabling the stuff disabled for debugging 2
This was SVN commit r12632.
2012-09-04 17:30:01 +00:00
myconid 10101b138d And re-enabling the stuff disabled for debugging
This was SVN commit r12631.
2012-09-04 16:59:03 +00:00
Mythos_Ruler 3cdf49c75f Changing texture for this tree top.
This was SVN commit r12630.
2012-09-04 16:57:17 +00:00
myconid 8b10290f78 Disabling some LOD stuff to track down Deiz's bug (as a result, parallax also temporarily disabled)
This was SVN commit r12629.
2012-09-04 15:55:36 +00:00
myconid 1ba858bf6e More on that bug (warning: renderer temporarily slower)
This was SVN commit r12628.
2012-09-04 12:34:02 +00:00
myconid f92cda7a91 Testing something different in the hope it helps with a bug reported on the forums
This was SVN commit r12627.
2012-09-04 11:09:36 +00:00
Deiz 6adccf3660 Hide unusable AIs from the default match setup drop-down list.
This was SVN commit r12626.
2012-09-04 07:09:36 +00:00
Deiz 25f7012f0c Squished the match setup player display a bit, to better show longer names at low resolutions.
This was SVN commit r12625.
2012-09-04 07:01:11 +00:00
Deiz 0a0a49eb09 Explicitly store whether whether a unit is moving, as formation members don't finish moving as normal.
This was SVN commit r12624.
2012-09-04 03:57:22 +00:00
Mythos_Ruler 0eeb187609 Mauryan units can build elephant stables now.
This was SVN commit r12623.
2012-09-04 00:57:05 +00:00
Mythos_Ruler 3efc51b9f2 Clarified Worker Elephant tooltip.
Increased Worker Elephant builder speed.

This was SVN commit r12622.
2012-09-04 00:37:16 +00:00
Mythos_Ruler 88f1145368 Acropolis 1 now uses Aegis Bot.
This was SVN commit r12621.
2012-09-03 23:56:52 +00:00
Mythos_Ruler bf825ed41f This was SVN commit r12620. 2012-09-03 23:56:11 +00:00
Mythos_Ruler ca4a5238af Updated Punjab 1 map.
This was SVN commit r12619.
2012-09-03 23:54:51 +00:00
Mythos_Ruler becc13cf44 Tweaked color of building decals.
This was SVN commit r12618.
2012-09-03 23:29:31 +00:00
Mythos_Ruler 80e3efda02 Destruction smoke for Rotary Mill.
This was SVN commit r12617.
2012-09-03 22:37:31 +00:00
gregory 541c77168c Updated Roman market AO.
This was SVN commit r12616.
2012-09-03 21:08:08 +00:00
gregory 681713fe98 Re-committed celt_house_b.dae with the correct model.
This was SVN commit r12615.
2012-09-03 17:11:59 +00:00
gregory 89c87f2af2 This was SVN commit r12614. 2012-09-03 16:43:57 +00:00
Deiz d805c87249 Send messages when formation members hit fail to find a path or are obstructed.
This was SVN commit r12613.
2012-09-03 02:59:15 +00:00
gregory 66318d7011 Added/fixed dust prop points on one of the Celtic house variants and one of the defense tower variants.
This was SVN commit r12612.
2012-09-03 01:51:02 +00:00
historic_bruno 7d2e201332 Fixes some unreferenced formal parameter warnings
This was SVN commit r12611.
2012-09-02 23:07:16 +00:00
Mythos_Ruler a972ba900d Renamed qBot-experimental to something nicer. Can easily be changed to something else.
This was SVN commit r12610.
2012-09-02 22:16:41 +00:00
Mythos_Ruler c518ad6834 Commented out "USE_SELF_LIGHT" because the lack of an alpha channel in many specular textures may cause problems on some systems. Per discussion with historicbruno.
This was SVN commit r12609.
2012-09-02 21:36:28 +00:00
Mythos_Ruler b9efc49c88 These helmets now use the new specular helmet material. More to come.
This was SVN commit r12608.
2012-09-02 21:08:43 +00:00
Mythos_Ruler 0c2b69cb89 A spec map material for helmets. This makes the specular shinier for helmets that use this material for a more noticeable effect.
This was SVN commit r12607.
2012-09-02 20:46:17 +00:00
Mythos_Ruler 545db71a8c Adding missing material.
This was SVN commit r12606.
2012-09-02 20:32:33 +00:00
historic_bruno eedb25fedc Fixes invalid light model and overbrightness on some demo maps
This was SVN commit r12605.
2012-09-02 20:23:27 +00:00
Pureon 8e1a9bf89b Fixing celt defence tower prop points and adding foundation
This was SVN commit r12604.
2012-09-02 18:06:49 +00:00
Pureon cb83f6955c Fixing dust prop point errors. Celt house and tower
This was SVN commit r12602.
2012-09-02 14:55:53 +00:00
myconid fd400f111c Bugfix: a problematic decal in Hellenic Sandbox, ticket #1632
This was SVN commit r12601.
2012-09-02 12:11:27 +00:00
myconid 6548827ca2 Changed a few more decals
This was SVN commit r12600.
2012-09-02 09:10:59 +00:00
myconid 8a61f207f2 Changed a couple of misnamed materials, which were breaking some decals
This was SVN commit r12599.
2012-09-02 09:00:27 +00:00
Mythos_Ruler 766823f293 Made theatron available to all hellenic factions.
This was SVN commit r12598.
2012-09-02 05:12:06 +00:00
Mythos_Ruler f48883187d Spec and Normal maps for Tropical stone quarries and one of the tropical cliff terrains.
This was SVN commit r12597.
2012-09-02 03:30:14 +00:00
Mythos_Ruler 1a3a6a73ac Made the "default" maps Acropolis 1 (first map alphabetically in the list).
This was SVN commit r12596.
2012-09-02 03:03:53 +00:00
Mythos_Ruler 6e3127cb74 Album image for the game's music.
This was SVN commit r12595.
2012-09-02 02:55:25 +00:00
Deiz 38ea080d25 Increase the AI's js runtime size to 32 MB for the time being.
This was SVN commit r12594.
2012-09-02 01:50:16 +00:00
myconid ba3b6b9bb7 Attempting to rewrite fixed renderpath model rendering code to apply LOS to models.
This was SVN commit r12593.
2012-09-02 01:33:56 +00:00
Mythos_Ruler 18aa6e3320 Tweaked
This was SVN commit r12592.
2012-09-01 23:42:08 +00:00
stwf a6e1e6cec7 report errors opening sound files and hopefully revcover from them gracefully
This was SVN commit r12591.
2012-09-01 23:24:32 +00:00
gregory 453f4a8aa6 Deleted broken and unused fancy Mars temple.
This was SVN commit r12590.
2012-09-01 23:23:29 +00:00
gregory 0be2384297 Added shader maps to (hopefully) all the Celtic buildings.
This was SVN commit r12589.
2012-09-01 22:53:28 +00:00
myconid affe91b52c Fixed fixed renderpath: green water, broken minimap
This was SVN commit r12588.
2012-09-01 22:34:36 +00:00
historic_bruno d45a044445 Cleans up rogue printf
This was SVN commit r12587.
2012-09-01 22:16:53 +00:00
leper ccdb67c8f2 Fix non-pch build.
This was SVN commit r12586.
2012-09-01 22:12:28 +00:00
Mythos_Ruler 535065eb5c Fixed Spartan cc
This was SVN commit r12585.
2012-09-01 22:02:05 +00:00
Enrique a1e21449fb Fixed Athenian CC, added spartan and macedonian CC
This was SVN commit r12584.
2012-09-01 21:53:39 +00:00
Mythos_Ruler c185ac89bc Added teams to this map.
This was SVN commit r12583.
2012-09-01 20:59:28 +00:00
Mythos_Ruler c5713719a8 Adjusted the Maur CC footprint a bit.
This was SVN commit r12582.
2012-09-01 20:39:52 +00:00
egbert 4a06158fa5 This was SVN commit r12581. 2012-09-01 18:59:19 +00:00
egbert 9b453f086e This was SVN commit r12580. 2012-09-01 18:57:30 +00:00
egbert ecff938a6f This was SVN commit r12579. 2012-09-01 18:56:13 +00:00
egbert f59024b491 This was SVN commit r12578. 2012-09-01 18:55:06 +00:00
historic_bruno a29acce208 Adds some missing includes, refs #1614
This was SVN commit r12577.
2012-09-01 18:23:13 +00:00
Deiz 0cd7da8d0d A C-style for loop is needed for this to iterate as expected.
This was SVN commit r12576.
2012-09-01 10:43:05 +00:00
Spahbod 74364a3130 Changing the release name to "Alpha XI Kronos" before someone makes a package.
This was SVN commit r12575.
2012-09-01 05:45:14 +00:00
stwf 0133197dcd proper disposal of single buffer sounds
This was SVN commit r12574.
2012-09-01 02:41:48 +00:00
Deiz 9cc8a0a40b Enable rally points for corrals.
This was SVN commit r12573.
2012-08-31 19:52:58 +00:00
myconid 166afff098 Fixed zoot's shimmering rock problem
This was SVN commit r12571.
2012-08-31 19:46:40 +00:00
historic_bruno df96445284 missing files from 89c8bccbde
This was SVN commit r12570.
2012-08-31 19:26:29 +00:00
Deiz 0340cc2baa Shade and show an insufficient resources tooltip for unaffordable walls. Fixes #1641.
This was SVN commit r12569.
2012-08-31 19:20:16 +00:00
myconid 2ed11f6a84 Trying to clean up the old specularity code
This was SVN commit r12568.
2012-08-31 19:12:42 +00:00
Mythos_Ruler 7ce09c315b Athenian cc by Enrique (still needs projectile prop point).
Spec and Normal maps for Roman siege wall. Siege wall gate still needs
it, but currently there is a bug with using the new materials on
animated structures.

This was SVN commit r12567.
2012-08-31 19:10:35 +00:00
historic_bruno 89c8bccbde Sound system patch by stwf:
Fixes sound system to work with archives (use VFS files instead of
POSIX), fixes #1604.
Improves error handling and logging, refs #1594.
Allows sound to be disabled with -nosound/-quickstart runtime options or
--without-audio build option, fixes #1609, #1614.
Experimentally increases default buffer size to help prevent sound
stoppages.

This was SVN commit r12566.
2012-08-31 19:08:41 +00:00
myconid e8758b8bf1 Making sure LOS really is black after Reveal Map option is used...
This was SVN commit r12565.
2012-08-31 18:33:03 +00:00
Deiz ff2ffa384b Domestic animals should be unable to gather treasure.
This was SVN commit r12564.
2012-08-31 08:25:27 +00:00
Deiz 9fcb7cc738 Fixed formations so switching formation in-place doesn't leave entities in FORMATIONMEMBER.WALKING and short walk orders bring units into proper formation.
This was SVN commit r12563.
2012-08-31 08:20:36 +00:00
Deiz d98c62f00a Show the resource tooltips over the resource counter icons. Fixes #1636.
This was SVN commit r12562.
2012-08-30 20:36:40 +00:00
myconid ea11dee4fa Bugfix: made sure LOS is always thresholded to black
This was SVN commit r12561.
2012-08-30 20:29:39 +00:00
historic_bruno 5f88bf8a79 Displays error when converting a grayscale texture instead of possibly crashing, refs #1640
This was SVN commit r12560.
2012-08-30 19:24:24 +00:00
historic_bruno 0b832176d5 Replaces grayscale decal texture with RGB, refs #1640
This was SVN commit r12559.
2012-08-30 19:21:25 +00:00
Mythos_Ruler df531c90d7 Map previews for the height map import maps.
This was SVN commit r12558.
2012-08-30 18:24:11 +00:00
myconid 5fcbf01fcb Using even stricter GLSL typing to please even more compilers...
This was SVN commit r12557.
2012-08-30 14:13:28 +00:00
Spahbod afe65d7b76 Adjusting the scale of Northern Lights preview.
This was SVN commit r12556.
2012-08-30 11:21:42 +00:00
Deiz 221c7dacde Also try to strip the 'resource|' prefix when handling a GatherNearPosition order.
This was SVN commit r12555.
2012-08-30 08:18:43 +00:00
Deiz 8968df0554 Only have builders auto-gather if they received a forced order. Patch by picobyte, fixes #1511.
This was SVN commit r12554.
2012-08-30 02:23:36 +00:00
Deiz a563786b86 Only play selection sounds for Gaia entities or entities that the player can control.
This was SVN commit r12553.
2012-08-30 02:02:59 +00:00
myconid 2850476389 Using stricter GLSL typing to please some compilers
This was SVN commit r12552.
2012-08-30 00:29:10 +00:00
myconid 38c1a4c4a1 Modified sky, minimap and healthbar renderers to use shaders, to fix a bug reported by historic_bruno
This was SVN commit r12551.
2012-08-29 23:07:53 +00:00
Yves fcf09598d9 Temporarily disabling FAM for Alpha 11 because it can cause problems on Ubuntu and hotloading doesn't seem to work anyway at the moment.
Known problems with FAM:
- System hangs at shutdown
- Assertion failure at startup in debug mode

This was SVN commit r12550.
2012-08-29 21:22:57 +00:00
Deiz 833d79445e Allow immediate re-targeting if an attack target becomes invalid.
This was SVN commit r12549.
2012-08-29 21:13:50 +00:00
Deiz 781ad7d520 Don't always call FinishOrder when leaving a formation, as they may be in the idle state.
This was SVN commit r12548.
2012-08-29 19:54:29 +00:00
Spahbod eea0a62b64 This was SVN commit r12547. 2012-08-29 17:01:41 +00:00
Spahbod 776282b59d Updating random biome system to include autumn textures. adding another theme to "unknown".
This was SVN commit r12546.
2012-08-29 16:43:39 +00:00
Spahbod 0d0bc32736 Adding "Unknown" random map. Updating "Gulf of Bothnia".
This was SVN commit r12545.
2012-08-29 13:00:01 +00:00
Spahbod 95ccd432c8 Adding "Unknown" random map
This was SVN commit r12544.
2012-08-29 12:59:12 +00:00
Deiz 08a4b12f01 Added resource used counters that track all non-barter spending. Fixes #1605.
This was SVN commit r12543.
2012-08-29 05:13:45 +00:00
Deiz 96ee70b75b Enforce attack/heal repeat delay to prevent units from performing actions too often.
This was SVN commit r12542.
2012-08-28 20:02:03 +00:00
Deiz dd40cc023e Resource supply corpses won't have UnitAI and should never be in formations.
This was SVN commit r12541.
2012-08-27 23:14:10 +00:00
quantumstate 205792ddd3 Fix path to user.cfg on unix
This was SVN commit r12540.
2012-08-27 20:36:05 +00:00
Mythos_Ruler 05525a9c2a Fixed.
This was SVN commit r12539.
2012-08-27 17:46:21 +00:00
Mythos_Ruler e15ba08510 Added teams to this map.
This was SVN commit r12538.
2012-08-27 17:09:09 +00:00
Deiz b4ba09c8b3 Reduce maximum garrison icons to 12 so stances can be shown for siege rams, etc.
This was SVN commit r12537.
2012-08-27 16:56:58 +00:00
Deiz 9db71f5417 Only count civ centres as destroyed if they aren't foundations.
This was SVN commit r12536.
2012-08-27 07:16:21 +00:00
Deiz 6a7e6ca343 Clean up entity name formatting; always show generic names in tooltips.
This was SVN commit r12535.
2012-08-27 07:07:33 +00:00
Deiz 126db0097a Generic names should have parens only if a specific name is also present.
This was SVN commit r12534.
2012-08-27 06:17:52 +00:00
Deiz 2de4786240 UnitAI's CanGather should always return false if the target isn't a resource.
This was SVN commit r12533.
2012-08-27 01:35:53 +00:00
Deiz b462f2acfe Show generic names in unit garrison tooltips.
This was SVN commit r12532.
2012-08-26 19:58:25 +00:00
wraitii 2bdb8f75ff Check the length of the unit collection in started attack plans to avoid errors. Fixes #1620
This was SVN commit r12531.
2012-08-26 11:25:39 +00:00
Deiz 576761c05e Never allow entities to set a rally point on themselves.
This was SVN commit r12530.
2012-08-26 06:38:29 +00:00
ShieldBearer 3e40453bd2 This was SVN commit r12529. 2012-08-26 06:30:44 +00:00
Deiz dd2d1eb6ec Added name tooltips to the summary screen civ emblems.
This was SVN commit r12528.
2012-08-25 22:05:15 +00:00
Deiz c688f64699 Increased the verbosity of the FinishOrder error and made it generate a stack trace.
This was SVN commit r12527.
2012-08-25 21:55:53 +00:00
myconid 89cf2b26e3 Second attempt to fix a graphical glitch in ARB mode
This was SVN commit r12526.
2012-08-25 21:41:31 +00:00
Deiz cd0802294a Forced chase orders should override stance.
This was SVN commit r12524.
2012-08-24 23:32:26 +00:00
Deiz 1c06a17e87 EntityRenamed should be ignored if the old entity doesn't match.
This was SVN commit r12523.
2012-08-24 08:22:29 +00:00
Deiz d89e64cf49 Regular champions take 13 seconds to build, Persian Immortals shouldn't build 2.6x as fast.
This was SVN commit r12522.
2012-08-24 07:24:33 +00:00
Deiz a4ff4b92b7 Include the generic name in the tooltips when selecting multiple units.
This was SVN commit r12521.
2012-08-24 07:14:50 +00:00
gregory 870fe14391 Updated Roman structure normal and specular maps.
This was SVN commit r12520.
2012-08-24 07:08:23 +00:00
quantumstate 9c9cab1f89 Add a Foundation element to the Armour templates for structures.
This was SVN commit r12519.
2012-08-23 21:22:49 +00:00
Mythos_Ruler 9defa4150e Height map test maps.
This was SVN commit r12518.
2012-08-23 17:54:08 +00:00
Mythos_Ruler c8d509e574 Fixed some templates.
This was SVN commit r12517.
2012-08-23 17:38:19 +00:00
Deiz 8facd45803 s/IRC/Chat/, clarified tooltip.
This was SVN commit r12516.
2012-08-23 06:59:16 +00:00
myconid 5b218ca4b0 An extra heightmap and demo map
This was SVN commit r12515.
2012-08-23 06:04:23 +00:00
myconid 6de082abca Forgot a semicolon :P
This was SVN commit r12514.
2012-08-22 08:04:55 +00:00
myconid e50bf9e539 Sky toggling through config and with Alt+Z
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
Deiz 95585d1e15 Tweaked a few fishing-related templates, removed ugly workaround.
This was SVN commit r12512.
2012-08-22 06:53:22 +00:00
Deiz 7e382fc26f CCmpUnitMotion::MoveToPointRange should ignore unit radius, so it correctly returns false when called repeatedly for large units.
This was SVN commit r12511.
2012-08-22 06:13:23 +00:00
historic_bruno 58b3a88daa Fixes more overloaded-virtual warnings in clang.
This was SVN commit r12510.
2012-08-21 21:47:36 +00:00
historic_bruno 619dd95d5b Fixes an overloaded-virtual warning in clang.
This was SVN commit r12509.
2012-08-21 20:13:42 +00:00
Mythos_Ruler d73c589a04 Normal maps for decals.
This was SVN commit r12508.
2012-08-21 18:13:37 +00:00
myconid 7ba2b8947c Attempting to fix a graphical bug affecting ARB mode
This was SVN commit r12507.
2012-08-21 18:04:05 +00:00
historic_bruno 43eac32795 Fixes GCC warning about passing NULL to non-pointer argument
This was SVN commit r12506.
2012-08-21 16:44:54 +00:00
historic_bruno ddbc9e7d86 Disables useless MSVC warning in MikktspaceWrap. Cleans up a few inconsistencies
This was SVN commit r12505.
2012-08-21 16:40:07 +00:00
myconid 952385b21d Ticket 1612: Fixed overlay z-fighting in GLSL mode
This was SVN commit r12504.
2012-08-21 16:28:06 +00:00
Deiz 6cf4efbd01 Handle exit and return hotkeys in message boxes. Fixes #1319.
This was SVN commit r12503.
2012-08-21 06:30:30 +00:00
danschub 19fd2f8b9f Fixed streched UV on Badland's rock.
This was SVN commit r12502.
2012-08-21 01:03:41 +00:00
historic_bruno 0af34b1fcb Removes some unread variables reported by LLVM. Refs #1114
This was SVN commit r12501.
2012-08-20 23:59:50 +00:00
Deiz 70c317b1b0 Hunt all domestic animals, not just very weak animals (<= 10 health).
This was SVN commit r12500.
2012-08-20 23:37:19 +00:00
quantumstate 4a2ff9521f Added rounding to armour changes (thanks Deiz)
This was SVN commit r12498.
2012-08-20 20:22:48 +00:00
Deiz 89eef72f20 cmpFoundation won't exist when repairing finished buildings.
This was SVN commit r12497.
2012-08-20 19:53:08 +00:00
quantumstate e5df8d17e1 Weaken foundation armour to 1/5th of standard.
This was SVN commit r12496.
2012-08-20 19:52:26 +00:00
Deiz af005b00b2 Added AI handling for 'resource|' pseudo-templates.
This was SVN commit r12495.
2012-08-20 18:02:56 +00:00
Deiz ad63a1e60e Don't sed templates at 5 AM without testing.
This was SVN commit r12494.
2012-08-20 16:07:50 +00:00
Deiz 3cf726ffa8 Adjusted wall sets so that all wall segments have the same health. Gave gates 2/3 of wall segment health.
This was SVN commit r12493.
2012-08-20 08:48:03 +00:00
Deiz b624328a89 Reverted k776's not-suggestion from ca3886be20, per k776's suggestion.
This was SVN commit r12492.
2012-08-20 08:23:21 +00:00
Deiz ca3886be20 Made citizen-soldiers build 25% faster than female citizens, per k776's suggestion.
This was SVN commit r12491.
2012-08-20 07:48:48 +00:00
Deiz 4136512a90 Scale the build rate as 'builders^0.7' rather than 'builders' (linear).
This was SVN commit r12490.
2012-08-20 07:30:50 +00:00
Mythos_Ruler a1d16c2fbd Made ALL cliff terrains triplanar.
This was SVN commit r12489.
2012-08-20 03:32:11 +00:00
Mythos_Ruler 951e682f27 normal and spec mapping for Celtic "henge"
This was SVN commit r12488.
2012-08-20 02:39:03 +00:00
Deiz cebe8bed64 Removed unused 'remain' corpse logic from UnitAI.
This was SVN commit r12487.
2012-08-20 01:41:56 +00:00
Deiz 66012e2e2c Destroy dying 'remain' entities and replace them with visually-identical resources. Fixes #1600.
This was SVN commit r12486.
2012-08-20 01:38:39 +00:00
Mythos_Ruler 034212a554 Made Mace fortress use the new actor and meshes.
This was SVN commit r12485.
2012-08-20 01:30:09 +00:00
Mythos_Ruler 36f2781a38 A better Spartan hoplites tip pic.
This was SVN commit r12484.
2012-08-20 00:51:54 +00:00
quantumstate 141dfabf5b Removed stray cd from a template file.
This was SVN commit r12483.
2012-08-19 22:05:28 +00:00
historic_bruno d71f883d3e Adds warning when OS X users try to toggle fullscreen since it's disabled
This was SVN commit r12482.
2012-08-19 20:45:43 +00:00
historic_bruno 875ea8f440 Fixes some warnings in mikktspace and weldmesh
This was SVN commit r12481.
2012-08-19 20:28:00 +00:00
quantumstate edd882492b Fixed syntax error in new technology.
This was SVN commit r12480.
2012-08-19 20:20:37 +00:00
quantumstate 1c1486d74a Don't allow people to train heroes because they are not balanced.
This was SVN commit r12479.
2012-08-19 20:16:18 +00:00
historic_bruno a17ffaa0f2 Fixes weldmesh build on *BSD
This was SVN commit r12478.
2012-08-19 19:57:23 +00:00
historic_bruno a3f9da72a5 Removes yucky sed commands from update-workspaces.sh to avoid modifying the Premake makefiles. Adds new BSD and OS X-specific Makefiles instead (can be autogenerated by Premake). Fixes a few bugs and omissions in the Premake4 build configuration script.
This was SVN commit r12477.
2012-08-19 18:49:02 +00:00
Pureon af59e1d9ca Fixed rotation of hele tower models
This was SVN commit r12476.
2012-08-19 15:34:27 +00:00
ShieldBearer ca0b3efc3d Carthaginian buildings now showcase AO, spec and normal maps. Room for improvement, but usable.
This was SVN commit r12475.
2012-08-19 12:08:27 +00:00
ShieldBearer 142d6619a8 Fixed farmstead AO map and added specularity to the roof tiles.
This was SVN commit r12474.
2012-08-19 09:49:10 +00:00
gregory 8300113a3a Fixed some artifacts on the Broch wall.
This was SVN commit r12473.
2012-08-19 07:36:48 +00:00
myconid 6e326e2d2e Ticket 1603: Using GL extension defines to avoid compiler errors on older systems
This was SVN commit r12472.
2012-08-19 07:05:11 +00:00
gregory 1b9b7dc390 Added normal mapping to the Broch.
This was SVN commit r12471.
2012-08-19 04:13:43 +00:00
danschub 7a32e9d868 Small Badland rocks committed.
This was SVN commit r12470.
2012-08-19 02:12:46 +00:00
danschub 689a15d784 Committed Temperate_Small_stonemine.
This was SVN commit r12469.
2012-08-19 01:47:57 +00:00
Deiz 9216dc3924 Have toggleChat (enter by default) send a chat message if the input isn't empty.
This was SVN commit r12468.
2012-08-19 00:28:46 +00:00
Deiz c32d3ece44 Remove focus when closing the chat window via the escape key.
This was SVN commit r12467.
2012-08-18 21:35:52 +00:00
WhiteTreePaladin 0f94813aa9 Export stop.png in GIMP to fix strange crash
This was SVN commit r12466.
2012-08-18 21:07:21 +00:00
Deiz 0dfdf868b2 Set ownership to Gaia when units that remain on death are killed. Refs #1600.
This was SVN commit r12465.
2012-08-18 20:33:44 +00:00
historic_bruno e485fb9e2c Implements copy/paste for OS X using NSPasteboard including pre-10.6 API support. Fixes #1326
This was SVN commit r12464.
2012-08-18 19:47:55 +00:00
Deiz 9519635869 0-population units (e.g. sheep) should never have production blocked.
This was SVN commit r12463.
2012-08-18 18:44:20 +00:00
Deiz 77f26c454a Have UnitAI respect the LeaveFoundation order unless in combat. Fixes #1406.
This was SVN commit r12462.
2012-08-18 08:13:47 +00:00
ShieldBearer a08d55e603 Added AO, norm and spec maps for all Iberian buildings except the walls and the dock(couldn't find the AO texture from myconid's git trunk) and to a couple of Carthaginian buildings too.
This was SVN commit r12461.
2012-08-18 05:40:23 +00:00
historic_bruno 8e996cedab Adds sensible default sound gains, when the config file(s) omit them
This was SVN commit r12458.
2012-08-17 23:00:41 +00:00
Deiz bbed3ca69a Made player slot reassignment in the game setup screen swap slot contents instead of leaving the old slot empty.
This was SVN commit r12457.
2012-08-17 21:22:07 +00:00
historic_bruno fdb3995141 Adds UTF-8 BOM stripping to checkrefs.pl when using JSON files, patch by retrosnub. Refs #1556
This was SVN commit r12456.
2012-08-17 19:24:23 +00:00
quantumstate 37964d048e Added camera movement speed modifier keys.
This was SVN commit r12455.
2012-08-17 18:33:41 +00:00
Mythos_Ruler 592478eb67 Another height map demo map and image.
This was SVN commit r12454.
2012-08-17 18:26:03 +00:00
Enrique a6230497ba Committed updated theatron and updated gymnasion for athenians
This was SVN commit r12453.
2012-08-17 02:17:38 +00:00
danschub 55dc7cc553 This was SVN commit r12452. 2012-08-17 01:28:26 +00:00
danschub a18dd1a36d Fixed Spec for the Temperate Rock Formation. Added parallax mapping for terrain's decals. Added missing AO for scandiv rock.
This was SVN commit r12451.
2012-08-16 23:18:21 +00:00
historic_bruno d7532a1c77 This was SVN commit r12450. 2012-08-16 18:52:39 +00:00
historic_bruno 3d67aeeb71 Adds some debug output to OpenAL init
This was SVN commit r12448.
2012-08-16 17:01:15 +00:00
gregory 791b6fa741 Partially fixed artifacts on the wood pile on the Roman mill.
This was SVN commit r12447.
2012-08-16 03:58:27 +00:00
historic_bruno 065a3e093b Fixes incorrect test for command debugging
This was SVN commit r12446.
2012-08-16 02:29:08 +00:00
Deiz de38f9ef9a Prevent domestic animals from being manually deleted (killed). Patch by yakca. Fixes #1525.
This was SVN commit r12445.
2012-08-16 02:08:56 +00:00
historic_bruno 714426f761 Fixes unnecessary use of VfsPath pointers in sound system. Refs #1223
This was SVN commit r12444.
2012-08-16 01:41:45 +00:00
Deiz 78e9fecf92 Added support for ungarrisoning units by template name and for ungarrisoning from multiple entities at once. Fixes #910.
This was SVN commit r12443.
2012-08-16 01:15:04 +00:00
danschub b03df364ea Fixed VHQ Parallax for the new rocks.
This was SVN commit r12442.
2012-08-16 00:46:43 +00:00
danschub b54a7486da Added Parallax VHQ for the new rocks
This was SVN commit r12441.
2012-08-16 00:31:42 +00:00
quantumstate 3653fe5d3a Added support for putting technologies in folders. Fixes #1462.
This was SVN commit r12440.
2012-08-15 22:25:25 +00:00
Kimball 765d02716a Updated Mauryan isw textures.
This was SVN commit r12439.
2012-08-15 18:22:28 +00:00
ShieldBearer ee83c07184 This was SVN commit r12437. 2012-08-15 13:14:37 +00:00
wraitii 8256f691f4 Optimizations, and made qBot-xp destroy walls when Iberians (but not towers).
This was SVN commit r12436.
2012-08-15 09:06:45 +00:00
Kimball 3e29520326 Mauryan Swordsman body textures
This was SVN commit r12435.
2012-08-15 06:44:58 +00:00
gregory 56c15ae427 Updated Roman normal maps.
This was SVN commit r12434.
2012-08-15 03:22:01 +00:00
Deiz 851786b01a Band-aid fix for corpses responding to the stop order.
This was SVN commit r12433.
2012-08-15 02:51:48 +00:00
Deiz aa86664d8f Make sure to initialize the entity collection's cached length before modifying the actual object. Fixes #1535.
This was SVN commit r12432.
2012-08-15 01:31:53 +00:00
historic_bruno af62b5ad8a Adds <Distanceless> flag to a bunch of voice sound groups
This was SVN commit r12430.
2012-08-15 01:04:54 +00:00
gregory e3b8d9c38c Deleted AO textures that didn't get deleted by Gen.Kenobi.
This was SVN commit r12429.
2012-08-15 00:49:17 +00:00
historic_bruno 011ba8255e New sound system implementation by stwf, refs #1223, #961.
Enables audio on OS X, refs #685, #931.
Fixes music not playing after a game, refs #946.

This was SVN commit r12428.
2012-08-15 00:10:44 +00:00
danschub 2c260660e6 Created AO folder for
This was SVN commit r12427.
2012-08-15 00:02:58 +00:00
gregory a6945413c3 Added AO to rome_temple and rome_temple_mars.
This was SVN commit r12426.
2012-08-14 21:11:06 +00:00
Mythos_Ruler ba253d34d4 Normals and Specs for Persian city tile terrain.
This was SVN commit r12425.
2012-08-14 18:01:40 +00:00
Mythos_Ruler 927592aca9 This was SVN commit r12424. 2012-08-14 17:47:13 +00:00
Deiz 0c56dfe272 Forgot to add the new short, medium wall templates.
This was SVN commit r12423.
2012-08-14 17:10:55 +00:00
Deiz e83bebe02e Remove entities from selection groups when they become hidden. Fixes #1373.
This was SVN commit r12422.
2012-08-14 14:02:52 +00:00
Deiz d90e53d0a5 Show cost ranges in the wall construction tooltip, if possible.
This was SVN commit r12421.
2012-08-14 07:51:50 +00:00
Deiz 981db4c005 Stone wall segments now have costs dependent on length. Rebalanced gate/tower costs per IRC discussion.
This was SVN commit r12420.
2012-08-14 07:46:47 +00:00
historic_bruno 97de77c6b6 Adds alternative materials to reference checker
This was SVN commit r12419.
2012-08-14 02:31:54 +00:00
gregory 6031b0785f Organized materials XML a bit.
This was SVN commit r12418.
2012-08-14 02:31:11 +00:00
danschub 2d505a5015 Added new Pointy_StoneMines_Badlands by Gen.Kenobi. It has AO, normal and SpecMaps. Need to fix AO and Spec and add new shaders to desert_decals.
This was SVN commit r12417.
2012-08-14 02:22:37 +00:00
gregory 5366dd8388 Added VHQ (very high-quality) parallax to materials that were missing it.
This was SVN commit r12416.
2012-08-14 02:04:59 +00:00
historic_bruno 4138a78c7f Fixes infinite recursion error in UnitAI when hunting an animal with a unit that's standing ground
This was SVN commit r12415.
2012-08-14 00:44:36 +00:00
gregory a71d77b03e Fixed material levels of quality more.
Added AO to dock prop.

This was SVN commit r12414.
2012-08-13 21:39:45 +00:00
historic_bruno 7d86fc4c31 Gate conversion now maintains wall HP percentage instead of magically restoring to full health
This was SVN commit r12413.
2012-08-13 21:37:40 +00:00
gregory 93a3f77aaa Fixed basic_trans levels of quality.
This was SVN commit r12412.
2012-08-13 20:17:29 +00:00
historic_bruno 9f358abaed Adds particle and material files to reference checker
This was SVN commit r12411.
2012-08-13 19:39:09 +00:00
historic_bruno 9cb5d48ccf Reverts mistaken default config changes. Please DO NOT use default.cfg for personal settings and check before committing modifications to that file.
This was SVN commit r12410.
2012-08-13 19:09:11 +00:00
gregory 02f2c082cb This was SVN commit r12409. 2012-08-13 18:00:15 +00:00
gregory d6792c4e1b This was SVN commit r12408. 2012-08-13 17:54:39 +00:00
gregory f000fc6bbd This was SVN commit r12407. 2012-08-13 17:50:54 +00:00
gregory b42708a3f1 This was SVN commit r12406. 2012-08-13 17:45:48 +00:00
gregory 1129c2be0e This was SVN commit r12405. 2012-08-13 17:41:48 +00:00
wraitii 902fc4a541 Show a red overlay over training/construction... icons that cannot be afforded.
This was SVN commit r12404.
2012-08-13 16:47:10 +00:00
OmriLahav 9e35243976 This was SVN commit r12402. 2012-08-13 14:25:37 +00:00
wraitii 9e9e1e3b78 Optimize enemy watchers usage. This should avoid massive lag later in the game.
This was SVN commit r12401.
2012-08-13 08:06:20 +00:00
gregory 1f17407161 This was SVN commit r12400. 2012-08-13 05:11:12 +00:00
gregory dac4ae2716 More AO! ...and an updating rome_struct_2_norm.png.
This was SVN commit r12399.
2012-08-13 03:09:20 +00:00
Deiz 8c97458de7 Prevent healers from healing themselves.
This was SVN commit r12398.
2012-08-13 02:56:51 +00:00
gregory 61cf6a6040 This was SVN commit r12397. 2012-08-13 00:03:18 +00:00
Deiz cbddd53e47 Avoid an edge case when buildings are destroyed while researching, leaving techs stuck. Refs #1521.
This was SVN commit r12396.
2012-08-12 23:40:04 +00:00
historic_bruno 13d7867a58 Fixes checkrefs.pl for latest actor format.
Adds checking for map preview textures.
Adds checking for random map scripts.

This was SVN commit r12395.
2012-08-12 21:00:58 +00:00
quantumstate b1090d1a12 Use a linear interpolation to find the point where the parallax ray intersects the surface more accurately.
This was SVN commit r12394.
2012-08-12 14:50:56 +00:00
fcxSanya 3b704b12a9 Summary screen: separate barter info for each resource
This was SVN commit r12393.
2012-08-12 09:12:06 +00:00
Deiz 3acc855a2d Renamed /restrictteam to /team, added /enemy, /msg, /all. Fixes #1583.
This was SVN commit r12392.
2012-08-12 06:48:49 +00:00
gregory 6f9a44d220 Removed shaders from Roman wall gate so it won't give errors.
This was SVN commit r12391.
2012-08-12 05:36:59 +00:00
gregory a6909b677a Deleted unused material file.
This was SVN commit r12390.
2012-08-12 05:29:41 +00:00
gregory 2534b26b16 Added AO to Roman market.
This was SVN commit r12389.
2012-08-12 05:00:59 +00:00
gregory 40886d1b24 This was SVN commit r12388. 2012-08-12 04:51:50 +00:00
gregory d9531b78f9 This was SVN commit r12387. 2012-08-12 04:49:00 +00:00
gregory 740322c88d Renamed the Roman structure texture normal map.
This was SVN commit r12386.
2012-08-12 04:42:59 +00:00
gregory a02d32a7d1 More AO.
This was SVN commit r12385.
2012-08-12 03:49:27 +00:00
danschub 913770347b Resized decals for the new Stonemine
This was SVN commit r12384.
2012-08-12 03:04:46 +00:00
danschub 90521c49ff Extended Rock_Scandiv.
This was SVN commit r12383.
2012-08-12 02:56:17 +00:00
Mythos_Ruler 6f80824c48 This was SVN commit r12382. 2012-08-12 02:55:50 +00:00
Mythos_Ruler ab19bc233a Height Map import demo.
This was SVN commit r12381.
2012-08-12 02:55:28 +00:00
danschub b89d23d325 Added Smoothed stone mine :)
This was SVN commit r12380.
2012-08-12 02:33:40 +00:00
Mythos_Ruler 2a7f037e69 Reverting some mistaken changes.
This was SVN commit r12379.
2012-08-12 02:24:20 +00:00
Mythos_Ruler e735df4a7f New geo entity.
This was SVN commit r12378.
2012-08-12 02:16:50 +00:00
danschub e4eb394ca8 Fixed GreekFortress.
This was SVN commit r12377.
2012-08-12 02:13:22 +00:00
danschub c4c215d5e1 Added a new StoneMine for Temperate terrains and new terrain decals.
This was SVN commit r12376.
2012-08-12 01:56:53 +00:00
Mythos_Ruler 49b734336a Some "tips" text fixes.
Spec maps for more helmets.

This was SVN commit r12375.
2012-08-12 01:54:23 +00:00
gregory ed806b6a9a Added messed up normal maps for the Roman camp so a graphics programmer can look at them.
This was SVN commit r12374.
2012-08-12 01:17:32 +00:00
Mythos_Ruler e403c748f2 More cliff terrain spec and normal mapping.
More metal mine spec mapping.

This was SVN commit r12373.
2012-08-12 00:11:46 +00:00
danschub 277b637578 Updated Greek_Fortrees_Up entities and added foundation to the model.
This was SVN commit r12372.
2012-08-12 00:08:49 +00:00
Deiz 2eed26df09 Implemented two chat commands, /restrictteam and /me. Refs #1583.
This was SVN commit r12371.
2012-08-11 23:59:28 +00:00
gregory b1657b63b3 This was SVN commit r12370. 2012-08-11 21:10:36 +00:00
Mythos_Ruler dedd0ca792 Some spec and normal tests for terrain.
This was SVN commit r12369.
2012-08-11 19:29:28 +00:00
Mythos_Ruler dde8f5f57b This was SVN commit r12368. 2012-08-11 17:10:27 +00:00
gregory 7adecfebb3 Updated AO again.
This was SVN commit r12367.
2012-08-11 17:08:00 +00:00
gregory 483707f3c8 Darkened AO on three Roman buildings.
This was SVN commit r12366.
2012-08-11 16:57:48 +00:00
fcxSanya 7a7d7e5d0a Add trade/barter stats to the summary screen.
This was SVN commit r12365.
2012-08-11 16:38:01 +00:00
Mythos_Ruler 9bbfc3f808 Spec map for Savanna metal mine.
Adjusted spec/ao/norm for Scandinavian rock.

This was SVN commit r12364.
2012-08-11 16:35:46 +00:00
myconid abca51c1ae Fixed typo in config file
This was SVN commit r12363.
2012-08-11 16:20:32 +00:00
Mythos_Ruler 06d22af3dc Making all cliffs triplanar.
Adding spec maps to helmets.

Adjusted the rome_struct_2 spec map a little.

This was SVN commit r12362.
2012-08-11 16:11:23 +00:00
myconid 9c56092999 Added very high quality parallax; GPU-intensive, defaults to off; enabled through config
This was SVN commit r12361.
2012-08-11 15:25:00 +00:00
quantumstate 4890789d58 Added support for team chat in multiplayer. Team chat is default if you are on a team of size >1. Using the prefix g will make the message global. Fixes #1583.
This was SVN commit r12360.
2012-08-11 15:12:48 +00:00
wraitii 96534fc5ed Fix a problem with civilizations who didn't have advanced building defined.
This was SVN commit r12359.
2012-08-11 12:41:29 +00:00
wraitii 226738d447 Last batch of fix for qBot-xp for the day if all goes well.
This was SVN commit r12358.
2012-08-11 10:36:39 +00:00
wraitii 508994e4c8 Fix a typo.
This was SVN commit r12357.
2012-08-11 07:59:05 +00:00
wraitii dc916e7295 Fix bugs related to garrisoning, should fix the pathfinder sometimes choosing a path over water when unneeded.
This was SVN commit r12356.
2012-08-11 07:41:23 +00:00
gregory c5658edfca Improved AO on the Roman farmstead and fortress, and added it to the barracks.
This was SVN commit r12355.
2012-08-11 07:20:36 +00:00
gregory c573f4905c Fixed warning on farmstead model.
This was SVN commit r12354.
2012-08-11 06:32:38 +00:00
gregory 9d54763401 Added improved normal mapping, parallax mapping, specular mapping, and AO on the Roman buildings.
Created folder for AO textures.

This was SVN commit r12353.
2012-08-11 06:10:29 +00:00
danschub b926a5ee54 Added Spec and Normal Maps for the Roman Structures by Gen.Kenobi. (rome_struc_2 texture files) - What applies to the Barracks, Corral, Dock, Farmstead, Fortress, Houses, Mill, ScoutTower and Walls. Feature Warning: Alphas not working properly + Gate fails to render material.
This was SVN commit r12352.
2012-08-11 02:21:04 +00:00
quantumstate 8cb340ade0 Make roof tile shadowing consistent by flipping UV's
This was SVN commit r12351.
2012-08-10 23:58:59 +00:00
myconid eee04db56b Bugfix- changed GLSL particle shader to use modelview matrix instead of modelviewprojection
This was SVN commit r12350.
2012-08-10 21:40:50 +00:00
myconid d45379cc62 Bugfix- changed GLSL particle shader to look the same as ARB
This was SVN commit r12349.
2012-08-10 21:02:22 +00:00
quantumstate 9dc838bed5 Add support for cropped images in the GUI code and update game setup to use cropped map previews. Refs #1343.
This was SVN commit r12348.
2012-08-10 19:59:20 +00:00
quantumstate 5d2c0b466f Resize all map previews to be 512x512 by adding a black area of padding.
This was SVN commit r12347.
2012-08-10 19:56:58 +00:00
Mythos_Ruler 0f4acf7167 Bigger foundation for Brit fortress.
This was SVN commit r12346.
2012-08-10 18:18:14 +00:00
Mythos_Ruler d7140c4edf Helmet specular stuff.
This was SVN commit r12345.
2012-08-10 18:18:04 +00:00
myconid eb422bc4b3 Bugfix- changed GLSL particle shader to look the same as ARB
This was SVN commit r12344.
2012-08-10 18:14:42 +00:00
wraitii 07ea313ad6 Major update for qBot-xp, with slight changes to unitAI (that broke qBot, and fix for that).
This was SVN commit r12343.
2012-08-10 16:33:58 +00:00
Deiz 2b503e68f7 Fixed broken chat; improved cheat message handling.
This was SVN commit r12342.
2012-08-10 03:35:20 +00:00
OmriLahav 8009c88a81 This was SVN commit r12340. 2012-08-09 21:42:32 +00:00
Pureon 8b365ca96d New Celtic Broch fortress
This was SVN commit r12339.
2012-08-09 21:13:21 +00:00
Deiz 613f845095 Improve gate closing behaviour when locked or with no allies nearby. Fixes #1551.
This was SVN commit r12337.
2012-08-09 19:06:01 +00:00
myconid a89d131f2d Added specular mapping for units
This was SVN commit r12336.
2012-08-09 18:49:35 +00:00
Mythos_Ruler 8d59192410 A couple more materials.
Testing spec mapping with Iberian bull statue and Craterus unit.

This was SVN commit r12335.
2012-08-09 18:30:05 +00:00
myconid 97c97dc7e0 Bugfix- changed decal/terrain blending mode for the fixed renderpath
This was SVN commit r12334.
2012-08-09 16:22:49 +00:00
wraitii ef55e60d9b Prevent chickens from spawning in the obstruction area of the civil centre.
This was SVN commit r12333.
2012-08-09 15:24:11 +00:00
historic_bruno 3ef639c4bc Adds new texture names to actor editor choices
This was SVN commit r12332.
2012-08-09 04:02:49 +00:00
Deiz c5ce1b23ae Remove a bit of indirection in UnitAI.
This was SVN commit r12331.
2012-08-09 02:32:56 +00:00
danschub 388544abdb Committed AO Scandiv_formation textures & material.
This was SVN commit r12330.
2012-08-09 00:55:40 +00:00
gregory 66d026a498 This was SVN commit r12329. 2012-08-09 00:14:58 +00:00
Deiz 87b2346154 Condensed the sanity checks for the Gaia range query, per leper's suggestion.
This was SVN commit r12328.
2012-08-08 23:29:30 +00:00
Deiz 14df6cf1a2 Removed triple and trailing newlines from random map descriptions.
This was SVN commit r12327.
2012-08-08 23:11:09 +00:00
Deiz f210008b07 Put a warning about the AI into the description of naval maps.
This was SVN commit r12326.
2012-08-08 23:10:21 +00:00
myconid e046fc0a01 Bugfix- changed some decal materials and fixed decal blending mode
This was SVN commit r12325.
2012-08-08 19:08:56 +00:00
gregory 6afe17dbf1 This was SVN commit r12324. 2012-08-08 18:50:20 +00:00
Mythos_Ruler dcbe7d2e96 This was SVN commit r12323. 2012-08-08 18:30:20 +00:00
Mythos_Ruler d5f93396b6 Deccan Plateau map.
This was SVN commit r12322.
2012-08-08 18:27:47 +00:00
Mythos_Ruler af9da8e01e Fixed decals on Celt Tavern and Mill.
This was SVN commit r12321.
2012-08-08 18:16:50 +00:00
Mythos_Ruler fb012f14b9 Fixed some corral decals.
This was SVN commit r12320.
2012-08-08 17:40:25 +00:00
Deiz 166255b744 Remember scroll position when re-opening dropdown lists.
This was SVN commit r12319.
2012-08-08 17:22:52 +00:00
Deiz eadd24b64b Added a 'Stop' button to the GUI for immediately halting units.
This was SVN commit r12318.
2012-08-08 05:36:42 +00:00
Deiz 1120701351 Substantially rework how Gaia is handled by UnitAI, BuildingAI. Dangerous animals and combat units will be attacked like regular enemies.
This was SVN commit r12317.
2012-08-08 05:32:53 +00:00
Deiz 84305155de Seamlessly change a player's entities to be Gaia-owned when resigning.
This was SVN commit r12316.
2012-08-08 05:27:59 +00:00
Deiz 791752c7a4 Added a 'quiet' version of SetOwner() that doesn't send a message, to allow faux-atomic batch ownership changes.
This was SVN commit r12315.
2012-08-08 05:18:20 +00:00
danschub 28333ba92e Committed fixed Normal Maps and materials for the Rock ScandivFormation. Now the bump is much more noticeable, yet realistic.
This was SVN commit r12314.
2012-08-08 00:26:08 +00:00
OmriLahav 7666bfcbda This was SVN commit r12312. 2012-08-07 21:32:45 +00:00
OmriLahav 18930375e6 This was SVN commit r12310. 2012-08-07 21:16:25 +00:00
myconid c9abf6f68c Heightmap importing in Atlas
This was SVN commit r12308.
2012-08-07 18:49:46 +00:00
myconid e488eb4d6f Bugfix for smoothlos, a test routine was complaining because g_Renderer wasn't available in test mode.
This was SVN commit r12307.
2012-08-07 18:28:23 +00:00
myconid 88ab3f0f5b Terrain/decal materials (includes triplanar/normal/specular/emissive mapping); custom alphamaps
This was SVN commit r12306.
2012-08-07 18:21:16 +00:00
Deiz 780970d16a Avoid a rare error when a group has both renamed and deleted entities.
This was SVN commit r12305.
2012-08-07 00:41:57 +00:00
myconid 648e68e49c smooth LOS
This was SVN commit r12304.
2012-08-06 22:38:42 +00:00
danschub 4b119b9bd1 *Small Greek Fortress Fixes
*Added Scandinav-Rock formation by Gen.Kenobi (with spec&normal included
as a test)

This was SVN commit r12303.
2012-08-06 22:34:37 +00:00
Pureon 77346e6914 Adding some missing random map previews
This was SVN commit r12302.
2012-08-06 22:08:07 +00:00
myconid 47c2907f10 added licensing headers to some of the new files
This was SVN commit r12301.
2012-08-06 21:34:41 +00:00
myconid da8c673a0a ao/parallax/normal/specular/emissive mapping; windy trees; time manager; render queries; conditional defines
This was SVN commit r12300.
2012-08-06 19:10:47 +00:00
historic_bruno 8fc1fd2478 Fixes default map names, closes #1578
This was SVN commit r12299.
2012-08-06 18:09:22 +00:00
historic_bruno c0f522fd20 Use upper camel case for member variables
This was SVN commit r12298.
2012-08-06 16:46:54 +00:00
danschub 00aa354f8f Updated Greek Fortress by Gen.Kenobi. Finally fixed it. Enjoy!
This was SVN commit r12297.
2012-08-06 15:51:16 +00:00
wraitii 0f44c5b3fe Fix some mistakes with class definition for stone/palisade gates and wallsets.
This was SVN commit r12296.
2012-08-06 11:43:02 +00:00
danschub bfdd23997d Added new Rock-set-desert by Gen.Kenobi
They might need re-scaling.

This was SVN commit r12295.
2012-08-06 03:07:58 +00:00
Mythos_Ruler 11eb862bdb Map preview for Acropolis 7.
Made the status bar for trees a little easier to see.

This was SVN commit r12294.
2012-08-05 19:07:41 +00:00
Deiz 78cc29b591 Added a resign option (deletes all of a player's entities).
This was SVN commit r12293.
2012-08-05 18:07:56 +00:00
Deiz 0037bb8230 Slightly ugly fix for 'You has been defeated.' message in singleplayer.
This was SVN commit r12292.
2012-08-05 18:05:25 +00:00
Enrique 0a2449bf5f Added small_scaffold actor
This was SVN commit r12291.
2012-08-05 16:31:36 +00:00
Enrique 8291019fa1 Added scaffold_small.dae prop
This was SVN commit r12290.
2012-08-05 16:27:38 +00:00
Enrique 88aff0c501 Added new theatron version to athenians civ.
-Modified entity athen_theatron.xml to reference visual actor
"hellenes/theatre_new.xml"

This was SVN commit r12289.
2012-08-05 16:00:25 +00:00
Spahbod 959a897ec1 This was SVN commit r12288. 2012-08-05 15:24:26 +00:00
Spahbod 8f635b7e01 Fixing an issue.
This was SVN commit r12287.
2012-08-05 15:04:35 +00:00
Spahbod 6d633c9b18 Fixing a bug
This was SVN commit r12286.
2012-08-05 14:24:39 +00:00
Spahbod 7d62da8d2c This was SVN commit r12285. 2012-08-05 14:20:51 +00:00
Spahbod 202a02568b Cheats ... fixes #1555.
This was SVN commit r12284.
2012-08-05 14:01:05 +00:00
wraitii 36cc1766a4 General improvements to the attack plans and the defense manager. Slight econ improvements (better early game priorities, faster play, better farming, tentative to get qBot to crowd resources less, tweaking of dropsites variable). Many bugfixes, should be stable enough for alpha 11.
This was SVN commit r12283.
2012-08-05 11:19:31 +00:00
Deiz 4a1b085df0 Send chat notifications upon player defeat.
This was SVN commit r12282.
2012-08-05 05:41:19 +00:00
Deiz b86d39681f Reveal the map for defeated players.
This was SVN commit r12281.
2012-08-05 05:34:17 +00:00
Deiz 86db7b8a59 Show multiplayer names in the summary screen, rather than the map's defaults.
This was SVN commit r12280.
2012-08-05 02:18:44 +00:00
Mythos_Ruler d04eb12b83 Made cart walls considerably longer to build time.
This was SVN commit r12279.
2012-08-04 20:53:01 +00:00
historic_bruno 347c7d45cc Updates random map wall_builder with correct gate sizes, patch by FeXoR. Fixes #1576
This was SVN commit r12278.
2012-08-04 19:29:45 +00:00
wraitii 2eb49be1a3 Show shallows (walkable water) on the minimap in a lighter color.
This was SVN commit r12277.
2012-08-04 18:52:02 +00:00
Deiz 2c642fc68e Uninitialized variable was causing nondeterministic weirdness in Atlas.
This was SVN commit r12275.
2012-08-04 16:56:09 +00:00
Pureon 1b78b3cc20 Projectile actors for Mauryan defence structures
This was SVN commit r12274.
2012-08-04 08:41:02 +00:00
gregory 1e0ea4b963 This was SVN commit r12272. 2012-08-04 00:02:11 +00:00
Deiz 20d75a3880 Free cursors before shutting down SDL. Fixes #1355.
This was SVN commit r12271.
2012-08-03 16:48:02 +00:00
Deiz c5a0dabe8d Do a second check when trying to place wall pieces with two control groups. Fixes #1529.
This was SVN commit r12270.
2012-08-03 16:38:31 +00:00
Deiz be31d3a9e7 Added a function for finding colliding entities with identical control groups. Refs #1529.
This was SVN commit r12269.
2012-08-03 16:36:40 +00:00
wraitii 2ee61750b4 Forgot to fix a few things before committing.
This was SVN commit r12268.
2012-08-03 16:12:45 +00:00
wraitii 45ee419171 Adding an experimental version of qBot. This is half a crossover with my former Marilyn bot (defense manager, attack plans) and some improvements here and there that I believe could help improve the bot.
This was SVN commit r12267.
2012-08-03 15:52:18 +00:00
OmriLahav 0d5366fd7b This was SVN commit r12264. 2012-08-03 11:30:28 +00:00
OmriLahav 09d0def213 This was SVN commit r12263. 2012-08-03 10:55:45 +00:00
historic_bruno ddcdd5d2e8 Updates logs readme with link to Trac, to replace confusing outdated info
This was SVN commit r12261.
2012-08-02 19:41:50 +00:00
Deiz 4bb0ad46a5 Re-saved all maps with walls, sanitizing their obstruction groups.
This was SVN commit r12260.
2012-08-01 21:39:54 +00:00
Deiz 4c8907e30c Added the new ControlPersist XML element to wall tower templates.
This was SVN commit r12259.
2012-08-01 21:39:08 +00:00
Deiz 692795e56e Added engine-side obstruction group sanitizing, saving, and loading. Refs #1566
This was SVN commit r12258.
2012-08-01 21:38:13 +00:00
Deiz c22476eee2 Check for builders that can't place foundations (e.g. Mauryan worker elephants)
This was SVN commit r12257.
2012-08-01 19:22:45 +00:00
Mythos_Ruler d1d17b7222 Acropolis map updates.
This was SVN commit r12256.
2012-08-01 18:14:14 +00:00
Deiz 1e38b39021 Remove deleted props.
This was SVN commit r12255.
2012-08-01 17:09:52 +00:00
Deiz d9c36f1fcc Remove empty texture that was causing asserts.
This was SVN commit r12254.
2012-08-01 15:50:50 +00:00
Enrique aa00a845d1 Fixed helle_docks_pentekonter.dae normals problem. Added playercolor details on helle_docks_props.dae.
This was SVN commit r12253.
2012-08-01 13:33:41 +00:00
Deiz 8c5558895e Disable rally points for Celtic wall towers (which can't be garrisoned).
This was SVN commit r12252.
2012-08-01 04:53:17 +00:00
Mythos_Ruler 0f7f73be2c Balanced some Dock costs.
This was SVN commit r12251.
2012-07-31 17:43:12 +00:00
Mythos_Ruler 05d4b1eccf Scaffold test object by Enrique. Looks nice. No errors. Possible prototype for some kind of construction scaffolding for buildings.
This was SVN commit r12250.
2012-07-31 17:35:50 +00:00
Mythos_Ruler a012a8c231 New Hellenic dock by Enrique. Needs some fixes though.
This was SVN commit r12249.
2012-07-31 17:26:04 +00:00
wraitii a796800bb1 Add the
This was SVN commit r12248.
2012-07-31 15:59:36 +00:00
wraitii 8074f18d6d Slight updates to the Corsica map. Also trying my hands at this whole "commit" stuff.
This was SVN commit r12247.
2012-07-31 14:41:09 +00:00
Deiz 83ca7142b6 Fixed a minor bug in the research display; removed an unnecessary comma.
This was SVN commit r12246.
2012-07-31 03:39:35 +00:00
Deiz be3ca61d43 Updated the production queue buttons, putting the progress sliders inside the button border.
This was SVN commit r12245.
2012-07-31 03:37:04 +00:00
Deiz b8b6ebb6ec Properly re-initialize drop-down lists when the list items changes. Fixes #1558.
This was SVN commit r12244.
2012-07-31 03:34:09 +00:00
Deiz c708de489e Display in-progress technologies in the upper right of the screen. Fixes #1431.
This was SVN commit r12243.
2012-07-31 02:03:25 +00:00
Deiz 08505d9353 Include a note about the UDP port in the 'host game' tooltip.
This was SVN commit r12242.
2012-07-30 21:08:29 +00:00
Deiz 3c0bd23108 Slightly speed up actor rendering; have selectables properly handle fog of war, etc. Refs #1365.
This was SVN commit r12241.
2012-07-30 21:06:54 +00:00
Mythos_Ruler 10e8847b6f Some template changes. Moves Dock and Fishing Boat to Village Phase. Warships to later phases. Increases accuracy of basic ranged units slightly. Based on patch by gudo.
This was SVN commit r12240.
2012-07-30 06:11:26 +00:00
Deiz 4264166acf Detect when units aren't in the world and hide their selection rings. Based on patch by dvangennip. Refs #1365.
This was SVN commit r12239.
2012-07-30 04:45:33 +00:00
Mythos_Ruler 9e59f496f3 Tweaked NA elephant walk speed.
Map preview for Acropolis 1 map.

This was SVN commit r12238.
2012-07-30 04:37:47 +00:00
Mythos_Ruler f9a8280b81 More map renaming.
This was SVN commit r12237.
2012-07-30 04:22:11 +00:00
Mythos_Ruler a82e6ecdd9 Renamed a bunch of numbered maps for better sorting. :)
This was SVN commit r12236.
2012-07-30 04:17:24 +00:00
Mythos_Ruler bb8783d6eb New Acropolis 1 map.
Edited Acropolis 2's description.

This was SVN commit r12235.
2012-07-30 04:09:02 +00:00
gregory 008d361a5e This was SVN commit r12234. 2012-07-30 02:29:20 +00:00
Mythos_Ruler 39784d47b5 Some updated textures.
This was SVN commit r12233.
2012-07-30 02:15:56 +00:00
Mythos_Ruler e17b9c84eb More map preview pics. All default maps complete.
This was SVN commit r12231.
2012-07-29 23:22:00 +00:00
Deiz 48d871d870 Allow gate lock/unlock buttons and wall conversion icons to show simultaneously.
This was SVN commit r12230.
2012-07-29 23:08:15 +00:00
historic_bruno 2c8adb1aea Adds support for Boost.Filesystem v3, the only option in Boost 1.50. Fixes #1527. Refs #1360
This was SVN commit r12229.
2012-07-29 23:04:22 +00:00
Mythos_Ruler 0f5756f5fb Renamed the sandbox maps for better drop menu sorting.
Added map previews for the Oasis maps.

This was SVN commit r12228.
2012-07-29 22:23:30 +00:00
Deiz b172a89965 Give the Brythonic and Gallic gates the new Celtic gate footprint and obstruction.
This was SVN commit r12227.
2012-07-29 20:07:36 +00:00
Pureon b1ccaa020f Preview image for fortress RMS
This was SVN commit r12226.
2012-07-29 18:22:27 +00:00
Spahbod 01e7895521 Adding Northern Lights random map...
This was SVN commit r12225.
2012-07-29 17:59:46 +00:00
Spahbod 8946e2782f This was SVN commit r12224. 2012-07-29 17:58:53 +00:00
Spahbod 815178fa3d This was SVN commit r12223. 2012-07-29 17:54:49 +00:00
Spahbod 06f0212597 This was SVN commit r12222. 2012-07-29 17:53:06 +00:00
Deiz 16ef74d9fe Clicking on empty space only clears the selection if modifiers aren't held. Fixes #1561.
This was SVN commit r12221.
2012-07-29 17:42:35 +00:00
Spahbod 467195e712 Making the lake map circular
This was SVN commit r12220.
2012-07-29 03:00:33 +00:00
historic_bruno d1b2922f02 Fixes unnecessary linking of X11 on OS X.
This was SVN commit r12219.
2012-07-28 23:48:57 +00:00
Mythos_Ruler 7eb751fa83 Moar scenario map previews. Still a work in progress.
This was SVN commit r12218.
2012-07-28 22:32:09 +00:00
Pureon 42b12f6567 Missing actors, textures, meshes fixes
This was SVN commit r12217.
2012-07-28 18:08:48 +00:00
Mythos_Ruler 5fef0394cc Fixed music. :)
This was SVN commit r12216.
2012-07-28 17:44:39 +00:00
Pureon d5936938d0 Celt slope wall prop actor references
This was SVN commit r12215.
2012-07-28 17:42:09 +00:00
Pureon 2c56ad61bd Cleanup of audio xml files
This was SVN commit r12214.
2012-07-28 17:36:59 +00:00
Pureon 5383d7e40b A few fixes to the Hele scout tower model
This was SVN commit r12213.
2012-07-28 15:17:51 +00:00
OmriLahav f5d2924b66 This was SVN commit r12212. 2012-07-27 11:49:43 +00:00
OmriLahav 187d6fa12e This was SVN commit r12211. 2012-07-27 11:35:17 +00:00
OmriLahav 50711f7369 This was SVN commit r12210. 2012-07-27 11:32:51 +00:00
OmriLahav 5678c7f9cd This was SVN commit r12209. 2012-07-27 11:05:32 +00:00
OmriLahav b564f57990 This was SVN commit r12208. 2012-07-27 10:17:12 +00:00
OmriLahav abe1578d14 This was SVN commit r12207. 2012-07-27 07:15:51 +00:00
OmriLahav afeda27de0 This was SVN commit r12206. 2012-07-27 07:11:55 +00:00
historic_bruno c6a0d0b6f3 Fixes build error left out of c1a3b8f171. Refs #1497
This was SVN commit r12205.
2012-07-27 05:26:37 +00:00
gregory 4a1483231f This was SVN commit r12204. 2012-07-27 05:05:21 +00:00
gregory f49de6fb8b This was SVN commit r12203. 2012-07-27 01:54:56 +00:00
OmriLahav 34f0cc2449 This was SVN commit r12202. 2012-07-26 22:50:54 +00:00
Pureon 3f933e2944 Fix to Cart stone gate closing animation speed
This was SVN commit r12201.
2012-07-26 19:50:49 +00:00
Pureon 19bc3ea9ec Hele stone gate closing animation update
This was SVN commit r12200.
2012-07-26 19:44:40 +00:00
Mythos_Ruler 40c1f32eef Carth war ele uses Zaggy's new elephant.
This was SVN commit r12199.
2012-07-26 17:28:54 +00:00
historic_bruno 9b79ca5179 Fixes incorrect exclusion of rpath that broke shared lib loading. Refs #1421, #1516
This was SVN commit r12198.
2012-07-26 13:33:04 +00:00
gregory 3050cdc8c6 This was SVN commit r12197. 2012-07-26 09:25:31 +00:00
gregory 37b8bef3a8 Added prop points to the elephant.
This was SVN commit r12196.
2012-07-26 09:02:29 +00:00
gregory 9564de4f17 Added elephant death animation.
This was SVN commit r12195.
2012-07-26 02:17:44 +00:00
gregory 189eaefe7d This was SVN commit r12194. 2012-07-25 23:55:33 +00:00
gregory a3cb804ccb This was SVN commit r12193. 2012-07-25 23:38:01 +00:00
quantumstate bfcbcc7ba8 Preserve selection order when entities are 'renamed'. Patch by Deiz/F00. Fixes #1544.
e.g. If you have a long wall as primary selection and CC as secondary,
after the gate upgrade the wall (now gate) remains the primary
selection.

This was SVN commit r12192.
2012-07-25 22:20:57 +00:00
quantumstate 0dc1d2139e Make rally points work for trade. Patch from Deiz/F00. Fixes #1173.
This was SVN commit r12191.
2012-07-25 21:38:56 +00:00
gregory 006aa8ee21 Added elephant animations except the death animation. Contains no prop points currently.
This was SVN commit r12190.
2012-07-25 05:10:13 +00:00
Mythos_Ruler 56b83a3926 Fixed the grapes.
Gave Persian healer a run.

This was SVN commit r12189.
2012-07-24 17:45:30 +00:00
Spahbod a4cc749eca Committing the left out grapes.
This was SVN commit r12188.
2012-07-24 14:51:24 +00:00
historic_bruno 3d973b3554 Adds hotkey (Tab) for showing all player's entities' status bars at once, based on patch by Deiz/F00. Fixes #1187
This was SVN commit r12187.
2012-07-24 04:14:09 +00:00
historic_bruno c1a3b8f171 Updates to myconid's most recent multiple UV set patch. Refs #1497
This was SVN commit r12185.
2012-07-24 02:57:25 +00:00
quantumstate 1f15257987 Update actor editor for data driven textures. From zoot. Refs #1493.
This was SVN commit r12184.
2012-07-23 22:51:20 +00:00
quantumstate f598101c34 Add support for multiple UVs and data driven texture loading. From myconid's patches. Fixes #1493 and fixes #1497.
This was SVN commit r12183.
2012-07-23 22:49:46 +00:00
Mythos_Ruler 068fe0cbbb Added Omnri's new tracks to Macedonian and Athenian civ jsons.
Added "breath" creation sound for female citizen.

This was SVN commit r12182.
2012-07-23 16:38:50 +00:00
Mythos_Ruler 13759f3572 Helen of Troy, not Hellen of Troy. ;)
This was SVN commit r12181.
2012-07-23 16:34:34 +00:00
Mythos_Ruler 4cbbbe6b04 This was SVN commit r12180. 2012-07-23 16:33:53 +00:00
OmriLahav 8cf822c6c3 This was SVN commit r12177. 2012-07-23 10:44:03 +00:00
OmriLahav e8fae14a3f This was SVN commit r12176. 2012-07-23 10:36:16 +00:00
OmriLahav 31f4b17d54 This was SVN commit r12174. 2012-07-22 21:44:15 +00:00
historic_bruno 2f90e1eee7 Adds --minimal-flags option to Premake, for building only with essential flags (currently only a *nix option). Based on patch by leper. Refs #1516.
Updates Premake4.make to not include CFLAGS in CXXFLAGS (see
aab1cdf9d6).

This was SVN commit r12173.
2012-07-22 02:52:37 +00:00
Pureon 6bcb4455ef Animations for Celt stone wall gate
This was SVN commit r12172.
2012-07-21 22:56:56 +00:00
Pureon d8b89936b3 New palisade gate animations
This was SVN commit r12171.
2012-07-21 00:58:40 +00:00
Pureon 666c12a309 Animations for Athenian wall gate
This was SVN commit r12170.
2012-07-20 23:16:03 +00:00
Pureon 04a7b2becd Hele animated stone wall gates
This was SVN commit r12169.
2012-07-20 22:56:26 +00:00
Mythos_Ruler bccafceb09 Some map updates and map previews.
This was SVN commit r12168.
2012-07-20 18:37:54 +00:00
Mythos_Ruler a5f737b441 Fixed map description.
This was SVN commit r12167.
2012-07-20 05:02:51 +00:00
historic_bruno b8ec515234 Construction cost should be checked after everything else to avoid messy refunds.
This was SVN commit r12166.
2012-07-20 02:50:43 +00:00
historic_bruno a41432f73b Adds support for Cost/Resources and Cost/BuildTime tech modifications.
This was SVN commit r12165.
2012-07-20 01:54:24 +00:00
Pureon 1bf086fefb Animations for Carthaginian stone gate
This was SVN commit r12164.
2012-07-19 23:45:07 +00:00
historic_bruno 574e079d64 Wall and gate selection usability improvements by Deiz/F00. Refs #619.
Fixes bug where selecting multiple wall types could convert to
mismatching gates.

This was SVN commit r12163.
2012-07-19 21:46:35 +00:00
Pureon 512e3a01b6 Celt gate resized to the size of long wall
This was SVN commit r12162.
2012-07-19 20:47:30 +00:00
Mythos_Ruler c1c0fcc67a This was SVN commit r12161. 2012-07-19 18:28:02 +00:00
Mythos_Ruler 4c1ddd33c5 This was SVN commit r12160. 2012-07-19 05:53:36 +00:00
Spahbod 718e1dfad4 Updating fortress random map to use the new autumn textures.
This was SVN commit r12159.
2012-07-19 05:41:08 +00:00
Spahbod b6faac80ae Templates of the new trees.
This was SVN commit r12158.
2012-07-19 05:36:58 +00:00
Spahbod bdd04befd2 Actors of the new art assets.
This was SVN commit r12157.
2012-07-19 05:35:56 +00:00
Spahbod 563197a409 Meshes for the new art assets.
This was SVN commit r12156.
2012-07-19 05:31:14 +00:00
Spahbod c4d248c53c This was SVN commit r12155. 2012-07-19 05:29:58 +00:00
Spahbod 08022d87ca This was SVN commit r12154. 2012-07-19 05:29:19 +00:00
Spahbod c4a3c9045a This was SVN commit r12153. 2012-07-19 05:28:30 +00:00
Spahbod 47130edc74 This was SVN commit r12152. 2012-07-19 05:25:56 +00:00
Spahbod 940beaebfe Textures for new graphical assets.
This was SVN commit r12151.
2012-07-19 05:23:49 +00:00
Mythos_Ruler 575f0371e6 Specific names for elephant stables and worker elephant.
This was SVN commit r12150.
2012-07-19 05:21:28 +00:00
Spahbod 1c4302cf5d Autumn terrain textures
This was SVN commit r12149.
2012-07-19 04:53:34 +00:00
historic_bruno 89399e08e6 Implements always visible hero selection rings, based on patch by Deiz/F00. Fixes #1365
This was SVN commit r12148.
2012-07-19 04:45:01 +00:00
Pureon 380d15d6c0 Resized model of the Carthaginian gate. Same size as long wall.
This was SVN commit r12147.
2012-07-18 23:29:56 +00:00
historic_bruno 3a5b2159b7 Fixes broken test
This was SVN commit r12146.
2012-07-18 21:39:45 +00:00
Pureon 3c8c5757de Adding icons to wooden gates
This was SVN commit r12145.
2012-07-18 21:17:14 +00:00
Pureon f0d9b496bf Wooden gate icon for palisades and siege walls
This was SVN commit r12144.
2012-07-18 19:40:14 +00:00
Mythos_Ruler 0374570ac6 Fixed error.
This was SVN commit r12143.
2012-07-18 06:01:26 +00:00
Mythos_Ruler 5546fb4283 Fix dog errors.
This was SVN commit r12142.
2012-07-18 05:52:31 +00:00
Mythos_Ruler 9761ded603 Specific names for the Briton/Gaul gates based on Bruno's research.
This was SVN commit r12141.
2012-07-18 05:08:45 +00:00
historic_bruno 181b461e7b This was SVN commit r12140. 2012-07-18 03:57:45 +00:00
historic_bruno 9b6839ace4 Adds gate conversion to palisades and siege walls. Fixes bug that all player entities in a selection could be converted to gates. Cleans up templates slightly. Refs #619
This was SVN commit r12139.
2012-07-18 03:56:18 +00:00
historic_bruno 95dea8e097 Gate-related template cleanup and tweaking
This was SVN commit r12138.
2012-07-18 01:10:47 +00:00
Spahbod b186fc4e7e A small tweak.
This was SVN commit r12137.
2012-07-17 03:55:00 +00:00
Spahbod 65ac54c4dd This was SVN commit r12136. 2012-07-17 03:53:52 +00:00
Spahbod a1cc4e623e New map previews by luziferius.
This was SVN commit r12135.
2012-07-17 03:49:15 +00:00
historic_bruno c495b0bca1 Adds gate cost to tooltip and shows both gate lock actions, based on patch by Deiz/F00. Changes and renames lock icons. Fixes #1539
This was SVN commit r12134.
2012-07-16 23:49:19 +00:00
Pureon a26f230867 Roman siege wall gate animations
This was SVN commit r12133.
2012-07-16 21:10:43 +00:00
Pureon a700486cd3 Lock icons for gates
This was SVN commit r12132.
2012-07-16 18:04:23 +00:00
Mythos_Ruler 1202c2b2a3 Some preview images for these scenarios.
This was SVN commit r12131.
2012-07-16 17:18:16 +00:00
gregory db2bbc10ca Made model able to be imported into Blender.
This was SVN commit r12130.
2012-07-16 15:32:59 +00:00
Spahbod b444e3c435 Cleanup...
This was SVN commit r12129.
2012-07-16 05:52:43 +00:00
Mythos_Ruler f3d0aaeeb4 Waypoint and garrison flags for Mauryans.
This was SVN commit r12128.
2012-07-16 05:05:41 +00:00
historic_bruno 7726448a7d Adds --without-nvtt option to update-workspaces.sh so we don't attempt to build NVTT in that case, based on patch by pcpa. Refs #1427
This was SVN commit r12127.
2012-07-16 04:57:07 +00:00
Mythos_Ruler 39e0878b6e This was SVN commit r12126. 2012-07-16 04:43:12 +00:00
Mythos_Ruler 6d93492e54 Added Mauryans to Punjab 1.
This was SVN commit r12125.
2012-07-16 04:37:35 +00:00
Mythos_Ruler 3153829d45 Made the dust a little more transparent.
This was SVN commit r12124.
2012-07-16 04:28:00 +00:00
historic_bruno 9f5c7a5607 Fixes possible conflicts in unit command panel when selecting multiple entities, patch by Deiz/F00. Fixes #1524
This was SVN commit r12123.
2012-07-16 04:12:48 +00:00
historic_bruno 3a85fb7c48 Displays save game timestamps in local time rather than UTC, patch by Deiz/F00. Fixes #1530
This was SVN commit r12122.
2012-07-16 03:55:40 +00:00
historic_bruno 743f60b920 Handles gate upgrade case left out of previous commit.
This was SVN commit r12121.
2012-07-16 01:52:18 +00:00
historic_bruno b59c2d9e36 Adds lock/unlock gate icons, based on patch by F00.
This was SVN commit r12120.
2012-07-16 01:40:09 +00:00
Pureon 27a0bd6331 Gate lock and unlock icons
This was SVN commit r12119.
2012-07-15 23:40:49 +00:00
Pureon 8f0eb7318e Iberian gate animations
This was SVN commit r12118.
2012-07-15 22:34:49 +00:00
quantumstate 8d64c26db9 Decrease trader income to 20% of the previous and increase the cost of traders to 100f 80m.
This was SVN commit r12117.
2012-07-15 18:55:35 +00:00
Mythos_Ruler 937670a916 Lots of Mauryan unit stuff.
This was SVN commit r12116.
2012-07-15 07:09:26 +00:00
Spahbod 900affb9bf This was SVN commit r12115. 2012-07-15 06:41:41 +00:00
Spahbod 694619a984 Adds gates to Fortress random map by FeXoR. Fixes #1533
This was SVN commit r12114.
2012-07-15 04:28:57 +00:00
Pureon 3eafdcf6db Roman gate animations
This was SVN commit r12113.
2012-07-15 00:17:38 +00:00
Pureon 4ca8e679d6 Persian gate animations again
This was SVN commit r12112.
2012-07-15 00:06:25 +00:00
Mythos_Ruler e0f3add90e Mauryan basic spearman.
This was SVN commit r12111.
2012-07-14 23:13:53 +00:00
Spahbod 1fd00b5e3f Added Lorraine Plain random map.
This was SVN commit r12110.
2012-07-14 17:17:06 +00:00
Pureon 62f7c6e27a Trying to fix gate animation locking animations
This was SVN commit r12109.
2012-07-14 09:04:20 +00:00
Pureon 2cdc6c7dbf Persian gate opening and closing animations
This was SVN commit r12108.
2012-07-14 08:04:00 +00:00
historic_bruno 5e92aabe72 Increases maximum dropdown list size slightly, allowing up to 10 lines at a time (must be careful that it fits on 1024x768!). Refs #1532
This was SVN commit r12107.
2012-07-14 04:29:16 +00:00
Spahbod 8c9ef1139a This was SVN commit r12106. 2012-07-14 04:15:20 +00:00
Spahbod 1b7519be91 Fixing the random player selection
This was SVN commit r12104.
2012-07-14 03:10:35 +00:00
historic_bruno 1d677156fd Adds animation and sound support to wall gates. Uses temporary sounds for now. Adds new animation choices to actor viewer/editor. Refs #619
This was SVN commit r12103.
2012-07-14 03:08:21 +00:00
Badmadblacksad fd22b91138 Do not close a gate if some units are in the passRange.
This was SVN commit r12102.
2012-07-13 22:34:49 +00:00
Spahbod c908970c02 This was SVN commit r12101. 2012-07-13 04:37:04 +00:00
Spahbod 8cd2751131 This was SVN commit r12100. 2012-07-13 04:15:23 +00:00
Spahbod 1233323e79 A minor change.
This was SVN commit r12099.
2012-07-13 04:05:13 +00:00
Spahbod d0a1a3bd50 Fixed a bug.
This was SVN commit r12098.
2012-07-13 03:41:07 +00:00
Spahbod 2717e6d34f Adding previews for some random maps.
This was SVN commit r12097.
2012-07-13 03:10:15 +00:00
Spahbod c63074cabb New GUI changes.
This was SVN commit r12096.
2012-07-13 03:00:18 +00:00
Badmadblacksad 6eb71380aa Get the gate template name from the wall name and fixes two templates which caused errors.
This was SVN commit r12095.
2012-07-12 22:49:40 +00:00
Pureon 953606cfcf Roman wall gate animations
This was SVN commit r12094.
2012-07-12 22:27:59 +00:00
Badmadblacksad 51b9fa6186 Uses xml attributes instead of elements for obstructions shapes.
This was SVN commit r12093.
2012-07-12 20:00:38 +00:00
Mythos_Ruler 8f2ed2586f Fixed "specific name" for palisades, since they were taking "stone wall" from the defense_wall template.
This was SVN commit r12091.
2012-07-11 16:44:03 +00:00
Pureon 3edbe6490e Palisade gate opening and closing animations
This was SVN commit r12090.
2012-07-11 16:40:56 +00:00
Pureon f340c8be63 Skeletal setup for animated opening and closing gates
This was SVN commit r12089.
2012-07-11 15:36:00 +00:00
Pureon c8b024ec5f Updates to a few sounds
This was SVN commit r12087.
2012-07-10 20:16:29 +00:00
Mythos_Ruler 0ef77d550c Britons get the Kennl.
Gauls get the Rotary Mill.

This was SVN commit r12086.
2012-07-09 03:24:50 +00:00
Mythos_Ruler 1926a18354 Britons emblem.
This was SVN commit r12085.
2012-07-08 21:22:27 +00:00
Mythos_Ruler b7e6bbdf3f Fixes waypoint flags for Britons and Gauls.
This was SVN commit r12084.
2012-07-08 20:15:16 +00:00
Badmadblacksad e416b38811 Fix phases.
This was SVN commit r12083.
2012-07-08 20:12:36 +00:00
Badmadblacksad 2c5933912c Gates. Adds UI buttons, replaces wall section with a gate, defines and create obstruction shapes, detects friendly units and eventually disable door's "block movement" flag, allows us to lock / unlock the door by disabling "block pathfinding" flag. Needs icons, play sound, animations. Fixes #1385, refs #619.
This was SVN commit r12081.
2012-07-08 16:25:33 +00:00
Mythos_Ruler 9a3a6b9c2f Tweaked Mauryan sandbox.
This was SVN commit r12080.
2012-07-07 21:54:43 +00:00
Mythos_Ruler 68f44a74bd - Fig Tree: Gave it the "berry bush" selection sound to help drive home that it is a fruit-bearing tree.
- All Mauryan buildings: Removed the Persian structural health bonus, a
legacy from copying over from Persian templates.
- Mauryan Barracks: Added the Indian Light Cavalry to the training
roster. Removed the Persian Barracks portrait icon.

This was SVN commit r12079.
2012-07-07 21:38:48 +00:00
historic_bruno 4cd3a93ca4 Fixes inconsistent bow props on some Persian units, based on patch by dvangennip. Fixes #1523
This was SVN commit r12078.
2012-07-06 23:52:17 +00:00
Mythos_Ruler 54e24d9a43 Fixed costs for Carthaginian embassies.
This was SVN commit r12076.
2012-07-06 00:57:59 +00:00
Mythos_Ruler 80d6d8930e Alters tooltips for Town and City Phase upgrades for clarity. Closes #1447
This was SVN commit r12075.
2012-07-06 00:23:31 +00:00
quantumstate 463e62a514 Added checks to see if a resource is in another players territory and to mark a resource as inaccessible if a unit has spent too long trying to reach it.
This was SVN commit r12074.
2012-07-05 21:14:48 +00:00
historic_bruno 574f4db8ab Fixes font texture handling to use format auto-detection when possible, based on patch by Deiz/F00. Fixes #1508
This was SVN commit r12073.
2012-07-05 01:05:09 +00:00
quantumstate fba0730db9 Add a comment about maxDensity based on FeXoR's description. Refs #1522.
This was SVN commit r12071.
2012-07-04 18:59:11 +00:00
Spahbod 585a30e1f3 Added FeXoR's changes for deep forest. Fixes #1522 .
This was SVN commit r12070.
2012-07-04 17:25:18 +00:00
Ykkrosh 5abedde99a Don't enable -fpch-preprocess (which may interfere with ccache) unless we're actually building with PCH
This was SVN commit r12069.
2012-07-04 15:20:42 +00:00
historic_bruno 512854e30c Fixes log folder script on WinXP/2000. Moves script inside source/tools. Adds start menu shortcut to the installer. Updates README. Fixes #1438
This was SVN commit r12068.
2012-07-04 03:50:01 +00:00
Mythos_Ruler f845878039 Renamed.
This was SVN commit r12067.
2012-07-04 01:48:57 +00:00
Mythos_Ruler 2bf4cde60a This was SVN commit r12066. 2012-07-04 01:46:44 +00:00
Mythos_Ruler b26e6a442a - Updated Persian Stable and Barracks portraits.
- Updated Carth and Pers civ files.
- Updated some Carth structure templates.

This was SVN commit r12065.
2012-07-04 01:08:51 +00:00
Mythos_Ruler 56571f4934 Theban stuff.
This was SVN commit r12063.
2012-07-04 00:05:43 +00:00
Mythos_Ruler 835af18630 Civ jsons.
This was SVN commit r12062.
2012-07-03 23:04:58 +00:00
Spahbod 7cfbf43f5e This was SVN commit r12061. 2012-07-03 07:07:50 +00:00
historic_bruno 31a58e07c1 Fixes Builder component to allow repairers who can't place new foundations.
This was SVN commit r12060.
2012-07-03 03:15:39 +00:00
Mythos_Ruler e8f5f74f71 Trying to make Worker Elephant construct buildings, without listing a list of buildings in its UI.
This was SVN commit r12058.
2012-07-03 02:52:11 +00:00
Mythos_Ruler 292cb1d26a Adjusted splash damage for onagers. Adjusted stats for Mauryan houses. Added builder support for Mauryan Worker Elephant.
This was SVN commit r12057.
2012-07-03 02:38:24 +00:00
historic_bruno 99d04e93bb Implements global tech modification function. Fixes #1358, refs #1520.
Applies tech modifications to template data returned by GuiInterface.
Extends engine to load arbitrary global scripts, separates this from RNG
replacement. Refs #1193.
Loads global scripts for most script contexts for consistency.
Adds simulation tests for global scripts.

This was SVN commit r12056.
2012-07-03 02:16:45 +00:00
Spahbod db943341a8 Secretly adding Gear random map.
This was SVN commit r12055.
2012-07-02 13:11:02 +00:00
Spahbod 11ec25726a Bug fixes. Some suggested by wraitii.
This was SVN commit r12054.
2012-07-02 08:07:59 +00:00
Spahbod e4f9816166 This was SVN commit r12053. 2012-07-02 07:43:44 +00:00
Spahbod 45c5e991d7 Fixing the bug on Deep Forest random map by FeXoR. Fixes #1513.
This was SVN commit r12052.
2012-07-02 03:28:27 +00:00
Mythos_Ruler 130caac4f5 Smoke, less thick.
This was SVN commit r12051.
2012-07-01 19:19:31 +00:00
Spahbod f38ba1d91b Updated the Sahel Watering Holes map.
This was SVN commit r12050.
2012-07-01 04:15:02 +00:00
vts 0e4efdf100 Small correction -- building with both xelatex and pdflatex doesn't make sense :o)
This was SVN commit r12049.
2012-07-01 01:05:06 +00:00
vts 75b436e010 A more detailed explanation of how the slab method for OBB/ray intersection from Real-Time Rendering, Third Edition works.
This was SVN commit r12048.
2012-07-01 01:02:26 +00:00
Mythos_Ruler 2921694346 Long skirt for Mauryan female.
This was SVN commit r12047.
2012-06-30 21:40:42 +00:00
Mythos_Ruler 28fbc77c45 Updated Mauryan civ json.
This was SVN commit r12046.
2012-06-30 03:52:30 +00:00
Mythos_Ruler 4899144d8a This was SVN commit r12045. 2012-06-30 02:13:40 +00:00
Mythos_Ruler 9e1310fed5 This was SVN commit r12044. 2012-06-30 00:31:03 +00:00
Mythos_Ruler 730263fa5e Mauryan female citizen.
This was SVN commit r12043.
2012-06-30 00:25:30 +00:00
Mythos_Ruler 1dc74dc2d7 Fixed up some Mauryan entities.
This was SVN commit r12042.
2012-06-29 23:39:05 +00:00
Pureon 67e7953e3a Mauryan Elephant stables added
This was SVN commit r12041.
2012-06-29 19:16:13 +00:00
Pureon fe809e1deb Mauryan infantry archer template tweak
This was SVN commit r12040.
2012-06-29 18:32:12 +00:00
Spahbod 347eb964bd Fixed an error in description.
This was SVN commit r12039.
2012-06-29 04:14:06 +00:00
Spahbod c3082fab9a Added Sahel Watering Holes random map.
This was SVN commit r12038.
2012-06-29 03:52:14 +00:00
Spahbod 4f60ef63c2 Fixed the starting angle on Oasis.
This was SVN commit r12037.
2012-06-29 03:20:40 +00:00
Pureon aa11c5bd90 Territory decay rate tech for Outposts
This was SVN commit r12036.
2012-06-29 00:02:04 +00:00
Pureon 9536dbb898 Roman quinquereme ship animations
This was SVN commit r12035.
2012-06-28 21:10:59 +00:00
vts 78d90087a2 In RMS: Fix misaligned iberian bonus starting walls. Fix celt split civs errors. Add roads. Closes #1449.
This was SVN commit r12034.
2012-06-28 21:02:47 +00:00
Pureon c00abd4ab6 Update to Mauryan civ template and some new tech icons
This was SVN commit r12033.
2012-06-27 21:49:31 +00:00
Pureon 0b55844452 Mauryan support elephant
This was SVN commit r12032.
2012-06-27 19:53:16 +00:00
Spahbod d4a44a6128 Removes "demo" keyword from volcanic lands.
This was SVN commit r12031.
2012-06-27 10:45:09 +00:00
Spahbod 0c7a9d43d7 Prevents trees to block the view of players. Refs #1408.
This was SVN commit r12030.
2012-06-27 10:44:25 +00:00
Spahbod 4a1f417d40 Fixed a bug.
This was SVN commit r12029.
2012-06-27 10:22:05 +00:00
Spahbod e8a4f9ce4a This was SVN commit r12028. 2012-06-27 08:17:04 +00:00
Spahbod c2ecc0eae0 Templates for new tropical flora.
This was SVN commit r12027.
2012-06-27 08:16:25 +00:00
Spahbod 3cb07b95d1 Models and actors for new Tropical flora.
This was SVN commit r12026.
2012-06-27 08:15:55 +00:00
leper aab1cdf9d6 Don't add system CFLAGS to the CXXFLAGS. Refs #1516.
This was SVN commit r12025.
2012-06-26 20:48:06 +00:00
leper 98dea7eb03 Fix issues with civ specific victory/defeat music. Fixes #1370.
This was SVN commit r12024.
2012-06-26 18:44:52 +00:00
Spahbod a8dce674ce Some minor changes. Added the possibility of a frozen sea in gulf of bothnia.
This was SVN commit r12023.
2012-06-26 12:29:41 +00:00
Spahbod 2cd95cfe1b Added more wood to archipelago, islands and migration so that players can reach phase 2 to build a dock. Updated oasis to the current standard including ally placement and iberian wall. Replaced the polar cliff texture in random biome system.
This was SVN commit r12022.
2012-06-26 08:54:00 +00:00
leper ad3f543d2c Revert useless part of previous commit.
This was SVN commit r12021.
2012-06-25 22:27:00 +00:00
leper a60d01ee2e Display map name and size on summary screen. Based on patch by hapsky. Fixes #1333.
Play victory and defeat music.
Replace celts with gauls.

This was SVN commit r12020.
2012-06-25 22:11:47 +00:00
Pureon 622d6b9162 Crenelations tech new icon
This was SVN commit r12019.
2012-06-25 20:45:57 +00:00
leper ace4793086 Make menu disappear when interacting with the game world. Based on patch by Deiz. Fixes #1291.
This was SVN commit r12018.
2012-06-25 17:27:22 +00:00
WhiteTreePaladin 272efcc364 K776's minor GUI changes
This was SVN commit r12017.
2012-06-25 03:43:34 +00:00
Pureon 7476ce438d Sandbox map update
This was SVN commit r12016.
2012-06-24 21:58:17 +00:00
WhiteTreePaladin 975fec3af3 Fix incorrect font reference
This was SVN commit r12015.
2012-06-24 21:44:20 +00:00
leper ebe5b66ba3 Fix test failure caused by f660f834bf.
This was SVN commit r12014.
2012-06-24 21:03:46 +00:00
Pureon 03363fe085 Updates to some more Mauryan civ files
This was SVN commit r12013.
2012-06-24 20:58:21 +00:00
WhiteTreePaladin f814e532ae Remove player color from queue panel and center civ shield behind name
This was SVN commit r12012.
2012-06-24 19:38:58 +00:00
Pureon 01d9b0d4b9 Mauryan civ. Sandbox map showing placeholder units and buildings
This was SVN commit r12011.
2012-06-24 13:55:36 +00:00
Pureon c7d90ec644 Mauryan structure actor files
This was SVN commit r12010.
2012-06-24 13:16:21 +00:00
Pureon ef6f73fb89 Placeholder structure models for Mauryans
This was SVN commit r12009.
2012-06-24 12:44:18 +00:00
Pureon 51a87cc8c3 Unit actors folder for Mauryans
This was SVN commit r12008.
2012-06-24 12:40:11 +00:00
Pureon d62971ad29 Unit sim templates
This was SVN commit r12007.
2012-06-24 10:59:54 +00:00
Pureon adae2dd998 Mauryan placeholder struct texture and emblem
This was SVN commit r12006.
2012-06-24 10:32:25 +00:00
Pureon 6822e33c65 Mauryan structure templates
This was SVN commit r12005.
2012-06-24 09:54:52 +00:00
Mythos_Ruler 23d1879876 Fixed song name. Added it to Spartans civ json.
This was SVN commit r12004.
2012-06-24 04:14:46 +00:00
WhiteTreePaladin 63bdbcc67a Unbold generic name
This was SVN commit r12003.
2012-06-24 03:21:47 +00:00
WhiteTreePaladin b19d7268b8 Update settings text to use bold stroke 16
This was SVN commit r12002.
2012-06-24 03:17:54 +00:00
WhiteTreePaladin 941a8c014b Update fontbuilder with stroked and bold stroked 12, 13, and 16
This was SVN commit r12001.
2012-06-23 22:05:05 +00:00
WhiteTreePaladin a8e00a4a7f Add stroked 16 font
This was SVN commit r12000.
2012-06-23 22:04:04 +00:00
WhiteTreePaladin 94bae18389 Use bolded text for unit names
This was SVN commit r11999.
2012-06-23 21:58:58 +00:00
WhiteTreePaladin 859b568e9f Add new stroked 12 and 13 fonts and update session panels to use them
(non-bold used stroked 2 and bold used stroked 3)

This was SVN commit r11998.
2012-06-23 21:37:26 +00:00
vts f660f834bf Added default, arbitrary-sized Footprint component to actor entities. Makes their selection outlines show up in Atlas. Fixes #1477.
This was SVN commit r11997.
2012-06-23 21:12:51 +00:00
leper 0b57709d17 Make unit command buttons clickable again.
This was SVN commit r11996.
2012-06-23 13:28:19 +00:00
leper efb6ac808b Fix premake build on OS X by linking with the CoreServices framework. Fixes #1505.
Remove obsolete and unused parameters. Fixes #1179.

This was SVN commit r11995.
2012-06-21 22:55:07 +00:00
Mythos_Ruler b35bebbdbf This was SVN commit r11994. 2012-06-21 22:30:17 +00:00
leper 95a003edb8 Fix premake's os.getversion() to work with glibc. Refs #1322.
This was SVN commit r11993.
2012-06-21 22:01:39 +00:00
OmriLahav 76ada61960 This was SVN commit r11991. 2012-06-21 07:05:21 +00:00
WhiteTreePaladin de8dc92e49 widen experience bar
This was SVN commit r11990.
2012-06-19 02:53:43 +00:00
WhiteTreePaladin 2268fd3f0e Fix unit commands alignment
This was SVN commit r11989.
2012-06-18 23:59:02 +00:00
WhiteTreePaladin 3337949721 Fix player name
This was SVN commit r11988.
2012-06-18 23:53:16 +00:00
WhiteTreePaladin 9fb45928a1 Fix unit civ tooltip
This was SVN commit r11987.
2012-06-18 23:51:07 +00:00
WhiteTreePaladin 03d56edb1b Add more detailed shading to selections details
This was SVN commit r11986.
2012-06-18 23:47:36 +00:00
WhiteTreePaladin 80213bba5f Fix rank icon hiding
This was SVN commit r11985.
2012-06-18 22:45:10 +00:00
WhiteTreePaladin 033120e8d8 Shrink experience bar, add tooltip to rank icon, rework middle panel shading
This was SVN commit r11984.
2012-06-18 22:33:40 +00:00
WhiteTreePaladin a34232d71e Add black border around stats bars
This was SVN commit r11983.
2012-06-18 13:40:53 +00:00
WhiteTreePaladin 0c083f9a45 Fix stats bars on multi-select and shrink all stats bars from 8 to 7 px
This was SVN commit r11982.
2012-06-18 13:33:11 +00:00
historic_bruno 3ec1b88d2c Adds missing break statements, thanks to picobyte. Fixes #1503
This was SVN commit r11981.
2012-06-18 01:38:30 +00:00
vts 8f2b82fa8a Basic README.txt for fontbuilder.py to outline installation process of PyCairo on Win32
This was SVN commit r11980.
2012-06-17 23:01:37 +00:00
vts 821cfe8862 Removed reverse dependency on SOverlayTexturedLine from CTexturedLineRData; fixes dangling pointer dereference. Fixes #1495.
This was SVN commit r11979.
2012-06-17 03:40:35 +00:00
WhiteTreePaladin 972f28c6a7 Update unit experience display
This was SVN commit r11978.
2012-06-17 00:28:05 +00:00
WhiteTreePaladin b269dabe3b Fix stamina and generic name issues
This was SVN commit r11977.
2012-06-16 22:41:48 +00:00
WhiteTreePaladin b66d1716e7 Recenter GUI and update unit details section.
This was SVN commit r11976.
2012-06-16 20:55:33 +00:00
historic_bruno 5752863e6f Updates premake Windows binary and VS projects for 637c09b204.
This was SVN commit r11974.
2012-06-15 23:11:57 +00:00
historic_bruno 8dc36bed4e Fixes error in actor viewer caused by 962da61f12. Fixes #1499
This was SVN commit r11973.
2012-06-14 22:47:57 +00:00
Mythos_Ruler 744eb1a7d7 This was SVN commit r11972. 2012-06-14 21:44:59 +00:00
leper 20e9d70757 Link with boost_system as that is needed for Boost <= 1.43. Refs #1360.
This was SVN commit r11971.
2012-06-13 22:54:14 +00:00
leper 637c09b204 Add support for OpenBSD. Fixes #1463.
Backport os_getversion from premake4.4-beta4 and extend it to support
POSIX-compilant systems.
Add some missing newlines at the end of file as these cause warnings on
OpenBSD.
Update the config paths.

This was SVN commit r11970.
2012-06-13 20:43:56 +00:00
Mythos_Ruler f056b8f6f0 This was SVN commit r11969. 2012-06-13 00:19:26 +00:00
Mythos_Ruler c4b993075a Celts -> Britons or Gauls.
This was SVN commit r11968.
2012-06-13 00:12:18 +00:00
quantumstate 4ddd2a7fb1 Added IsInWorld check to attack code. Refs #1496
This was SVN commit r11967.
2012-06-12 12:13:24 +00:00
quantumstate f944649153 Fix the attack error due to no footprint. Refs #1496.
This was SVN commit r11966.
2012-06-12 12:04:55 +00:00
historic_bruno d97f8180d5 Removes unused Boost link dependencies with patch by fabio. Fixes #1360
This was SVN commit r11965.
2012-06-12 05:38:43 +00:00
ShieldBearer 306a9759d5 stats bar textures
This was SVN commit r11964.
2012-06-11 13:12:39 +00:00
WhiteTreePaladin d905e4c63a Split GUI out to bottom corners based on suggestions, and move barter icons down
This was SVN commit r11963.
2012-06-11 01:07:41 +00:00
leper 29a11e24d5 Fix NVTT build on OpenBSD based on patch by anthonyjbentley. Refs #1463.
This was SVN commit r11962.
2012-06-10 22:39:26 +00:00
WhiteTreePaladin 85f4702531 Hide stamina for now
This was SVN commit r11961.
2012-06-10 03:38:25 +00:00
WhiteTreePaladin bf81922c62 Fix resource label when type is a treasure and fix civ tooltip
This was SVN commit r11960.
2012-06-10 02:56:21 +00:00
WhiteTreePaladin aa58b6ccfa always show generic name for now
This was SVN commit r11959.
2012-06-10 02:39:16 +00:00
WhiteTreePaladin 87d415aca9 Update GUI selection details panel (single selections)
This was SVN commit r11958.
2012-06-10 02:05:40 +00:00
historic_bruno 4ac52a3c47 Fixes bug in percentage map explored calculation. Refs #1334
This was SVN commit r11957.
2012-06-09 23:04:27 +00:00
Mythos_Ruler fba599c847 This was SVN commit r11956. 2012-06-09 05:59:01 +00:00
Mythos_Ruler 82ca0243d7 This was SVN commit r11955. 2012-06-09 05:58:09 +00:00
Mythos_Ruler a00b92dcd5 Gauls.
This was SVN commit r11954.
2012-06-09 05:57:28 +00:00
Mythos_Ruler 67f306724a Britons json.
This was SVN commit r11953.
2012-06-09 01:17:49 +00:00
Mythos_Ruler 52af3369ba Britons.
This was SVN commit r11952.
2012-06-09 01:17:27 +00:00
leper 2243f699fc Fix test failure.
Fix entity placement on Phoenician Levant.

This was SVN commit r11951.
2012-06-08 19:17:31 +00:00
historic_bruno 962da61f12 Adds shared LOS for allied players, based on patch by Deiz/F00. Fixes #1334.
This was SVN commit r11949.
2012-06-08 04:41:39 +00:00
leper 659049eb1c Auto-gather all types of treasures. Fixes #1422. Patch by Deiz.
This was SVN commit r11948.
2012-06-07 21:56:29 +00:00
Mythos_Ruler 4d0aaa4bdb This was SVN commit r11947. 2012-06-06 22:59:36 +00:00
Mythos_Ruler 231b0cd5f6 Testing branching phases.
This was SVN commit r11946.
2012-06-06 21:38:17 +00:00
Pureon 8aaa6d06e2 Removing some large unused png image files
This was SVN commit r11945.
2012-06-06 19:40:16 +00:00
vts 6b50a660b9 Added elapsed real time (as opposed to elapsed simulation time) to MT_Interpolate messages. Fixes leftover TODO from #824. Refs #824.
This was SVN commit r11944.
2012-06-06 19:37:03 +00:00
gregory f9fa347a7f Fixed shark animation and skeleton.
This was SVN commit r11939.
2012-06-05 04:05:01 +00:00
Mythos_Ruler d020e02644 This was SVN commit r11938. 2012-06-05 02:05:41 +00:00
WhiteTreePaladin d271ca89cf Update GUI style for single object selections (based on quantumstate's mockup)
This was SVN commit r11937.
2012-06-05 00:36:35 +00:00
leper 0296323c9d Make FCollada compile on OpenBSD, based on patch by anthonyjbentley. Refs #1463.
This was SVN commit r11936.
2012-06-04 21:33:15 +00:00
historic_bruno 66194deedc Fixes player setup to set all diplomacy values (including self as ally).
Removes unnecessary checks from CmpPlayer diplomacy functions.
Fixes some inconsistent formatting.

This was SVN commit r11935.
2012-06-04 00:24:08 +00:00
leper 4ee4f16793 Stop rearranging formations for orders carried out individually. Fixes #1476.
This was SVN commit r11934.
2012-06-03 23:00:36 +00:00
vts da719b883c Split out code specific to textured overlay lines construction from OverlayRenderer into its own files.
This was SVN commit r11933.
2012-06-02 21:19:20 +00:00
Mythos_Ruler 210f0265b7 Updated Acropolis maps.
This was SVN commit r11932.
2012-06-02 06:00:45 +00:00
Mythos_Ruler 4c01de2100 Reduced accuracy for Basic-level ranged citizen units.
Portraits for Mace and Spart rams.

Lower XP requirements for cavalry promotion.

This was SVN commit r11931.
2012-06-02 05:57:57 +00:00
historic_bruno 8c848c2f45 Replaces info icon with higher quality version. Fixes #1469.
Uses add_color effect, so it's easier to change the theme.
Fixes some inconsistent whitespace.

This was SVN commit r11930.
2012-06-02 00:09:57 +00:00
Mythos_Ruler 98ee2bdf0a elongated raindrop.
This was SVN commit r11929.
2012-06-01 01:28:51 +00:00
vts 1c005b0c0e Fixed AABB to OBB transformation resulting in NaN basis vectors when the AABB size in one or more dimensions is zero. Fixes #1121.
This was SVN commit r11928.
2012-05-31 23:17:15 +00:00
Mythos_Ruler 9e798addf9 This was SVN commit r11927. 2012-05-31 17:49:26 +00:00
historic_bruno 73f9d984fe Fixes typo in crenellations tech.
This was SVN commit r11926.
2012-05-31 03:40:25 +00:00
Mythos_Ruler 9d619a673e A pair of tower technologies.
This was SVN commit r11925.
2012-05-30 05:55:55 +00:00
Mythos_Ruler 3009d463a6 Updated Savanna terrains.
This was SVN commit r11924.
2012-05-29 21:27:39 +00:00
Mythos_Ruler f876f2e747 Traders respond when tasked to trade.
This was SVN commit r11923.
2012-05-29 05:07:14 +00:00
fcxSanya d7752438fe Do not count domestic animals as units in statistics, based on patch by Deiz. Fixes #1439
This was SVN commit r11922.
2012-05-29 04:04:41 +00:00
leper 636896dd7f Pass template to gather-near-position. Fixes #1454.
Add order_trade sound.

This was SVN commit r11921.
2012-05-27 20:23:08 +00:00
Pureon f2e6194440 Lighting on some demo maps. No more maps use 'old' LightingModel
This was SVN commit r11920.
2012-05-26 13:57:44 +00:00
Pureon 48fd27a10a Second female unit voice. All phrases
This was SVN commit r11918.
2012-05-26 11:22:45 +00:00
Pureon 757c873a2e New death sounds added
This was SVN commit r11915.
2012-05-25 21:37:10 +00:00
Mythos_Ruler aec44da406 Bunch of different stuff.
This was SVN commit r11914.
2012-05-25 21:36:07 +00:00
Pureon 20125515f1 Removing changes to skeletons.xml that conflict with other skeletons
This was SVN commit r11913.
2012-05-25 21:20:28 +00:00
leper 5f6dea8455 Fix the size of the Units Demo map.
This was SVN commit r11912.
2012-05-25 20:42:24 +00:00
Pureon 1004864733 Siege ram for the Macedonians
This was SVN commit r11910.
2012-05-24 21:44:28 +00:00
leper 137b6dd338 Queued orders for rally points. Fixes #1053 and #1211.
This was SVN commit r11909.
2012-05-24 18:25:31 +00:00
gregory 4c974a49a4 This was SVN commit r11908. 2012-05-24 00:33:55 +00:00
gregory b0c3533b20 Added shark move animation.
This was SVN commit r11907.
2012-05-23 23:48:06 +00:00
Mythos_Ruler a69b2f796c Ranged infantry promotions now confer accuracy boosts instead of attack boosts. In the end, the accuracy boost ends up being an attack boost (in average damage per second).
This was SVN commit r11906.
2012-05-23 21:22:34 +00:00
Mythos_Ruler 6d96dd7137 Increased the size of the Units Demo map.
Fixed some things about the Celts sandbox map.

This was SVN commit r11905.
2012-05-23 21:17:18 +00:00
Mythos_Ruler c8d404eb25 Fixed errors when Celt walls die.
This was SVN commit r11904.
2012-05-23 20:31:11 +00:00
historic_bruno 0ce770f227 Disables Roman Quinquereme no sail variation.
This was SVN commit r11903.
2012-05-23 20:12:48 +00:00
Mythos_Ruler c6b53e1677 New Athenian emblem.
This was SVN commit r11902.
2012-05-22 23:15:33 +00:00
Mythos_Ruler e999289021 Kennel available in town phase.
This was SVN commit r11900.
2012-05-22 16:57:09 +00:00
Spahbod cab27587fd This was SVN commit r11899. 2012-05-22 15:28:21 +00:00
Mythos_Ruler 7b1ab20852 This was SVN commit r11898. 2012-05-22 07:14:26 +00:00
Spahbod 7559764fa6 Fixed some maps that caused errors and removed extra trees from some.
This was SVN commit r11897.
2012-05-22 06:38:07 +00:00
Ykkrosh dd072112d1 Improved shadow filtering, from eihrul.
This was SVN commit r11896.
2012-05-21 19:23:14 +00:00
Spahbod 16883b225b Gathers all the trees near the player start position near each other to make more room for players. Fixes #1408.
This was SVN commit r11895.
2012-05-21 16:14:51 +00:00
Spahbod 4b4d048967 Found a better name for Persian fishing boat.
This was SVN commit r11894.
2012-05-21 10:39:25 +00:00
Spahbod 088caa647f Fixed the bug in Hyrcanian Shores. Fixes #1388.
This was SVN commit r11893.
2012-05-21 09:35:05 +00:00
historic_bruno 8fd3fbc210 Fixes Attack.js error.
This was SVN commit r11892.
2012-05-20 22:51:51 +00:00
leper c4d6019599 Add garrison order sound and remove the old garrison sound.
Fix some map errors, tabs in templates and update docs.

This was SVN commit r11891.
2012-05-20 15:44:57 +00:00
Pureon 4cf3467819 New siege ram for the Spartans
This was SVN commit r11890.
2012-05-20 11:32:35 +00:00
EmjeR d5e3e975c8 This was SVN commit r11888. 2012-05-20 00:26:18 +00:00
quantumstate f72d820cd4 Added randomized arrow positions with hit detection when the missile lands and splash damage. Fixes #18.
This was SVN commit r11886.
2012-05-19 23:07:41 +00:00
leper 6cc98a6763 Add heal order sound.
This was SVN commit r11885.
2012-05-19 18:27:00 +00:00
Pureon 7be67fe6b7 Added new voice sounds to all female units. Recorded by khegarty
This was SVN commit r11884.
2012-05-19 16:02:16 +00:00
Mythos_Ruler 7ad6a6012f Persians: Cav techs to Stables. Infantry techs to Barracks.
This was SVN commit r11883.
2012-05-19 06:24:12 +00:00
Mythos_Ruler 7f3bd8fb48 Shiny Bactrian lancers.
This was SVN commit r11882.
2012-05-19 06:16:55 +00:00
Mythos_Ruler 97bf4df2a6 Some Athenian shields for their buildings.
This was SVN commit r11881.
2012-05-19 04:46:50 +00:00
Mythos_Ruler 5d59175953 Footprint sizes for these things.
This was SVN commit r11880.
2012-05-18 22:41:31 +00:00
quantumstate c2c0469472 Make qBot swap gatherers based on gathering speed and always deposit resources when switching resource.
Also added missing var's in for loops.

This was SVN commit r11879.
2012-05-18 22:27:08 +00:00
quantumstate d7faa813f4 Update territory bitmask and add a returnResource command for entities.
This was SVN commit r11878.
2012-05-18 22:10:56 +00:00
Mythos_Ruler 0d9dcac82a Changing the Greek civs on these maps.
This was SVN commit r11877.
2012-05-18 21:42:55 +00:00
leper 68d1cf167e Add repair order queueing to formations. Refs #592.
This was SVN commit r11876.
2012-05-18 21:31:57 +00:00
historic_bruno e7689342f8 Implements TerritoryDecay/HealthDecayRate and Promotion/RequiredXp tech modifications.
This was SVN commit r11875.
2012-05-18 03:58:37 +00:00
historic_bruno 8fba8097ce Reverts bfb7526bcf.
This was SVN commit r11874.
2012-05-17 23:24:12 +00:00
historic_bruno 786896bf8d Prevents fishing ship from attacking structures (docks).
This was SVN commit r11873.
2012-05-17 22:33:46 +00:00
Mythos_Ruler 862f6fb3e3 Update to Necropolis.
This was SVN commit r11872.
2012-05-17 13:43:15 +00:00
Mythos_Ruler fb44299104 This was SVN commit r11871. 2012-05-17 13:10:12 +00:00
historic_bruno 96b2c1e89b Makes territory_pull selectable in Atlas only.
This was SVN commit r11870.
2012-05-17 02:32:16 +00:00
Mythos_Ruler 5d72fa689e Updated spartan emblem.
This was SVN commit r11869.
2012-05-17 01:53:41 +00:00
Mythos_Ruler a4e701fcf9 Lightened up the shark textures.
This was SVN commit r11867.
2012-05-16 20:56:08 +00:00
Mythos_Ruler a5a7bf3c5d Spartan females can make palisades.
This was SVN commit r11866.
2012-05-16 17:57:56 +00:00
Mythos_Ruler cdafb50278 Selection groups for wall lengths.
This was SVN commit r11865.
2012-05-16 17:56:06 +00:00
Ykkrosh 04fe6d2363 Add reminders to keep alpha names in sync
This was SVN commit r11864.
2012-05-15 21:34:28 +00:00
12149 changed files with 506502 additions and 106899 deletions
-1
View File
@@ -8,5 +8,4 @@
*.png filter=lfs diff=lfs merge=lfs -text
*.psa filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
binaries/data/mods/internal/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text
binaries/data/mods/public/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text
+38 -18
View File
@@ -14,21 +14,6 @@ the file's path.
Some files don't yet have licensing details specified - if you care about any
in particular, let us know and we can try to clarify it.
/source
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/lib
MIT
/source/tools
Various (unspecified)
/source/tools/atlas
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/tools/atlas/wxJS
LGPL version 2.1 (or later) - see license_lgpl-2.1.txt
/binaries/data
GPL version 2 (or later) - see license_gpl-2.0.txt
@@ -45,11 +30,46 @@ in particular, let us know and we can try to clarify it.
Proprietary - see license_dbghelp.txt for restrictions you must agree to
before distributing this particular file
/libraries
Various - see individual directories and files for details
/build
Various (unspecified)
/build/premake/premake4
BSD
/build/premake/*.lua
MIT
/docs
Various (unspecified)
/libraries
Various - see LICENSE.txt within that directory
/source
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/lib
MIT
/source/third_party/encryption
GPL version 2 (or later)
ISC (pkcs5_pbkdf2.cpp)
MIT (pkcs5_pbkdf2.h)
/source/third-party/jsonspirit
MIT
/source/third_party/mikktspace
zlib
/source/third_party/mongoose
MIT
/source/third_party/tinygettext
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/tools
Various - see LICENSE.txt within that directory
/source/tools/atlas
GPL version 2 (or later) - see license_gpl-2.0.txt
-2
View File
@@ -1,2 +0,0 @@
cd /D "%appdata%\0ad\logs\"
start .
+4 -14
View File
@@ -11,7 +11,7 @@ project of this scope.
There are several ways to contact us and find more information:
Web site: http://wildfiregames.com/0ad/
Web site: http://play0ad.com/
Forums: http://www.wildfiregames.com/forum/
@@ -28,7 +28,7 @@ Open the "binaries\system" folder.
To launch the game: Run pyrogenesis.exe
To launch the map editor: Run Atlas.bat
To launch the map editor: Run Atlas.bat or "pyrogenesis.exe -editor"
-----------------------------------
@@ -43,15 +43,5 @@ http://trac.wildfiregames.com/wiki/BuildInstructions
Reporting problems
------------------
Bugs should be reported on Trac: http://trac.wildfiregames.com/
On Windows: If the game crashes, it should generate 'crashlog' files that will
help us debug the problem. Run OpenLogsFolder.bat to find the files
("%appdata%\0ad\logs\"), and attach crashlog.txt and crashlog.dmp to the bug
report.
On Linux / OS X: If the game detects an error, it should generate crashlog.txt
in ~/.config/0ad/logs/ . If it doesn't, it should at least print some
information on stdout. Attach crashlog.txt or the other information to the
bug report. It might also help to run the game in gdb and copy the output of
the "bt full" command, if possible.
Bugs should be reported on Trac. For information on reporting problems
and finding logs, see http://trac.wildfiregames.com/wiki/ReportingErrors
+171 -29
View File
@@ -5,20 +5,39 @@
; * create a text file called "local.cfg" instead, and copy *
; * the lines from this file that you want to change. *
; * *
; * On Linux / OS X, create: *
; * ~/.config/0ad/config/local.cfg *
; * On Linux, create: *
; * $XDG_CONFIG_HOME/0ad/config/local.cfg *
; * (Note: $XDG_CONFIG_HOME defaults to ~/.config) *
; * *
; * On OS X, create: *
; * ~/Library/Application\ Support/0ad/config/local.cfg *
; * *
; * On Windows, create: *
; * %appdata%/0ad/config/local.cfg *
; * %appdata%\0ad\config\local.cfg *
; * *
; **************************************************************
; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
windowed = false
; Show detailed tooltips (Unit stats)
showdetailedtooltips = false
; Enable/disable the splashscreen
splashscreendisable = false
; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch.
splashscreenversion = 0
; Pause the game on window focus loss (Only applicable to single player mode)
pauseonfocusloss = true
; Default player name to use in multiplayer
; playername = "anonymous"
; Default server name or IP to use in multiplayer
multiplayerserver = "127.0.0.1"
; Force a particular resolution. (If these are 0, the default is
; to keep the current desktop resolution in fullscreen mode or to
; use 1024x768 in windowed mode.)
@@ -28,14 +47,27 @@ yres = 0
; Force a non-standard bit depth (if 0 then use the current desktop bit depth)
bpp = 0
; Preferred display (for multidisplay setups, only works with SDL 2.0)
display = 0
; System settings:
fancywater = true
; if false, actors won't be rendered but anything entity will be.
renderactors = true
waterugly=false; Force usage of the fixed pipeline water. This is faster, but really, really ugly.
waterfancyeffects = false
waterrealdepth = true
waterrefraction = true
waterreflection = true
shadowsonwater = false
shadows = true
shadowpcf = true
vsync = false
particles = true
silhouettes = true
showsky = false
nos3tc = false
noautomipmap = true
@@ -57,15 +89,36 @@ force_s3tc_enable = true
; but will reduce performance and features when a modern graphics card is available.
renderpath = default
; Prefer GLSL shaders over ARB shaders (not recommended)
;;;;; EXPERIMENTAL ;;;;;
; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
preferglsl = false
; Replace alpha-blending with alpha-testing, for performance experiments
forcealphatest = false
; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true.
gentangents = false
; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
gpuskinning = false
; Use smooth LOS interpolation; REQUIRES preferglsl=true.
smoothlos = false
; Use screen-space postprocessing filters (HDR, bloom, DOF, etc). Incompatible with fixed renderpath.
postproc = false
; Quality level of shader effects (set to 10 to display effects)
materialmgr.quality = 0.0
; Maximum distance to display parallax effect. Set to 0 to disable parallax.
materialmgr.PARALLAX_DIST.max = 150
; Maximum distance to display high quality parallax effect.
materialmgr.PARALLAX_HQ_DIST.max = 75
; Maximum distance to display very high quality parallax effect. Set to 30 to enable.
materialmgr.PARALLAX_VHQ_DIST.max = 0
;;;;;;;;;;;;;;;;;;;;;;;;
; Replace alpha-blending with alpha-testing, for performance experiments
forcealphatest = false
; Opt-in online user reporting system
userreport.url = "http://feedback.wildfiregames.com/report/upload/v1/"
@@ -74,10 +127,15 @@ skycolor = "0 0 0"
; GENERAL PREFERENCES:
sound.mastergain = 0.5
sound.mastergain = 0.9
sound.musicgain = 0.2
sound.ambientgain = 0.6
sound.actiongain = 0.7
sound.uigain = 0.7
; Camera control settings
view.scroll.speed = 120.0
view.scroll.speed.modifier = 1.05 ; Multiplier for changing scroll speed
view.rotate.x.speed = 1.2
view.rotate.x.min = 28.0
view.rotate.x.max = 60.0
@@ -85,12 +143,14 @@ view.rotate.x.default = 35.0
view.rotate.y.speed = 2.0
view.rotate.y.speed.wheel = 0.45
view.rotate.y.default = 0.0
view.rotate.speed.modifier = 1.05 ; Multiplier for changing rotation speed
view.drag.speed = 0.5
view.zoom.speed = 256.0
view.zoom.speed.wheel = 32.0
view.zoom.min = 50.0
view.zoom.max = 200.0
view.zoom.default = 120.0
view.zoom.speed.modifier = 1.05 ; Multiplier for changing zoom speed
view.pos.smoothness = 0.1
view.zoom.smoothness = 0.4
view.rotate.x.smoothness = 0.5
@@ -101,6 +161,9 @@ view.fov = 45.0 ; Field of view (degrees), lower is
view.height.smoothness = 0.5
view.height.min = 16
; How close do we have to be to the actual location in order to jump back to the previous one?
camerajump.threshold = 40
; HOTKEY MAPPINGS:
; Each one of the specified keys will trigger the action on the left
@@ -109,34 +172,62 @@ view.height.min = 16
; See keys.txt for the list of key names.
; > SYSTEM SETTINGS
hotkey.exit = "Alt+F4", "Ctrl+Break" ; Exit to desktop
hotkey.exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
hotkey.leave = Escape ; End current game or Exit
hotkey.confirm = Return ; Confirm the current command.
hotkey.pause = Pause ; Pause/unpause game
hotkey.screenshot = F2 ; Take PNG screenshot
hotkey.bigscreenshot = "Shift+F2" ; Take large BMP screenshot
hotkey.togglefullscreen = "Alt+Return" ; Toggle fullscreen/windowed mode
hotkey.screenshot.watermark = "K" ; Toggle product/company watermark for official screenshots
hotkey.screenshot.watermark = "Alt+K" ; Toggle product/company watermark for official screenshots
hotkey.wireframe = "Alt+W" ; Toggle wireframe mode
hotkey.silhouettes = "Alt+S" ; Toggle unit silhouettes
hotkey.showsky = "Alt+Z" ; Toggle sky
; > CAMERA SETTINGS
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (stepped control)
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (stepped control)
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W" ; Rotate camera to look upwards
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S" ; Rotate camera to look downwards
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera clockwise around terrain
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
hotkey.camera.reset = "R" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (stepped control)
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (stepped control)
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W" ; Rotate camera to look upwards
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S" ; Rotate camera to look downwards
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera clockwise around terrain
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1 ; Rotate camera clockwise around terrain (stepped control)
hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Enable scrolling by moving mouse
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left
hotkey.camera.right = D, RightArrow ; Scroll or rotate right
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards
hotkey.camera.pan = MouseMiddle ; Enable scrolling by moving mouse
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left
hotkey.camera.right = D, RightArrow ; Scroll or rotate right
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards
hotkey.camera.scroll.speed.increase = "Ctrl+Shift+S" ; Increase scroll speed
hotkey.camera.scroll.speed.decrease = "Ctrl+Alt+S" ; Decrease scroll speed
hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R" ; Increase rotation speed
hotkey.camera.rotate.speed.decrease = "Ctrl+Alt+R" ; Decrease rotation speed
hotkey.camera.zoom.speed.increase = "Ctrl+Shift+Z" ; Increase zoom speed
hotkey.camera.zoom.speed.decrease = "Ctrl+Alt+Z" ; Decrease zoom speed
hotkey.camera.jump.1 = F5 ; Jump to position N
hotkey.camera.jump.2 = F6
hotkey.camera.jump.3 = F7
hotkey.camera.jump.4 = F8
;hotkey.camera.jump.5 =
;hotkey.camera.jump.6 =
;hotkey.camera.jump.7 =
;hotkey.camera.jump.8 =
;hotkey.camera.jump.9 =
;hotkey.camera.jump.10 =
hotkey.camera.jump.set.1 = "Ctrl+F5" ; Set jump position N
hotkey.camera.jump.set.2 = "Ctrl+F6"
hotkey.camera.jump.set.3 = "Ctrl+F7"
hotkey.camera.jump.set.4 = "Ctrl+F8"
;hotkey.camera.jump.set.5 =
;hotkey.camera.jump.set.6 =
;hotkey.camera.jump.set.7 =
;hotkey.camera.jump.set.8 =
;hotkey.camera.jump.set.9 =
;hotkey.camera.jump.set.10 =
; > CONSOLE SETTINGS
hotkey.console.toggle = BackQuote, F9 ; Open/close console
@@ -150,8 +241,9 @@ hotkey.cut = "Ctrl+X" ; Cut selected text and copy to the clipboar
hotkey.selection.add = Shift ; Add units to selection
hotkey.selection.milonly = Alt ; Add only military units to selection
hotkey.selection.remove = Ctrl ; Remove units from selection
hotkey.selection.cancel = Esc ; Un-select all units and cancel building placement
hotkey.selection.idleworker = Period ; Select next idle worker
hotkey.selection.idlewarrior = Comma ; Select next idle warrior
hotkey.selection.idlewarrior = ForwardSlash ; Select next idle warrior
hotkey.selection.offscreen = Alt ; Include offscreen units in selection
hotkey.selection.group.select.0 = 0
hotkey.selection.group.save.0 = "Ctrl+0"
@@ -186,10 +278,18 @@ hotkey.selection.group.add.9 = "Shift+9"
; > SESSION CONTROLS
hotkey.session.kill = Delete ; Destroy selected units
hotkey.session.stop = "H" ; Stop the current action
hotkey.session.attack = "Ctrl+Alt" ; Modifier to force attack instead of another action
hotkey.session.attackmove = Ctrl ; Modifier to attackmove when clicking on a point
hotkey.session.attackmoveUnit = "Ctrl+Q" ; Modifier to attackmove targeting only units when clicking on a point (should contain the attackmove keys)
hotkey.session.garrison = Ctrl ; Modifier to garrison when clicking on building
hotkey.session.autorallypoint = Ctrl ; Modifier to set the rally point on the building itself
hotkey.session.guard = "G" ; Modifier to escort/guard when clicking on unit/building
hotkey.session.queue = Shift ; Modifier to queue unit orders instead of replacing
hotkey.session.batchtrain = Shift ; Modifier to train units in batches
hotkey.session.massbarter = Shift ; Modifier to barter bunch of resources
hotkey.session.masstribute = Shift ; Modifier to tribute bunch of resources
hotkey.session.fulltradeswap = Shift ; Modifier to put the desired trade resource to 100%
hotkey.session.unloadtype = Shift ; Modifier to unload all units of type
hotkey.session.deselectgroup = Ctrl ; Modifier to deselect units when clicking group icon, instead of selecting
hotkey.session.rotate.cw = RightBracket ; Rotate building placement preview clockwise
@@ -197,15 +297,30 @@ hotkey.session.rotate.ccw = LeftBracket ; Rotate building placement preview
hotkey.timewarp.fastforward = Space ; If timewarp mode enabled, speed up the game
hotkey.timewarp.rewind = Backspace ; If timewarp mode enabled, go back to earlier point in the game
; > UNIT TRAINING
hotkey.session.queueunit.1 = "Z" ; add first unit type to queue
hotkey.session.queueunit.2 = "X" ; add second unit type to queue
hotkey.session.queueunit.3 = "C" ; add third unit type to queue
hotkey.session.queueunit.4 = "V" ; add fourth unit type to queue
hotkey.session.queueunit.5 = "B" ; add fivth unit type to queue
hotkey.session.queueunit.6 = "N" ; add sixth unit type to queue
hotkey.session.queueunit.7 = "M" ; add seventh unit type to queue
hotkey.session.queueunit.8 = Comma ; add eighth unit type to queue
; > OVERLAY KEYS
hotkey.fps.toggle = "Alt+F" ; Toggle frame counter
hotkey.realtime.toggle = "Alt+T" ; Toggle current display of computer time
hotkey.session.devcommands.toggle = "Alt+D" ; Toggle developer commands panel
hotkey.session.gui.toggle = "Alt+G" ; Toggle visibility of session GUI
hotkey.menu.toggle = "F10" ; Toggle in-game menu
hotkey.timeelapsedcounter.toggle = "F12" ; Toggle time elapsed counter
hotkey.session.showstatusbars = Tab ; Toggle display of status bars
hotkey.session.highlightguarding = PgDn ; Toggle highlight of guarding units
hotkey.session.highlightguarded = PgUp ; Toggle highlight of guarded units
; > HOTKEYS ONLY
hotkey.chat = Return ; Toggle chat window
hotkey.teamchat = "T" ; Toggle chat window in team chat mode
; > GUI TEXTBOX HOTKEYS
hotkey.text.delete.left = "Ctrl+Backspace" ; Delete word to the left of cursor
@@ -216,14 +331,18 @@ hotkey.text.move.right = "Ctrl+RightArrow" ; Move cursor to start of word to
; > PROFILER
hotkey.profile.toggle = "F11" ; Enable/disable real-time profiler
hotkey.profile.save = "Shift+F11" ; Save current profiler data to logs/profile.txt
hotkey.profile2.enable = "F11" ; Enable HTTP/GPU modes for new profiler
hotkey.profile2.toggle = "Ctrl+F11" ; Enable/disable HTTP/GPU modes for new profiler
profiler2.http.autoenable = false ; Enable HTTP server output at startup (default off for security/performance)
profiler2.gpu.autoenable = false ; Enable GPU timing at startup (default off for performance/compatibility)
profiler2.autoenable = false ; Enable HTTP server output at startup (default off for security/performance)
profiler2.script.enable = false ; Enable Javascript profiling. Needs to be set before startup and can't be changed later. (default off for performance)
profiler2.gpu.arb.enable = true ; Allow GL_ARB_timer_query timing mode when available
profiler2.gpu.ext.enable = true ; Allow GL_EXT_timer_query timing mode when available
profiler2.gpu.intel.enable = true ; Allow GL_INTEL_performance_queries timing mode when available
; Developer options
jsdebugger.enable = false ; Enable Javascript debugging. The Debugger is currently broken and can't be enabled until the SpiderMonkey upgrade is done and the debugger is updated for the new API.
tinygettext.debug = false ; Enable Tinygettext debugging information. If true, Tinygettext prints error messages each time that a translation for an English string is not found.
; > QUICKSAVE
hotkey.quicksave = "Shift+F5"
hotkey.quickload = "Shift+F8"
@@ -237,3 +356,26 @@ joystick.camera.rotate.x = 3
joystick.camera.rotate.y = 2
joystick.camera.zoom.in = 5
joystick.camera.zoom.out = 4
; SESSION GUI SETTINGS
gui.session.timeelapsedcounter = false ; Show the game duration in the top right corner
gui.session.attacknotificationmessage = true ; Show attack notification messages
gui.session.minimap.pingduration = 50.0 ; The duration for which an entity will be pinged after an attack notification
gui.session.minimap.blinkduration = 1.7 ; The blink duration while pinging
; GENERAL GUI SETTINGS
gui.cursorblinkrate = 0.5 ; Cursor blink rate in seconds (0.0 to disable blinking)
; Multiplayer lobby preferences
lobby.server = "lobby.wildfiregames.com" ; Address of lobby server
lobby.xpartamupp = "wfgbot17" ; Name of the server-side xmpp client that manage games
lobby.chattimestamp = false ; Show time chat message was posted
lobby.room = "arena17" ; Default MUC room to join
lobby.history = 0 ; Number of past messages to display on join
; Overlay Preferences
overlay.fps = "false" ; Show frames per second in top right corner
overlay.realtime = "false" ; Show current system time in top right corner
; MOD SETTINGS
mod.enabledmods = "mod public"
+11
View File
@@ -0,0 +1,11 @@
;
; Developer configuration file
;
; NOTE: This is not read by the config system currently.
;
; This file is used by the engine to decide which mods are mounted, and in what
; order. The precense of this file suppresses loading of mods in the user mod
; path (see http://trac.wildfiregames.com/wiki/GameDataPaths) if the same mod is
; present in binaries/data/mods. It also implies -noUserMod.
; This is done to make saved maps end up in the right mod folder (and in the
; game-relative data path) to commit them later on.
+108 -4
View File
@@ -1,4 +1,5 @@
## List of key names that can be used in .cfg files for specifying hotkeys:
## This file documents keynames that can be used in .cfg files for specifying hotkeys
## Note: the keynames are not actually configured or implemented here
Backspace, BkSp
Tab
@@ -120,16 +121,18 @@ Caps Lock, CapsLock
Scroll Lock, ScrlLock
Right Shift, RightShift
Left Shift, LeftShift
Shift, AnyShift
Right Ctrl, RightCtrl
Left Ctrl, LeftCtrl
Ctrl, AnyCtrl
Right Alt, RightAlt
Left Alt, LeftAlt
Right Meta
Left Meta
Alt, AnyAlt
Left Super, LeftWin
Right Super, RightWin
Super, AnyWindows ## Windows key, also Command/meta key on Macs
Alt Gr, AltGr
Compose
Compose
Help
Print Screen, PrtSc
@@ -144,3 +147,104 @@ Right Mouse Button, MouseRight
Middle Mouse Button, MouseMiddle
Mouse Wheel Up, WheelUp
Mouse Wheel Down, WheelDown
MouseButtonX, MouseNX # where X is a number 1-255, for extra mouse buttons
## (note that some mice start numbering their buttons at higher numbers
## so the first extra button on your mouse might be #8 here)
## Special keys for international and non-QWERTY keyboards:
World0, W0
World1, W1
World2, W2
World3, W3
World4, W4
World5, W5
World6, W6
World7, W7
World8, W8
World9, W9
World10, W10
World11, W11
World12, W12
World13, W13
World14, W14
World15, W15
World16, W16
World17, W17
World18, W18
World19, W19
World20, W20
World21, W21
World22, W22
World23, W23
World24, W24
World25, W25
World26, W26
World27, W27
World28, W28
World29, W29
World30, W30
World31, W31
World32, W32
World33, W33
World34, W34
World35, W35
World36, W36
World37, W37
World38, W38
World39, W39
World40, W40
World41, W41
World42, W42
World43, W43
World44, W44
World45, W45
World46, W46
World47, W47
World48, W48
World49, W49
World50, W50
World51, W51
World52, W52
World53, W53
World54, W54
World55, W55
World56, W56
World57, W57
World58, W58
World59, W59
World60, W60
World61, W61
World62, W62
World63, W63
World64, W64
World65, W65
World66, W66
World67, W67
World68, W68
World69, W69
World70, W70
World71, W71
World72, W72
World73, W73
World74, W74
World75, W75
World76, W76
World77, W77
World78, W78
World79, W79
World80, W80
World81, W81
World82, W82
World83, W83
World84, W84
World85, W85
World86, W86
World87, W87
World88, W88
World89, W89
World90, W90
World91, W91
World92, W92
World93, W93
World94, W94
World95, W95
+8
View File
@@ -0,0 +1,8 @@
[main]
host = https://www.transifex.com
[0ad.engine]
file_filter = <lang>.engine.po
source_file = engine.pot
source_lang = en
+30
View File
@@ -0,0 +1,30 @@
[
{
"output": "engine.pot",
"inputRoot": "../../../source",
"project": "Pyrogenesis",
"copyrightHolder": "Wildfire Games",
"rules": [
{
"extractor": "cpp",
"filemasks": {
"includeMasks": ["**.cpp"],
"excludeMasks": ["third_party/**", "tools/**"]
},
"options": {
"keywords": {
"Translate": [1],
"TranslatePlural": [1, 2],
"TranslateWithContext": [[1], 2],
"TranslatePluralWithContext": [[1], 2, 3],
"MarkForTranslation": [1],
"MarkForTranslationWithContext": [[1], 2]
},
"commentTags": [
"Translation:"
]
}
}
]
}
]
@@ -0,0 +1,4 @@
function GlobalSubtractionHelper(a, b)
{
return a-b;
}
@@ -0,0 +1,8 @@
function TestScript1_GlobalHelper() {}
TestScript1_GlobalHelper.prototype.GetX = function()
{
return GlobalSubtractionHelper(1, -1);
};
Engine.RegisterComponentType(IID_Test1, "TestScript1_GlobalHelper", TestScript1_GlobalHelper);
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<element name="Pathfinder" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<a:documentation/>
<!--
NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
and use a converter tool like trang to generate the Relax NG XML (.rng) file
-->
<a:documentation/>
<interleave>
<element name="MaxSameTurnMoves">
<data type="nonNegativeInteger"/>
</element>
<element name="PassabilityClasses">
<oneOrMore>
<element>
<anyName/>
<interleave>
<optional>
<element name="MinWaterDepth">
<data type="decimal"/>
</element>
</optional>
<optional>
<!-- TODO: fixed type -->
<element name="MaxWaterDepth">
<data type="decimal"/>
</element>
</optional>
<optional>
<element name="MaxTerrainSlope">
<data type="decimal"/>
</element>
</optional>
<optional>
<element name="MinShoreDistance">
<data type="decimal"/>
</element>
</optional>
<optional>
<element name="MaxShoreDistance">
<data type="decimal"/>
</element>
</optional>
</interleave>
</element>
</oneOrMore>
</element>
<element name="MovementClasses">
<oneOrMore>
<element>
<anyName/>
<interleave>
<attribute name="Speed">
<data type="decimal"/>
</attribute>
<attribute name="Cost">
<data type="decimal"/>
</attribute>
<optional>
<element name="UnitClasses">
<zeroOrMore>
<element>
<anyName/>
<interleave>
<attribute name="Speed">
<data type="decimal"/>
</attribute>
<attribute name="Cost">
<data type="decimal"/>
</attribute>
</interleave>
</element>
</zeroOrMore>
</element>
</optional>
</interleave>
</element>
</oneOrMore>
</element>
</interleave>
</element>
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Pathfinder>
<!-- Sets limit on the number of same turns moves we will process -->
<!-- Setting the value to 0 disable this functionality -->
<MaxSameTurnMoves>64</MaxSameTurnMoves>
<PassabilityClasses>
<!-- Unit pathfinding classes: -->
<unrestricted/>
<default>
<MaxWaterDepth>2</MaxWaterDepth>
<MaxTerrainSlope>1.0</MaxTerrainSlope>
@@ -8,8 +15,37 @@
<ship>
<MinWaterDepth>1</MinWaterDepth>
</ship>
<!-- Building construction classes:
* Land is used for most buildings, which must be away
from water and not on cliffs or mountains.
* Shore is used for docks, which must be near water and
land, yet shallow enough for builders to approach.
-->
<building-land>
<MaxWaterDepth>0</MaxWaterDepth>
<MinShoreDistance>1.0</MinShoreDistance>
<MaxTerrainSlope>1.0</MaxTerrainSlope>
</building-land>
<building-shore>
<MaxShoreDistance>2.0</MaxShoreDistance>
<MaxTerrainSlope>1.25</MaxTerrainSlope>
</building-shore>
</PassabilityClasses>
<!--
Warning: Movement costs are a subtle tradeoff between
pathfinding accuracy and computation cost. Be extremely
careful if you change them.
(Speeds are safer to change, but ought to be kept roughly
in sync with costs.)
-->
<MovementClasses>
<default Speed="1.0" Cost="1.08"/>
<city Speed="1.0" Cost="1.0">
<UnitClasses>
<infantry Speed="1.4" Cost="0.6"/>
</UnitClasses>
</city>
</MovementClasses>
</Pathfinder>
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<element name="TerritoryManager" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<a:documentation/>
<!--
NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
and use a converter tool like trang to generate the Relax NG XML (.rng) file
-->
<a:documentation/>
<interleave>
<element name="ImpassableCost">
<data type="integer">
<param name="minInclusive">0</param>
<param name="maxInclusive">255</param>
</data>
</element>
<element name="BorderThickness">
<data type="decimal"/>
</element>
<element name="BorderSeparation">
<data type="decimal"/>
</element>
</interleave>
</element>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<TerritoryManager>
<ImpassableCost>4</ImpassableCost>
<BorderThickness>0.5</BorderThickness>
<BorderSeparation>0.55</BorderSeparation>
<BorderThickness>0.75</BorderThickness>
<BorderSeparation>0.85</BorderSeparation>
</TerritoryManager>
@@ -3,5 +3,6 @@
<VisualActor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
</Entity>
@@ -4,6 +4,7 @@
<Actor>example</Actor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
<Selectable/>
<Position>
@@ -4,6 +4,7 @@
<Actor>example</Actor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
<Selectable/>
<Position>
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="straight_a">
<mesh>gaia/cliff_a.dae</mesh>
</variant>
<variant name="corner_inside">
<mesh>gaia/cliff_a_corner_inside.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>gaia/cliff_desert_a.dds</texture>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="chinese merchant sail">
<mesh>props/chin_merch_sail.dae</mesh>
<texture>props/chin_sail_dragon.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="chinese trireme sail">
<mesh>props/chin_tri_sail.dae</mesh>
<texture>props/chin_sail_dragon.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/iber_barracks_a.dae</mesh>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="shields-a">
<mesh>props/iber_civic_centre.dae</mesh>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>props/iber_pc.pmd</mesh>
<props/>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_dock_boat.dae</mesh>
<texture>structural/iber_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>props/iber_fc.dae</mesh>
<props/>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_farmstead_hay.dae</mesh>
<texture>props/wrld_hay_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="mesh">
<mesh>props/iber_fishship_sail.dae</mesh>
<texture>props/iber_sail_b.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1">
<mesh>props/iber_fortress_props.dae</mesh>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="props-1">
<mesh>props/iber_gate_door.dae</mesh>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="props-1">
<mesh>props/iber_gate_door_2.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_wallgate_shields.dae</mesh>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="House A - props 1">
<mesh>props/iber_house_a_1.dae</mesh>
</variant>
<variant frequency="1" name="House A - props 2">
<mesh>props/iber_house_a_2.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="House B - props 1">
<mesh>props/iber_house_b_1.dae</mesh>
</variant>
<variant frequency="1" name="House B - props 2">
<mesh>props/iber_house_b_2.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="House C - props 1">
<mesh>props/iber_house_c_1.dae</mesh>
</variant>
<variant frequency="1" name="House C - props 2">
<mesh>props/iber_house_c_2.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>props/iber_tc.dae</mesh>
<props/>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Market Props 1">
<mesh>props/iber_market_props_01.dae</mesh>
</variant>
<variant frequency="1" name="Market Props 2">
<mesh>props/iber_market_props_02.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="mesh">
<mesh>props/iber_merch_sail.dae</mesh>
<texture>props/iber_sail_a.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="mill-props-a">
<mesh>props/iber_mill_a.dae</mesh>
</variant>
<variant frequency="1" name="mill-props-b">
<mesh>props/iber_mill_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="monument_props_a">
<mesh>props/iber_sb_props_a.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="monument_props_b">
<mesh>props/iber_sb_props_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="shields-a">
<mesh>props/iber_scout_tower.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="temple-shields-a">
<mesh>props/iber_temple_a.dae</mesh>
</variant>
<variant frequency="1" name="temple-shields-b">
<mesh>props/iber_temple_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/iber_hc_fancy.dae</mesh>
<texture>structural/wrld_stone_iber.dds</texture>
</variant>
</group>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant name="Chinese Merchant Ship">
<mesh>structural/chin_merch.dae</mesh>
<props>
<prop actor="props/structures/chinese/merchant_sail.xml" attachpoint="root"/>
</props>
<texture>structural/chin_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant name="Chinese Trireme">
<mesh>structural/chin_tri.dae</mesh>
<props>
<prop actor="props/structures/chinese/trireme_sail.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<texture>structural/chin_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/wonder_colosseum_main.dae</mesh>
<props>
<prop actor="props/structures/miscellaneous/colosseum_details.xml" attachpoint="root"/>
<prop actor="props/structures/miscellaneous/colosseum_interior.xml" attachpoint="root"/>
<prop actor="props/structures/miscellaneous/colosseum_roof.xml" attachpoint="root"/>
</props>
<texture>null_white.dds</texture>
</variant>
</group>
</actor>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Some files were not shown because too many files have changed in this diff Show More