Commit graph

154 commits

Author SHA1 Message Date
Daniel Buckmaster
9e4446046f Merge pull request #710 from lukaspj/3-Textures-Blending-Fix
3 textures blending fix
2014-11-04 17:06:04 +11:00
Daniel Buckmaster
be75d5eaab Merge pull request #886 from eightyeight/fix-postfx-manager
Reduce minimum tab width in PostFX manager
2014-11-04 14:20:03 +11:00
Daniel Buckmaster
719fcd7d2d Reduce minimum tab width in PostFX manager. 2014-11-04 14:16:32 +11:00
Daniel Buckmaster
ed820f2dd4 Merge pull request #761 from J0linar/PostFx_Vignette
Added Vignette PostFx
2014-11-04 13:30:47 +11:00
Daniel Buckmaster
ef9bc91bff Merge pull request #744 from lukaspj/Ribbon-Implementation
Ribbon and RibbonNode
2014-10-28 15:19:17 +11:00
Daniel Buckmaster
e02e542717 Merge pull request #749 from lukaspj/MixedParticleRendering
Re-enable Mixed particle rendering
2014-10-28 09:50:02 +11:00
unkown
c527313284 Fixed a crash when ribbons are loaded 2014-10-20 21:09:41 -06:00
Daniel Buckmaster
a8d9f6c499 Fixed Full template art a bit.
Player can now swim properly, and the physical zone elevator is a bit
more helpful (i.e. it sends you to the landing rather than leaving you
floating in midair). Fiddled some more with PostFX settings.
2014-10-06 12:58:32 +11:00
Daniel Buckmaster
e5bc07010c Fixed minor issues with Outpost level.
* Black spots caused by wrongly named images.
 * HDR settings tweaked to be a bit brighter.
2014-10-04 20:30:27 +10:00
Daniel Buckmaster
5103ba22e2 Merge pull request #807 from eightyeight/az_outpost
Added Outpost testing level by Azaezel
2014-10-03 09:34:30 +10:00
Areloch
099a91553a Merge pull request #723 from Azaezel/lightRay_Cleanup
Light ray cleanup
2014-10-01 22:34:23 -05:00
Daniel Buckmaster
599ad823b0 Added Outpost testing level by Azaezel. 2014-10-02 10:51:39 +10:00
Daniel Buckmaster
0a9b393e23 Merge pull request #775 from Azaezel/soldier_triggers
player triggers.
2014-10-02 10:22:34 +10:00
LuisAntonRebollo
535f56af6e Merge pull request #801 from eightyeight/gtest-tests
Googletest tests
2014-10-02 01:31:13 +02:00
Daniel Buckmaster
2a9e6ef5e6 Renamed default ribbon datablocks. 2014-09-24 08:27:03 +10:00
LukasPJ
35f88a77b1 Script integration for Ribbons 2014-09-23 15:44:55 +02:00
Azaezel
9318f8faf3 player triggers. these are what determine the timing ffor when footprint decals and a sound are played based on material configurations during a given animation. 2014-09-05 23:10:08 -05:00
Azaezel
ae55b5f552 Adds material definitions for groundcover referencing. 2014-09-01 19:39:29 -05:00
Daniel Buckmaster
5a430af051 Merge remote-tracking branch 'gg/development' into gtest-tests 2014-08-30 17:51:41 +10:00
Lukas Joergensen
53f241974b Doing a hard compare instead of using step for blending factors 2014-08-25 21:08:39 +02:00
J0linar
83c8274952 -added Vignette PostFx
-added vignette to the Full and Empty Template
-added vignette to the PostEffect Manager
-added vignette Shader and .cs File
2014-08-20 06:22:10 +02:00
Daniel Buckmaster
76b2e4e975 Fixed template scripts. 2014-08-16 11:52:50 +10:00
Daniel Buckmaster
346ad5bdaa Finished up splash screen implementation.
* Added stub methods for non-Windows platforms
 * Move canvas show to after tools have loaded
 * Fix a tab
2014-08-16 11:28:53 +10:00
Lukas Joergensen
981b37e548 Re-enable MixedParticleRendering 2014-08-08 00:34:32 +02:00
Areloch
0878f005c0 Fixed the pure virtual function to be an empty one, which should resolve the linux build failure.
Also tweaked the loading methodology to have the canvas by default assume it should force the window display as soon as it can. You can set the canvas to not do that when it's created via the new displayWindow variable.

