Commit graph

4615 commits

Author SHA1 Message Date
fcxSanya
894dc30c69 Trade. Closes #30.
This was SVN commit r11279.
2012-03-08 20:42:28 +00:00
historic_bruno
c393732939 Adds slightly more helpful error message when failing to validate an entity template.
This was SVN commit r11273.
2012-03-08 05:13:35 +00:00
historic_bruno
e6c58b2a3e Adds log rendering to actor viewer.
This was SVN commit r11272.
2012-03-08 01:16:29 +00:00
Ykkrosh
98c8a47192 Fix crash on Clang
This was SVN commit r11269.
2012-03-07 20:40:38 +00:00
vts
3c677ee425 Prevent unnecessary work, especially on maps with many actors
This was SVN commit r11267.
2012-03-07 19:54:54 +00:00
historic_bruno
4cdde2b62a Replaces Atlas "Screenshot" option with normal lower-res version (saves result as PNG).
Adds new "Big screenshot" option (saves result as 6400x4800 BMP). Refs
#984.

This was SVN commit r11257.
2012-03-06 00:15:48 +00:00
quantumstate
0b0f2e9e30 Fixed broken tests by silently failing if Math.js is not found. This is not ideal but seems better than everything else.
This was SVN commit r11253.
2012-03-05 21:20:39 +00:00
Ykkrosh
e9bbf25997 Remove some redundant code
This was SVN commit r11252.
2012-03-05 18:30:00 +00:00
Ykkrosh
2afc4d9d8f Fix #1140 (signedness warning on some platforms).
This was SVN commit r11251.
2012-03-05 17:05:02 +00:00
Ykkrosh
dc715fe57f Remove some unused includes
This was SVN commit r11250.
2012-03-05 16:15:07 +00:00
Ykkrosh
26efdaf216 Try to improve ambiguous bit descriptions
This was SVN commit r11249.
2012-03-05 16:09:47 +00:00
historic_bruno
07ab38cdcb Implements COLLADA -1 vertex weight support, using simpler initial solution. Fixes #1012.
This was SVN commit r11242.
2012-03-05 00:42:34 +00:00
historic_bruno
d60df4b127 Adds saved game deletion. Refs #1090
Documents a few things related to saved games.

This was SVN commit r11233.
2012-03-04 05:27:17 +00:00
vts
4cb7972ec2 Renamed some Atlas classes and g_GameLoop to better reflect their Atlas-related nature and to lower potential confusion with similar main-game-related functionality. Refs #678.
This was SVN commit r11232.
2012-03-03 23:48:04 +00:00
vts
649cb7ee7b Added PickFriendlyEntitiesOnScreen function to the JS side for #1187.
This was SVN commit r11230.
2012-03-03 21:42:23 +00:00
quantumstate
e2e5c81272 Added safe (identical across platforms) replacement sin and cos functions for scripts. This is part of #1193.
This was SVN commit r11226.
2012-03-03 00:06:16 +00:00
historic_bruno
7fa6afac37 Corrects some Doxygen comments and adds a few others of interest.
This was SVN commit r11209.
2012-03-01 03:55:05 +00:00
historic_bruno
a01e1cd46a Fixes incorrect use of jschar (broke Linux builds)
This was SVN commit r11207.
2012-02-29 23:41:23 +00:00
historic_bruno
2d65ee60f3 Tweaks minimap water color.
This was SVN commit r11202.
2012-02-29 01:12:52 +00:00
historic_bruno
366cd7f15a Fixes broken selections in saved games (CmpSelectable needed to call Init on deserialization).
Adds function name to log output when serializer fails on functions, to
aid in debugging.

This was SVN commit r11199.
2012-02-28 22:12:30 +00:00
historic_bruno
d755af157f Fixes constant logical operand warning on OS X build.
This was SVN commit r11190.
2012-02-28 03:34:33 +00:00
historic_bruno
ef1e8de44e Removes size_t from shareable types to prevent 32/64-bit errors.
Adds unsigned int to shareable types. In the future, use
int32/player_id_t for player IDs and uint32/entity_id_t for entity IDs.

This was SVN commit r11189.
2012-02-27 23:16:31 +00:00
historic_bruno
5f23cd6d10 Changes Atlas ObjectID type to unsigned int, fixes 64-bit build errors caused by size_t.
This was SVN commit r11186.
2012-02-27 22:29:53 +00:00
vts
b8e8602e39 Fixed test failure in test_CmpTemplateManager.h after atlas selection improvement
This was SVN commit r11182.
2012-02-27 19:10:49 +00:00
historic_bruno
7d9e98b00e Adds multiple entity selection to Atlas (including move/delete). Fixes #678.
Makes all actors selectable in Atlas and gives them selection rings (an
EditorOnly flag is used in the template for Atlas-only selectables).
Adds player colors to Atlas selection rings.
Fixes decal selection by falling back to old-style AABBs. Refs #1032.
Replaces UnitManager selections with EntitySelection helpers.
Adds DrawOverlays to Atlas views, for Atlas-specific rendering.
Fixes bug where selection rings conflicted with Move/rotate tool in
Atlas simulation test.

