7dec618898
Some attempts to fix GLES build in smooth LOS and post proc manager.
...
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
replaces glPush/PopAttrib by resetting the viewport manually.
Adjusts GLSL shaders for these changes.
This was SVN commit r14152.
2013-11-12 01:30:17 +00:00
f1613a3c90
Fixes fancy waves build on GLES (replaces GL_QUADS with GL_TRIANGLES)
...
This was SVN commit r14151.
2013-11-12 01:25:32 +00:00
81eabfc934
Fixes basic water rendering on GLES (replaces GL_QUADS with GL_TRIANGLES).
...
Sets SDL2 to use correct profile for GLES.
Cleans up some old SDL 1.3 version checks.
This was SVN commit r14150.
2013-11-12 01:24:04 +00:00
5771bee032
First pass at fixing GLES build - more to come
...
This was SVN commit r14149.
2013-11-12 01:17:16 +00:00
0682c23fe3
Replaces BGRA textures with RGBA textures supported by GLES
...
This was SVN commit r14148.
2013-11-12 01:11:08 +00:00
54abce1a3c
hellenic walltower rotated 180 to match the droppoint with the wall RMS
...
This was SVN commit r14147.
2013-11-12 00:05:26 +00:00
df1d5d2260
fix tag 2102648f7c which had unwanted changes
...
This was SVN commit r14146.
2013-11-11 16:29:44 +00:00
0e74e3a521
Removed Ostorius.
...
This was SVN commit r14145.
2013-11-11 16:09:00 +00:00
2102648f7c
Allows autogarrison of newly trained units, fixes #1044
...
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
fad8f7fce0
adds some needed protection
...
This was SVN commit r14143.
2013-11-11 15:03:22 +00:00
3d8865f10b
Adds gloox to OS X libs build script, with patch to fix build (fixed upstream in 5de9ed7444).
...
Fixes lobby build on OS X.
Fixes zlib not building as static lib.
This was SVN commit r14142.
2013-11-11 04:41:44 +00:00
29ef5f3ce9
Adds patch for SDL 1.2 build on OS X 10.9 (Mavericks), CGDirectPaletteRef was deprecated and has now been removed. See https://bugzilla.libsdl.org/show_bug.cgi?id=2085
...
This was SVN commit r14141.
2013-11-11 01:19:55 +00:00
45a7f577d3
A bunch of OS X SDK-related fixes.
...
Adds runtime support for 10.5 APIs: display modes, bundle paths, system
paths, pasteboards. Previously this was compile-time support only, which
prevented building on later SDKs while targeting earlier APIs.
Adds hardcoded version for pre-10.6 builds, to avoid messing with
deprecated Gestalt or having to add a 10.5 non-dispatch singleton (Grand
Central Dispatch didn't exist in 10.5)
This was SVN commit r14140.
2013-11-11 00:11:25 +00:00
011cbb5725
Fixes OS X STL incompatibilities when building against later SDKs and targeting 10.5 (fixes stringstream build errors in these conditions)
...
This was SVN commit r14139.
2013-11-11 00:09:16 +00:00
5c2c7248b1
Adds zlib, curl, iconv and libxml2 to OS X libs build script, to avoid using the non-backward-compatible versions provided by Apple.
...
Adds patch for zlib configure to pick up CFLAGS/LDFLAGS, to better
support SDK builds.
Cleans up OS X libs build script, hides some extraneous output.
This was SVN commit r14138.
2013-11-11 00:04:07 +00:00
4406be3a69
Fix crash when trying to join the lobby again if the host disconnected in the game setup screen.
...
This was SVN commit r14137.
2013-11-10 22:42:48 +00:00
f070bf9d1e
Prohibit the user from picking the 'system' lobby name, as that's reserved for special messages.
...
This was SVN commit r14136.
2013-11-10 21:52:38 +00:00
e01445818a
Nerf/rebalance siege towers.
...
- Armor changed from 2h/20p/10c to 5h/20p/2c
- Attack changed from 25p to 10p/5c
- Bonus added: 2x vs structures
- Ranged reduced from 65 to 55
- Elevation bonus of 10 added
- PreferredClasses is now 'Structure'
- Ungarrisoned arrow count decreased to 0 from 2
- Build time increased to 60 from 50
- BuffHeal is now 0 (decreased from 1)
- Health reduced from 800 to 500
- Walking speed reduced to 5 from 6
The idea is for siege towers to be useful for siege, but also for
cleaning out large numbers of units. Previously they were very good at
the latter and useless for the former. They should still be very
powerful units, but not uncounterable and massing siege towers
(previously unbeatable if enough were acquired) should no longer be
feasible.
This was SVN commit r14135.
2013-11-10 20:21:50 +00:00
2811d4c367
Fixed this map.
...
This was SVN commit r14134.
2013-11-10 19:22:24 +00:00
912e485a64
Elephant changes and tweaks.
...
This was SVN commit r14133.
2013-11-10 19:08:38 +00:00
85e9a2b0ce
Added 3 idle animations and attack, death and walk animations for all asian elephants.
...
Maurya hero howdah added with normal and specular maps
This was SVN commit r14132.
2013-11-10 17:39:04 +00:00
a2477f9d40
Increasing the generation speed of the maps: Alpine Lakes
...
This was SVN commit r14131.
2013-11-10 17:29:40 +00:00
a96ed190a5
Add GLX_MESA_query_renderer support to hwdetect
...
This was SVN commit r14130.
2013-11-10 16:24:03 +00:00
d178f32698
Fix Unicode in JS print() on Linux
...
This was SVN commit r14129.
2013-11-10 16:13:40 +00:00
c27c663697
Print a traceback after an exception in the bot.
...
This was SVN commit r14128.
2013-11-10 04:28:18 +00:00
59da5fad2a
Fix some spidermonkey lobby complaints when run in strict mode.
...
This was SVN commit r14127.
2013-11-10 04:09:03 +00:00
174f636fd2
Fixes tests
...
This was SVN commit r14126.
2013-11-10 03:24:29 +00:00
37cedb8133
Make filters work and add a skirmish map filter.
...
This was SVN commit r14125.
2013-11-10 00:45:19 +00:00
4fb6896fd8
Fix warning when the hosted game is a random rms.
...
This was SVN commit r14124.
2013-11-09 23:57:31 +00:00
d7ec8c47a6
Fix Unicode support in lobby.
...
Fix EncryptPassword being called with the wrong argument order, and
encrypting username instead of password. (This will break all existing
lobby accounts.)
Fix EncryptPassword not using all of salt_base.
This was SVN commit r14123.
2013-11-09 23:26:17 +00:00
35d48d2fe8
...and increase HDATA_USER_SIZE so OglTex actually fits
...
This was SVN commit r14122.
2013-11-09 18:49:35 +00:00
1ad9d5424a
Fix error at startup on 64-bit builds.
...
OglTex had a size_t added, which pushed it over HDATA_USER_SIZE.
Use u32 instead to minimise the difference between platforms.
This was SVN commit r14121.
2013-11-09 18:39:45 +00:00
dcb3c0ad7a
Increasing the generation speed of the maps: Continent
...
This was SVN commit r14120.
2013-11-09 16:00:01 +00:00
d3fade285b
Basic Nubian archer textures.
...
Map preview for Corsica and Sardinia.
This was SVN commit r14119.
2013-11-09 14:42:32 +00:00
2d2853dd6f
Fix problems with EndGameManager in Atlas by waiting for the first turn
...
This was SVN commit r14118.
2013-11-09 10:09:28 +00:00
9cc172b164
Fixes --without-lobby for MSVC and clang, refs #2249 .
...
Cleans up some whitespace.
Removes obsolete PCH files.
This was SVN commit r14117.
2013-11-09 02:57:10 +00:00
3c47b12cbe
Display texture memory usage in profiler's renderer stats
...
This was SVN commit r14116.
2013-11-09 01:03:23 +00:00
3a278df3f7
Move ship to shoreline when tasking units to garrison inside, fixes #1391
...
This was SVN commit r14115.
2013-11-08 23:22:59 +00:00
5dfc3746e3
Remove old and unused archive stats.
...
This was SVN commit r14114.
2013-11-08 17:27:21 +00:00
81cf02cc13
Fix building with --without-lobby. Fixes #2249 .
...
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
0f8d3e23db
;
...
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
1a32a10f52
Updated premake to support VS2013. Also changed platform toolsets to vc110_xp and vc120_xp for VS2012 and VS2013 respectively. This way the builds will also work on WinXP.
...
This was SVN commit r14111.
2013-11-08 14:08:16 +00:00
da6abe630a
Fix error message on starting game due to missing global variable.
...
This was SVN commit r14110.
2013-11-08 09:52:48 +00:00
7547dae0e2
Fixing the revert by the previous commit.
...
This was SVN commit r14109.
2013-11-08 08:04:35 +00:00
f88b5be079
Increasing the generation speed of the maps: Islands, Lake.
...
This was SVN commit r14108.
2013-11-08 08:02:32 +00:00
bb28e0eb70
Fix some system message/spam filter bugs in the lobby.
...
This was SVN commit r14107.
2013-11-08 00:57:58 +00:00
1138419017
Remove broken build script
...
This was SVN commit r14106.
2013-11-07 22:20:38 +00:00
62b92af925
Fix lobby registration errors.
...
This was SVN commit r14105.
2013-11-07 22:07:26 +00:00
f53bd8974c
Add autobuilder support for glooxwrapper
...
This was SVN commit r14103.
2013-11-07 21:45:59 +00:00
93cffe9deb
Remove the old and no longer used archive builder that rebuilt the archive while the game is running.
...
This approach isn't used anymore. Now we start the archive building with
parameters to pyrogeneis.
Refs #2241 (the code used g_ScriptingHost which is going to be removed)
This was SVN commit r14102.
2013-11-07 21:06:18 +00:00
