mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-24 19:53:54 +00:00
Code Issues Releases Wiki Activity
8531 commits 108 branches 66 tags 133 MiB
Commit graph

410 commits

Author SHA1 Message Date
Roman Melnik
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).
 2012-04-01 20:36:57 +03:00
Jason Hooks
0021ccf862 Merge remote-tracking branch 'upstream/master' 2012-03-31 20:48:42 -04:00
Marc Zinnschlag
40310f3663 Merge remote branch 'scrawl/occlusionquery' 2012-03-31 22:09:47 +02:00
scrawl
a4576f043d fixed the physics debug rendering now activates/deactivates properly 2012-03-30 16:02:41 +02:00
scrawl
58f7a03626 Merge branch 'terrain18' into terraincollision 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-03-28 21:46:52 +02:00
scrawl
8bbb02a1bd ogre 1.8 fixes 2012-03-28 21:30:59 +02:00
Jason Hooks
b9fabce9c4 Awesome, working 2012-03-27 20:17:54 -04:00
scrawl
72ff7ec030 Merge branch 'next' into occlusionquery 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2012-03-27 23:46:48 +02:00
Jason Hooks
318355f1be Bouncy effect gone 2012-03-26 21:35:20 -04:00
scrawl
18c2b5eb0a Merge branch 'next' into occlusionquery 2012-03-26 22:09:41 +02:00
Lukasz Gromanowski
5185a28b60 Issue #225: Initialize all class members in constructor. 2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
d3b88b9e34 Issue #225: Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader. 2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
a7ac0e526e Issue #225: Added cleanup of parts of PhysicEngine. 
Added cleanup of CMotionState inserted to RigidBody,
and btSortedOverlappingPairCache inserted to btDbvtBroadphase
in PhysicEngine.
 2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
633e80cded Issue #225: Added cleanup of maps used in PhysicEngine. 2012-03-26 19:09:55 +02:00
Chris Robinson
f8f749dbec Merge remote branch 'zini/next' into sound-rewrite 2012-03-26 00:02:21 -07:00
scrawl
382fa6ac68 fixes 2012-03-25 22:53:00 +02:00
Jason Hooks
e4251be529 Down gravity 2012-03-25 15:16:02 -04:00
scrawl
53d4be5cf6 object pickup should work everywhere 2012-03-25 20:52:56 +02:00
scrawl
17a4adfe88 add raycast method that returns _all_ objects that were hit 2012-03-25 12:26:44 +02:00
Jason Hooks
18a139cd66 adding up and down move buttons 2012-03-24 22:03:08 -04:00
Chris Robinson
2bc81a778b Merge remote branch 'zini/next' into sound-rewrite 2012-03-24 17:27:10 -07:00
scrawl
f959a5cbeb auto adjust size of map window title bar 2012-03-24 23:24:19 +01:00
scrawl
99b2b6b648 ogre 1.8 fixes 2012-03-24 14:46:48 +01:00
scrawl
64212c0ee6 replaced all the StaticImage and StaticText in code 2012-03-21 14:54:02 +01:00
scrawl
b0b41a9199 should now compile warning free 2012-03-21 13:48:57 +01:00
scrawl
d451d7bb67 compile fixes for mygui 3.2 2012-03-20 20:24:36 +01:00
Chris Robinson
74e79bb4af Merge remote branch 'zini/master' into sound-rewrite 
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
 2012-03-20 06:17:02 -07:00
Jason Hooks
2b3e75718c Updating everything 2012-03-19 20:03:48 -04:00
Jason Hooks
ed7cb1dc67 restarting 2012-03-19 19:38:44 -04:00
Marc Zinnschlag
655f9fe920 Merge remote branch 'k1ll/staticogre' 2012-03-18 11:16:34 +01:00
k1ll
b83b7d0650 Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin. 2012-03-17 20:03:37 +01:00
Chris Robinson
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.
 2012-03-16 17:08:13 -07:00
k1ll
b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 2012-03-15 15:51:39 +01:00
Michael Papageorgiou
3b6826b1ac Set the attenuation model to linear, to be more in line with the vanilla game 2012-03-14 22:36:06 +02:00
scrawl
9612ce595b Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision 
Conflicts:
	CMakeLists.txt
 2012-03-13 17:09:50 +01:00
