Nikolay Kasyanov
e9d4195500
removed cout spam
2012-07-28 02:03:34 +04:00
Nikolay Kasyanov
fbe9a94568
bug #348 : fixed OS X deployment
...
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
2012-07-28 01:55:37 +04:00
Nikolay Kasyanov
94ce95c679
bug #348 : works again on OS X
2012-07-25 00:13:33 +04:00
scrawl
e7ab3544ac
removed some redundant code
2012-07-21 13:52:12 +02:00
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
2012-07-20 16:44:03 +02:00
guidoj
a021165d9f
Changed standard C lib includes to C++ format
2012-07-17 09:44:24 +02:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
gugus
feec67094f
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwworld/physicssystem.cpp
2012-07-09 15:23:26 +02:00
gugus
03f7740474
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/worldimp.hpp
2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d
merge
2012-07-07 15:27:04 -04:00
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
scrawl
87127775e8
fix shutdown crash if ogre was not initialised yet
2012-06-26 19:10:47 +02:00
scrawl
01d1995164
fix compilation against latest bullet svn
2012-06-20 18:22:18 +02:00
Jason Hooks
86d8a07fc7
Switching back to old scaling
2012-06-19 13:28:06 -04:00
Jason Hooks
4d55ecfdbe
Deleting scaled shapes; scaleObject()
2012-06-18 13:03:00 -04:00
Jason Hooks
33fe80723c
btScaledBvhTriangleMeshShapes
2012-06-17 20:56:10 -04:00
Jason Hooks
ac6b455592
StepSize moved back to 9
2012-06-17 12:57:59 -04:00
Jason Hooks
a1902b4121
Tweaks for high speed
2012-06-16 17:29:03 -04:00
gugus
5397b9dba6
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
2012-06-16 11:38:07 +02:00
Marc Zinnschlag
ba38bad46e
Merge remote branch 'scrawl/leakfix'
2012-06-15 17:42:32 +02:00
gugus
974585d357
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
2012-06-15 14:53:58 +02:00
gugus
01fefca0a3
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-06-15 14:53:19 +02:00
scrawl
0b850a2cb5
fix crash introduced by last commit
2012-06-15 09:15:37 +02:00
Marc Zinnschlag
0f71439991
Merge remote branch 'garvek/master'
2012-06-15 08:22:56 +02:00
scrawl
b6744e6195
Merge branch 'master' into leakfix
2012-06-14 21:28:24 +02:00
scrawl
e498495589
fix a leak: physics heightfield was only destroyed on cell change and not on exit
2012-06-14 21:27:55 +02:00
Sylvain THESNIERES
9f84518910
Remove dead code
...
Object class is quake specific stuff and these parts were *dead*. There is more references to the pointer but it is commented and seems to be used as "reference code" for future implementation of player functions, so I prefered not touching them.
2012-06-14 08:09:03 +02:00
Jason Hooks
c4c8288af8
Seven digit scales
2012-06-13 19:34:13 -04:00
Jason Hooks
5028f9926d
Bullet scale solution
2012-06-12 18:09:58 -04:00
Jason Hooks
10810ee311
Outputting formatted string with scale
2012-06-11 19:55:10 -04:00
Jason Hooks
20288de685
Post merge
2012-06-11 15:39:57 -04:00
Jason Hooks
595b0729da
Few things changed
2012-06-10 21:08:58 -04:00
scrawl
447158e9d6
shutdown crash fix
2012-06-09 19:15:11 +02:00
Sylvain THESNIERES
0c7476b88c
Fix build in DEBUG mode for MSVC
...
- commented stall code
2012-06-08 19:56:27 +02:00
scrawl
42e44ac1b5
fixed some leaks
2012-06-06 21:08:20 +02:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
gugus
0012d7eb58
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-06-03 12:53:23 +02:00
Jason Hooks
d081f7ea83
Don't run up walls
2012-05-31 20:13:40 -04:00
Edmondo Tommasina
a9a582f858
renderer.cpp: fix std::runtime_error compile error
2012-05-30 23:18:59 +02:00
Jason Hooks
fb4e7f02b9
code correction
2012-05-29 22:03:00 -04:00
scrawl
c5a685d11f
addition to last commit: show the selected weapon/spell names as inventory/spell window caption
2012-05-29 18:59:11 +02:00
gugus
a711a3ebe1
Various fixes
2012-05-29 16:45:43 +02:00
scrawl
5d03e86613
added field of view and texture filtering to settings window
2012-05-29 04:54:54 +02:00
scrawl
14f4f09f83
proper resolution switching (reposition GUI & adjust mouse clipping region)
2012-05-28 09:19:25 +02:00
scrawl
f6a6684685
when the resolution changes, adjust camera aspect ratio and recreate compositors
2012-05-27 21:39:18 +02:00
scrawl
656a8f1be9
working menu transparency slider
2012-05-23 01:32:36 +02:00
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
2012-05-22 03:36:03 +02:00
scrawl
a284bfb4d0
Merge branch 'master' into inventoryGUI
2012-05-19 15:07:37 +02:00
gugus
09ec1da0f6
fix the latest commit: objects activation works again.
2012-05-17 16:12:55 +02:00