Fabian Woltermann
e2129355bf
Remove the bloom printout, add a camera distance printout
2018-02-17 21:00:47 +01:00
Fabian Woltermann
16ed58f403
Print a helpful reminder about the camera controls
2018-02-17 16:25:15 +01:00
m!m
0178374b98
Merge pull request #1606 from The-E/NewLab
...
Use mission backgrounds in the F3 lab
2018-02-16 11:26:51 +01:00
Fabian Woltermann
738e4a8153
Remove unused variable
2018-02-16 09:49:11 +01:00
faceman
85c2b3a7f0
Removes a magic number from ship.cpp
2018-02-16 16:08:45 +11:00
faceman
508b8a176b
Fixes beam behaviour with additive/cap/etc damage types
2018-02-16 15:12:25 +11:00
Fabian Woltermann
87bb2cbcc7
Remove debris rendering for now
2018-02-15 14:19:59 +01:00
Fabian Woltermann
9e673ff7fe
light_reset needs to be called on every frame.
...
this also adds a trace scope to sunspot processing
2018-02-15 11:09:53 +01:00
Fabian Woltermann
126b6718db
Reset the background window when it's closed
2018-02-15 11:01:34 +01:00
Fabian Woltermann
b0fc182fab
Fix crash when switching between weapons and ships
2018-02-15 10:44:45 +01:00
Fabian Woltermann
158292afba
We can't show tech or external models yet
2018-02-15 10:35:25 +01:00
Fabian Woltermann
d75ec93484
Merge pull request #1604 from Flip-Sandwich/master
...
Consistent beam damage per frame regardless of time acceleration
2018-02-14 20:11:18 +01:00
Fabian Woltermann
69f4fa60f5
Remove unused variables
2018-02-14 17:10:26 +01:00
asarium
96d3eebad9
Don't include the default ai_profiles system in CFile
...
This fixes a warning caused by parsing the default ai_profiles table
twice. The default table was moved out of the data/tables folder and
into a special builtin category which will not be included in CFile.
2018-02-14 16:45:04 +01:00
Fabian Woltermann
3b21b2469f
A clean, up-to-date patch of the new lab code
2018-02-14 16:19:38 +01:00
Fabian Woltermann
cbe1d20fcc
Merge pull request #1310 from asarium/feature/inMemoryCfile
...
Add support for accessing default files with CFile
2018-02-14 11:45:34 +01:00
m!m
3d3bbb5dc4
Merge pull request #1602 from The-E/RadarRangeWarning
...
Downgrade the invalid radar range error in the plr reader code to a warning
2018-02-14 11:12:34 +01:00
asarium
4c5b1c679b
Add support for accessing default files with CFile
...
This allows to use more complex file structures in the executable
without requiring that those exist as real files. The rest of the code
does not need to handle the difference between a default file and a real
file anymore which means that it's now possible to embed image files
into the executable since bmpman only needs to use the standard CFile
API.
I added two tests which check if the default file can be found and
opened and if a mod file overrides the default file which should always
be possible.
2018-02-14 11:02:59 +01:00
faceman
a6d8b6b5fa
Consistent beam damage per frame regardless of time acceleration
2018-02-14 10:41:49 +11:00
asarium
ffad093153
Fix assertion failure in ship_get_sound
...
This assertion could be hit if the player died and the engine tried to
play a sound for the now destroyed ship. Since the existing code already
had a check for the case that the object is an observer I just added
another case for OBJ_GHOST.
2018-02-12 19:46:25 +01:00
Fabian Woltermann
6a73d8f9d0
Having an invalid radar range in the pilot file should not be a fatal error.
2018-02-12 12:08:13 +01:00
m!m
a0a88128ef
Merge pull request #1599 from The-E/DirectionalLightFix
...
Make sure directional lights are always rendered
2018-02-12 11:40:05 +01:00
Fabian Woltermann
6fad19c8bc
More changes requested by CI
2018-02-12 10:40:56 +01:00
Fabian Woltermann
119b5d662b
Addressing feedback and CI issues
2018-02-12 08:57:39 +01:00
Fabian Woltermann
0b612c2f1a
Remove an unused #define
2018-02-10 14:20:45 +01:00
Fabian Woltermann
8aee62b818
Make sure directional lights are always rendered; this kinda spiralled out into a bit of general cleanup regarding the lighting code.
2018-02-10 14:09:32 +01:00
asarium
b557985e90
Fix off-by-one error in stuff_int_list
2018-02-10 10:54:12 +01:00
Fabian Woltermann
4f43a2edf3
Merge pull request #1594 from The-E/MissileLightingdefault
...
Remove the -missile_lighting commandline parameter
2018-02-09 09:35:16 +01:00
m!m
6083c89b45
Merge pull request #1596 from asarium/fix/parse_int_list_errors
...
Improve error messages in stuff_int_list
2018-02-08 21:57:15 +01:00
asarium
eefba9159a
Improve error messages in stuff_int_list
...
This also converts an assertion into a proper error message which would
contain the actual file and line number.
2018-02-08 19:48:10 +01:00
m!m
8fed2fcfe3
Merge pull request #1590 from The-E/OGLDebugMessageSpamFix
...
Reduce the amount of Debug message spam due to non-fatal OGL warnings
2018-02-08 19:12:06 +01:00
Fabian Woltermann
d149dd18b5
Use correct bit math operator
2018-02-07 15:32:37 +01:00
Fabian Woltermann
a7d624f82d
Add -missile_lighting to the deprecated flags
2018-02-06 16:38:52 +01:00
m!m
aaab3fa03b
Merge pull request #1589 from The-E/DebugFilterFix
...
Fix for debug_filters defaulting to +Parse
2018-02-06 14:20:41 +01:00
Fabian Woltermann
1c56d9f497
Remove the -missile_lighting commandline parameter
2018-02-05 16:18:15 +01:00
Fabian Woltermann
ccaa766474
Merge pull request #1486 from asarium/opengl/combinedVertexBuffers
...
Pack vertex and index data into one buffer
2018-02-04 16:16:45 +01:00
Fabian Woltermann
741c28d785
Merge pull request #1565 from asarium/ci/gcc7
...
Add GCC 7 configuration for Travis CI
2018-02-04 16:15:25 +01:00
Fabian Woltermann
d73a21a579
Fix variable shadowing warning
2018-02-03 23:02:19 +01:00
Fabian Woltermann
5b8f4343a3
Since OGL debug messages are only useful for coders, most of the time, we shouldn't print them to the general log unless they're actually critical
2018-02-03 22:58:43 +01:00
Fabian Woltermann
310785a961
Somehow, this loop to search for an existing debug filter did not work correctly anymore?
2018-02-03 22:38:53 +01:00
Fabian Woltermann
9029aad64d
Merge pull request #1586 from asarium/fix/1579_workaround
...
Add a workaround for clipping planes on NVIDIA
2018-01-30 20:58:07 +01:00
asarium
acc018507b
Pack vertex and index data into one buffer
...
This changes the model loading code such that all index and vertex data
is packed in a single GPU buffer for each data type (index and vertex
data are still in separate buffers). This reduces the amount of buffer
rebinding needed when rendering a scene which will reduce the CPU
overhead. Furthermore, this opens up possibilities of future
improvements for which it is beneficial if all data is in the same
buffer (e.g. MultiDrawIndirect rendering).
To manage where to put the data in the GPU buffer I implemented a
custom HeapAllocator which manages where data can be put. It uses a very
primitive first-fit algorithm but that is sufficient for this usage
type. This does add quite a lot of overhead while allocating GPU model
data (I did some tracing and some allocation calls took as long as
130ms).
This fixes #1457 .
2018-01-27 13:54:36 +01:00
asarium
25698b4534
Add a workaround for clipping planes on NVIDIA
2018-01-27 13:40:04 +01:00
Fabian Woltermann
a2f6897c43
Merge pull request #1581 from asarium/feature/luaVersionCheck
...
Add lua function for checking the engine version
2018-01-26 17:05:24 +01:00
Fabian Woltermann
0777f24f08
Merge pull request #1583 from The-E/JumpnodeNameAssertion
...
Improve the JumpNode::SetName assertion to be readable by non-coders
2018-01-22 10:28:11 +01:00
Fabian Woltermann
ed45baa843
Improve the JumpNode::SetName assertion to be readable by non-coders
2018-01-21 23:38:58 +01:00
asarium
e795327a3f
Add simple NanoVG draw buffer for better performance
...
This improves the rendering performance of the target hotkey brackets a
bit which caused a significant slowdown previously.
2018-01-20 18:32:39 +01:00
asarium
3c238d61e2
Add lua function for checking the engine version
...
This can be used to check if an API function is available in the current
version of the engine without causing runtime errors.
2018-01-20 16:37:31 +01:00
m!m
2d3e7e54e8
Merge pull request #1534 from asarium/fix/fs2netdSigbus
...
Fix SIGBUS crash in fs2netd
2018-01-18 16:14:54 +01:00
Tyler Blount
8ba05c1c3d
Merge pull request #1578 from SamuelCho/reflection_blur_fix
...
Fix gloss-dependent blurred reflections
2018-01-16 09:01:54 -07:00
Fabian Woltermann