Michael Papageorgiou
836732096e Fix both relative and 3D sounds 2012-03-13 14:08:32 +02:00
Nikolay Kasyanov
b4343431c6 Merged openengine into openmw 2012-03-11 18:16:29 +04:00
Nikolay Kasyanov
48c12e9d5c Merge mangle into openmw 2012-03-11 18:13:59 +04:00
Marc Zinnschlag
4c240c644f OpenEngine update (log fix) 2012-03-05 10:58:33 +01:00
Marc Zinnschlag
e7fa1d94b8 Merge remote branch 'scrawl/shapefix' 2012-03-05 10:51:18 +01:00
scrawl
ba0365a427 collision shape scale fix 2012-03-02 16:47:39 +01:00
Marc Zinnschlag
12b7c6f1ac Merge remote branch 'corristo/master' 2012-03-02 12:11:53 +01:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
Nikolay Kasyanov
70da2a2a99 removed tabs 2012-03-02 14:18:10 +04:00
Nikolay Kasyanov
fa3fbf940c Fix for OS X 10.6 support 2012-03-02 14:10:11 +04:00
scrawl
f2b807142a update mangle 2012-02-29 11:08:25 +01:00
scrawl
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
 2012-02-28 21:49:45 +01:00
Marc Zinnschlag
1652680e9b mangle update (music workaround) 2012-02-26 10:23:34 +01:00
Nikolay Kasyanov
cb780720bb fix for string.h: use our own strnlen only on OS X < 10.7 2012-02-25 17:43:30 +04:00
Marc Zinnschlag
69a00df01a submodule update (uncommon crash fix) 2012-02-24 08:56:27 +01:00
Marc Zinnschlag
db205cf8aa Merge remote branch 'scrawl/next' into test 
Conflicts:
	libs/openengine
 2012-02-20 14:54:08 +01:00
