Commit graph

3499 commits

Author SHA1 Message Date
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
xoltan
add2f8cb47 Terrain Macro Texture
Adds another layer of detail-like texture to the terrain and the
interface updates in the Terrain Painter.
2013-03-27 18:58:37 -06: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
thecelloman
25efdb4a06 Adding a basic rule-based terrain painting implementation.
http://www.garagegames.com/community/resources/view/17145
2013-03-21 17:45:23 -04:00
Daniel Buckmaster
6ff1db6c0c Made the flipped y-axis on terrain import optional.
Pass a final boolean argument to TerrainBlock::import to control
y-axis flipping. It is enabled by default, since this was the previous
default behavior.

This should be added as an option in the terrain import dialog - see
game/tools/worldEditor/gui/guiTerrainImportGui.gui
2013-03-21 09:22:07 +11:00
SilentMike
79fd610301 Merge pull request #266 from thecelloman/removecontrolshelpdlg
Removing the controlsHelpDlg to reduce maintenance overhead.
2013-03-20 14:18:56 -07:00
thecelloman
b452597696 Removing the controlsHelpDlg to reduce maintenance overhead. 2013-03-20 16:51:42 -04:00
SilentMike
6c31872928 Merge pull request #264 from thecelloman/gameguisarenotcore
Relocate game specific GUIs  out of the "core"
2013-03-20 09:20:46 -07:00
thecelloman
c1831e4bd8 Relocates several game specific GUIs (with relevant art and scripts) out of the "core". 2013-03-20 12:10:08 -04:00
SilentMike
5094eb5930 Merge pull request #260 from thecelloman/removeUshell
Remove unused and (partially) unworking UnifiedShell.
2013-03-18 14:42:43 -07:00
SilentMike
5f2904f521 Merge pull request #259 from thecelloman/toolsguiseparation
Tools GuiProfile Separation.
2013-03-18 12:05:35 -07:00
thecelloman
d3ba8e8e44 Remove unused and (partially) unworking UnifiedShell. 2013-03-18 10:02:05 -04:00
thecelloman
ceff8d72e0 Tools GuiProfile Separation.
This effectively duplicates (where necessary) and moves tools specific GuiProfiles out of the core and into the tools.  This will allow future modifications to either the game guis or tools guis that use these profiles to not conflict with each other.
2013-03-18 06:38:48 -04:00
SilentMike
256735e35c Merge pull request #255 from thecelloman/updatetinyxml
Update TinyXML to v2.6.2
2013-03-13 14:55:48 -07:00
thecelloman
512f0f10e7 Update TinyXML to v2.6.2 2013-03-13 04:00:12 -04:00
SilentMike
17c750b19a Merge pull request #243 from thecelloman/updatesquish
Update squish
2013-03-10 11:36:02 -07:00
SilentMike
27e47b0503 Merge pull request #250 from thecelloman/updatelibpngandzlib
Updating libpng to v1.5.14 and zlib to v1.2.7
2013-03-10 11:35:45 -07:00
thecelloman
4fdfb47f41 Updating libpng to v1.5.14 and zlib to v1.2.7
Since libpng has a dependency upon zlib, both updates were combined for one commit/pull-request.
2013-03-09 16:19:11 -05:00
David Wyand
845931296e Merge pull request #248 from DavidWyand-GG/HardCodedPaths2
Removed hard coded directory paths
2013-03-07 15:58:43 -08:00
DavidWyand-GG
4b1334db9f Removed hard coded directory paths
- Removed references to core directory.
- Switch some references to tools directory
- Added preferences variables where appropriate
2013-03-07 18:56:53 -05:00
thecelloman
8de0b7cbb1 Update squish library to 1.11 2013-03-04 14:37:50 -05:00
Tim Newell
31036c4031 Bug fixes for alternative zip layout and define to toggle it on 2013-02-28 16:46:46 -05:00
bank
9f2b0bcaf4 Fix engine API copy/paste errors (typo). 2013-02-28 23:50:57 +04:00
SilentMike
3df2aa64f4 Merge pull request #240 from thecelloman/vorbispatch
Patches the libvorbis update with missed files.
2013-02-25 00:48:26 -08:00
thecelloman
9fb0929a41 Patches the libvorbis update with missed files. 2013-02-25 03:45:08 -05:00
SilentMike
b4167d9b65 Merge pull request #239 from thecelloman/updatelibogg
Updates libogg to v1.3.0
2013-02-24 16:36:45 -08:00
thecelloman
9a7664b0fa Updates libogg to v1.3.0 2013-02-24 19:32:54 -05:00
SilentMike
77505ee162 Merge pull request #238 from thecelloman/updatelibvorbis
Update libvorbis to v1.3.3
2013-02-24 16:16:21 -08:00
thecelloman
44beb6210b Updates livVorbis to v1.3.3 2013-02-24 19:07:14 -05:00
David Wyand
853b70255b Merge pull request #234 from DavidWyand-GG/RazerHydraWork
Razer Hydra integration
2013-02-22 12:39:06 -08:00
David Wyand
67eb2a8d2d Merge pull request #237 from DavidWyand-GG/BulletBuilding
Compile Bullet library under Windows
2013-02-22 12:37:11 -08:00
DavidWyand-GG
0074c4f141 Compile Bullet library under Windows
For some reason the Bullet physics library's project file was not being
included in the solution when the bullet module was added.  This change
makes sure that when you want to use Bullet, it will correctly be added
by the Project Generator.
2013-02-22 15:35:23 -05:00