jp9000
|
2a9e3a7179
|
Merge branch 'master' of https://github.com/jp9000/obs-studio
|
2013-12-12 21:41:53 -07:00 |
|
jp9000
|
de21e622b5
|
removed os_gettime_ms, added os_file_exists
|
2013-12-12 21:41:46 -07:00 |
Palana
|
3da014543e
|
fix min_adjust usage in calc_torque
|
2013-12-12 23:57:36 +01:00 |
|
Palana
|
fd5b00871f
|
add GetDataFilePath implementation for osx
|
2013-12-12 11:44:17 +01:00 |
|
jp9000
|
467362f584
|
added new settings management base class, updated main settings form, added to build files
|
2013-12-11 21:50:10 -07:00 |
|
jp9000
|
c902eab4db
|
fix a typo in the main program automake file
|
2013-12-10 21:17:58 -07:00 |
|
jp9000
|
dc4d1db4ea
|
update formbuilder file
|
2013-12-10 21:15:51 -07:00 |
|
jp9000
|
1e6c518700
|
change a few names for some of the control callbacks
|
2013-12-10 21:14:45 -07:00 |
|
jp9000
|
b0df5cf29c
|
add settings window subclass files
|
2013-12-10 21:14:20 -07:00 |
|
jp9000
|
c2604baea0
|
added more button callbacks
|
2013-12-10 11:22:33 -07:00 |
|
jp9000
|
28786349f3
|
added more text for settings window
|
2013-12-10 11:22:09 -07:00 |
|
jp9000
|
f9e9626ee6
|
Added preliminary settings window form
|
2013-12-10 11:21:34 -07:00 |
|
Palana
|
003dbfef73
|
compile osx test with -fobjc-arc
|
2013-12-09 19:23:16 +01:00 |
|
Jim
|
6887f00359
|
Merge pull request #7 from MattMcNam/master
Updated CMake with new effect file locations
|
2013-12-07 15:03:08 -08:00 |
|
Jim
|
4c256cc0de
|
Merge pull request #8 from Ceropean/master
Fixed build for *nix and added functions to platform-nix.c
|
2013-12-07 15:02:48 -08:00 |
Ján Mlynek
|
1005a841d4
|
fixed build for *nix platform
|
2013-12-07 22:51:58 +01:00 |
|
Ján Mlynek
|
c37fe1fd16
|
added functions to platform-nix.c
|
2013-12-07 22:32:29 +01:00 |
Matthew McNamara
|
a76a5937df
|
Updated CMakeLists with new effect file locations, added cmake & xcode build folders to gitignore
|
2013-12-07 21:05:31 +01:00 |
|
jp9000
|
5d3f3e0d1b
|
make text lookup use a simple linked lists rather than an unnecessary array of pointers
|
2013-12-07 11:23:49 -07:00 |
|
jp9000
|
9b882c097b
|
should only check for ending quote character in locale data if it began with a quote
|
2013-12-07 10:25:34 -07:00 |
|
jp9000
|
70290b8c2b
|
fixed locale code, added locale files, made wx use locale files, fixed some bugs, and added platform-specific files to the main program
|
2013-12-07 10:22:56 -07:00 |
|
jp9000
|
a899606d53
|
Merge branch 'master' of https://github.com/jp9000/obs-studio
|
2013-12-07 09:56:37 -07:00 |
|
jp9000
|
ec30222fc3
|
change build directory structure for a bit more consistency
|
2013-12-07 09:56:06 -07:00 |
|
Palana
|
0199c84687
|
updated automake files with latest osx changes
|
2013-12-07 17:40:27 +01:00 |
|
Palana
|
e6017ec1ba
|
changed allocation counter to uint64_t
also avoids format string confusion for bnum_allocs
|
2013-12-07 17:39:43 +01:00 |
|
Palana
|
968f9c03bd
|
use %u for size_t on microsoft compilers
|
2013-12-07 16:50:05 +01:00 |
|
Palana
|
0f484c4620
|
fix warning for OBSSource::operator=
|
2013-12-06 21:43:51 +01:00 |
|
Palana
|
499eaa4840
|
check for __APPLE__ instead of __WXCOCOA__
|
2013-12-06 21:31:42 +01:00 |
|
Palana
|
ad1abd45e8
|
fix format string
|
2013-12-06 21:31:42 +01:00 |
|
Palana
|
2284ef09fa
|
compile libobs with -fobjc-arc
|
2013-12-06 21:31:42 +01:00 |
|
jp9000
|
78e581a3c1
|
update makefiles for previous name changes
|
2013-12-06 09:18:47 -07:00 |
|
jp9000
|
0434ef0f62
|
change naming for some main program files for consistency
|
2013-12-06 09:16:33 -07:00 |
|
jp9000
|
2c886a9d83
|
fix references to subclass files within forms
|
2013-12-06 06:51:14 -07:00 |
|
jp9000
|
00b55c9d95
|
moved wx forms and generated files into a discrete 'forms' directory
|
2013-12-06 06:48:21 -07:00 |
|
jp9000
|
85374daa94
|
made it so that preview panel scales based upon window size
|
2013-12-06 06:39:19 -07:00 |
|
jp9000
|
a8d9c5b25c
|
updated UI files
|
2013-12-06 06:38:50 -07:00 |
|
jp9000
|
ff47b3a2dc
|
added functions to get current audio/video output information
|
2013-12-06 06:38:19 -07:00 |
|
jp9000
|
8298fa4dc7
|
With the permission of my fellow contributors, I'm switching obs-studio back to GPL v2+ to prevent issues between this project and the original OBS project, and for personal reasons to avoid legal ambiguity (not political reasons, I admittedly would prefer GPL v3+)
|
2013-12-02 22:24:38 -07:00 |
|
Palana
|
1bd2b9fd99
|
added os_get_home_path and os_mkdir to osx cocoa platform
|
2013-11-29 22:38:05 +01:00 |
|
Palana
|
e230b0e984
|
updated include paths (CMake+osxtest) and function prototype (osxtest)
fixes compilation with changes from e5c99175c5
|
2013-11-29 20:58:29 +01:00 |
|
Palana
|
99b06288ba
|
move using namespace below includes
fixes ambiguity between <wchar.h> and <cwchar>
|
2013-11-28 20:49:06 +01:00 |
|
jp9000
|
e5c99175c5
|
fixed some build issues on non-windows systems
|
2013-11-26 23:07:27 -07:00 |
|
jp9000
|
58810f9806
|
changed gs_draw_sprite to allow custom sizes, added output textures to the core, and adjusted the test code to accommodate the changes
|
2013-11-26 22:26:14 -07:00 |
|
jp9000
|
32e34ffe25
|
fixed a bug in matrix3_transpose - rotate the vector, don't transform the vector
|
2013-11-26 22:24:10 -07:00 |
|
jp9000
|
56034fd9ac
|
made a workaround to ensure that translations can be done through our custom system rather than using wx's internal system
|
2013-11-26 22:22:41 -07:00 |
|
jp9000
|
74dc470681
|
made it so that graphics device and associated objects are not lost every time video settings are changed
|
2013-11-26 22:20:11 -07:00 |
|
jp9000
|
279b487269
|
remove sys/stat.h include from obs-app.cpp
|
2013-11-23 23:40:05 -07:00 |
|
jp9000
|
0aad78819c
|
added initial config file stuff, set up a 'dummy' window to cause the graphics system to persist through window changes
|
2013-11-23 23:38:52 -07:00 |
|
jp9000
|
9b76651183
|
updated obs basic window form (needed an ID and needed a OnClose callback)
|
2013-11-23 23:36:25 -07:00 |
|
jp9000
|
fcf7e508a9
|
added os_mkdir to platform functions
|
2013-11-23 23:35:03 -07:00 |