894dc30c69
Trade. Closes #30 .
...
This was SVN commit r11279.
2012-03-08 20:42:28 +00:00
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
e6c58b2a3e
Adds log rendering to actor viewer.
...
This was SVN commit r11272.
2012-03-08 01:16:29 +00:00
98c8a47192
Fix crash on Clang
...
This was SVN commit r11269.
2012-03-07 20:40:38 +00:00
3c677ee425
Prevent unnecessary work, especially on maps with many actors
...
This was SVN commit r11267.
2012-03-07 19:54:54 +00:00
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
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
e9bbf25997
Remove some redundant code
...
This was SVN commit r11252.
2012-03-05 18:30:00 +00:00
2afc4d9d8f
Fix #1140 (signedness warning on some platforms).
...
This was SVN commit r11251.
2012-03-05 17:05:02 +00:00
dc715fe57f
Remove some unused includes
...
This was SVN commit r11250.
2012-03-05 16:15:07 +00:00
26efdaf216
Try to improve ambiguous bit descriptions
...
This was SVN commit r11249.
2012-03-05 16:09:47 +00:00
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
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
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
649cb7ee7b
Added PickFriendlyEntitiesOnScreen function to the JS side for #1187 .
...
This was SVN commit r11230.
2012-03-03 21:42:23 +00:00
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
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
a01e1cd46a
Fixes incorrect use of jschar (broke Linux builds)
...
This was SVN commit r11207.
2012-02-29 23:41:23 +00:00
2d65ee60f3
Tweaks minimap water color.
...
This was SVN commit r11202.
2012-02-29 01:12:52 +00:00
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
d755af157f
Fixes constant logical operand warning on OS X build.
...
This was SVN commit r11190.
2012-02-28 03:34:33 +00:00
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
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
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
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
7663e78861
Fix terrain overlay rendering
...
This was SVN commit r11163.
2012-02-25 22:11:34 +00:00
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
c888c00377
Avoid unnecessary use of printf in text renderer.
...
This was SVN commit r11154.
2012-02-25 17:14:47 +00:00
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
b7e848de23
Avoid unused parameter warnings due to safe bool operators.
...
This was SVN commit r11142.
2012-02-25 06:24:24 +00:00
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
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
590228804e
Fixed rally line attachment point for circular buildings (refs #1172 )
...
This was SVN commit r11106.
2012-02-20 00:13:46 +00:00
d4c32b8a80
Fixes tests broken by [11100]
...
This was SVN commit r11104.
2012-02-19 22:00:29 +00:00
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
5a4aa790ad
Fix spelling and whitespace and add rationale
...
This was SVN commit r11088.
2012-02-17 14:34:44 +00:00
4c43d1f9c5
Fixing building with older versions of Boost
...
This was SVN commit r11083.
2012-02-16 18:01:10 +00:00
7656ffa265
Be more informative about errors in CreateDirectories
...
This was SVN commit r11082.
2012-02-16 13:50:31 +00:00
645a6e31be
Basic touch input for testing
...
This was SVN commit r11081.
2012-02-15 22:27:02 +00:00
832a51da80
GLSL text support
...
This was SVN commit r11080.
2012-02-15 21:53:13 +00:00
5f6e3de42f
Convert shaders to GLSL ES automatically
...
This was SVN commit r11079.
2012-02-15 20:33:43 +00:00
20d23eb340
Sysdep code for Android/ARM
...
This was SVN commit r11075.
2012-02-15 15:40:31 +00:00
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
d70a981377
Android fixes
...
This was SVN commit r11068.
2012-02-13 23:53:09 +00:00
9972eb8cae
Enough GLES compatibility to reach the menu screen
...
This was SVN commit r11064.
2012-02-13 20:53:24 +00:00
d89c82092a
Fix GLSL shaders on Mesa
...
This was SVN commit r11063.
2012-02-13 20:47:14 +00:00
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
677ccf53e6
Yet more GLES compatibility
...
This was SVN commit r11061.
2012-02-13 16:41:17 +00:00
a9eca31bad
Even more GLES compatibility
...
This was SVN commit r11060.
2012-02-13 15:06:25 +00:00
4bf59b9a7d
More GLES compatibility, mainly around terrain rendering.
...
This was SVN commit r11059.
2012-02-13 14:02:14 +00:00
baff889321
Fix invalid varargs
...
This was SVN commit r11054.
2012-02-12 21:05:13 +00:00
531b40578a
More GLES compatibility.
...
Add config option to disable hardware cursors on Windows.
This was SVN commit r11053.
2012-02-12 20:45:31 +00:00
1185ebdea5
Fix build
...
This was SVN commit r11051.
2012-02-12 13:26:57 +00:00
db85833655
More GLES compatibility.
...
Move more rendering code to shader API.
This was SVN commit r11050.
2012-02-12 13:20:49 +00:00
4029d409bb
Handle CBrush assertion failure less fatally
...
This was SVN commit r11049.
2012-02-12 12:36:05 +00:00
202a8e17c4
Fixes camera constraints by clamping the camera focus point to within the map bounds instead of outside, since the constraints are partially based on terrain height. Should improve scrolling behavior on both circular and square maps. Refs #656 , #850
...
This was SVN commit r11044.
2012-02-10 02:17:40 +00:00
2bf3383624
Attempt to fix minimap rendering issues
...
This was SVN commit r11041.
2012-02-09 20:45:19 +00:00
a3f168b887
Initial support for GLSL generic vertex attributes in shader API, for GLES compatibility.
...
Specify GLSL version in shader files, for better error detection.
This was SVN commit r11040.
2012-02-09 17:55:25 +00:00
1f5b8f1c9a
Move GUI renderer towards using shader infrastructure.
...
Remove support for unused GUI sprite effects.
Use vertex arrays for bounding box rendering.
This was SVN commit r11039.
2012-02-08 20:43:38 +00:00
08bd07ddd6
Adds safe bool operator to ICmpPtr, replacing the null() method, based on patch by leper. Also changes bool operator in AtSmartPtr to safe bool. Fixes #1077 .
...
Changes some CmpPtr variable names for consistency.
This was SVN commit r11036.
2012-02-08 02:46:15 +00:00
046729dfa7
Fixes Atlas double-click behavior in simulation test, by handling the events in Canvas and recognizing wxWidgets' ButtonDown and ButtonDClick events are mutually exclusive.
...
This was SVN commit r11035.
2012-02-07 00:40:55 +00:00
3fab2729b5
Partial SDL2 compatibility
...
This was SVN commit r11033.
2012-02-06 22:47:35 +00:00
ba84c54535
Render GUI quads with consistent winding order, to stop them vanishing with negative sizes.
...
This was SVN commit r11030.
2012-02-05 22:57:58 +00:00
275e5b9620
Fixes signed/unsigned comparison warnings in GCC.
...
This was SVN commit r11014.
2012-02-04 06:17:17 +00:00
374242bcfc
Fix warnings in autobuild script
...
This was SVN commit r11012.
2012-02-03 17:08:43 +00:00
868b256cce
Throw error in PSA converter if animation has no frames, as this will lead to a divide-by-zero error in the engine, and it's good to catch that as early as possible.
...
This was SVN commit r11009.
2012-02-03 01:49:32 +00:00
0f4928bd0a
Use dummy IO tracer, to avoid overhead of storing data that will never be used. (See #1143.)
...
This was SVN commit r11007.
2012-02-02 23:12:36 +00:00
b9c406551b
Cache shader effects. Fixes #1143 .
...
This was SVN commit r11006.
2012-02-02 22:58:42 +00:00
41e3bad341
More build fixes for FreeBSD.
...
Adds BSD sysdep.
Adds support for MAKE variable, overriding make command in our build
scripts.
Fixes more files not ending with newline.
This was SVN commit r10994.
2012-01-31 00:06:56 +00:00
5cdb2ebd70
Fix cursor winding
...
This was SVN commit r10992.
2012-01-30 12:13:43 +00:00
fc27a5c0ea
More FreeBSD build fixes.
...
Fixes some warnings about files that don't end with newline.
This was SVN commit r10991.
2012-01-30 06:21:11 +00:00
2d0e8021aa
Fixes old g++ build error with default template arguments, by wrapping them in parentheses.
...
This was SVN commit r10990.
2012-01-30 04:57:39 +00:00
cc5a0fba4e
Use shader API for GUI text.
...
Flip GUI quads so we don't have to disable back-face culling.
This was SVN commit r10989.
2012-01-30 00:27:23 +00:00
63572a5247
Fix build
...
This was SVN commit r10986.
2012-01-29 20:16:47 +00:00
04c63a4093
Clean up some text rendering to avoid relying on deprecated GL matrix state.
...
Use scissor instead of deprecated clip planes for GUI text.
Remove unused support for generic font names.
This was SVN commit r10985.
2012-01-29 20:04:21 +00:00
8be430eb30
Remove obsolete ogl_shader
...
This was SVN commit r10984.
2012-01-29 12:23:16 +00:00
9884d21830
Be more consistent in using the ARB forms of functions. Fixes #1138 , based on patch by Echelon9.
...
This was SVN commit r10983.
2012-01-29 12:15:22 +00:00
8324a8981d
Simplify GLSL program files.
...
Move water shaders to new shader system.
This was SVN commit r10982.
2012-01-29 12:04:39 +00:00
adbd7633dd
# Initial GLSL rendering support
...
This was SVN commit r10978.
2012-01-29 01:22:22 +00:00
8ca59d418d
Partially fix hotloading (see #848 )
...
This was SVN commit r10977.
2012-01-29 01:19:54 +00:00
63e151fbd5
Slightly more Android compatibility
...
This was SVN commit r10975.
2012-01-28 16:38:21 +00:00
27687873d5
Fix SSE skinning normalisation ( fixes #1136 ). Add a few more comments.
...
This was SVN commit r10974.
2012-01-28 12:17:44 +00:00
7f679a7975
# Support separate rotation and scaling for each terrain texture
...
This was SVN commit r10952.
2012-01-22 18:20:33 +00:00
d40e4797de
Report timer_Resolution via hwdetect
...
This was SVN commit r10947.
2012-01-22 13:49:09 +00:00
8fabaa4f8c
Fixes Atlas crashing when random map generator fails, load the blank map for now.
...
This was SVN commit r10939.
2012-01-21 00:53:34 +00:00
d068c1dd09
Fix build with old versions of Mesa
...
This was SVN commit r10936.
2012-01-19 18:23:54 +00:00
95e6673ed4
Fixes include in wsdl.
...
This was SVN commit r10932.
2012-01-18 22:51:49 +00:00
91652bdf6e
Implemented nested territory boundaries. Fixes #918 .
...
Fixed out of bounds memory access in Atlas due to always using global
terrain in TerrainOverlay
Fixed wrong player ID calculation in TerritoryOverlay
This was SVN commit r10929.
2012-01-18 21:22:58 +00:00
8099388bec
final sync with work - add VECTOR_ALIGNED, fix wsdl to match new SDL include path
...
This was SVN commit r10926.
2012-01-18 15:36:44 +00:00
182bf2b4af
Vague start at hypothetical Android support
...
This was SVN commit r10923.
2012-01-17 22:05:43 +00:00
09907adae3
Prevents game from running with root permissions with appropriately scary message on Unix-like OSes, based on patch by leper. Fixes #1058 .
...
This was SVN commit r10916.
2012-01-16 03:30:55 +00:00
e64a3d3946
Experiment a little with OpenGL ES
...
This was SVN commit r10915.
2012-01-15 23:15:31 +00:00
c8bf34948c
Fixes no PCH build. Fixes #1113 .
...
This was SVN commit r10914.
2012-01-15 21:48:41 +00:00
e4b2de4bba
Delete obsolete AoE3Ed code
...
This was SVN commit r10909.
2012-01-14 19:12:18 +00:00
c9cdde256f
Disable GCC warning triggered by wx headers
...
This was SVN commit r10908.
2012-01-14 19:06:47 +00:00
1389e754de
Include *.DELETED files when building archives. See #1110 .
...
This was SVN commit r10907.
2012-01-14 18:46:20 +00:00
893cb2668e
Renames our sdl.h to libsdl.h, to avoid case sensitivity errors when it includes SDL.h.
...
This was SVN commit r10904.
2012-01-12 23:32:27 +00:00
72bd886f80
Delete ancient obsolete simulation code.
...
This was SVN commit r10903.
2012-01-12 12:56:15 +00:00
ce67dfd333
Rename CELL_SIZE to TERRAIN_TILE_SIZE, to free up the term "cell" for other concepts.
...
This was SVN commit r10902.
2012-01-12 12:51:10 +00:00
4f559e8aff
Report quicksave/quickload times, to help identify performance problems.
...
This was SVN commit r10901.
2012-01-12 12:47:24 +00:00
