6bc33fe8bd
Update renderer design to be more flexible and data-driven based on material and shader definitions.
...
Support conditional expressions in shader effect XML files.
Consolidate fixed-function model rendering into the shader system.
Remove lots of now-obsolete renderer code.
Move shader defines from std::map to new class with interned data, for
performance.
Move texture from model into material.
Alleviate singletonitis.
Remove obsolete lodbias setting.
Remove unused terrain shadow transparency.
This was SVN commit r11423.
2012-04-03 18:44:46 +00:00
a56169ff8c
Add interned string class, for fast comparisons and reduced memory usage.
...
This was SVN commit r11422.
2012-04-03 18:26:52 +00:00
3792b02963
Fix CPreprocessor uninitialised data causing error messages on "#endif" followed by EOF with no newline. Warn about unrecognised "#elif".
...
This was SVN commit r11418.
2012-04-02 16:12:46 +00:00
8680c6ce06
Delete rally point marker entity when entity is destroyed. Fixes #1254 .
...
This was SVN commit r11409.
2012-03-28 23:09:05 +00:00
d0fc32af4c
Fix failure in replay mode
...
This was SVN commit r11402.
2012-03-26 22:11:30 +00:00
0fda0019d1
Updates data paths on OS X and Windows. On OS X only write to locations inside ~/Library. On Windows make the distinction between local and roaming appdata, and use folder inside My Documents for user-created data. Fixes #1145 .
...
Adds proper OS X app bundle support.
Updates Windows installer script.
This was SVN commit r11389.
2012-03-22 00:23:31 +00:00
1095782d1a
Increase maximum VBO size, to support larger meshes
...
This was SVN commit r11387.
2012-03-21 18:45:10 +00:00
f1e73807a8
Fix formatting
...
This was SVN commit r11377.
2012-03-20 18:13:27 +00:00
e97547dbd4
Fix FFP renderer
...
This was SVN commit r11376.
2012-03-20 13:32:30 +00:00
0e1b5522d6
Fix #868 (move wxWidgets Unix config files to XDG basedir location), based on patch from leper.
...
Fix handling of set but empty XDG environment variables.
This was SVN commit r11374.
2012-03-19 22:40:06 +00:00
700e28480d
Add command-line option to enable archivebuilder compression
...
This was SVN commit r11373.
2012-03-19 21:16:12 +00:00
36107cb7e1
GLES compatibility for particles and shadows.
...
Fix invalid enum errors.
Fix shader texture binding.
This was SVN commit r11372.
2012-03-19 21:10:14 +00:00
8c6231f940
Fix black-square cursor on 16bpp Windows
...
This was SVN commit r11371.
2012-03-19 20:46:12 +00:00
5a21140093
Added grayscale option for ui textures
...
This was SVN commit r11364.
2012-03-18 19:43:03 +00:00
d7128572ae
Removed logger output for XML token node tests
...
This was SVN commit r11360.
2012-03-17 23:03:02 +00:00
2207786c05
Missed a bit of indentation in previous commit
...
This was SVN commit r11343.
2012-03-15 22:58:25 +00:00
31da0a746b
Fixes crash when removing non-existent tokens from XML 'token' nodes
...
This was SVN commit r11342.
2012-03-15 22:57:08 +00:00
4eec2bf5d2
Fixes some bugs related to deleting saved games (in particular, load/delete was broken if the file was deleted externally while the game was running).
...
Adds saved game directory to the hotload watch list.
Logs error instead of crashing when saved game is not found.
Changes Atlas double-click selection to only pick units from the same
player.
This was SVN commit r11332.
2012-03-14 00:23:28 +00:00
6fc508f662
Fix non-PCH build.
...
Fix typo.
This was SVN commit r11327.
2012-03-13 21:39:01 +00:00
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
