Commit graph

4926 commits

Author SHA1 Message Date
Areloch
6e8fa7215a Moves from using dStrIsEmpty to the new String::isEmpty static function. Keeps things cleaner, consistent, and works with intellisense. 2015-06-06 17:40:49 -05:00
Azaezel
b1e8a45a48 leak prevention according to: https://vld.codeplex.com/ ConsoleValue() constructors and destructors to handle corner-cases not already addressed via init, and cleanup 2015-06-02 14:25:08 -05:00
Azaezel
a4c09d1680 leak prevention according to: https://vld.codeplex.com/ apparently we weren't freeing the entirety of the ProfilerData linked list when resetting the Profiler, and that was leading to a pinhole leak per profiled block 2015-06-01 23:45:49 -05:00
Areloch
8a55feebef Merge pull request #1319 from Areloch/nonocculus_popup_dialog_fix
Nonocculus popup dialog fix

Az verified that it corrects the issue in non-oculus builds.
2015-06-01 22:39:10 -05:00
Areloch
9368b7b915 Adjusted the popup issue fix to ensure nothing breaks in either regular or oculus mode. 2015-06-01 22:34:55 -05:00
Areloch
f5d8de8c4d Fixed an issue where non-occulus builds didn't correctly push pop-up dialogs to the canvas. 2015-06-01 22:01:29 -05:00
Areloch
d92a9841f2 Merge pull request #1299 from RichardRanft/developmentOrigin
Add static String::isEmpty(const char*) method
2015-06-01 00:38:39 -05:00
RichardRanft
6c9cff4c68 Update str.cpp
Fixed copy/paste error - now actually checks the parameter passed in....
2015-05-31 20:42:05 -07:00
LukasPJ
c5dd7230ad Fix for rendering particles to the glow buffer 2015-05-28 20:41:42 +10:00
James Urquhart
d9436e65c5 Add workaround for issue #1292 2015-05-28 20:34:10 +10:00
Areloch
c152ae86f3 Merge pull request #1317 from Areloch/Revised_roadtop_Tex_Empty
Replaces the old road texture with a newer one in the Empty template …
2015-05-27 23:48:12 -05:00
Areloch
66ebe9da23 Replaces the old road texture with a newer one in the Empty template to match the new one in the Full template. 2015-05-27 23:46:56 -05:00
Areloch
83dddb3cb6 Merge pull request #1129 from Azaezel/retread
revised road top texture
2015-05-27 23:44:12 -05:00
Areloch
4378cb181d Merge pull request #1297 from jamesu/oculus_dk2
Oculus VR DK2 Support
2015-05-27 09:29:47 -05:00
RichardRanft
38413be513 Update str.cpp
Effectively copied dStrIsEmtpy() into String::isEmpty().
2015-05-24 22:43:27 -07:00
Areloch
eea608dec2 Merge pull request #1303 from jamesu/console_vstring_fix
Add workaround for issue #1292
2015-05-24 23:19:54 -05:00
Daniel Buckmaster
7a54e300e3 Merge pull request #1305 from eightyeight/vignette-settings
Apply vignette settings properly for #1302
2015-05-22 16:27:24 +10:00
Daniel Buckmaster
f827411338 Merge pull request #1313 from eightyeight/editor-toolbar-images
Added toolbar expand button images.
2015-05-17 20:07:32 +10:00
Daniel Buckmaster
5fcf385aca Added toolbar expand button images.
I wonder when they disappeared.
2015-05-17 19:05:02 +10:00
Daniel Buckmaster
d1bcc75d5e Merge pull request #1307 from eightyeight/forestitem-default-bounds
tsForestItemData: default to no bounds instead of crazy bounds
2015-05-17 13:55:23 +10:00
James Urquhart
e5c28b4d7f Simplify buffer check when adding a registered variable 2015-05-16 14:57:40 +01:00
James Urquhart
15169eab9f Fix issue with registered variables becoming corrupted when string value was accessed. 2015-05-16 14:50:20 +01:00
Daniel Buckmaster
4f83afeeeb Merge pull request #1310 from eightyeight/more-case-issues
Corrected another filename case
2015-05-16 22:51:52 +10:00
Daniel Buckmaster
c1e7041fe9 Corrected another filename case. 2015-05-16 22:50:34 +10:00
Daniel Buckmaster
b3d33c0734 Merge pull request #1309 from eightyeight/add-details-to-assert
Add more info to fatal assert in SceneContainer
2015-05-16 22:42:54 +10:00
Daniel Buckmaster
49d2ab8bc3 Add more info to fatal assert in SceneContainer. See #1287. 2015-05-16 22:41:20 +10:00
Daniel Buckmaster
aacad0d83a Merge pull request #1308 from eightyeight/linux-filenames
Case-sensitive filenames for Linux
2015-05-16 22:40:28 +10:00
Daniel Buckmaster
587afaac4f Case-sensitive filenames for Linux. See #1287. 2015-05-16 22:37:58 +10:00
Daniel Buckmaster
42bd368045 Default to no bounds instead of crazy bounds. See #1287. 2015-05-16 22:32:42 +10:00
Daniel Buckmaster
9cfc852192 Apply vignette settings properly for #1302. 2015-05-16 17:52:58 +10:00
Azaezel
a879ad4dcf re-enables prior functionality allowing folks to post-editor modify terrain cached textures. 2015-05-16 16:35:47 +10:00
Azaezel
462aeefb36 opengl crashfix: cannot self-multiply a uniform. use a temp-variable. 2015-05-16 14:11:40 +10:00
James Urquhart
3a218217f4 Add workaround for issue #1292 2015-05-15 12:32:00 +01:00
Areloch
b30b5d9076 Merge pull request #1229 from Azaezel/guiShapeNameHud_filterFix
stops names showing through statics
2015-05-12 15:20:56 -05:00
Daniel Buckmaster
1cb5f0f160 Fixed constructor order in ShapeBase. 2015-05-09 23:06:30 +10:00
Daniel Buckmaster
d4e5b47195 Merge branch 'linux-sound' into release-3.7 2015-05-09 15:06:30 +10:00
Daniel Buckmaster
ae4ac53592 Remove comments. 2015-05-09 15:02:41 +10:00
Levitator1
f3199b04e4 Fix for no sound output under Linux 2015-05-09 14:53:21 +10:00
Daniel Buckmaster
69f2efab8f Merge remote-tracking branch 'lukaspj/Fuzzy-texture-border-fix' into release-3.7 2015-05-09 14:29:30 +10:00
James Urquhart
2aca5f6ee7 Remove unused stereo target codepath in Oculus code 2015-05-08 11:55:54 +01:00
James Urquhart
12d435c341 Remove value constructors for ConsoleValueRef & fix callbacks which use them. Fixes issue #1289 2015-05-08 09:04:04 +10:00
RichardRanft
3ddd9b8a4c Add static String::isEmpty(const char*) method and use it to verify path for Forest::saveDataFile() is not empty. 2015-05-06 15:39:02 -07:00
James Urquhart
3a457749ec Oculus VR DK2 Support
- Updated to work with 0.5.x SDK
- Uses Oculus Rendering rather than PostFX
- Stereo rendering refactored so more rendering info is grabbed from the DisplayDevice
- Implements an Offscreen Canvas for in-game gui with oculus
- Message dialogs and metrics display can now go to the OffScreen Canvas (if oculus demo is setup correctly)
2015-05-06 23:09:51 +01:00
Areloch
b3170bcddf Merge pull request #1286 from Azaezel/NoMRBit
crash out on net stream leaks.
2015-04-28 00:38:33 -05:00
Daniel Buckmaster
eb0351139e Merge pull request #1288 from eightyeight/issue1277
Issue 1227
2015-04-27 21:48:10 +10:00
Areloch
2f69ffd2d4 Fixes issue #1277
Adds the file path to the saveDataFile call (missionpath\missionname.forest as the format)

