asarium
94412da2de
Fix FreeTrack and headtracking
2016-08-16 15:44:40 +02:00
m!m
31fdcfdfbb
Merge pull request #806 from The-E/ship_weapon_flags
...
Converts the flags of ship_weapon to use the new flag system
2016-08-16 11:37:01 +02:00
Fabian Woltermann
ed974844e4
Merge pull request #795 from asarium/cmakeMerge/freetrack
...
Add improved head tracking code
2016-08-16 11:33:06 +02:00
Fabian Woltermann
418c47e426
Merge with master
2016-08-16 09:58:09 +02:00
MageKing17
384b4b9413
Merge pull request #834 from The-E/multi_server_version_bump
...
Bumps multi server version due to changes in the multiplayer sexp code
2016-08-15 23:39:48 -07:00
Fabian Woltermann
8248ac2516
Encapsulates the multi_sexp infrastructure in its own class ( #833 )
...
While working on #824 , I found out that cleaning up that particular piece of code would not be doable cleanly without a refactor of the multi_sexp infrastructure. This is that refactor; it encapsulates the code of multi_sexp inside a class, an instance of which is then used to manage all the network stuff that sexps need to do.
2016-08-15 23:39:40 -07:00
asarium
925e8df36e
Fix wrong condition introduced by #829
2016-08-15 22:21:10 +02:00
MageKing17
8f4972aab9
Merge pull request #618 from Karajorma/RemoveOldSEXPPackets
...
Remove several packets used in multiplayer that can now be handled by…
2016-08-15 12:52:11 -07:00
Fabian Woltermann
e0314eecd0
Bumps multi server version due to changes in the multiplayer sexp code
2016-08-15 21:42:38 +02:00
Fabian Woltermann
5b29d5449b
Merge pull request #831 from asarium/warnings/evenmore64bit
...
And another batch of warning fixes
2016-08-15 20:45:41 +02:00
Fabian Woltermann
8c939d0050
Merge pull request #814 from asarium/fix/selectedJoystick
...
Refine joystick selection
2016-08-15 20:44:52 +02:00
Fabian Woltermann
5ffe4b3168
Merge pull request #829 from asarium/feature/flagsetMultiple
...
Add support for indexing flagset with multiple flags
2016-08-15 20:43:37 +02:00
Fabian Woltermann
22f92bad55
Merge pull request #832 from z64555/fix/freelook1
...
Fixes an issue where the regular padlock view was disabled.
2016-08-15 20:43:21 +02:00
z64555
84a16c72ff
Fixes an issue where the regular padlock view was disabled.
2016-08-15 13:06:57 -05:00
asarium
0a7800d3ea
And another batch of warning fixes
2016-08-15 18:55:35 +02:00
asarium
9aff8d9b62
Fix logic operation
2016-08-15 16:22:39 +02:00
m!m
02ecdf6cf7
Merge pull request #817 from The-E/aiming_flags
...
Changes aiming flags to the new system
2016-08-15 15:29:26 +02:00
m!m
d637ccd8ed
Merge pull request #816 from The-E/ship_exit_flags
...
Changes ship exit flags to the new system
2016-08-15 15:28:13 +02:00
asarium
86cdb905db
Add support for indexing flagset with multiple flags
...
This uses the , operator for combining the flag values.
2016-08-15 15:24:48 +02:00
Fabian Woltermann
e1da184702
Merge pull request #825 from asarium/unittests/initial
...
Add unit test setup
2016-08-15 14:13:37 +02:00
asarium
4274a6da76
Add unit test setup
2016-08-15 11:40:08 +02:00
m!m
ddd64146d9
Merge pull request #820 from z64555/fix/filelength
...
Adds macro to replace instances of the deprecated filelength with...
2016-08-15 11:12:50 +02:00
MageKing17
43ca34cb4c
Merge pull request #821 from SamuelCho/lightshafts_reorder
...
Reorder lightshafts in the post process pipeline.
2016-08-14 20:16:50 -07:00
SamuelCho
60bee02f92
Reorder lightshafts in the post process pipeline. Fixes the glare effect from being too bright.
2016-08-14 19:09:29 -07:00
z64555
2b4117256a
Adds macro to replace instances of the deprecated filelength with _filelength if using MSVC.
2016-08-14 20:11:40 -05:00
asarium
8f034b08d4
Refine joystick selection
...
This uses the device-id as a tie-breaker if more than one joystick in
the system have the same GUID.
2016-08-14 20:26:03 +02:00
Fabian Woltermann
d5ac9a33c1
Merge pull request #815 from asarium/feature/flagsetInitializer
...
Add initializer_list support for flagset
2016-08-14 17:07:33 +02:00
Fabian Woltermann
43b68c5b22
Changes aiming flags to the new system
2016-08-14 16:59:22 +02:00
Fabian Woltermann
3160bdaa00
Changes ship exit flags to the new system
2016-08-14 16:48:11 +02:00
asarium
d1baf8edca
Add initializer_list support for flagset
...
This allows to initialize a flagset instance from a {...} expression
without having to create an intermediary instance.
2016-08-14 16:39:29 +02:00
m!m
af9cc94470
Merge pull request #807 from The-E/ship_subsys_flags
...
Changes the subsystem flags to the new flag system.
2016-08-14 16:24:28 +02:00
asarium
4e1334dbd2
Add code for printing information about connected joysticks
2016-08-14 12:32:09 +02:00
z64555
6f7039ed01
Merge pull request #809 from asarium/fix/joystickGUIDs
...
Fix wrong joystick event assignment
2016-08-14 02:11:58 -05:00
Echelon9
69a88cf58f
Improve legacy mode warning console message
...
Without the new line, this important warning line can get lost within
the console messages e.g. on Linux.
2016-08-13 17:44:03 -04:00
asarium
a4d70c78cb
Fix wrong joystick event assignment
...
Kobrar reported that joystick events were not properly assigned to the
right Joystick instances because the GUIDs of the joysticks was the same
(that's another problem since the code assumes that they actually are
Globally Unique like the name says).
The fix was to simply use the instance ID for checking if two sticks are
the same which seems to work more reliably.
2016-08-13 23:14:47 +02:00
asarium
60afa1431a
Add improved head tracking code
...
This adds an abstraction layer over the previous TrackIR implementation
and also adds an interface for the FreeTrack protocol.
2016-08-13 21:43:23 +02:00
Fabian Woltermann
d7e6e5e152
Fixes an issue in flagsets where the sanity check for flagset::set was inverted.
2016-08-13 18:26:17 +02:00
Fabian Woltermann
b352a4c13a
Merge pull request #770 from asarium/cmake_/ninjaColor
...
Enable color diagnostics for Ninja generator
2016-08-13 15:17:42 +02:00
Fabian Woltermann
dc11b13edd
Merge pull request #783 from MageKing17/feature/more-target-flags
...
Greatly expand available flags for creating target priority groups.
2016-08-13 15:17:15 +02:00
Fabian Woltermann
e1ba2256ed
Changes the subsystem flags to the new flag system.
2016-08-13 13:52:51 +02:00
Fabian Woltermann
0117ba446c
Merge pull request #794 from z64555/fix/joystick_hats1
...
More compatibility code for joystick hats.
2016-08-13 11:50:24 +02:00
Fabian Woltermann
71acc296f0
Merge pull request #804 from z64555/feature/freelook
...
Feature/freelook
2016-08-13 11:50:06 +02:00
Fabian Woltermann
64153da3bd
Converts the flags of ship_weapon to use the new flag system
2016-08-13 10:42:47 +02:00
z64555
d24aa9f478
Remove 4-pos hat to 8-pos hat conversion code. Revert this commit if needed in the future!
2016-08-13 01:03:50 -05:00
z64555
431dd7067e
More joystick hat compatibility code.
...
* There's now registers for both 4 position and 8 position hats for both timestamps and downcounts
* There's conversion code to allow an 8-position hat to act like a 4-position hat, which is needed by the FSO codebase which only uses 4-pos hats
* There's also conversion code to allow a 4-pos hat to act like an 8-position hat to some degree.
2016-08-13 01:03:49 -05:00
z64555
994f8f7ec4
Fix bug introduced by freelook code that disabled target padlock view mode.
2016-08-12 21:47:04 -05:00
MageKing17
78de88adcf
Greatly expand available flags for creating target priority groups.
...
Target priorities could previous only select based on very few flags, for the simple reason that very few were defined in the ai_tgt_*_flags[] arrays. This simply adds additional flags (even some that seem a little silly; I can't actually think of a reason to especially target "objects that are being rendered", but hey, maybe somebody will find a use for it in the future).
2016-08-12 19:24:07 -07:00
Fabian Woltermann
770fce8de5
Bitset flags -- take 2 ( #775 )
...
This introduces a new mechanism for handling bit flags. Instead of using an int (or two, or three) to write bits into, this uses the std::bitset in a wrapper class that accepts an enum class as input. This means that certain classes of errors we've had a few of in the engine, where a coder used the wrong set of flags or checked them against the wrong variable (SF_STEALTH vs SIF_STEALTH, for example) can now be detected at a compiler level rather than not at all.
2016-08-12 16:13:50 -07:00
z64555
b60f8742e2
Re-Re-enables the freelook mode. Somehow got lost during the Antipodes merge.
2016-08-12 18:09:24 -05:00
asarium
a685642554
And another batch of 64-bit fixes
2016-08-12 09:42:55 +02:00
asarium