mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-10-31 19:56:42 +00:00
Code Issues Releases Wiki Activity
12236 commits 38 branches 54 tags 122 MiB
Commit graph

470 commits

Author SHA1 Message Date
scrawl
f11079f1e4 Fix findGround (off by 2 units) 2014-05-12 23:10:11 +02:00
Sebastian Wick
512ee1204e fixes a bug when resizing the window before a window listener is set 2014-03-29 15:49:48 +01:00
scrawl
ea357cfed0 Fix crash when resizing while company logo is playing 2014-03-27 20:39:56 +01:00
scrawl
12de0afb03 Feature #50: Spawn projectiles 
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
 2014-03-08 01:31:27 +01:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
cc9cii
5c11a94511 Fix 32bit Windows non-debug build with MSVC 11.0 crash during startup. 2014-02-28 00:29:57 +11:00
scrawl
d4aeb177f9 Remove unused btKinematicCharacterController 2014-01-15 14:53:29 +01:00
scrawl
aa855e9524 Include some required Ogre headers explicitely 2014-01-09 20:56:24 +01:00
scrawl
c004fb778f Get rid of underscore defines. They are reserved by the standard. 2014-01-05 18:22:29 +01:00
Marc Zinnschlag
a6e6411686 Merge remote-tracking branch 'scrawl/master' 2014-01-02 12:12:52 +01:00
scrawl
5b0a4c9424 Get rid of unused file and some other cruft. 2014-01-02 01:44:09 +01:00
scrawl
9245faf2aa Don't destroyRenderTarget with a NULL window 2014-01-01 22:19:02 +01:00
Lukasz Gromanowski
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>
 2013-12-30 21:47:06 +01:00
scrawl
a3ff9e5be8 Change destruction order - fixes a shutdown crash discovered with mesa 2013-12-26 20:53:52 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
scrawl
f695deb29d Remember window positions 2013-12-05 15:46:23 +01:00
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