This correctly utilizes the forest object's datafile field if it's set.
If not, it will create a new forest item with the missionPath\missionName.forest convention.

This also removes the checks for the hardcoded "theForest" forest object name, so that if it is renamed for some reason, it doesn't break.

Lastly, this corrects a minor semi-related bug, where if you are in the forest editor and have a brush selected, and then click to paint, but no forest object currently exists, it prompts to create one. Once the forest object is created, it would trigger the editor to inspect the newly made forest object. If you attempted to paint the currently selected brush, there was a mis-match in the inspector information, and it would trigger a crash.

This has been corrected by re-initializing the forest editor's selected tool mode so it can be utilized immediately after the forest object is created.
2015-04-27 21:45:57 +10:00
Daniel Buckmaster
2fbf6bdb9d Removed a space. 2015-04-27 21:30:09 +10:00
Daniel Buckmaster
98fa3d02df Merge remote-tracking branch 'Azaezel/decal_rot_mangle' into development 2015-04-27 21:28:42 +10:00
Azaezel
6201e48501 crash out on net stream leaks.
causes a fatal assertion when bitstream is passed an int value it cannot transmit given the provided bit length, and reports what the value and count were, respectively
2015-04-26 20:25:40 -05:00
Azaezel
f8d41a2b96 Merge pull request #1283 from Azaezel/randiiiiiii
corrects getrandom to behave as documented.
2015-04-26 11:27:03 +10:00