krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
13428 commits 35 branches 0 tags 65 MiB
Commit graph

503 commits

Author SHA1 Message Date
scrawl
3a82f8c193 Fix incorrect log file name for launcherOgre.log 2013-12-03 15:56:00 +01:00
scrawl
636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01:00
scrawl
4f35fd8184 Removed a workaround from Renderer, some cleanup 2013-10-30 13:05:28 +01:00
Alexander "Ace" Olofsson
5e42c73356 Better fix for unshield, comments on changes, no more commented out code. 2013-09-05 10:39:17 +02:00
Alexander "Ace" Olofsson
22a5f7198f A few fixes to build on Windows 2013-09-04 23:25:47 +02:00
scrawl
f12d5b728a Ogre 1.9 compatibility changes 2013-08-29 17:14:25 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
Chris Robinson
3fa65f21dd Use a proper cone shape with a contact test to check for melee hits 2013-08-23 12:27:40 -07:00
Chris Robinson
a993af53e7 Merge remote-tracking branch 'zini/master' into physics 2013-08-20 02:21:44 -07:00
Chris Robinson
394fc75697 Clean up the trace struct 2013-08-19 20:39:37 +02:00
Chris Robinson
b351109649 Get rid of the old newtrace method 2013-08-19 20:39:37 +02:00
Chris Robinson
14acacf401 Use a better method to do actor physics traces 2013-08-19 20:39:37 +02:00
scrawl
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
 2013-08-19 20:34:20 +02:00
Chris Robinson
1aa92067c2 Fix tracing down 2013-08-19 04:56:02 -07:00
Chris Robinson
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.
 2013-08-18 05:38:50 -07:00
Chris Robinson
8bcce0fb55 Clean up the trace struct 2013-08-17 05:09:33 -07:00
Chris Robinson
62c7b3698d Get rid of the old newtrace method 2013-08-17 05:09:33 -07:00
Chris Robinson
65ce3c6ba5 Use a better method to do actor physics traces 2013-08-17 05:09:32 -07:00
Chris Robinson
de95926e9f Use controllers to animate lights in ObjectLists 2013-08-06 19:49:04 -07:00
Chris Robinson
643e7651e0 Use a null material for non-SubEntities in the selection buffer 2013-08-06 19:49:00 -07:00
Marc Zinnschlag
41b2fa985b silenced some warnings 2013-08-03 15:26:53 +02:00
Marc Zinnschlag
9123afa863 Merge remote-tracking branch 'gus/MeleeCombat2' 2013-08-03 15:23:36 +02:00
gus
4c7dcdc8aa check if there is an object in the way 2013-08-03 11:33:34 +02:00
gus
830762722d first attempt: hit detection with a sphere (not finished) 2013-08-03 11:26:36 +02:00
Marc Zinnschlag
130141ecac Merge remote-tracking branch 'corristo/master' 2013-07-31 22:17:14 +02:00
Nikolay Kasyanov
66608d5c92 Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre 2013-07-31 22:30:52 +04:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
gus
b248d85b84 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2 2013-07-31 10:04:50 +02:00
gus
565cbe146d function declaration 2013-07-31 10:04:09 +02:00
scrawl
aa555b3086 Doors no longer get hindered by actors that have collision disabled 2013-07-31 02:39:42 +02:00
scrawl
04b90b7d14 Other actors no longer collide with an actor that has collision disabled 2013-07-30 22:00:48 +02:00
Marc Zinnschlag
a547c2584e Merge remote-tracking branch 'swick/sdl2fix' 2013-07-29 13:51:00 +02:00
Sebastian Wick
0d2b357bdf use SDL_WINDOWPOS_CENTERED_DISPLAY and SDL_WINDOWPOS_UNDEFINED_DISPLAY instead of coordinates 2013-07-29 12:38:57 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
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.
 2013-07-26 10:24:15 +02:00
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.
 2013-07-08 13:12:12 -07:00
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. 2013-07-07 20:22:41 +02:00
Marc Zinnschlag
847ec9fa56 Merge remote-tracking branch 'swick/master' 2013-07-01 10:16:39 +02:00
Sebastian Wick
72b7e113cc only apply in fullscreen 2013-07-01 04:08:26 +02:00
Sebastian Wick
8bdc9ff3ae set position of the window for multiple monitors 2013-07-01 03:56:33 +02:00
Vincent Heuken
f43b48015e remove actor's collisionbox on death 2013-06-27 19:42:27 -07:00
Nikolay Kasyanov
de2868c0a3 Fixed 64-bit OS X build 2013-06-16 21:47:26 +04:00
scrawl
c71da1a2ff Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2 2013-06-16 15:01:09 +02:00
Nikolay Kasyanov
50e5aa8976 Custom rendering loop on OS X again. Prevents default Ogre message pump 
from stealing input events.
 2013-06-16 16:25:13 +04:00
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 2013-06-15 15:33:47 +02:00
Nikolay Kasyanov
6abb7a18b0 SDL2 input: seems to work on OS X, has some input issues though 2013-06-15 14:40:18 +04:00
Nikolay Kasyanov
3fded2d8bf Removed custom Carbon message pump 2013-06-15 13:55:09 +04:00
Nikolay Kasyanov
adf54cb735 SDL2 input: compilation fixed 2013-06-15 13:54:24 +04:00
scrawl
c29699487f forgot to add file 2013-06-12 17:08:02 +02:00
scrawl
403704b92a Use openmw.png for SDL_SetWindowIcon 2013-06-12 16:15:04 +02:00
scrawl
918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 2013-06-12 14:58:07 +02:00
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
 2013-06-12 12:34:33 +02:00
