a6e6411686
Merge remote-tracking branch 'scrawl/master'
11 years ago
5b0a4c9424
Get rid of unused file and some other cruft.
11 years ago
9245faf2aa
Don't destroyRenderTarget with a NULL window
11 years ago
5c5f87445b
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
a3ff9e5be8
Change destruction order - fixes a shutdown crash discovered with mesa
11 years ago
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
f695deb29d
Remember window positions
11 years ago
3a82f8c193
Fix incorrect log file name for launcherOgre.log
11 years ago
636d399c7f
Refactored Ogre initialisation into a component
11 years ago
4f35fd8184
Removed a workaround from Renderer, some cleanup
11 years ago
5e42c73356
Better fix for unshield, comments on changes, no more commented out code.
11 years ago
22a5f7198f
A few fixes to build on Windows
11 years ago
f12d5b728a
Ogre 1.9 compatibility changes
11 years ago
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
12 years ago
3fa65f21dd
Use a proper cone shape with a contact test to check for melee hits
12 years ago
a993af53e7
Merge remote-tracking branch 'zini/master' into physics
12 years ago
394fc75697
Clean up the trace struct
12 years ago
b351109649
Get rid of the old newtrace method
12 years ago
14acacf401
Use a better method to do actor physics traces
12 years ago
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
12 years ago
1aa92067c2
Fix tracing down
12 years ago
8c3564326e
Improve movement inertia
...
Handles all 3 axis. Incoming velocity is only added to inertia when
leaving the ground, and does not continually add to it.
12 years ago
8bcce0fb55
Clean up the trace struct
12 years ago
62c7b3698d
Get rid of the old newtrace method
12 years ago
65ce3c6ba5
Use a better method to do actor physics traces
12 years ago
de95926e9f
Use controllers to animate lights in ObjectLists
12 years ago
643e7651e0
Use a null material for non-SubEntities in the selection buffer
12 years ago
41b2fa985b
silenced some warnings
12 years ago
9123afa863
Merge remote-tracking branch 'gus/MeleeCombat2'
12 years ago
4c7dcdc8aa
check if there is an object in the way
12 years ago
830762722d
first attempt: hit detection with a sphere (not finished)
12 years ago
130141ecac
Merge remote-tracking branch 'corristo/master'
12 years ago
66608d5c92
Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre
12 years ago
7dc30a01cd
Some changes suggested by cppcheck
12 years ago
b248d85b84
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2
12 years ago
565cbe146d
function declaration
12 years ago
aa555b3086
Doors no longer get hindered by actors that have collision disabled
12 years ago
04b90b7d14
Other actors no longer collide with an actor that has collision disabled
12 years ago
a547c2584e
Merge remote-tracking branch 'swick/sdl2fix'
12 years ago
0d2b357bdf
use SDL_WINDOWPOS_CENTERED_DISPLAY and SDL_WINDOWPOS_UNDEFINED_DISPLAY instead of coordinates
12 years ago
6164e5bae6
Restored window resizing
12 years ago
e7459a04b1
Fix always false comparison
...
SDL_GetWindowWMInfo result of type SDL_bool (SDL_TRUE = 1 or
SDL_FALSE = 0) should not be compared to -1.
12 years ago
dbdfa624e1
Don't start the player with collision disabled
...
Since we spawn properly at the door now, there's no reason
to start with tcl on.
12 years ago
50a0d16f8f
Pass only the X11 window to Ogre, otherwise it would treat it as parentWindowHandle instead of externalWindowHandle. parentWindowHandle does not seem to play nice with SDL and occasionally crashes with a GLXBadDrawable error on startup.
12 years ago
847ec9fa56
Merge remote-tracking branch 'swick/master'
12 years ago
72b7e113cc
only apply in fullscreen
12 years ago
8bdc9ff3ae
set position of the window for multiple monitors
12 years ago
f43b48015e
remove actor's collisionbox on death
12 years ago
de2868c0a3
Fixed 64-bit OS X build
12 years ago
c71da1a2ff
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
12 years ago
50e5aa8976
Custom rendering loop on OS X again. Prevents default Ogre message pump
...
from stealing input events.
12 years ago
f1ff9b69b3
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
12 years ago
6abb7a18b0
SDL2 input: seems to work on OS X, has some input issues though
12 years ago
3fded2d8bf
Removed custom Carbon message pump
12 years ago
adf54cb735
SDL2 input: compilation fixed
12 years ago
c29699487f
forgot to add file
12 years ago
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
12 years ago
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
12 years ago
1e7cf4ae1c
GLES2 experiment
12 years ago
0c4a963132
Container UI rewrite
12 years ago
fe5aaa9dff
fix NPC collisions
12 years ago
15afbe58a8
minor corretion
12 years ago
603af21715
little interface improvement
12 years ago
a328a03bd3
more fix. Fargoth quest almost work as in vanilla now.
12 years ago
006f25d1c0
First try to improve AI. Does not work yet due to strange bug in physicsystem
12 years ago
95eeea2a27
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
...
This reverts commit 089ef7a2a067422c397c
12 years ago
089ef7a2a0
Merge remote-tracking branch 'glorf/acrobatics'
12 years ago
236ec3409f
Finished acrobatics
12 years ago
627c3fdb6b
Added GetStandingPC, GetStandingActor; Fixed GetStartingPos
12 years ago
91c89e5db4
Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace
12 years ago
2e1dda9010
Fix old bullet versions
12 years ago
208f9ca8c5
Fix problem with newer (or older?) bullet version (thanks travis)
12 years ago
9343b4459e
Opening doors
12 years ago
933f894148
Added Blind and Night Eye effects
12 years ago
21bdcc9f20
Only use the shader based mygui manager if the fixed pipeline is unavailable
12 years ago
b34caccd2e
Fix moving NPCs not getting their collision box moved
12 years ago
254c6840d8
Fix particle direction
12 years ago
dd981077b9
Handle the vertical and horizontal parameters of Nif particles
...
Note that 'horizontal' is mapped to rotate around the Z axis, not Y. The Nif
particle parameters seem to be set up to expect a normal OpenGL (Direct3D?)
orientation, rather than the 90-degree pitch offset of the game.
12 years ago
7191f6ed2a
Start a Nif-style particle emitter
...
Not complete yet (doesn't handle the vertical or horizontal direction/angle),
and should probably be renamed.
12 years ago
9cc97b195c
Implement Gravity particle affector effects
12 years ago
5b30677e41
Add the start of a custom gravity affector
12 years ago
b98063bba0
Fix deleted pointer access (getPosition, getRotation)
12 years ago
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
12 years ago
4daaa4030d
Added shader based MyGUI render manager to allow using Ogre's next generation render systems.
12 years ago
81615c1ae5
Add a custom GrowFade particle affector
12 years ago
4d14fe0d95
Merge remote-tracking branch 'zini/master' into nifogre
12 years ago
77ba0fbe73
Prepare for creating particles
...
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
12 years ago
ebaf80d539
Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.
12 years ago
af6409b9f5
Fix NPC physics scale problem
12 years ago
b2f6f67d53
Merge remote-tracking branch 'scrawl/master' into next
12 years ago
3277ef26da
Fix a crash when dropping objects without a collision shape
12 years ago
6c1ff8caca
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
12 years ago
f84db69ade
Remove the background window trick, which currently doesn't serve any purpose
12 years ago
84afd87321
Placeable objects should not collide unless they have a NiRootCollisionNode
12 years ago
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
12 years ago
d696da7677
Fix selection buffer
12 years ago
7e100c36b5
Merge remote-tracking branch 'gus/AI'
12 years ago
5938e19362
Clean up
12 years ago
48b3f1e0cf
Clean up. But still a little hacky
12 years ago
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
3e97943e06
Merge remote-tracking branch 'scrawl/includes'
12 years ago
05bd94effb
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
7fb2ff18a3
Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public)
12 years ago
9a84f6744f
Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)
12 years ago
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
12 years ago
109dff2d29
renamed high level NIF files...
12 years ago
9810eafe23
Removing now unused oengine/imagerotate
12 years ago
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
12 years ago
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
12 years ago
2e7bc1a368
Z-up conversion: local map, fix tcg
12 years ago
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
12 years ago
fe6fa9ebe7
Simplify newtrace a bit
12 years ago
66743ecee7
Remove some unused trace fields
12 years ago
86f6491bc8
Remove unused pmove code
12 years ago
89fabdb3a9
Update the PhysicActor's RigidBody when moving
...
This works, but is less than ideal. As it is now, the rigid body gets updated
twice as the position and rotation are set separately. They should instead be
updated together.
12 years ago
5a1a0b7338
Add and use an MWWorld::isFlying method
12 years ago
5d403ebdd3
Fix collision debug drawer (tcg)
12 years ago
6356d3a385
Start actors with collision enabled
...
NPCs are now affected by gravity. The player still starts in no-collision mode
though, since they start in the void rather than a door marker.
12 years ago
735c1ec2ae
Cleanup trace.cpp/h
12 years ago
d47d2216f2
Use some const references where appropriate
12 years ago
cbdd459500
Remove unneeded playerMove from PhysicActor
12 years ago
923d0d6eb4
Fix up some header includes
12 years ago
e577ee2de8
Add a method to set/retrieve being on the ground
12 years ago
608c112f34
Supply the new render window to mygui
12 years ago
31f760ccce
Fixing issues from last commit: restored input and occlusion queries
12 years ago
c4d518132f
With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.
12 years ago
a782a9109b
Store the vertical velocity in the physic actor
12 years ago
82e4da4e64
Get the half-extents from the physicactor
12 years ago
5334934612
Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.
12 years ago
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
12 years ago
10a3caa504
more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine
12 years ago
043e29c620
Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)
12 years ago
e4f140841e
Make OpenMW work with Ogre 1.9
12 years ago
917bbc4e11
Create static and non-discardable textures with the right parameters (should fix Issue 443)
12 years ago
3c91f7793b
overrode MyGUI::DataManager::isDataExist
...
Created a override of MyGUI::DataManager::isDataExist to fix a
performance issue with MyGUI startup. This required moving the
functionality of MyGUI::OgrePlatform into OEngine::GUI::MyGUIManager so
that a new version of the MyGUI::DataManager could be created.
12 years ago
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
12 years ago
a842fc2c11
added hack to fix an alignment issue in MSVC 2010
...
The default allocator in Visual Studio 2010 does not respect the
alignment requirements of classes it is allocating memory for. This
results in a potential crash when using OEngine::Physics::PhysicActor
that has been allocated on the heap if it is built against a version of
Bullet that has SSE intrinsics enabled.
12 years ago
867fb620c3
part 2
12 years ago
00a2de432a
fix BulletShapeLoader namespace
12 years ago
4ca0eb93ee
fix markers used for raycasting and blocking activation
12 years ago
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
12 years ago
35d099a638
disabling gcc extensions
12 years ago
044ab3d2b6
fix error in framelistener with tcg enabled
12 years ago
1cb1259e18
fixing some unrelated warnings
12 years ago
9d1a9520fc
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
12 years ago
f365cab824
Possible fix for a issue
12 years ago
845dddbab8
fix a weird problem with the fading overlay
12 years ago
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
12 years ago
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
12 years ago
Marc Zinnschlag
scrawl
Lukasz Gromanowski
Alexander "Ace" Olofsson
Chris Robinson
gus
Nikolay Kasyanov
Sebastian Wick
Emanuel Guevel
Vincent Heuken
Glorf
Nathan Jeffords
Jordan Milne
Jason Hooks