This way, old templates and projects should work as normal without changes, while the new templates are built to take advantage of the nicer splash screen arrangement.
2014-08-04 21:28:36 -05:00
Daniel Buckmaster
85a0c1c59f Allow test flags to be specified, so we don't need TEST_STRESS. 2014-08-02 10:21:28 +10:00
Daniel Buckmaster
e5bb218377 Turns out we don't actually need a Canvas! Cool. 2014-07-17 13:24:04 +02:00
Areloch
c2da67d473 Fixes the splash screen so that it displays until the game has actually done initial setup and can display GUI elements. This prevents the ugly blank window just sitting there while the GUI loads. 2014-07-15 17:44:19 -05:00
Daniel Buckmaster
b7c720d01d Reverted #540 2014-07-14 15:13:30 +02:00
LuisAntonRebollo
e09a09005d Merge pull request #706 from eightyeight/add-gtest
Add Google test library
2014-07-12 12:53:57 +02:00
Azaezel
4b3ede6674 explicit downcasting for some halfs 2014-07-09 18:07:23 -05:00
Azaezel
d6cc399813 col is a float4, LUMINANCE_VECTOR a float3. results seemed cleaner this end doing a dot of the rgb than padding the lum 2014-07-09 18:06:31 -05:00
Daniel Buckmaster
2248c90d52 Default mainfiles to run unit tests. 2014-07-08 18:55:37 +02:00
Daniel Buckmaster
195e05dcfb Merge pull request #650 from Azaezel/ejectionOffsetVariance_defaults
Ejection offset variance defaults
2014-07-08 14:16:05 +02:00
Daniel Buckmaster
cf5d48e6ef Merge pull request #665 from andr3wmac/multiformat
Support for large lists of shape formats.
2014-07-08 14:14:54 +02:00
LuisAntonRebollo
a90be04041 Merge pull request #687 from eightyeight/procedural-terrain-coverage
Add coverage option to procedural terrain generator
2014-06-15 11:31:40 +02:00
rextimmy
709bd99ed4 Vehicle gamepad fix for full template. 2014-06-10 09:06:21 +10:00
Daniel Buckmaster
05e6fbf3d6 Merge remote-tracking branch 'JackDavidson/master' into procedural-terrain-coverage 2014-06-09 21:43:57 +10:00
Daniel Buckmaster
849e8efeae Merge pull request #661 from Azaezel/grenade_decal
Grenade decal
2014-05-26 11:57:18 +10:00
Thomas Fischer
2434a82b67 Merge pull request #609 from BeamNG/templates_case_sensitive
Case-sensitive fixes on template script files for Linux.
2014-05-23 08:05:14 +02:00
Thomas Fischer
a665ac5d2b Merge pull request #610 from BeamNG/templates_glsl_files
Changes to Templates GLSL files for OpenGL
2014-05-23 07:56:55 +02:00
Andrew Mac
eb74525a38 Added support for large lists of shape formats. Needed for assimp. 2014-05-21 14:50:44 -03:00
Azaezel
10abee5e67 Fix for issue #660 with stated preferred decal. (The more complex example of the two possible.) 2014-05-19 10:18:46 -05:00
Azaezel
894d4f6d36 editor default and retrieval values for particle emitter ejectionOffsetVariance (sets the sliderbars and text from memory when reloading an emitter DB) 2014-05-13 21:38:49 -05:00
JackDavidson
060b2a4e29 Commit to add "Coverage" option to procedural terrain generator
This commit adds a "Coverage" option to the procedural terrain
generator. Allows mixing of textures. See
http://www.garagegames.com/community/blogs/view/22371 for more info.
This version has many improvements - coverage is now entered as a
percentage, accepts decimals, and doesn't have any bugs as far as I
know.
2014-05-04 22:17:24 -07:00
LuisAntonRebollo
6aea37b407 Changes to GLSL files for OpenGL 2014-04-13 19:55:45 +02:00
LuisAntonRebollo
a8462b7fc3 Case-sensitive fixes on template script files for Linux. 2014-04-13 19:50:22 +02:00
LuisAntonRebollo
54fa2bcdab Merge pull request #540 from signmotion/default-keyboard-layout
Added a default keyboard layout for launching the game.
2014-03-29 14:20:30 +01:00
Thomas Fischer
f3dbe07b9a main.cs configuring now (optional), fixed installation up, fixed application name up, fixed executable name, added configured torsion template 2014-03-19 18:17:35 +01:00
Thomas Fischer
9b49f56bd6 changed Generator to T3D_Generator to prevent problems with newer php versions 2014-03-14 19:58:23 +01:00