232 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Palakis	4141983ccd	Fixed a potential bug + WIP on scene collection/profile change	2017-02-26 17:04:48 +01:00
Palakis	2b8b5001e0	Merge branch 'master' of github.com:Palakis/obs-websocket	2017-02-25 17:43:52 +01:00
Palakis	532126561e	Rollback changes : my dev environment had the wrong Qt version (5.7.0-1 instead of 5.7.0)	2017-02-25 17:42:58 +01:00
Stéphane L	3c026c4eef	Update README.md	2017-02-25 17:33:46 +01:00
Palakis	ae6c15158f	Bugfix : copy issue in CMakeLists.txt	2017-02-25 16:39:55 +01:00
Palakis	6aa57247f9	Better build instructions (including release packager on Windows)	2017-02-25 16:32:20 +01:00
Palakis	50862ac945	Typo fix	2017-02-25 14:48:09 +01:00
Palakis	01ce6faa20	Add german translation to CMakeLists.txt	2017-02-24 20:33:45 +01:00
Palakis	6e571aef95	Fixed issue with exception "Must construct a QApplication before a QWidget"	2017-02-24 20:26:19 +01:00
Palakis	d6091c83e2	A bit of cleaning	2017-02-24 20:09:42 +01:00
Palakis	5ca55fc13e	sprintf is more cross-platform	2017-02-24 18:30:04 +01:00
Stéphane L	2b60da02e8	sprintf_s() is not cross-platform	2017-02-24 17:40:41 +01:00
Stéphane L	f02297152c	Update Utils.h	2017-02-24 17:37:44 +01:00
Palakis	af7c0bbc72	Removed a log message with a password in it	2017-02-24 00:50:16 +01:00
Palakis	40727d5a6c	Changed config key names from snake_case to CamelCase	2017-02-23 22:40:11 +01:00
Stéphane L	9bdd73dbc6	Merge pull request #41 from Frahmer/german-translation-2 ... Add german translation	2017-02-23 22:34:22 +01:00
Stéphane L	3e1ed09f12	Update README.md	2017-02-23 22:31:56 +01:00
Tobias	3682c625d7	Add german translation ... Add "ServerEnable" and "ServerPort" translation.	2017-02-23 22:30:08 +01:00
Stéphane L	70cd52ac95	Update README.md	2017-02-23 22:29:42 +01:00
Stéphane L	3264da4b2f	Update README.md	2017-02-23 22:29:24 +01:00
Stéphane L	06c1648f55	Updated PROTOCOL.md : new table of contents	2017-02-23 22:21:06 +01:00
Stéphane L	94c3e5d41d	Update PROTOCOL.md : better lisibility	2017-02-23 22:07:14 +01:00
Palakis	7ae20d8c3b	Semver : version number row left shift to 4.0.0	2017-02-23 21:36:00 +01:00
Palakis	0ff4411abf	Bugfix : deadlock when closing the server ... Caused by a non-recursive mutex	2017-02-23 21:25:26 +01:00
Palakis	3d68b7c9e5	Updated locale variables names + WIP Dynamic Server Settings	2017-02-23 21:01:24 +01:00
Stéphane L	f8b1cae0c9	Merge pull request #40 from Frahmer/german-translation ... Add german translation	2017-02-23 18:28:54 +01:00
Tobias	5bee0fc453	Add german translation	2017-02-22 19:30:15 +01:00
Palakis	7162765824	Fix compiler warning	2017-02-20 23:03:00 +01:00
Palakis	99aa6be887	Updated PROTOCOL.md and fixed some types	2017-02-17 17:01:25 +01:00
Palakis	afaaff298f	Fixes #35	2017-02-17 11:41:41 +01:00
Palakis	68cf9af6a3	Provide a item's base size in its infos	2017-02-17 11:25:46 +01:00
Palakis	8d5752d6b5	Version bump to the next release during dev	2017-02-15 20:18:06 +01:00
Palakis	98dbcc4c69	Copyright update and credit where it's due	2017-02-15 18:33:32 +01:00
Palakis	687d8fd120	PROTOCOL.md fix	2017-02-15 18:27:37 +01:00
Palakis	114ace23f7	Added OBS version number in the response fields of GetVersion	2017-02-15 18:25:44 +01:00
Palakis	3fbc221db0	Style changes	2017-02-15 17:09:34 +01:00
Palakis	f2e6e137a6	Fixed #21	2017-02-15 11:35:35 +01:00
Stéphane L	bb232f1b3e	Merge pull request #37 from mikhailswift/add_mute_source_command ... Add mute source commands	2017-02-13 21:17:16 +01:00
Palakis	9dc153bc22	Bugfix : std's map and set can cause crashes	2017-02-13 19:03:52 +01:00
Palakis	b9bbdf5978	Renamed pClient to pHandler	2017-02-13 18:25:07 +01:00
Mikhail Swift	e0db0e394d	Added missing return statements to ToggleMute and SetMute handlers	2017-02-13 12:09:44 -05:00
Mikhail Swift	3e9001721e	Fixed incorrect header level for SetMute and ToggleMute	2017-02-13 12:08:36 -05:00
Mikhail Swift	bbf3b0f86f	updated mistake in protocol.md	2017-02-12 23:06:00 -05:00
Mikhail Swift	7f3eb9f11b	update spaces to tabs in wsrequesthandler for toggle and set mute	2017-02-12 22:54:29 -05:00
Mikhail Swift	c783c51915	update spaces to tabs in wsrequesthandler for set and toggle mute	2017-02-12 22:52:20 -05:00
Mikhail Swift	0816d222c6	Fixed mistake in ToggleMute	2017-02-12 17:55:06 -05:00
Mikhail Swift	af16c70143	Added ToggleMute and SetMute handlers, updated PROTOCOL.md	2017-02-12 18:46:02 +00:00
Palakis	748b6f6e2e	Protect clients object list with a QMutex	2017-02-12 19:20:32 +01:00
Palakis	3bd600ed52	Preliminary work on event timestamping	2017-02-05 02:00:21 +01:00
Palakis	78e6ad0f59	Fixes #27	2017-02-05 01:46:38 +01:00