scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 04:31:35 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
12,738 Commits 62 Branches 1,531 Tags
4153aa80a94de6a13399780542808f1cf9fc84e9
Commit Graph
784 Commits
Author SHA1 Message Date
asarium 4a9f1a2d56 Fix the rest of the string conversion warnings 2017-01-05 00:15:01 +01:00
Fabian Woltermann 94b6a418c7 Merge pull request #1129 from SamuelCho/model_code_cleanup 
Model code cleanup
 2017-01-03 08:44:03 +01:00
Samuel Cho 347dca5e60 Renamed draw_list to a more descriptive model_draw_list. Removed unlit maps since those aren't needed anymore. Changed transforms in model_draw_list to use the transform_stack instead of using duplicate code. Removed some unused graphics code. Fixed scaling when using batched transforms. 2017-01-02 20:15:37 -08:00
MageKing17 a6c8af28f2 Add collision group support to beams. 
Makes beams inherit their firing ship's collision group if "$Weapons inherit parent collision group:" is enabled, and adds a collision group check to beam/ship collisions (and only beam/ship collisions, since collision groups are only currently checked for ship/ship and ship/weapon collisions).

This shouldn't break any existing mods, since usage of collision groups is surprisingly rare, and so is usage of weapons inheriting their parent's collision groups, and this change should only affect mods that do both at the same time; from a (very quick, non-representative) survey of modders, it's entirely possible that the mod requesting this change is the only one that does so (theoretically, there could be a mod out there that uses scripting to explicitly set the collision group of a beam object, but if they did so and then relied on it not actually doing anything, that's incredibly silly of them).
 2016-12-30 23:39:07 -08:00
Fabian Woltermann 94721d06de Merge pull request #1100 from asarium/feature/monitorRevival 
Integrate the existing monitor system into the new tracing system
 2016-12-25 15:26:52 +01:00
asarium 6922d3ca2c Integrate the existing monitor system into the new tracing system 
This writes the monitor updates as counter events into the event trace
file.
 2016-12-21 16:10:01 +01:00
asarium 7e1ca2ce51 Fix scripting hook object parameter 
It was using the object pointer of the User before which is not correct
since the object pointer of the beam is needed.
 2016-12-20 17:57:43 +01:00
DahBlount 4a3287457d Fix Don't Spawn If Shot 2016-11-29 11:54:43 -07:00
asarium d64196eff0 Refactor tracing subsystem 
The new design is centered around the Event Trace JSON format but it
should still be possible to adapt it for other profiling tools. The old
profiling system has been removed.
 2016-11-24 10:26:21 +01:00
niffiwan b8826835e2 Fix Coverity 1365316 
Move check for -1 to before we use weapon_index as an array index :)
Also fixes coverity 1365315; which seems like a redundant issue...
 2016-10-30 22:43:21 +10:00
asarium 92cb2140aa Replace _isnan with std::isnan 2016-10-15 19:37:18 +02:00
DahBlount c323917db9 Splits up isWeaponUsed into two functions 2016-10-12 14:18:08 -06:00
DahBlount 5575e65eb6 Add isWeaponUsed scripting function 2016-10-12 14:18:08 -06:00
DahBlount ffab766a38 Clarify flag choice dependent upon weapon type 
Ensures that primary weapons can't launch secondary weapons and vice
versa.
 2016-10-10 01:59:31 -06:00
DahBlount 8bebea455a Make linked/dual fire consistent 
Make sure we've got initialized values in the secondary pattern indexes
for a ship_weapon and also allow linked/dual fire to be in sequence
instead of swapping in the base weapon at the beginning of each pattern
loop.
 2016-10-10 01:24:25 -06:00
DahBlount c2b98654fc Make sure substitution weapons get counted as used. 
This will ensure the weapons get properly paged in.
 2016-10-10 01:24:25 -06:00
asarium 6dbf200cc3 Move lua to scripting folder 2016-10-03 21:38:29 +02:00
Goober5000 d9c9647919 Merge pull request #947 from MageKing17/cleanup/miscellaneous 
Some miscelleaneous cleanup commits.
 2016-09-17 23:15:17 -04:00
asarium 26f45732da Move profiling functions into separate folder 2016-09-14 12:26:53 +02:00
MageKing17 bce17561ed Change pointless .size() calls into .empty() calls. 
The codebase had quite a few instances of .size() being called and then checked to see if it was 0 or not (or less than 1, or greater-than-or-equal-to 1, which are basically equivalent), when .empty() could be called instead (negated or not, depending on what the original condition was).
 2016-09-07 18:36:12 -07:00
Fabian Woltermann 99a59efdbf AI Goal flags converted 2016-08-31 15:30:49 +02:00
SamuelCho b75a354505 Cleaned up more rendering code. Shrunk the vertex struct since we don't use spec_rgb anymore. Removed any declarations using the old geometry batcher. Streamlined desaturation in the model shader to use the main color uniform. Removed old unneeded interp_ code. Removed stored geometry shader parameters from the shader constants since we're no longer using the EXT version of geometry shaders. 2016-08-30 23:22:09 -07:00
asarium 173041e03a Remove is_minimum_GLSL_version() 
Since OpenGL Core is required now that function would always return true
so it can be removed.
 2016-08-26 22:16:30 +02:00