scrawl
60856b46e6 moved the renderer update call from OMW::Engine to RenderingManager 2012-02-19 23:22:29 +01:00
scrawl
f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 2012-02-18 18:25:28 +01:00
Marc Zinnschlag
4fcb721054 openengine update (physics crash workaround 2012-02-10 14:59:22 +01:00
Marc Zinnschlag
258ab0218a submodule update (issue #131) 2012-01-23 23:32:00 +01:00
Marc Zinnschlag
7a1799d529 submodule update 2011-11-10 08:37:03 +01:00
Marc Zinnschlag
7c8853f6fe post-merge fixes 2011-09-27 09:45:28 +02:00
Marc Zinnschlag
960654e58f using new openengine version 2011-09-06 09:56:45 +02:00
Jan-Peter Nilsson
6aa1f3efdd Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 2011-04-27 12:34:52 +02:00
Marc Zinnschlag
57c3414fcd OpenEngine update (bug-fix) 2011-03-23 22:56:11 +01:00
Marc Zinnschlag
615f10b8c0 OpenEngine update 2011-03-22 21:52:27 +01:00
Marc Zinnschlag
bd08e308f8 mangle update 2011-03-22 14:12:45 +01:00
Marc Zinnschlag
68004630e9 OpenEngine update 2011-03-20 22:42:17 +01:00
Marc Zinnschlag
647e88003e build and activation fix 2011-03-19 19:54:37 +01:00
Marc Zinnschlag
c82a2fe37d OpenEngine enhancements 2011-03-09 19:30:16 +01:00
gugus
40193253b0 fix some time bug 2011-03-09 18:29:57 +01:00
Marc Zinnschlag
bf10471668 various OpenEngine improvements (don't forget to update your submodules) 2011-03-07 14:57:18 +01:00
Jan-Peter Nilsson
e290f2f82f Get physic fix in openengine and build nifbullet 2011-02-27 00:47:56 +01:00
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +01:00
Marc Zinnschlag
940554b5fc openengine update (remember to do a submodule update) 2011-01-12 18:02:23 +01:00
athile
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. 2011-01-10 13:48:16 -07:00
Marc Zinnschlag
b6e7de6527 new mangle version (remember to update your subnodules) 2011-01-09 09:39:13 +01:00
Yuri Krupenin
6b6ee5440e Minimal set of fixes to build with MinGW. 2011-01-03 17:00:53 +03:00
Nicolay Korslund
004541f5cf Tested and applied Chris' sound patch. 2010-09-14 13:27:20 +02:00
Nicolay Korslund
aa91b0232f submodule update 2010-09-10 13:58:12 +02:00
Jan Borsodi
ec8e92f7cd Submodule update 2010-09-10 13:38:17 +02:00
Nicolay Korslund
fd5f4a5e5e Mangle update (OpenAL bugfix) 2010-09-10 11:00:26 +02:00
athile
11d0eb0bf2 submodule updates 2010-09-07 15:20:39 +01:00
Nicolay Korslund
5552c44753 Cleaned up strnlen in esm_reader. Added -Werror switch to g++. 2010-09-07 10:40:00 +02:00
Nicolay Korslund
e30306f7c3 Removed redundant custom exception class 2010-09-02 22:30:39 +02:00
Nicolay Korslund
d911653846 Merge with athile's WIP windows build 2010-09-02 12:55:27 +02:00
Nicolay Korslund
ca13c09209 Merged in athile's changes to mangle and openengine 2010-09-02 12:53:35 +02:00
Nicolay Korslund
e123fc1107 OpenEngine update (fixed crash bug) 2010-09-02 12:35:53 +02:00
athile
336fb1636c Windows fixes 2010-08-30 11:19:45 +01:00
athile
9e2129c4b3 WIP Windows build 2010-08-30 10:34:13 +01:00
athile
72fbeb9b9a Mangle update 2010-08-30 02:41:09 +01:00
Nicolay Korslund
064bc4b6c9 Finished sound system 2010-08-19 16:05:48 +02:00
Nicolay Korslund
65c2070086 Temporarily disabled music 2010-08-18 13:05:31 +02:00
Nicolay Korslund
ef9ed99622 Mangle update (not important) 2010-08-18 10:49:45 +02:00
Nicolay Korslund
f2b2fe560f Mangle update: Implemented streaming, fixed various bugs. 2010-08-17 13:18:37 +02:00
Nicolay Korslund
08289158d7 Added support for WAV files with libsndfile 2010-08-16 17:14:37 +02:00
Nicolay Korslund
9875d74abf Implemented 3D sound placement. Sound management / lookup system not 
done yet.
 2010-08-14 21:01:20 +02:00
Nicolay Korslund
979ea4e607 Mangle update for const error 2010-08-13 23:01:23 +02:00
Nicolay Korslund
912c8b1f2d Added mpg123 file reader 2010-08-13 22:30:22 +02:00
Nicolay Korslund
ebcbff255e Changed how avcodec/avformat (ffmpeg) is included 2010-08-13 19:38:58 +02:00
Nicolay Korslund
cad9712411 Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file. 2010-08-13 17:11:03 +02:00
Nicolay Korslund
cf4185faef Added sound test (remember to git submodule update) 2010-08-13 14:43:57 +02:00
Nicolay Korslund
7516e4ca53 Added music playing as a test 2010-08-12 17:58:29 +02:00
Nicolay Korslund
34572f0b19 Compiled and linked in sound system (not yet functional) 2010-08-12 16:13:54 +02:00
Nicolay Korslund
925b5d29dd Added back right version of libs/openengine/ submodule. Please run git submodule update. 2010-07-21 16:24:23 +02:00
Marc Zinnschlag
d72ed19460 implemented script compiler for console 2010-07-20 23:21:48 +02:00
Nicolay Korslund
c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 2010-07-20 20:23:37 +02:00
Nicolay Korslund
c84672a560 Added MyGUI to OpenMW, fully working (with events and script hooks) 2010-07-17 19:38:32 +02:00
Nicolay Korslund
4eb2863db4 Added input to apps/mygui_dev/ 2010-07-16 21:49:36 +02:00
Nicolay Korslund
13d3f9c87e Integrated OpenEngine, replaces entire components/engine/ directory. 2010-07-16 14:56:14 +02:00
Nicolay Korslund
259908013e Started integrating OE (NO-COMPILE) 2010-07-16 10:28:19 +02:00
Nicolay Korslund
5005f5eb06 Fixed platform/strings.h to work again on Linux 2010-06-28 11:45:42 +02:00
athile
b2485e8a52 Windows build fixes 2010-06-27 14:43:07 -07:00
Nicolay Korslund
91f5c9c01f Moved mangle submodule. Running 'git submodule update' should be enough. 2010-06-26 10:39:37 +02:00
Marc Zinnschlag
e4f85cb3e6 directory structure reorganisation (still missing the mangle stuff) 2010-06-25 22:28:59 +02:00