Marc Zinnschlag
244eb11651
Merge remote-tracking branch 'greye/widechar'
2014-05-23 07:48:26 +02:00
greye
8f9091550e
require boost::locale only on Windows
2014-05-22 15:42:47 +04:00
scrawl
2f6d400c62
Merge branch 'master' of https://github.com/OpenMW/openmw into newgame
2014-05-21 10:41:03 +02:00
greye
b728a919a2
write dependency on boost::locale to CMake files
2014-05-20 12:59:58 +04:00
greye
46c32f6c47
OpenEngine MyGUI logging facility
2014-05-20 10:37:04 +04:00
scrawl
510b7f8505
Task #1333 : Remove cmake git tag reading
2014-05-19 07:31:19 +02:00
Marc Zinnschlag
7c149e98e0
Merge branch 'openmw-30'
2014-05-18 22:38:52 +02:00
Marc Zinnschlag
a5f0fe7282
incremented version number
2014-05-18 20:07:41 +02:00
Marc Zinnschlag
d08869a25d
Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead
Fixes for MSVC warnings, less overall changes
...
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
slothlife
c160a04ede
Revert "Fixes for warnings when building with MSVC"
...
This reverts commit 46eb20b98c
2014-05-14 00:03:30 -05:00
Marc Zinnschlag
199f030d38
adjusted cmake file for opencs user settings file rename
2014-05-09 17:19:44 +02:00
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
Marc Zinnschlag
21142711f0
Merge remote-tracking branch 'graffy76/master'
2014-05-07 10:35:11 +02:00
graffy76
a17cb1f389
Fixed opencs.ini formatting
2014-05-06 07:37:52 -05:00
graffy76
475214ab62
Implmented QSettings for loading / saving file definitions. Also
...
renamed opencs.cfg to opencs.ini to follow Ini format standards
2014-05-05 05:56:03 -05:00
Thoronador
688d556510
remove references to Audiere and MPG123 from top-level CMake file
2014-05-03 21:20:22 +02:00
Sandy
36914b43d7
Remove install of License of no longer used font
2014-05-01 08:19:05 -04:00
scrawl
78d322e6a5
Revert "Temporary added broken CMakeLists.txt - Travis IRC notification test."
...
This reverts commit 529d2436b5
2014-04-01 11:44:27 +02:00
Lukasz Gromanowski
529d2436b5
Temporary added broken CMakeLists.txt - Travis IRC notification test.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-03-31 22:14:12 +02:00
scrawl
0a17245633
Refactored settings window
2014-03-22 19:02:14 +01:00
Alexander "Ace" Olofsson
7ed3effc92
Fix windows packaging issue now that the OFL license doesn't exist
...
anymore.
2014-03-19 12:01:53 +01:00
scrawl
9089df3080
Add unity build option
...
Each component and each MW-subsystem will be used as a single compilation unit.
2014-03-16 23:49:12 +01:00
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
2014-03-05 17:08:58 +01:00
Marc Zinnschlag
6101916b7d
bumped version number
2014-03-04 08:52:48 +01:00
pvdk
56d537e23d
Added some sanity checking: compare git version with manual version
2014-02-19 14:37:27 +01:00
pvdk
b43325119a
Some changes to the version retrieval: ignore shallow clones
2014-02-19 14:19:08 +01:00
pvdk
85b7240948
Made the git version retrieval more reliable
2014-02-19 13:43:14 +01:00
Nikolay Kasyanov
4a61868521
OS X: fixed Ogre plugin packaging
2014-02-16 19:01:28 +04:00
Nikolay Kasyanov
e4017b8bfe
It seems that OctreeSceneManager is not required anymore
2014-02-16 14:16:45 +04:00
Nikolay Kasyanov
3c281c6a62
OS X: specify path to framework binary, not to framework directory
2014-02-16 14:12:45 +04:00
Nikolay Kasyanov
c2fe0d480a
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
2014-02-14 00:04:16 +04:00
Marc Zinnschlag
053b3dc371
Merge branch 'openmw-28'
...
Conflicts:
CMakeLists.txt
2014-02-13 20:57:28 +01:00
Nikolay Kasyanov
58add97676
Merge branch 'master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
2014-02-13 20:34:06 +04:00
scrawl
4e6507248b
Fix travis build
2014-02-13 12:19:21 +01:00
pvdk
19bef4fce8
Distinguish between release and development builds
2014-01-23 13:18:05 +01:00
pvdk
43bc223e68
Added version info retrieval from git tags
2014-01-22 17:04:49 +01:00
scrawl
37a59a37c6
Remove cpack (no longer used, according to BrotherBrick)
2014-01-17 15:20:28 +01:00
scrawl
659d790048
uuid is not used
2014-01-17 15:20:28 +01:00
scrawl
d4aeb177f9
Remove unused btKinematicCharacterController
2014-01-15 14:53:29 +01:00
Marc Zinnschlag
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
2014-01-08 20:16:39 +01:00
Dmitriy 'Endorph' Shkurskiy
116f125f05
Windows-specific definition to deny SDL from providing it's own WinMain()
2014-01-04 07:46:30 +02:00
Marc Zinnschlag
0d3e67dafc
Merge branch 'master' into openmw-28
2014-01-02 13:39:36 +01:00
scrawl
5b0a4c9424
Get rid of unused file and some other cruft.
2014-01-02 01:44:09 +01:00
Marc Zinnschlag
fe34c9cf1f
increased version number
2014-01-01 15:06:31 +01:00
Scott Howard
2f082ef796
remove unneeded libraries
2013-12-29 16:25:49 -05:00
Nikolay Kasyanov
892ff93489
OS X: attempt to fix #1045
2013-12-25 00:25:58 +04:00
Nikolay Kasyanov
73c6aba4d0
OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized
...
plugin install routine.
2013-12-12 15:20:04 +04:00
Nikolay Kasyanov
874ecee079
OS X: do not enforce static boost, this can be set externally
...
anyway
2013-12-12 14:20:13 +04:00
Nikolay Kasyanov
89c60b065c
OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable
2013-12-12 14:19:48 +04:00