This was SVN commit r11177.
2012-02-27 05:32:35 +00:00
Ykkrosh
7663e78861 Fix terrain overlay rendering
This was SVN commit r11163.
2012-02-25 22:11:34 +00:00
Ykkrosh
5009636e39 Improve Android compatibility.
Basic touchscreen input for testing.
Better GLSL support for map rendering.

This was SVN commit r11155.
2012-02-25 17:29:27 +00:00
Ykkrosh
c888c00377 Avoid unnecessary use of printf in text renderer.
This was SVN commit r11154.
2012-02-25 17:14:47 +00:00
Ykkrosh
9b0a3830df Support more commands in shader technique XML files.
Always print GLSL shader logs, to help debugging.

This was SVN commit r11149.
2012-02-25 15:38:38 +00:00
historic_bruno
b7e848de23 Avoid unused parameter warnings due to safe bool operators.
This was SVN commit r11142.
2012-02-25 06:24:24 +00:00
historic_bruno
d3038bbb5c Fixes Atlas assertion failure on wxOSX/Cocoa by properly checking combo box selection index.
This was SVN commit r11135.
2012-02-24 04:40:29 +00:00
historic_bruno
46ee6f0566 Adds more specific error messages to failed model or animation loading.
This was SVN commit r11111.
2012-02-21 05:00:21 +00:00
vts
590228804e Fixed rally line attachment point for circular buildings (refs #1172)
This was SVN commit r11106.
2012-02-20 00:13:46 +00:00
historic_bruno
d4c32b8a80 Fixes tests broken by [11100]
This was SVN commit r11104.
2012-02-19 22:00:29 +00:00
historic_bruno
b4a33851e6 Improves CColladaManager caching behavior: skeletons.xml changes now invalidate cached .pmd/psa files, CCacheLoader is used for consistency, adds support for archived files. Fixes #1167.
Adds COLLADA conversion to archive builder.
Fixes archive builder on Windows.
Moves error logging from CCacheLoader::TryLoadingCached to its callers,
because this failure can be legitimate (in the case of uncached .pmd/psa
files).

This was SVN commit r11100.
2012-02-19 03:30:59 +00:00
Ykkrosh
5a4aa790ad Fix spelling and whitespace and add rationale
This was SVN commit r11088.
2012-02-17 14:34:44 +00:00
Ykkrosh
4c43d1f9c5 Fixing building with older versions of Boost
This was SVN commit r11083.
2012-02-16 18:01:10 +00:00
Ykkrosh
7656ffa265 Be more informative about errors in CreateDirectories
This was SVN commit r11082.
2012-02-16 13:50:31 +00:00
Ykkrosh
645a6e31be Basic touch input for testing
This was SVN commit r11081.
2012-02-15 22:27:02 +00:00
Ykkrosh
832a51da80 GLSL text support
This was SVN commit r11080.
2012-02-15 21:53:13 +00:00
Ykkrosh
5f6e3de42f Convert shaders to GLSL ES automatically
This was SVN commit r11079.
2012-02-15 20:33:43 +00:00
Ykkrosh
20d23eb340 Sysdep code for Android/ARM
This was SVN commit r11075.
2012-02-15 15:40:31 +00:00
Ykkrosh
f4625e69af Partial Android compatibility.
Remove unnecessary VM allocation (which seemingly causes problems on
Android due to mmap during static initialization).
Allow building without NVTT.

This was SVN commit r11074.
2012-02-15 13:58:58 +00:00
Ykkrosh
d70a981377 Android fixes
This was SVN commit r11068.
2012-02-13 23:53:09 +00:00
Ykkrosh
9972eb8cae Enough GLES compatibility to reach the menu screen
This was SVN commit r11064.
2012-02-13 20:53:24 +00:00
Ykkrosh
d89c82092a Fix GLSL shaders on Mesa
This was SVN commit r11063.
2012-02-13 20:47:14 +00:00
vts
4f5a02acc4 Changes CCmpProjectileManager's culling to use recursive world bounds. Fixes instantly-disappearing smoke trails on projectiles going off-screen.
This was SVN commit r11062.
2012-02-13 20:06:57 +00:00
Ykkrosh
677ccf53e6 Yet more GLES compatibility
This was SVN commit r11061.
2012-02-13 16:41:17 +00:00
Ykkrosh
a9eca31bad Even more GLES compatibility
This was SVN commit r11060.
2012-02-13 15:06:25 +00:00
Ykkrosh
4bf59b9a7d More GLES compatibility, mainly around terrain rendering.
This was SVN commit r11059.
2012-02-13 14:02:14 +00:00