a3c680d20a
Merge remote-tracking branch 'scrawl/sleep_wait' into next
12 years ago
bf5e30b24f
everything done except health/mana restore
12 years ago
4829f47a4f
rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI
12 years ago
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
12 years ago
f01aae138f
Removing void
12 years ago
b96485284a
removed some unneeded return values
12 years ago
05c3936797
Merge remote-tracking branch 'upstream/master' into static
12 years ago
ff54508633
during cleanup we now delete all plugins created
12 years ago
05687c120f
protection for null cast
12 years ago
0fa1dea6c1
Box size set; Set speed
12 years ago
192d634098
Movement keys; View angles
12 years ago
4eae810de3
Merge remote-tracking branch 'edmondo/master'
12 years ago
76f2a82884
More pmove stuff; Turned off broadphase, we could not fall in exteriors
12 years ago
f6384574da
Starting to introduce pmove
12 years ago
f586f53a42
positioning
12 years ago
f21faf197c
selectionbuffer.cpp: fix ‘runtime_error’ is not a member of ‘std’
12 years ago
c161a3850f
Use correct type for iterator
...
Fixes building on Windows with vs2010.
12 years ago
02bca98e9f
Setrotate working
12 years ago
2793096b50
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
12 years ago
44c644dd7b
make it statically compilable
12 years ago
565aad3783
changed a method for ogre 1.8.0
12 years ago
1f7e044fad
removed some debug stuff
12 years ago
6ac2a12296
item selection working on the preview
12 years ago
eef750e6b0
race selection preview
12 years ago
a1a7733730
Set scale implemented
12 years ago
2b339f6c0f
loading screen
12 years ago
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
12 years ago
3e3437f9c3
Revised create and adjust rigid body functions
12 years ago
23777033fd
Starting to implement new PhysicActor
12 years ago
2efceba1fc
Tearing apart PhysicActor
12 years ago
0697c7f7f4
Finally merged in master
13 years ago
b7697a62ad
Position set back to zero
13 years ago
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
13 years ago
40c7a850bf
fix pmove BB shape origin
13 years ago
8762f4a47a
boxrotation nif field; commented functions
13 years ago
7b8b4c366d
Set angle now working for npcs and creatures
13 years ago
1f5bc229e0
Separate adjustRigidBody function
13 years ago
c4fe2e4e2a
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
13 years ago
97c45455fd
fix WindowManager destruction
13 years ago
86d6f190bf
Input system rewrite
13 years ago
e7329d5f8b
Creatures now have a properly positioned box shape
13 years ago
2beaa9d9ae
Workaround to allow main loop to know Ogre::Root's mQueuedEnd value
...
This change is needed because of changes in exit handling
13 years ago
91f0eed9c4
Merge remote branch 'scrawl/master'
13 years ago
ebf1fe415e
tiny fix
13 years ago
225530c690
implemented better main loop for OS X (carbon version). Input feels far less laggy
13 years ago
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
13 years ago
083e3537b4
post merge
13 years ago
cacf0bd10d
Basic collision with npcs
13 years ago
c251fbdf23
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
libs/openengine/ogre/renderer.cpp
13 years ago
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
13 years ago
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
13 years ago
d37d0b1947
build fix for windows
13 years ago
e9d4195500
removed cout spam
13 years ago
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
13 years ago
d5e63a767e
replace sprintf() with boost::format
13 years ago
26595f22f6
float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
13 years ago
9f813aa26c
update resource naming in getObjectAABB()
13 years ago
49b1d5e127
fix object placing
13 years ago
87050e48c8
physics getObjectHeight(), MWWorld::Class::getModel() definition
13 years ago
94ce95c679
bug #348 : works again on OS X
13 years ago
f8d6a36196
Merge branch 'master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
13 years ago
e7ab3544ac
removed some redundant code
13 years ago
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
13 years ago
a021165d9f
Changed standard C lib includes to C++ format
13 years ago
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
b4c8375f3c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/bsa/bsa_archive.cpp
13 years ago
b353cfd457
Remove unused Mangle::VFS
13 years ago
bd68f7bd33
Remove final direct uses of Mangle::Stream
13 years ago
2a3ce5ee6d
Remove Mangle::Stream
...
The base Stream class is left because some part of the terrain esm land factory
inherits from it, though it's largely unused (few of the methods work, and none
actually do anything).
13 years ago
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
13 years ago
7375035fef
Counter changed back to 10
13 years ago
feec67094f
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwworld/physicssystem.cpp
13 years ago
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
13 years ago
b5edad790d
merge
13 years ago
c85aaafac2
more include cleanup (most removing Ogre.h)
13 years ago
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
13 years ago
87127775e8
fix shutdown crash if ogre was not initialised yet
13 years ago
01d1995164
fix compilation against latest bullet svn
13 years ago
86d8a07fc7
Switching back to old scaling
13 years ago
4d55ecfdbe
Deleting scaled shapes; scaleObject()
13 years ago
33fe80723c
btScaledBvhTriangleMeshShapes
13 years ago
ac6b455592
StepSize moved back to 9
13 years ago
a1902b4121
Tweaks for high speed
13 years ago
5397b9dba6
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
13 years ago
ba38bad46e
Merge remote branch 'scrawl/leakfix'
13 years ago
974585d357
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
13 years ago
01fefca0a3
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
0b850a2cb5
fix crash introduced by last commit
13 years ago
0f71439991
Merge remote branch 'garvek/master'
13 years ago
b6744e6195
Merge branch 'master' into leakfix
13 years ago
e498495589
fix a leak: physics heightfield was only destroyed on cell change and not on exit
13 years ago
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.
13 years ago
c4c8288af8
Seven digit scales
13 years ago
5028f9926d
Bullet scale solution
13 years ago
10810ee311
Outputting formatted string with scale
13 years ago
20288de685
Post merge
13 years ago
595b0729da
Few things changed
13 years ago
447158e9d6
shutdown crash fix
13 years ago
0c7476b88c
Fix build in DEBUG mode for MSVC
...
- commented stall code
13 years ago
42e44ac1b5
fixed some leaks
13 years ago
c85c794c86
fixed some cppcheck issues
13 years ago
0012d7eb58
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
d081f7ea83
Don't run up walls
13 years ago
a9a582f858
renderer.cpp: fix std::runtime_error compile error
13 years ago
fb4e7f02b9
code correction
13 years ago
c5a685d11f
addition to last commit: show the selected weapon/spell names as inventory/spell window caption
13 years ago
a711a3ebe1
Various fixes
13 years ago
5d03e86613
added field of view and texture filtering to settings window
13 years ago
14f4f09f83
proper resolution switching (reposition GUI & adjust mouse clipping region)
13 years ago
f6a6684685
when the resolution changes, adjust camera aspect ratio and recreate compositors
13 years ago
656a8f1be9
working menu transparency slider
13 years ago
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
13 years ago
a284bfb4d0
Merge branch 'master' into inventoryGUI
13 years ago
09ec1da0f6
fix the latest commit: objects activation works again.
13 years ago
c5d685c780
added an assert
13 years ago
78b06d0ebf
inventory window pinning
13 years ago
a4d6d1baff
added a utility for creating texture atlas at runtime
13 years ago
c4b63bdb2f
.gitmodules
13 years ago
04ead5eb42
make the no-clip mode move much faster
13 years ago
6850f3945c
disable those physics debug prints
13 years ago
a13f542396
disable snapping underwater
13 years ago
86b6184f43
pMove in a seperate loop with fixed timestep to prevent frame-dependent movement
13 years ago
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
50d79a8815
Merge branch 'next' into tooltips
13 years ago
2c89306306
Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2
13 years ago
8ebae0b706
Solid trace
13 years ago
16855291a7
Implementing snapping
13 years ago
00260a24ce
Water corrections
13 years ago
75b336baea
Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2
...
Conflicts:
apps/openmw/mwinput/inputmanager.cpp
apps/openmw/mwworld/player.cpp
libs/openengine/bullet/physic.cpp
13 years ago
4d07ae7fe0
Swimming working
13 years ago
5f9056c45d
Better no clip
13 years ago
51a76eda92
Merge branch 'master' into graphics
13 years ago
1ce759af06
Merging in master
13 years ago
14377ba789
window caption fix
13 years ago
b3dc1931a9
general GUI refactoring, part 1
13 years ago
10398723d8
use different image pixel format
13 years ago
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
13 years ago
52b0b28c78
fixed the mygui output on console
13 years ago
f2fae770d4
Merge branch 'master' into physicsaedra2
...
Conflicts:
apps/openmw/mwworld/player.cpp
13 years ago
4a6a8e5420
don't write to disk
13 years ago
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
13 years ago
33f360f52f
transparency fix
13 years ago
944654f263
image rotating function
13 years ago
75dd651205
Merge branch 'terraincollision' into physicsterrain
...
Conflicts:
apps/openmw/mwworld/physicssystem.cpp
13 years ago
74deb5588d
Post merge
13 years ago
bc636f036c
made it compile
13 years ago
9e1a9e5758
Merge branch 'master' into physicsaedra2
...
Conflicts:
apps/openmw/mwinput/inputmanager.cpp
libs/openengine/bullet/physic.cpp
13 years ago
57299571d5
Preparing for clothes/armor
13 years ago
c0af3c7241
Merge branch 'master' into terraincollision
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
d09f0610ea
Add basic windows pinning
...
Create WindowPinnableBase class for windows which should be
allowed to be pinned.
Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).
Handle clicking on PinToggle button (pinning/unpinning a window).
13 years ago
0021ccf862
Merge remote-tracking branch 'upstream/master'
13 years ago
40310f3663
Merge remote branch 'scrawl/occlusionquery'
13 years ago
a4576f043d
fixed the physics debug rendering now activates/deactivates properly
13 years ago
58f7a03626
Merge branch 'terrain18' into terraincollision
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
8bbb02a1bd
ogre 1.8 fixes
13 years ago
b9fabce9c4
Awesome, working
13 years ago
72ff7ec030
Merge branch 'next' into occlusionquery
...
Conflicts:
apps/openmw/mwrender/sky.cpp
13 years ago
318355f1be
Bouncy effect gone
13 years ago
18c2b5eb0a
Merge branch 'next' into occlusionquery
13 years ago
5185a28b60
Issue #225 : Initialize all class members in constructor.
13 years ago
d3b88b9e34
Issue #225 : Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
13 years ago
a7ac0e526e
Issue #225 : Added cleanup of parts of PhysicEngine.
...
Added cleanup of CMotionState inserted to RigidBody,
and btSortedOverlappingPairCache inserted to btDbvtBroadphase
in PhysicEngine.
13 years ago
633e80cded
Issue #225 : Added cleanup of maps used in PhysicEngine.
13 years ago
f8f749dbec
Merge remote branch 'zini/next' into sound-rewrite
13 years ago
382fa6ac68
fixes
13 years ago
e4251be529
Down gravity
13 years ago
53d4be5cf6
object pickup should work everywhere
13 years ago
17a4adfe88
add raycast method that returns _all_ objects that were hit
13 years ago
18a139cd66
adding up and down move buttons
13 years ago
2bc81a778b
Merge remote branch 'zini/next' into sound-rewrite
13 years ago
f959a5cbeb
auto adjust size of map window title bar
13 years ago
99b2b6b648
ogre 1.8 fixes
13 years ago
64212c0ee6
replaced all the StaticImage and StaticText in code
13 years ago
b0b41a9199
should now compile warning free
13 years ago
d451d7bb67
compile fixes for mygui 3.2
13 years ago
74e79bb4af
Merge remote branch 'zini/master' into sound-rewrite
...
Conflicts:
apps/openmw/mwsound/soundmanager.cpp
apps/openmw/mwsound/soundmanager.hpp
13 years ago
2b3e75718c
Updating everything
13 years ago
ed7cb1dc67
restarting
13 years ago
655f9fe920
Merge remote branch 'k1ll/staticogre'
13 years ago
b83b7d0650
Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin.
13 years ago
42b445383f
Remove Mangle- and OpenEngine-related sound code
...
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
13 years ago
b7eb7ff8e3
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
13 years ago
3b6826b1ac
Set the attenuation model to linear, to be more in line with the vanilla game
13 years ago
9612ce595b
Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision
...
Conflicts:
CMakeLists.txt
13 years ago
836732096e
Fix both relative and 3D sounds
13 years ago
b4343431c6
Merged openengine into openmw
13 years ago
48c12e9d5c
Merge mangle into openmw
13 years ago
4c240c644f
OpenEngine update (log fix)
13 years ago
e7fa1d94b8
Merge remote branch 'scrawl/shapefix'
13 years ago
ba0365a427
collision shape scale fix
13 years ago
12b7c6f1ac
Merge remote branch 'corristo/master'
13 years ago
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
13 years ago
70da2a2a99
removed tabs
13 years ago
fa3fbf940c
Fix for OS X 10.6 support
13 years ago
f2b807142a
update mangle
13 years ago
f2c3616638
Merge branch 'next' into terrain_next
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
cmake/FindOGRE.cmake
13 years ago
1652680e9b
mangle update (music workaround)
13 years ago
cb780720bb
fix for string.h: use our own strnlen only on OS X < 10.7
13 years ago
69a00df01a
submodule update (uncommon crash fix)
13 years ago
db205cf8aa
Merge remote branch 'scrawl/next' into test
...
Conflicts:
libs/openengine
13 years ago
60856b46e6
moved the renderer update call from OMW::Engine to RenderingManager
13 years ago
f81b615976
implemented script functions FadeIn, FadeOut, FadeTo
13 years ago
4fcb721054
openengine update (physics crash workaround
13 years ago
258ab0218a
submodule update (issue #131 )
13 years ago
7a1799d529
submodule update
13 years ago
7c8853f6fe
post-merge fixes
13 years ago
960654e58f
using new openengine version
14 years ago
6aa1f3efdd
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
14 years ago
57c3414fcd
OpenEngine update (bug-fix)
14 years ago
615f10b8c0
OpenEngine update
14 years ago
bd08e308f8
mangle update
14 years ago
68004630e9
OpenEngine update
14 years ago
647e88003e
build and activation fix
14 years ago
c82a2fe37d
OpenEngine enhancements
14 years ago
40193253b0
fix some time bug
14 years ago
bf10471668
various OpenEngine improvements (don't forget to update your submodules)
14 years ago
e290f2f82f
Get physic fix in openengine and build nifbullet
14 years ago
1e9dc4b435
de-Windownizing and some build-fixes
14 years ago
940554b5fc
openengine update (remember to do a submodule update)
14 years ago
c459eb7c55
Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010.
14 years ago
b6e7de6527
new mangle version (remember to update your subnodules)
14 years ago
6b6ee5440e
Minimal set of fixes to build with MinGW.
14 years ago
004541f5cf
Tested and applied Chris' sound patch.
15 years ago
aa91b0232f
submodule update
15 years ago
ec8e92f7cd
Submodule update
15 years ago
fd5f4a5e5e
Mangle update (OpenAL bugfix)
15 years ago
11d0eb0bf2
submodule updates
15 years ago
5552c44753
Cleaned up strnlen in esm_reader. Added -Werror switch to g++.
15 years ago
e30306f7c3
Removed redundant custom exception class
15 years ago
d911653846
Merge with athile's WIP windows build
15 years ago
ca13c09209
Merged in athile's changes to mangle and openengine
15 years ago
e123fc1107
OpenEngine update (fixed crash bug)
15 years ago
336fb1636c
Windows fixes
15 years ago
9e2129c4b3
WIP Windows build
15 years ago
72fbeb9b9a
Mangle update
15 years ago
064bc4b6c9
Finished sound system
15 years ago
65c2070086
Temporarily disabled music
15 years ago
ef9ed99622
Mangle update (not important)
15 years ago
f2b2fe560f
Mangle update: Implemented streaming, fixed various bugs.
15 years ago
08289158d7
Added support for WAV files with libsndfile
15 years ago
9875d74abf
Implemented 3D sound placement. Sound management / lookup system not
...
done yet.
15 years ago
979ea4e607
Mangle update for const error
15 years ago
912c8b1f2d
Added mpg123 file reader
15 years ago
ebcbff255e
Changed how avcodec/avformat (ffmpeg) is included
15 years ago
cad9712411
Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file.
15 years ago
cf4185faef
Added sound test (remember to git submodule update)
15 years ago
7516e4ca53
Added music playing as a test
15 years ago
34572f0b19
Compiled and linked in sound system (not yet functional)
15 years ago
925b5d29dd
Added back right version of libs/openengine/ submodule. Please run git submodule update.
15 years ago
d72ed19460
implemented script compiler for console
15 years ago
c61212202b
Moved mwgui/ back to apps/openmw/. Fixed mouse position bug.
15 years ago
c84672a560
Added MyGUI to OpenMW, fully working (with events and script hooks)
15 years ago
4eb2863db4
Added input to apps/mygui_dev/
15 years ago
13d3f9c87e
Integrated OpenEngine, replaces entire components/engine/ directory.
15 years ago
259908013e
Started integrating OE (NO-COMPILE)
15 years ago
5005f5eb06
Fixed platform/strings.h to work again on Linux
15 years ago
b2485e8a52
Windows build fixes
15 years ago
91f5c9c01f
Moved mangle submodule. Running 'git submodule update' should be enough.
15 years ago
e4f85cb3e6
directory structure reorganisation (still missing the mangle stuff)
15 years ago
Marc Zinnschlag
scrawl
Jason Hooks
Brother Brick
Edmondo Tommasina
Michael Mc Donnell
greye
Nikolay Kasyanov
gugus
Chris Robinson
guidoj
Sylvain THESNIERES
Roman Melnik
Lukasz Gromanowski
k1ll
Michael Papageorgiou
Jan-Peter Nilsson
athile
Yuri Krupenin
Nicolay Korslund
Jan Borsodi
athile