Goober5000
6d60bb1511
add some additional clarifying comments
2016-01-25 00:49:21 -05:00
Goober5000
28faa9e588
warn for dumb-rotation as well as regular rotation
2016-01-25 00:26:26 -05:00
Goober5000
78ff02501b
improve debug warning handling
2016-01-24 21:41:31 -05:00
Goober5000
165124267a
Add model_instance handling for weapons, asteroids, and skyboxes
2016-01-24 21:28:43 -05:00
Goober5000
b9033ab2a2
fix Travis error
2016-01-24 19:00:04 -05:00
Goober5000
102efb192c
some additional error handling
2016-01-24 17:55:13 -05:00
Goober5000
4b05468f3c
update comment with a small clarification, add an assertion that the function contract is being followed, and fix an incipient bug by adding a necessary is_ship flag
2016-01-20 14:44:45 -05:00
Goober5000
26a500bf7c
address warnings flagged by Travis
2016-01-19 22:18:09 -05:00
Goober5000
81ad6dc1b5
remove a field that is now redundant
2016-01-05 01:04:46 -05:00
Goober5000
025c58c679
fix const-correctness due to Swifty's change
2016-01-05 00:56:51 -05:00
Goober5000
bb93319871
small update due to changed API
2016-01-04 23:34:30 -05:00
Goober5000
8f224a76a4
incorporate turning rate
2016-01-04 23:34:30 -05:00
Goober5000
a640015afc
tweak the creation of dumb_rotate instances; move the check for can_move below look_at and dumb_rotate
2016-01-04 23:34:29 -05:00
Goober5000
82807f2760
delete dumb rotations when we delete the associated instance
2016-01-04 23:34:29 -05:00
Goober5000
97924c0628
Add data structures and the hook to create the dumb rotations when model instances are created. This might be sufficient to get dumb rotations working for ships.
2016-01-04 23:34:28 -05:00
Goober5000
680ac9175f
move the two dumb_rotation iterations into one function (which calls a subfunction) in modelread.cpp, and add some descriptive commenting
2016-01-04 23:34:28 -05:00
Goober5000
e3c4f90287
first chunk of work to reimplementing dumb_rotate in a way that syncs with the rest of the model code
2016-01-04 23:34:27 -05:00
Goober5000
ed2bbc35eb
Merge pull request #501 from SamuelCho/kill_ship_model_start
...
Killed the last vestiges of ship_model_start/stop.
2016-01-04 22:45:03 -05:00
Fabian Woltermann
23aa8cb18d
Merge pull request #504 from niffiwan/fix/shield_hit_anim_duration
...
Allow shield hit animations to play to the end
2016-01-04 15:40:03 +01:00
Echelon9
7691c4905e
Correct comment regarding glGetString(GL_SHADING_LANGUAGE_VERSION)
2016-01-03 16:33:05 -05:00
Echelon9
9bd4fb3ac7
Lift up FXAA shader GLSL version check to opengl_post_load_shader(), out of the GLSL shader compiler preprocessor stage.
2016-01-03 16:33:05 -05:00
Echelon9
49b5d9a3b7
Fix up the revert of 0345d09a513082d15b53b045471f3fe1e3621b9b
2016-01-03 16:33:04 -05:00
Echelon9
22f14d56ea
Revert "GLSL: Provide a dynamic #version directive to the shaders, in line with OpenGL standards"
...
This reverts commit 0345d09a513082d15b53b045471f3fe1e3621b9b.
2016-01-03 16:33:04 -05:00
Echelon9
5f4568cc0e
OpenGL: Correct typo in one use of the __VERSION__ predefined macro
2016-01-03 16:33:04 -05:00
Echelon9
39842e7115
OpenGL: Rely on predefined macro __VERSION__ in GLSL language specification, rather than rolling our own. This predefined macro has been a language feature in all GLSL versions we support. See Section 3.3 Preprocessor.
2016-01-03 16:33:04 -05:00
Echelon9
cb90d286e5
GLSL: Provide a dynamic #version directive to the shaders, in line with OpenGL standards
2016-01-03 16:33:04 -05:00
Echelon9
e4c98e8527
Remove final DirectX Shader Model concepts. OpenGL GLSL version supported by the driver can be directly queried, rather than a layer of abstraction through SM2, SM3 and SM4. Allows Use_GLSL to be removed following refactoring.
2016-01-03 16:33:04 -05:00
Echelon9
5d593f0df0
Plumb through is_minimum_GLSL_version()
2016-01-03 16:33:04 -05:00
Echelon9
a045e5d266
Refactor out -disable_glsl_model command line option, which is encoded in Use_GLSL internally
2016-01-03 16:33:04 -05:00
Echelon9
21b8e3bb52
Add helper function is_minimum_GLSL_version()
2016-01-03 16:33:04 -05:00
Echelon9
3aa671a211
Replace SHADER_MODEL with GLSL_VERSION
2016-01-03 16:33:04 -05:00
Echelon9
d3ce9874a7
DirectX Shader Model 4.0 is equivalent to GLSL version 3.30. Source: https://www.opengl.org/wiki/Detecting_the_Shader_Model
2016-01-03 16:33:04 -05:00
SamuelCho
1cfbc24fb9
Merge branch 'master' into kill_ship_model_start
2016-01-03 13:04:03 -08:00
SamuelCho
4a4486c9be
Merge branch 'master' into kill_ship_model_start
2016-01-03 13:02:47 -08:00
SamuelCho
f57e346eff
Only enable team glow colors if team color texture mask has an alpha channel.
2016-01-02 16:47:28 -08:00
MageKing17
b0115a5f80
Stop exporting -no_fps_capping to the launcher.
...
Given the number of unintended consequences that can result from use of this command-line flag, we should return to the pre-137eb7e4d4cb0f9c153d15bbcce847347aa3d716 behavior of not including it in the exe_params[] array; anyone who knows what it does and why we don't advertise it can still use it for testing purposes, but it should prevent the typical user from turning it on without knowing exactly what can go wrong.
2016-01-02 12:19:13 -08:00
niffiwan
a23630346b
Merge pull request #505 from DahBlount/Fix-for-Coverity-#1343617
...
Fix for coverity 1343617
2015-12-31 17:40:29 +10:00
DahBlount
d4d805d6ca
Move turret_enemy_objnum check further up in block and change to Assertion
2015-12-30 23:44:04 -07:00
Karajorma
8a2eec5b4a
Fix the issue with repeat counts first discovered on this thread http://www.hard-light.net/forums/index.php?topic=90763.msg1801379#msg1801379
2015-12-30 16:56:50 +08:00
niffiwan
ee64b83aec
Allow shield hit animations to play to the end
...
Previously they'd always stop at 75% complete, and it's probably just
luck that it worked correctly for ✌️
2015-12-28 14:55:54 +10:00
MageKing17
24b58db67f
Merge pull request #479 from SamuelCho/hud_lock_fix_for_issue_456
...
My attempt to fix the HUD lock scoping issues raised by issue #456 .
2015-12-25 22:52:40 -08:00
Samuel Cho
2ddee36007
Cleaned up HudGaugeLock::render() and removed hud_draw_diamond() since that's not being used.
2015-12-25 19:34:39 -08:00
Goober5000
542dc68df2
add to Ship_flag_names array
2015-12-21 00:56:51 -05:00
Goober5000
b1ac0876d4
add no-disabled-self-destruct ship flag
...
Normally, ships whose weapons or engines subsystems are destroyed will
self-destruct after 90 seconds if they are part of a wing (see
ai_maybe_self_destruct). This adds a ship flag to prevent that from
happening.
2015-12-20 23:12:59 -05:00
Goober5000
7badc4dfd9
Merge pull request #476 from MageKing17/feature/weapon-bank-modular-compatibility
...
Modular tables now clear allowed weapons if +noreplace isn't specified.
2015-12-17 00:47:28 -05:00
niffiwan
036aae0ee2
Merge pull request #502 from SamuelCho/team_color_glows
...
Team color glows
2015-12-17 12:50:53 +10:00
SamuelCho
9cc70790c9
Save all the channels of the team mask, not just the red and green channels.
2015-12-16 00:57:12 -08:00
SamuelCho
7d392bd61c
Adjust the blended glow color value by how much the team mask contributes to this fragment.
2015-12-16 00:44:58 -08:00
SamuelCho
1552e02a51
Added support for glowing team color textures.
2015-12-16 00:20:15 -08:00
Fabian Woltermann
175640d60a
Merge pull request #492 from SamuelCho/faster_bmp_lookup
...
Changed bitmap_lookup to use ubyte instead of floats.
2015-12-16 06:39:50 +01:00
Goober5000