scrawl
6164e5bae6
Restored window resizing
12 years ago
Emanuel Guevel
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
Chris Robinson
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
scrawl
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
Marc Zinnschlag
847ec9fa56
Merge remote-tracking branch 'swick/master'
12 years ago
Sebastian Wick
72b7e113cc
only apply in fullscreen
12 years ago
Sebastian Wick
8bdc9ff3ae
set position of the window for multiple monitors
12 years ago
Vincent Heuken
f43b48015e
remove actor's collisionbox on death
12 years ago
Nikolay Kasyanov
de2868c0a3
Fixed 64-bit OS X build
12 years ago
scrawl
c71da1a2ff
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
12 years ago
Nikolay Kasyanov
50e5aa8976
Custom rendering loop on OS X again. Prevents default Ogre message pump
...
from stealing input events.
12 years ago
scrawl
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
Nikolay Kasyanov
6abb7a18b0
SDL2 input: seems to work on OS X, has some input issues though
12 years ago
Nikolay Kasyanov
3fded2d8bf
Removed custom Carbon message pump
12 years ago
Nikolay Kasyanov
adf54cb735
SDL2 input: compilation fixed
12 years ago
scrawl
c29699487f
forgot to add file
12 years ago
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago
scrawl
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
12 years ago
scrawl
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
scrawl
1e7cf4ae1c
GLES2 experiment
12 years ago
scrawl
0c4a963132
Container UI rewrite
12 years ago
gus
fe5aaa9dff
fix NPC collisions
12 years ago
gus
15afbe58a8
minor corretion
12 years ago
gus
603af21715
little interface improvement
12 years ago
gus
a328a03bd3
more fix. Fargoth quest almost work as in vanilla now.
12 years ago
gus
006f25d1c0
First try to improve AI. Does not work yet due to strange bug in physicsystem
12 years ago
Marc Zinnschlag
95eeea2a27
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
...
This reverts commit 089ef7a2a0
, reversing
changes made to 67422c397c
.
12 years ago
Marc Zinnschlag
089ef7a2a0
Merge remote-tracking branch 'glorf/acrobatics'
12 years ago
Glorf
236ec3409f
Finished acrobatics
12 years ago
scrawl
627c3fdb6b
Added GetStandingPC, GetStandingActor; Fixed GetStartingPos
12 years ago
scrawl
91c89e5db4
Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace
12 years ago
scrawl
2e1dda9010
Fix old bullet versions
12 years ago
scrawl
208f9ca8c5
Fix problem with newer (or older?) bullet version (thanks travis)
12 years ago
scrawl
9343b4459e
Opening doors
12 years ago
scrawl
933f894148
Added Blind and Night Eye effects
12 years ago
scrawl
21bdcc9f20
Only use the shader based mygui manager if the fixed pipeline is unavailable
12 years ago
scrawl
b34caccd2e
Fix moving NPCs not getting their collision box moved
12 years ago
Chris Robinson
254c6840d8
Fix particle direction
12 years ago
Chris Robinson
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
Chris Robinson
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
Chris Robinson
9cc97b195c
Implement Gravity particle affector effects
12 years ago
Chris Robinson
5b30677e41
Add the start of a custom gravity affector
12 years ago
scrawl
b98063bba0
Fix deleted pointer access (getPosition, getRotation)
12 years ago
Chris Robinson
3768e04a0c
Merge remote-tracking branch 'zini/master' into nifogre
12 years ago
scrawl
4daaa4030d
Added shader based MyGUI render manager to allow using Ogre's next generation render systems.
12 years ago
Chris Robinson
81615c1ae5
Add a custom GrowFade particle affector
12 years ago
Chris Robinson
4d14fe0d95
Merge remote-tracking branch 'zini/master' into nifogre
12 years ago
Chris Robinson
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
scrawl
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
scrawl
af6409b9f5
Fix NPC physics scale problem
12 years ago
Marc Zinnschlag
b2f6f67d53
Merge remote-tracking branch 'scrawl/master' into next
12 years ago
scrawl
3277ef26da
Fix a crash when dropping objects without a collision shape
12 years ago
scrawl
6c1ff8caca
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
12 years ago
scrawl
f84db69ade
Remove the background window trick, which currently doesn't serve any purpose
12 years ago
scrawl
84afd87321
Placeable objects should not collide unless they have a NiRootCollisionNode
12 years ago
scrawl
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
12 years ago
scrawl
d696da7677
Fix selection buffer
12 years ago
Marc Zinnschlag
7e100c36b5
Merge remote-tracking branch 'gus/AI'
12 years ago
gus
5938e19362
Clean up
12 years ago
gus
48b3f1e0cf
Clean up. But still a little hacky
12 years ago
scrawl
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
Marc Zinnschlag
3e97943e06
Merge remote-tracking branch 'scrawl/includes'
12 years ago
scrawl
05bd94effb
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
gus
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
scrawl
9a84f6744f
Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)
12 years ago
scrawl
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
Nathan Jeffords
109dff2d29
renamed high level NIF files...
12 years ago
scrawl
9810eafe23
Removing now unused oengine/imagerotate
12 years ago
scrawl
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
12 years ago
scrawl
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
scrawl
2e7bc1a368
Z-up conversion: local map, fix tcg
12 years ago
scrawl
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
12 years ago
Chris Robinson
fe6fa9ebe7
Simplify newtrace a bit
12 years ago
Chris Robinson
66743ecee7
Remove some unused trace fields
12 years ago
Chris Robinson
86f6491bc8
Remove unused pmove code
12 years ago
Chris Robinson
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
Chris Robinson
5a1a0b7338
Add and use an MWWorld::isFlying method
12 years ago
scrawl
5d403ebdd3
Fix collision debug drawer (tcg)
12 years ago
Chris Robinson
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
Chris Robinson
735c1ec2ae
Cleanup trace.cpp/h
12 years ago
Chris Robinson
d47d2216f2
Use some const references where appropriate
12 years ago
Chris Robinson
cbdd459500
Remove unneeded playerMove from PhysicActor
12 years ago
Chris Robinson
923d0d6eb4
Fix up some header includes
12 years ago
Chris Robinson
e577ee2de8
Add a method to set/retrieve being on the ground
12 years ago
scrawl
608c112f34
Supply the new render window to mygui
12 years ago
scrawl
31f760ccce
Fixing issues from last commit: restored input and occlusion queries
12 years ago
scrawl
c4d518132f
With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.
12 years ago
Chris Robinson
a782a9109b
Store the vertical velocity in the physic actor
12 years ago
Chris Robinson
82e4da4e64
Get the half-extents from the physicactor
12 years ago
scrawl
5334934612
Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.
12 years ago
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
12 years ago
Jordan Milne
10a3caa504
more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine
12 years ago
Jordan Milne
043e29c620
Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)
12 years ago
scrawl
e4f140841e
Make OpenMW work with Ogre 1.9
12 years ago
Jordan Milne
917bbc4e11
Create static and non-discardable textures with the right parameters (should fix Issue 443)
12 years ago
Nathan Jeffords
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
scrawl
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
Nathan Jeffords
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
scrawl
867fb620c3
part 2
12 years ago
scrawl
00a2de432a
fix BulletShapeLoader namespace
12 years ago
scrawl
4ca0eb93ee
fix markers used for raycasting and blocking activation
12 years ago
scrawl
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
Marc Zinnschlag
35d099a638
disabling gcc extensions
12 years ago
scrawl
044ab3d2b6
fix error in framelistener with tcg enabled
12 years ago
scrawl
1cb1259e18
fixing some unrelated warnings
12 years ago
Marc Zinnschlag
9d1a9520fc
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
12 years ago
Jason Hooks
f365cab824
Possible fix for a issue
12 years ago
scrawl
845dddbab8
fix a weird problem with the fading overlay
12 years ago
Marc Zinnschlag
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
12 years ago
scrawl
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
12 years ago
Marc Zinnschlag
a3c680d20a
Merge remote-tracking branch 'scrawl/sleep_wait' into next
12 years ago
scrawl
bf5e30b24f
everything done except health/mana restore
12 years ago
scrawl
4829f47a4f
rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI
12 years ago
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
12 years ago
Jason Hooks
f01aae138f
Removing void
12 years ago
Marc Zinnschlag
b96485284a
removed some unneeded return values
12 years ago
Brother Brick
05c3936797
Merge remote-tracking branch 'upstream/master' into static
12 years ago
Brother Brick
ff54508633
during cleanup we now delete all plugins created
12 years ago
Jason Hooks
05687c120f
protection for null cast
12 years ago
Jason Hooks
0fa1dea6c1
Box size set; Set speed
12 years ago
Jason Hooks
192d634098
Movement keys; View angles
12 years ago
Marc Zinnschlag
4eae810de3
Merge remote-tracking branch 'edmondo/master'
12 years ago
Jason Hooks
76f2a82884
More pmove stuff; Turned off broadphase, we could not fall in exteriors
12 years ago
Jason Hooks
f6384574da
Starting to introduce pmove
12 years ago
Jason Hooks
f586f53a42
positioning
12 years ago
Edmondo Tommasina
f21faf197c
selectionbuffer.cpp: fix ‘runtime_error’ is not a member of ‘std’
12 years ago
Michael Mc Donnell
c161a3850f
Use correct type for iterator
...
Fixes building on Windows with vs2010.
12 years ago
Jason Hooks
02bca98e9f
Setrotate working
12 years ago
scrawl
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
Brother Brick
44c644dd7b
make it statically compilable
12 years ago
scrawl
565aad3783
changed a method for ogre 1.8.0
12 years ago
scrawl
1f7e044fad
removed some debug stuff
12 years ago
scrawl
6ac2a12296
item selection working on the preview
12 years ago
scrawl
eef750e6b0
race selection preview
12 years ago
Jason Hooks
a1a7733730
Set scale implemented
12 years ago
scrawl
2b339f6c0f
loading screen
12 years ago
Jason Hooks
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
12 years ago
Jason Hooks
3e3437f9c3
Revised create and adjust rigid body functions
12 years ago
Jason Hooks
23777033fd
Starting to implement new PhysicActor
12 years ago
Jason Hooks
2efceba1fc
Tearing apart PhysicActor
12 years ago
Jason Hooks
0697c7f7f4
Finally merged in master
13 years ago
Jason Hooks
b7697a62ad
Position set back to zero
13 years ago
scrawl
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
greye
40c7a850bf
fix pmove BB shape origin
13 years ago
Jason Hooks
8762f4a47a
boxrotation nif field; commented functions
13 years ago
Jason Hooks
7b8b4c366d
Set angle now working for npcs and creatures
13 years ago
Jason Hooks
1f5bc229e0
Separate adjustRigidBody function
13 years ago
scrawl
c4fe2e4e2a
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
13 years ago
scrawl
97c45455fd
fix WindowManager destruction
13 years ago
scrawl
86d6f190bf
Input system rewrite
13 years ago