WLs50
|
1feb4c4bd0
|
fix merging issue regarding discord-rpc
|
2025-04-05 14:49:42 +02:00 |
|
WLs50
|
0280b40ca5
|
Merge remote-tracking branch 'manul-public/master' into manul-staging
|
2025-04-05 14:24:53 +02:00 |
|
WLs50
|
ffe5ece058
|
wrap discord rpc as optional feature
|
2025-03-17 07:19:07 +01:00 |
|
WLs50
|
d793866937
|
Merge branch 'manul-staging' of https://github.com/wls50/maszyna-internal into manul-staging
|
2025-03-16 22:14:42 +01:00 |
|
WLs50
|
8f98292cbe
|
implement moon
|
2025-03-16 22:12:37 +01:00 |
|
|
|
27f4920869
|
Add discord-rpc library
|
2025-03-16 16:22:54 +01:00 |
|
WLs50
|
07583a9f07
|
fix order of parameters after cmake -E copy -t
|
2025-03-16 14:51:38 +01:00 |
|
WLs50
|
d9b64c42fb
|
fix unresolved symbols when static linking glfw
|
2025-03-10 20:32:27 +01:00 |
|
WLs50
|
33ffcaf66b
|
always use included glfw for build
|
2025-03-09 21:22:35 +01:00 |
|
WLs50
|
a5f6397eca
|
merge manul
|
2025-03-09 15:36:11 +01:00 |
|
|
|
33b85baf77
|
Add discord-rpc library
|
2025-02-24 22:02:01 +01:00 |
|
milek7
|
ba5dfda64d
|
WITH_PYTHON build option
|
2022-07-07 02:29:36 +02:00 |
|
milek7
|
129bc9059c
|
make imgui version runtime selectable
|
2022-04-13 22:15:43 +02:00 |
|
milek7
|
10fdb24c79
|
change MSVC build flags
|
2022-04-09 22:20:01 +02:00 |
|
milek7
|
ce6d530aa8
|
changes for standalone e3d export
|
2022-03-06 18:18:07 +01:00 |
|
milek7
|
5bafa31f9d
|
Merge commit 'd8170c932b448ba6888e702746b5ae22632062d8' into sim
|
2022-01-05 22:21:05 +01:00 |
|
Milek7
|
f1723ac66b
|
remove flags for old luajit
|
2021-09-12 17:03:37 +02:00 |
|
milek7
|
994b1446c1
|
toggleable lua support during build
|
2021-03-06 03:49:53 +01:00 |
|
milek7
|
3d15cf3672
|
add crashreporter
|
2021-02-13 18:32:19 +01:00 |
|
milek7
|
41cda4a889
|
skip precompiled headers for 3rd party files (fixes imgui2-modern renderer interaction)
|
2021-01-31 00:05:15 +01:00 |
|
milek7
|
a30d5f858a
|
build system tweaks
|
2021-01-30 17:05:08 +01:00 |
|
milek7
|
ca8145904b
|
do not make unnecessary exports on nix platforms
|
2021-01-30 16:00:58 +01:00 |
|
milek7
|
158c42b5f0
|
cleanup: remove VSDev camera implementation, remove symbols from CI because they are unreasonably big, mac CI tmp upload
|
2021-01-24 23:53:37 +01:00 |
|
milek7
|
610ae75b17
|
reenable precompiled header, add USE_LTO option, enable LTO in CI builds
|
2021-01-24 23:15:18 +01:00 |
|
milek7
|
4e868288ee
|
add support for ETC2_EAC in .ktx files
|
2021-01-20 22:46:52 +01:00 |
|
milek7
|
5fcd108b3d
|
add MacOS ARM64 to CI builds
|
2021-01-19 15:47:33 +01:00 |
|
milek7
|
6a18494379
|
let's try random macos fix
|
2020-11-23 22:59:33 +01:00 |
|
milek7
|
1f489b164f
|
cmake libpng search tweaks
|
2020-11-23 22:11:04 +01:00 |
|
milek7
|
1c5dcfb87e
|
enable openvr for windows CI
|
2020-11-18 01:19:46 +01:00 |
|
milek7
|
c9169edf72
|
prepend_scn feature
|
2020-10-31 01:19:37 +01:00 |
|
milek7
|
b4951a5db4
|
rename autogenerated version file, it clashes during merges
|
2020-10-19 02:38:53 +02:00 |
|
milek7
|
d13cf5c1a4
|
automated version.h
|
2020-10-19 01:17:12 +02:00 |
|
milek7
|
47d8a7c541
|
fix source list, break elseif chain because msvc is dumb
|
2020-10-19 00:06:48 +02:00 |
|
milek7
|
c953ece94a
|
disable compiling experimental features by default
|
2020-10-18 23:38:31 +02:00 |
|
milek7
|
29f8f91ad8
|
Merge remote-tracking branch 'tmj/master' into sim
|
2020-10-18 23:35:14 +02:00 |
|
milek7
|
1dc1bd5fcb
|
pre-merge renames
|
2020-09-30 18:27:43 +02:00 |
|
milek7
|
936effa9db
|
openvr WIP
|
2020-09-29 22:27:13 +02:00 |
|
milek7
|
09f442456f
|
cppzmq libs
|
2020-03-29 22:14:47 +02:00 |
|
milek7
|
cefd741d04
|
zmq panel interface
|
2020-03-29 21:54:57 +02:00 |
|
milek7
|
e8537a16bb
|
headtracking from joystick input
|
2020-02-11 00:16:57 +01:00 |
|
milek7
|
a8b614cf6f
|
fix error reporting of python syntax errors
|
2019-09-18 19:18:53 +02:00 |
|
milek7
|
8bb65f006d
|
gl::query class, use of occlusion queries in glare rendering
|
2019-09-15 21:04:52 +02:00 |
|
milek7
|
c651ba21a2
|
extcam camera preview
|
2019-09-07 02:06:09 +02:00 |
|
milek7
|
1626864bfe
|
cleanup
|
2019-08-09 00:45:38 +02:00 |
|
milek7
|
0ed35ed254
|
Merge branch 'gfx-work' into sim
|
2019-08-08 15:56:06 +02:00 |
|
milek7
|
37fea6db7a
|
Merge branch 'milek-dev' into gfx-work
|
2019-08-08 15:35:25 +02:00 |
|
milek7
|
1fa6313373
|
Merge branch 'master' of https://github.com/tmj-fstate/maszyna into milek-dev
|
2019-08-08 00:37:04 +02:00 |
|
milek7
|
d039207b03
|
snapshot
|
2019-07-02 01:00:42 +02:00 |
|
milek7
|
aae73106f4
|
Merge branch 'gfx-work' into sim
|
2019-04-15 13:10:40 +02:00 |
|
milek7
|
c0b11a4517
|
Merge branch 'sim_VideoStream' of https://github.com/MichalPeterek/maszyna into sim
|
2019-04-09 00:02:05 +02:00 |
|