Fabian Woltermann edecb1ca73 Merge pull request #844 from SamuelCho/opengl_core_materials 
OpenGL Core, material draw system, and geometry batching rewrite
 2016-08-26 19:07:32 +02:00
Fabian Woltermann 989f799766 Fix for parsing the no pierce flag (#890) 
Removes "no pierce shields" from the `Weapon_Info_Flags[]` array as it's not actually a flag (fixes usage of it tripping an assertion).
 2016-08-26 01:41:20 -07:00
MageKing17 1a9867593b Fix minor problem with the logic for parsing the beam flag. 
It was setting the Pierce_shields flag based on whether or not the Beam flag was set, rather than based on whether or not the beam flag was explicitly provided; as such, a TBM entry for a non-piercing beam that contained a "$Flags:" entry but didn't re-set "no pierce shields" could spontaneously regain its piercing status (explicitly setting "beam" again will re-add piercing, but this should match previous behavior).
 2016-08-25 22:55:37 -07:00
SamuelCho e74af5ad53 Merge branch 'master' into opengl_core_materials 2016-08-25 21:43:14 -07:00
SamuelCho 6442307c27 Merge branch 'master' into opengl_core_materials 2016-08-25 20:04:14 -07:00
m!m fceaf9eb06 Merge pull request #870 from The-E/ai_info_flags 
Ai info flags conversion
 2016-08-25 12:22:07 +02:00
SamuelCho 6fd1f8fbb0 Merge branch 'opengl_core_materials' of https://github.com/SamuelCho/fs2open.github.com into opengl_core_materials 2016-08-24 21:57:23 -07:00
SamuelCho 67916a4efb Cleaned up various warnings from orphaned variables or added by the new rendering code. 2016-08-24 21:28:24 -07:00
Fabian Woltermann 61cf5bef9b Merge pull request #850 from asarium/warnings/more64bit 
64-bit warning fixes...
 2016-08-24 13:04:12 +02:00
MageKing17 a141e5d4f4 Merge pull request #877 from The-E/weapon_flag_parsing_fix 
Fixes an issue when parsing the weapon info flagset.
 2016-08-23 14:47:19 -07:00
asarium 20beb2eec1 64-bit warning fixes... 2016-08-23 23:17:41 +02:00
Fabian Woltermann e535cf566b Fix a few issues found while reviewing, thanks MageKing 2016-08-23 22:01:57 +02:00
asarium beb9288c73 Merge branch 'opengl_core_materials' of https://github.com/SamuelCho/fs2open.github.com into ogl_core/merge 
Conflicts:
	code/graphics/gropengl.cpp
	code/io/cursor.cpp
	freespace2/SDLGraphicsOperations.cpp
 2016-08-23 16:05:28 +02:00
Fabian Woltermann 444ae43aa4 Fixes an issue when parsing the weapon info flagset. 2016-08-23 14:37:43 +02:00
asarium a11b95ef56 Fix weapon flag parsing when +override is present 2016-08-23 13:41:28 +02:00
Fabian Woltermann 3e6022b000 Merge pull request #869 from asarium/fix/weaponsMemoryLeak 
Fix memory leak reported by LeakSanitizer
 2016-08-23 10:38:28 +02:00
Fabian Woltermann add8662737 Converts AI Info flags 2016-08-22 16:39:42 +02:00
Fabian Woltermann ed84ac348e Merge with master 2016-08-22 11:37:50 +02:00
m!m 38fb41909b Merge pull request #861 from The-E/ai_profile_flags 
Ai profile flags converted
 2016-08-22 11:32:55 +02:00
asarium a3e458ba49 Fix memory leak reported by LeakSanitizer 2016-08-22 11:28:51 +02:00
SamuelCho 311cf769df Reconciled bit flags. 2016-08-20 19:39:10 -07:00
SamuelCho 89046b536a Fixed use of erroneous frame number for rendering shockwave distortions. 2016-08-20 17:36:57 -07:00
m!m a34bcd60ed Merge pull request #852 from The-E/weapon_flags 
Weapon flags
 2016-08-20 15:57:05 +02:00
Fabian Woltermann 325442207c Addressing feedback 2016-08-20 12:57:32 +02:00
Fabian Woltermann 0591b7ef49 ai profile flags 2016-08-19 22:44:39 +02:00
Fabian Woltermann 9f27973147 Fixes various bugs 2016-08-19 19:23:55 +02:00
Risto Toijala 5d96e49354 Fix weapon flag parsing 
Starting with git 127976c (#851), FSO fails to start, displaying an
error. This is my attempt to fix it. FSO starts, but I do not know how
to check that the flags are parsed correctly.
 2016-08-19 19:19:46 +03:00