scrawl
1e7cf4ae1c GLES2 experiment 2013-05-25 04:15:24 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
gus
fe5aaa9dff fix NPC collisions 2013-05-09 11:12:55 +01:00
gus
15afbe58a8 minor corretion 2013-05-07 19:43:44 +01:00
gus
603af21715 little interface improvement 2013-05-07 19:42:21 +01:00
gus
a328a03bd3 more fix. Fargoth quest almost work as in vanilla now. 2013-05-07 19:35:10 +01:00
gus
006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 2013-05-06 00:46:50 +01:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'" 
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
 2013-05-01 16:56:16 +02:00
Marc Zinnschlag
089ef7a2a0 Merge remote-tracking branch 'glorf/acrobatics' 2013-05-01 13:44:23 +02:00
Glorf
236ec3409f Finished acrobatics 2013-05-01 12:21:59 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
scrawl
91c89e5db4 Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace 2013-04-30 20:26:59 +02:00
scrawl
2e1dda9010 Fix old bullet versions 2013-04-28 16:19:40 +02:00
scrawl
208f9ca8c5 Fix problem with newer (or older?) bullet version (thanks travis) 2013-04-28 15:56:09 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
scrawl
933f894148 Added Blind and Night Eye effects 2013-04-25 02:31:51 +02:00
scrawl
21bdcc9f20 Only use the shader based mygui manager if the fixed pipeline is unavailable 2013-04-25 02:31:38 +02:00
scrawl
b34caccd2e Fix moving NPCs not getting their collision box moved 2013-04-18 16:46:38 +02:00
Chris Robinson
254c6840d8 Fix particle direction 2013-04-13 18:22:30 -07:00
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.
 2013-04-13 16:16:57 -07:00
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.
 2013-04-13 14:36:24 -07:00
Chris Robinson
9cc97b195c Implement Gravity particle affector effects 2013-04-13 13:03:45 -07:00
Chris Robinson
5b30677e41 Add the start of a custom gravity affector 2013-04-12 14:39:06 -07:00
scrawl
b98063bba0 Fix deleted pointer access (getPosition, getRotation) 2013-04-11 18:02:44 +02:00
Chris Robinson
3768e04a0c Merge remote-tracking branch 'zini/master' into nifogre 2013-04-07 17:24:47 -07:00
scrawl
4daaa4030d Added shader based MyGUI render manager to allow using Ogre's next generation render systems. 2013-04-07 00:12:04 +02:00
Chris Robinson
81615c1ae5 Add a custom GrowFade particle affector 2013-04-06 00:18:36 -07:00
Chris Robinson
4d14fe0d95 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-04 22:06:27 -07:00
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).
 2013-04-04 05:10:52 -07:00
scrawl
ebaf80d539 Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change. 2013-04-03 23:55:57 +02:00
scrawl
af6409b9f5 Fix NPC physics scale problem 2013-03-31 13:50:57 +02:00
Marc Zinnschlag
b2f6f67d53 Merge remote-tracking branch 'scrawl/master' into next 2013-03-21 22:07:37 +01:00
scrawl
3277ef26da Fix a crash when dropping objects without a collision shape 2013-03-21 21:08:23 +01:00
scrawl
6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 2013-03-20 02:29:03 +01:00
scrawl
f84db69ade Remove the background window trick, which currently doesn't serve any purpose 2013-03-18 19:46:20 +01:00
scrawl
84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 2013-03-14 03:04:02 +01:00
scrawl
d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 2013-03-08 23:46:25 +01:00
scrawl
d696da7677 Fix selection buffer 2013-03-07 21:38:27 +01:00
Marc Zinnschlag
7e100c36b5 Merge remote-tracking branch 'gus/AI' 2013-03-06 19:05:55 +01:00
gus
5938e19362 Clean up 2013-03-06 17:31:57 +00:00
gus
48b3f1e0cf Clean up. But still a little hacky 2013-03-04 12:08:35 +00:00
scrawl
5341bf9504 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:51:58 +01:00
Marc Zinnschlag
3e97943e06 Merge remote-tracking branch 'scrawl/includes' 2013-03-03 15:37:13 +01:00
scrawl
05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:14:20 +01:00
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) 2013-03-03 13:06:45 +00:00
scrawl
9a84f6744f Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr) 2013-03-03 13:11:02 +01:00
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
 2013-03-03 11:02:38 +01:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
