Commit graph

262 commits

Author SHA1 Message Date
SilentMike
ee44e44784 Merge pull request #319 from thecelloman/cleancheetahtssc
Clean up the cheetah's onLoad() TSShapeConstructor script
2013-04-09 10:06:28 -07:00
David Wyand
a841337428 Merge pull request #318 from DavidWyand-GG/GraphicsAdapters
GFX now handles non-default adapters
2013-04-09 09:57:56 -07:00
DavidWyand-GG
0d77cdc270 GFX now handles non-default adapters
The GFX (DirectX) pipeline did not respect the choice of adapter and
always went for the default one.  Normally this isn't an issue unless
you wish to target a particular adapter and display device combination.
This has been corrected.

The GFX initialize functions now attempt to find the best adapter that
matches a given display device (i.e. monitor) if one has been passed in.
To aid with choosing a display device some new monitor enumeration
methods have been added to the platform window manager.  These methods
have been exposed to the Canvas.
2013-04-09 12:50:17 -04:00
David Wyand
1ed1a41256 Merge pull request #317 from DavidWyand-GG/PointZeroing
zero() method added to all point classes
2013-04-09 08:39:57 -07:00
DavidWyand-GG
a40db9fa9b zero() method added to all point classes
Only some of the mPointX classes had the zero() method implemented.
This commit adds the method to all point classes.
2013-04-09 11:38:48 -04:00
David Wyand
a8d499f7f1 Merge pull request #316 from DavidWyand-GG/FixRealStringPaths
Fix texture and object console paths
2013-04-09 07:07:34 -07:00
DavidWyand-GG
bfec2dfd79 Fix texture and object console paths
- Be sure to delete all prefs.cs files following this change.
- Changes the console types of the missing, unavailable and warning
texture paths.  The old type was causing string corruption when saving
preferences.
- Changes the console type of the TSShapeConstructor collision shapes.
The old type was causing string corruption when saving preferences.
- Changed missing texture reference in ProcessedMaterial from String to
const char*.
2013-04-09 10:05:57 -04:00
thecelloman
1a87d56116 Clean up the cheetah's onLoad() TSShapeConstructor script
This prevents some console spam due to erroneous node removal requests.
2013-04-09 05:32:05 -04:00
SilentMike
028142428e Merge pull request #315 from thecelloman/edbuttons
Add buttons to the MainMenu to access the Editors.
2013-04-08 13:52:26 -07:00
thecelloman
73a55c53a4 Add buttons to the MainMenu to access the Editors. 2013-04-08 16:48:14 -04:00
SilentMike
0d9d321ec8 Merge pull request #314 from thecelloman/terrainfxmat
Add missing terrain related materials.
2013-04-08 10:42:02 -07:00
thecelloman
88b75a1847 Add missing terrain related materials.
This prevents the "cannot find material X" messages in the console.  These psuedo materials are what enables footstep sounds and footpuffs on terrain materials.
2013-04-08 13:30:03 -04:00
SilentMike
e284bd06af Merge pull request #313 from thecelloman/cleanwpndiradd
Add and remove relevant file execs for the new weapon fx usage
2013-04-08 09:45:37 -07:00
thecelloman
684dec4a12 Add and remove relevant file execs for the new weapon fx usage in previous commit, pull request #312 2013-04-08 12:40:46 -04:00
SilentMike
5ae7483af6 Merge pull request #312 from thecelloman/cleanwpndir
Cleanup of weapon fx and assets.
2013-04-08 08:17:55 -07:00
thecelloman
0ab520c001 Cleanup of weapon fx and assets.
This reduces duplication by grouping assets used by multiple weapons in one location: shared.
This reduces duplication and cleans particle fx that was spread across multiple files.  We now have rocketfx.cs and grenadefx.cs
This also fixes some minor particle fx console warnings/errors.
Fixed missing material for Cheetah Turret.
2013-04-08 07:09:55 -04:00
SilentMike
f0aa2e4926 Update README.md 2013-04-05 19:07:55 -03:00
SilentMike
b5a6514dae Merge pull request #304 from thecelloman/moveroads
Relocate default road & path assets.
2013-04-05 09:49:04 -07:00
SilentMike
5d122634ee Merge pull request #307 from thecelloman/fix282
Fix for issue #282
2013-04-04 13:10:57 -07:00
thecelloman
9c0bb322cb Fix for issue #282
Material selector now renders preview thumbnails.
2013-04-04 16:08:36 -04:00
SilentMike
3cec772992 Merge pull request #306 from thecelloman/removearmorclass
Removing the Armor script class.
2013-04-04 12:41:22 -07:00
thecelloman
281897c41e Removing the Armor script class.
Using PlayerData as the generic namespace.  This is more inline with other default datablock methods.
2013-04-04 15:39:15 -04:00
thecelloman
6f8161b098 Relocate default road & path assets. 2013-04-04 15:29:38 -04:00
SilentMike
8d0e6b8142 Merge pull request #299 from thecelloman/movelightassets
Moving the light related assets and data out of the core.
2013-04-04 11:49:24 -07:00
SilentMike
93c7e1fb73 Merge pull request #302 from thecelloman/movewater
Relocate water related assets.
2013-04-04 11:16:08 -07:00
thecelloman
6d7270c894 Relocate water related assets.
Also remove duplication, favoring DDS over other formats.
2013-04-04 14:13:46 -04:00
SilentMike
0f76a1718f Merge pull request #300 from thecelloman/moveskies
Relocating sky related assets.
2013-04-04 07:49:34 -07:00
thecelloman
a371fc5855 Relocating sky related assets.
Also reduced duplication of the "empty" solid color sky cubemaps.
2013-04-04 10:46:28 -04:00
thecelloman
fb341fdf97 Moving the light related assets and data out of the core. 2013-04-02 19:44:31 -04:00
SilentMike
0e63ca1079 Merge pull request #293 from thecelloman/nobuggy
Removing the old TGE era "Buggy" vehicle.
2013-04-02 12:56:32 -07:00
thecelloman
aee045bd50 Removing the old TGE era "Buggy" vehicle. 2013-04-02 15:51:48 -04:00
SilentMike
70ca39955b Merge pull request #291 from thecelloman/movetpd
Moved teleporter related particle data out of the managed data file and ...
2013-04-02 11:57:42 -07:00
thecelloman
65197aa753 Moved teleporter related particle data out of the managed data file and into art/datablock/teleporter.cs. I also corrected a bad filepath that would prevent mission loading. 2013-04-02 14:54:01 -04:00
SilentMike
a868b649ad Merge pull request #286 from thecelloman/removeOOBSign
Remove unused OOBSign from PlayGui
2013-03-28 11:47:57 -07:00
SilentMike
a750ec9664 Merge pull request #285 from thecelloman/issue193
Resolve issue #193 - Gui Editor treeview now refreshes correctly...
2013-03-28 11:31:56 -07:00
SilentMike
d8a3565716 Merge pull request #284 from thecelloman/ryderasdefault
Set the Ryder as the default starting weapon instead of the Lurker.
2013-03-28 10:59:35 -07:00
SilentMike
9a983c8dd2 Merge pull request #283 from thecelloman/issue163
Resolve issue #163: Material Editor Crash- Opening the material editor with a mesh selected doesn't open a custom material.
2013-03-28 09:48:19 -07:00
thecelloman
608869d504 Remove unused OOBSign from PlayGui 2013-03-27 23:35:21 -04:00
thecelloman
19c685dc23 Resolve issue #193 - Gui Editor treeview now refreshes correctly when changed through a drag/drop operation. 2013-03-27 23:21:25 -04:00
thecelloman
1452c407d9 Set the Ryder as the default starting weapon instead of the Lurker. 2013-03-27 22:49:58 -04:00
thecelloman
7e5ddf4ca2 Resolve issue #163
Fixed and assert on changing material, and we now map the material to the MATMGR by name instead of type.
2013-03-27 21:36:17 -04:00
SilentMike
769268784f Merge pull request #268 from eightyeight/terrain-import-flipped
Importing terrain heightmaps flips Y-axis
2013-03-25 14:03:11 -07:00
SilentMike
1ae70e69a5 Merge pull request #278 from thecelloman/relocateparticles
Relocated the particles subdirectory to a more intuitive location.
2013-03-25 13:56:28 -07:00
thecelloman
07c16a2f38 Relocating the particles image directory out of art/shapes/particles to art/particles. This should be a more logical and intuitive location. Relevant managed particle related datablock save location defaults have been adjusted as well. 2013-03-25 16:49:08 -04:00
Daniel Buckmaster
b868906ba5 Added a checkbox to the terrain import GUI and fixed a space. 2013-03-23 09:24:02 +11:00
SilentMike
8b997da575 Merge pull request #274 from thecelloman/issue225
Resolve issue #225:  Minor Issues From ParticleData Times Change
2013-03-22 13:34:47 -07:00
thecelloman
d1b18ad887 Some default particles now have additional defaults for their times[n] array. This resolves some console warning spam. 2013-03-22 16:29:15 -04:00
SilentMike
f92a1969e7 Merge pull request #273 from thecelloman/kpaint-addendum
Filled in the variable names in autoMaterialLayers() prototype
2013-03-22 12:09:50 -07:00
thecelloman
1468a049af Filling out the variable names in the function prototype for autoMaterialLayers() for clarity.
Minor whitespace formatting changes (spacing) for consistency.
2013-03-22 15:02:45 -04:00
SilentMike
840e8aa5ce Merge pull request #272 from thecelloman/kpaint
Adding a basic rule-based terrain painting implementation.
2013-03-21 14:52:55 -07:00