6de082abca
Forgot a semicolon :P
...
This was SVN commit r12514.
2012-08-22 08:04:55 +00:00
e50bf9e539
Sky toggling through config and with Alt+Z
...
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
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
58b3a88daa
Fixes more overloaded-virtual warnings in clang.
...
This was SVN commit r12510.
2012-08-21 21:47:36 +00:00
619dd95d5b
Fixes an overloaded-virtual warning in clang.
...
This was SVN commit r12509.
2012-08-21 20:13:42 +00:00
43eac32795
Fixes GCC warning about passing NULL to non-pointer argument
...
This was SVN commit r12506.
2012-08-21 16:44:54 +00:00
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
952385b21d
Ticket 1612: Fixed overlay z-fighting in GLSL mode
...
This was SVN commit r12504.
2012-08-21 16:28:06 +00:00
0af34b1fcb
Removes some unread variables reported by LLVM. Refs #1114
...
This was SVN commit r12501.
2012-08-20 23:59:50 +00:00
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
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
875ea8f440
Fixes some warnings in mikktspace and weldmesh
...
This was SVN commit r12481.
2012-08-19 20:28:00 +00:00
a17ffaa0f2
Fixes weldmesh build on *BSD
...
This was SVN commit r12478.
2012-08-19 19:57:23 +00:00
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
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
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
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
37964d048e
Added camera movement speed modifier keys.
...
This was SVN commit r12455.
2012-08-17 18:33:41 +00:00
d7532a1c77
This was SVN commit r12450.
2012-08-16 18:52:39 +00:00
3d67aeeb71
Adds some debug output to OpenAL init
...
This was SVN commit r12448.
2012-08-16 17:01:15 +00:00
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
3653fe5d3a
Added support for putting technologies in folders. Fixes #1462 .
...
This was SVN commit r12440.
2012-08-15 22:25:25 +00:00
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
97de77c6b6
Adds alternative materials to reference checker
...
This was SVN commit r12419.
2012-08-14 02:31:54 +00:00
9f358abaed
Adds particle and material files to reference checker
...
This was SVN commit r12411.
2012-08-13 19:39:09 +00:00
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
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
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
97c97dc7e0
Bugfix- changed decal/terrain blending mode for the fixed renderpath
...
This was SVN commit r12334.
2012-08-09 16:22:49 +00:00
e046fc0a01
Bugfix- changed some decal materials and fixed decal blending mode
...
This was SVN commit r12325.
2012-08-08 19:08:56 +00:00
166255b744
Remember scroll position when re-opening dropdown lists.
...
This was SVN commit r12319.
2012-08-08 17:22:52 +00:00
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
c9abf6f68c
Heightmap importing in Atlas
...
This was SVN commit r12308.
2012-08-07 18:49:46 +00:00
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
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
648e68e49c
smooth LOS
...
This was SVN commit r12304.
2012-08-06 22:38:42 +00:00
47c2907f10
added licensing headers to some of the new files
...
This was SVN commit r12301.
2012-08-06 21:34:41 +00:00
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
c0f522fd20
Use upper camel case for member variables
...
This was SVN commit r12298.
2012-08-06 16:46:54 +00:00
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
2c642fc68e
Uninitialized variable was causing nondeterministic weirdness in Atlas.
...
This was SVN commit r12275.
2012-08-04 16:56:09 +00:00
20d75a3880
Free cursors before shutting down SDL. Fixes #1355 .
...
This was SVN commit r12271.
2012-08-03 16:48:02 +00:00
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
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
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
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
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
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
c6a0d0b6f3
Fixes build error left out of c1a3b8f171. Refs #1497
...
This was SVN commit r12205.
2012-07-27 05:26:37 +00:00
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
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
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
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
51b9fa6186
Uses xml attributes instead of elements for obstructions shapes.
...
This was SVN commit r12093.
2012-07-12 20:00:38 +00:00
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
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
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
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
ebe5b66ba3
Fix test failure caused by f660f834bf.
...
This was SVN commit r12014.
2012-06-24 21:03:46 +00:00
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
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
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
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
8dc36bed4e
Fixes error in actor viewer caused by 962da61f12. Fixes #1499
...
This was SVN commit r11973.
2012-06-14 22:47:57 +00:00
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
4ac52a3c47
Fixes bug in percentage map explored calculation. Refs #1334
...
This was SVN commit r11957.
2012-06-09 23:04:27 +00:00
2243f699fc
Fix test failure.
...
Fix entity placement on Phoenician Levant.
This was SVN commit r11951.
2012-06-08 19:17:31 +00:00
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
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
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
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
137b6dd338
Queued orders for rally points. Fixes #1053 and #1211 .
...
This was SVN commit r11909.
2012-05-24 18:25:31 +00:00
dd072112d1
Improved shadow filtering, from eihrul.
...
This was SVN commit r11896.
2012-05-21 19:23:14 +00:00
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
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
2ee9981d99
Replace boost::uniform_real to avoid OOS caused by changes in behaviour between Boost versions
...
This was SVN commit r11857.
2012-05-13 23:40:06 +00:00
fbc3cbad7c
Fix handling of non-ASCII paths on Unix
...
This was SVN commit r11839.
2012-05-11 14:30:15 +00:00
3efbd0ab25
Fixes Atlas losing map settings if random map generation failed. Refs #1398 .
...
This was SVN commit r11835.
2012-05-10 23:11:42 +00:00
56269b2489
Fixes Atlas bug where default player data wasn't sent to engine after being displayed in the UI (introduced by 1f5f82f375). Fixes #1398 .
...
This was SVN commit r11834.
2012-05-10 22:49:04 +00:00
1f5f82f375
Fixes invalid civ check in rmgen.
...
Removes some default data from the Atlas blank map.
Changes default civ in autostart-random mode.
This was SVN commit r11809.
2012-05-09 23:06:03 +00:00
282d0f39e2
Remove unused variables
...
This was SVN commit r11804.
2012-05-09 15:39:16 +00:00
c036a7d7e3
Adds control groups to saved game data, based on patch by mk12. Fixes #1261 .
...
This was SVN commit r11783.
2012-05-07 04:18:54 +00:00
37a5bedb81
Adds partial support for Debian GNU/kFreeBSD, based on patch by vincent. Refs #1322 .
...
This was SVN commit r11781.
2012-05-07 01:53:35 +00:00
1674a7503f
Fixes error from 79c6a2cecc.
...
This was SVN commit r11780.
2012-05-07 01:29:02 +00:00
79c6a2cecc
Adds config and hotkey options for toggling unit silhouettes, based on patches by Ello and mk12. Fixes #1186 .
...
This was SVN commit r11779.
2012-05-07 01:09:53 +00:00
d67d2e2370
Updated some documentation in CmpObstructionManager
...
This was SVN commit r11766.
2012-05-05 23:10:25 +00:00
490182ddd0
Wall placement. Closes #786 .
...
This was SVN commit r11760.
2012-05-05 19:22:22 +00:00
ffc89ee1af
Adds some OS X availability macros to support 10.5 SDK. Not foolproof but good enough for now.
...
This was SVN commit r11757.
2012-05-05 03:18:22 +00:00
0c233487ec
Disables broken window resizing and fullscreen toggling on OS X. Fixes #1381 . Refs #741
...
This was SVN commit r11752.
2012-05-04 23:30:46 +00:00
32d2927449
Adds UTF-8 support for JavaScript files.
...
This was SVN commit r11750.
2012-05-04 21:48:46 +00:00
d0784bd314
Fix minimap issue caused by 5b7027ec53. Fixes #1372 .
...
This was SVN commit r11748.
2012-05-04 17:44:28 +00:00
da4c1c8f2b
Fixes handling of UTF-8 encoded JSON files (stripping BOM if necessary). Fixes #1375 .
...
This was SVN commit r11739.
2012-05-04 03:46:05 +00:00
58836c624a
Read formations from civ JSON files. Fixes #1234 , #601 .
...
This was SVN commit r11735.
2012-05-03 23:32:10 +00:00
5b7027ec53
Fix tech overlay issue.
...
This was SVN commit r11725.
2012-05-02 22:57:35 +00:00
6f06d7e69e
...
...
This was SVN commit r11714.
2012-05-01 23:01:40 +00:00
9173f3c81f
This was SVN commit r11713.
2012-05-01 22:54:02 +00:00
030771907e
This was SVN commit r11712.
2012-05-01 22:52:24 +00:00
fc47098743
Implements TerritoryInfluence/Radius tech modification. Adds C++ interface for TechnologyManager. Renames its message to MT_TechnologyModification defined in TypeList.h. Refs #1357 .
...
This was SVN commit r11711.
2012-05-01 22:44:27 +00:00
e4528af72b
Fix vector allocator types
...
This was SVN commit r11708.
2012-05-01 21:12:43 +00:00
cafb817446
Reverts broken change from 022fc4c47c.
...
This was SVN commit r11694.
2012-04-29 03:20:00 +00:00
022fc4c47c
Fixes Atlas stealing focus on OS X, based on patch by mk12. Fixes #1317 .
...
This was SVN commit r11693.
2012-04-29 02:04:59 +00:00
0bd649294f
Add support for texture-based terrain overlays.
...
Fix GLES compatibility.
This was SVN commit r11663.
2012-04-24 16:46:32 +00:00
f72bfb1cf1
Add option to disable particles, based on patch by rogue-spectre. Fixes #1222 .
...
This was SVN commit r11658.
2012-04-23 22:57:51 +00:00
97f49954cd
Allocate VBO buffers in OverlayRenderer only after graphics capabilities and shader path have been properly determined. Fixes #824 .
...
This was SVN commit r11654.
2012-04-23 18:55:32 +00:00
2590e62c38
Dropped some remnant debugging code
...
This was SVN commit r11644.
2012-04-22 22:45:28 +00:00
61fad4a2b5
Fixed strange selection ring fadeout on unit deselection in Atlas
...
This was SVN commit r11634.
2012-04-22 17:49:43 +00:00
3cbfd9260e
Properly enforce the MAX_QUAD_OVERLAYS constraint
...
Some cleanup of graphics/Overlay.h
This was SVN commit r11629.
2012-04-22 13:19:35 +00:00
34fc883317
Pretty unit selection overlay rings. Fixes #824 .
...
This was SVN commit r11623.
2012-04-22 04:04:02 +00:00
9488ca42f6
Disable deadlocking fatal exception handler in Atlas
...
This was SVN commit r11603.
2012-04-21 14:12:37 +00:00
4c372aa6d8
Remove some unused component setters
...
This was SVN commit r11602.
2012-04-21 13:12:36 +00:00
58eb0c97bb
Reuse terrain texture name formatting function
...
This was SVN commit r11601.
2012-04-21 13:09:01 +00:00
177d7856a6
Avoid assertion failure when editing terrain off the edge of the map
...
This was SVN commit r11600.
2012-04-21 13:07:47 +00:00
b101f5ad01
Adds hardware cursors for Linux and OS X. Requires libxcursor on Linux. Fixes #748 .
...
Adds explicit links to frameworks we need on OS X.
This was SVN commit r11596.
2012-04-21 07:53:53 +00:00
6f18a42269
Fixes bug detecting mouse focus change. Refs #748 .
...
This was SVN commit r11594.
2012-04-21 07:14:39 +00:00
755e407aeb
Technologies. Refs #3 . Full unlocking technology implementation. Only unit gathering rates can be modified currently because the patch was big enough already.
...
This was SVN commit r11584.
2012-04-20 17:21:04 +00:00
4d8ba45375
Removes unnecessary change from [11575]
...
This was SVN commit r11578.
2012-04-20 03:01:09 +00:00
c8745ee41f
Handle game ending in Atlas a bit more gracefully, it now continues until the user stops the simulation test. Fixes #641 .
...
This was SVN commit r11575.
2012-04-20 01:41:54 +00:00
75e7ea497b
Add comment about incorrect array-bounds warning
...
This was SVN commit r11560.
2012-04-18 22:00:07 +00:00
edc62a240a
Try to avoid some type warnings
...
This was SVN commit r11558.
2012-04-18 21:02:11 +00:00
769350a3e7
Compute camera height and zoom limits based on smoothed terrain heightmap. Fixes #794 , based on patch by Dietger.
...
This was SVN commit r11556.
2012-04-18 20:39:00 +00:00
3027ce1a04
Rationalise terrain dirty-rect coordinates.
...
Clean up some whitespace.
This was SVN commit r11543.
2012-04-17 22:35:34 +00:00
a16d56cc72
Delete an unused obsolete method
...
This was SVN commit r11540.
2012-04-17 21:06:47 +00:00
54fb33841e
Fix some issues.
...
This was SVN commit r11537.
2012-04-17 20:44:18 +00:00
c56f96040e
Implement healing. Fixes #999 .
...
This was SVN commit r11536.
2012-04-17 20:22:13 +00:00
80277e3da9
Fix #953 (local.cfg adds keys instead of replacing them)
...
This was SVN commit r11535.
2012-04-17 13:14:34 +00:00
be453771cf
Fixes OS X build.
...
This was SVN commit r11529.
2012-04-17 03:57:53 +00:00
5cfeccea09
Adds eyedropper tool to Atlas terrain brush (Shift+Click to activate). Fixes #1122 .
...
Adds preview box showing currently selected terrain.
This was SVN commit r11528.
2012-04-17 02:43:52 +00:00
772b38e6be
Fixes player colors in actor viewer, based on patch by mk12. Fixes #1022 .
...
This was SVN commit r11527.
2012-04-17 01:26:24 +00:00
cf11aa8dea
Fixes Atlas canvas resolution init on OS X. Replaces hacky solution for the same problem on wxGTK. Fixes #1176 .
...
This was SVN commit r11525.
2012-04-16 00:57:30 +00:00
7f612c266a
Calculate new random variations where necessary upon graphics object reloads. Fixes #979 .
...
This was SVN commit r11523.
2012-04-15 23:04:25 +00:00
6410d36a55
Fix engine to respect lack of castshadow flag in actors.
...
Remove unused variable.
This was SVN commit r11499.
2012-04-14 17:31:18 +00:00
9028c354e6
Fix non-PCH build more. Fixes #1313 .
...
This was SVN commit r11494.
2012-04-13 15:01:51 +00:00
789036fb90
Fix #1299 (page up in console doesn't scroll up)
...
This was SVN commit r11493.
2012-04-13 12:15:50 +00:00
55e576177d
Fix non-pch build. Fixes #1313 .
...
This was SVN commit r11491.
2012-04-12 20:55:21 +00:00
227f9e403f
Experimental GPU skinning.
...
Share inverse bind pose matrices between models.
This was SVN commit r11490.
2012-04-12 15:43:59 +00:00
ce215cace3
Add support for custom vertex attributes and array-of-matrix uniforms in GLSL.
...
This was SVN commit r11489.
2012-04-12 14:10:02 +00:00
e6a82fff48
Bind textures correctly to GLSL sampler uniforms.
...
This was SVN commit r11476.
2012-04-10 21:07:52 +00:00
f2260892bd
Add config option to force alpha-tested materials.
...
This was SVN commit r11475.
2012-04-10 21:03:22 +00:00
11115770ec
Fix memory leak
...
This was SVN commit r11474.
2012-04-10 20:56:18 +00:00
b6ef80b741
Fix GCC build
...
This was SVN commit r11456.
2012-04-08 17:44:29 +00:00
f3617822e0
Make AlwaysVisible objects always visible in shader mode. Fixes #908 .
...
This was SVN commit r11454.
2012-04-08 16:36:23 +00:00
b7888aea52
Add support for specular materials.
...
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.
This was SVN commit r11453.
2012-04-08 15:55:06 +00:00
b253cbbee6
Don't unnecessarily die when loading empty files
...
This was SVN commit r11449.
2012-04-07 21:36:27 +00:00
305723f9a7
Prevent AABB/frustum intersections from blowing up on empty input bounds. Fixes #1027 .
...
This was SVN commit r11441.
2012-04-05 22:29:01 +00:00
6d57808b84
Fix build with old Boost
...
This was SVN commit r11427.
2012-04-04 11:48:07 +00:00
59447bce2e
Move shaders into appropriate subdirectories.
...
Delete some obsolete shader files.
This was SVN commit r11424.
2012-04-03 19:45:58 +00:00
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
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