scrawl
9810eafe23 Removing now unused oengine/imagerotate 2013-03-01 22:27:53 +01:00
scrawl
d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 2013-03-01 18:45:52 +01:00
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
 2013-02-26 14:54:53 +01:00
scrawl
2e7bc1a368 Z-up conversion: local map, fix tcg 2013-02-26 13:39:10 +01:00
scrawl
cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 2013-02-25 15:12:03 +01:00
Chris Robinson
fe6fa9ebe7 Simplify newtrace a bit 2013-02-20 04:14:52 -08:00
Chris Robinson
66743ecee7 Remove some unused trace fields 2013-02-19 07:00:22 -08:00
Chris Robinson
86f6491bc8 Remove unused pmove code 2013-02-19 06:38:48 -08:00
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.
 2013-02-19 04:18:15 -08:00
Chris Robinson
5a1a0b7338 Add and use an MWWorld::isFlying method 2013-02-18 22:39:43 -08:00
scrawl
5d403ebdd3 Fix collision debug drawer (tcg) 2013-02-19 04:03:24 +01:00
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.
 2013-02-17 06:02:57 -08:00
Chris Robinson
735c1ec2ae Cleanup trace.cpp/h 2013-02-08 13:12:34 -08:00
Chris Robinson
d47d2216f2 Use some const references where appropriate 2013-02-07 16:33:44 -08:00
Chris Robinson
cbdd459500 Remove unneeded playerMove from PhysicActor 2013-02-07 15:48:41 -08:00
Chris Robinson
923d0d6eb4 Fix up some header includes 2013-02-06 21:47:09 -08:00
Chris Robinson
e577ee2de8 Add a method to set/retrieve being on the ground 2013-02-06 21:44:58 -08:00
scrawl
608c112f34 Supply the new render window to mygui 2013-02-05 20:48:25 +01:00
scrawl
31f760ccce Fixing issues from last commit: restored input and occlusion queries 2013-02-05 20:26:13 +01:00
scrawl
c4d518132f With the 1x1 background window trick, we can apply VSync without restart. Some issues left though. 2013-02-05 19:22:08 +01:00
Chris Robinson
a782a9109b Store the vertical velocity in the physic actor 2013-02-05 09:24:22 -08:00
Chris Robinson
82e4da4e64 Get the half-extents from the physicactor 2013-02-05 07:41:57 -08:00
scrawl
5334934612 Listen to render window updates and properly activate/deactivate occlusion queries pre/post update. 2013-02-03 18:03:09 +01:00
scrawl
15e51b76de Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth 2013-02-03 15:46:23 +01:00
Jordan Milne
10a3caa504 more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine 2013-01-13 23:38:46 -04:00
Jordan Milne
043e29c620 Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble) 2013-01-13 21:32:45 -04:00
scrawl
e4f140841e Make OpenMW work with Ogre 1.9 2013-01-12 08:23:15 +01:00
Jordan Milne
917bbc4e11 Create static and non-discardable textures with the right parameters (should fix Issue 443) 2013-01-05 00:26:33 -04:00
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.
 2013-01-04 08:50:37 -08:00
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.
 2013-01-03 01:09:03 +01:00
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.
 2013-01-01 10:59:12 -08:00
scrawl
867fb620c3 part 2 2012-11-08 19:25:06 +01:00
scrawl
00a2de432a fix BulletShapeLoader namespace 2012-11-08 18:48:07 +01:00
scrawl
4ca0eb93ee fix markers used for raycasting and blocking activation 2012-10-24 17:47:03 +02:00
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
 2012-10-17 18:17:53 +02:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
scrawl
044ab3d2b6 fix error in framelistener with tcg enabled 2012-09-28 17:02:18 +02:00
scrawl
1cb1259e18 fixing some unrelated warnings 2012-09-23 19:36:37 +02:00
Marc Zinnschlag
9d1a9520fc Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-22 09:05:36 +02:00
Jason Hooks
f365cab824 Possible fix for a issue 2012-09-21 16:10:08 -04:00
scrawl
845dddbab8 fix a weird problem with the fading overlay 2012-09-21 18:09:07 +02:00
Marc Zinnschlag
87a9373a56 Merge remote-tracking branch 'scrawl/gamma' into next 2012-09-20 09:01:58 +02:00
scrawl
32de090079 Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities 2012-09-19 19:34:02 +02:00
Marc Zinnschlag
a3c680d20a Merge remote-tracking branch 'scrawl/sleep_wait' into next 2012-09-19 09:41:32 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
scrawl
4829f47a4f rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI 2012-09-18 21:04:43 +02:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
Jason Hooks
f01aae138f Removing void 2012-09-17 17:23:26 -04:00
Marc Zinnschlag
b96485284a removed some unneeded return values 2012-09-17 13:41:15 +02:00
Brother Brick
05c3936797 Merge remote-tracking branch 'upstream/master' into static 2012-09-17 11:57:38 +02:00