mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 12:19:55 +00:00
Code Issues Releases Wiki Activity
4664 commits 38 branches 54 tags 122 MiB
Commit graph

2920 commits

Author SHA1 Message Date
scrawl
b9a3f8e8d7 gamma slider 2012-09-19 23:47:42 +02:00
scrawl
d9f6072f02 gamma correct rendering & adjustment setting 2012-09-19 23:25:07 +02:00
Marc Zinnschlag
ede9a2b170 fixed an orientation problem 2012-09-19 19:56:02 +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
be44810623 implemented GetPCSleep 2012-09-19 03:11:23 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
scrawl
ab698bb401 date time label 2012-09-18 20:53:32 +02:00
scrawl
4d4ba6698a fix character preview destruction; don't allow empty names in name dialog 2012-09-18 19:00:20 +02:00
scrawl
0ba996f290 dialog layout 2012-09-18 18:29:03 +02:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
Marc Zinnschlag
fcda3b6ca8 fixed some script argument types 2012-09-18 11:09:54 +02:00
Marc Zinnschlag
ea8eab4f34 more cleanup 2012-09-18 11:06:19 +02:00
Marc Zinnschlag
408c5b8bd4 some cleanup 2012-09-18 10:49:51 +02:00
Marc Zinnschlag
4469976be9 Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-09-18 10:44:25 +02:00
gugus
3c1a9061de Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly 2012-09-17 14:12:27 +02:00
gugus
032ff7c879 Clean-up. There is still a little bug. 2012-09-17 13:36:48 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
Jason Hooks
192d634098 Movement keys; View angles 2012-09-16 13:19:38 -04:00
Jason Hooks
76f2a82884 More pmove stuff; Turned off broadphase, we could not fall in exteriors 2012-09-15 22:48:24 -04:00
Jason Hooks
f586f53a42 positioning 2012-09-15 16:45:50 -04:00
scrawl
896428c129 enableRestMenu & enableLevelupMenu 2012-09-15 20:18:41 +02:00
scrawl
9cf1cbc89b remove book skill gain 2012-09-15 20:03:53 +02:00
scrawl
3e5ab069a6 remove the const cast 2012-09-15 19:52:18 +02:00
Jason Hooks
02bca98e9f Setrotate working 2012-09-15 13:23:49 -04:00
scrawl
cf358fa79d >= instead of == 2012-09-15 19:20:13 +02:00
scrawl
0dc242c603 don't increase skill beyond 100 2012-09-15 19:10:48 +02:00
scrawl
f5237ff1a6 skill gain from books 2012-09-15 19:06:56 +02:00
scrawl
234f8fa5d5 added the missing sound & notification for skill increase 2012-09-15 18:35:59 +02:00
scrawl
b34b894d6a removed some debug stuff 2012-09-15 17:20:47 +02:00
scrawl
76b494100e finished? 2012-09-15 17:12:42 +02:00
scrawl
95f3a20e2c Merge branch 'master' into levelup 2012-09-15 14:25:37 +02:00
scrawl
3e794a6087 remove useless member and removed a warning 2012-09-15 01:02:07 +02:00
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
 2012-09-15 00:57:29 +02:00
Marc Zinnschlag
b7c9285b24 added support for out of world rendering 2012-09-14 21:12:16 +02:00
scrawl
b76a28f69c beginnings of the gui 2012-09-14 19:44:00 +02:00
scrawl
35f7216f2f fixed some things 2012-09-14 17:25:32 +02:00
scrawl
7c59b83419 performance optimization 2012-09-14 17:10:10 +02:00
scrawl
a308d2e38a fixed exception, fixed armor label obscuring the items 2012-09-14 15:33:24 +02:00
scrawl
1f7e044fad removed some debug stuff 2012-09-14 14:41:19 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0 race selection preview 2012-09-13 19:03:31 +02:00
scrawl
5155339cb6 character preview working 2012-09-13 14:56:50 +02:00
scrawl
d90af9c524 Merge branch 'master' into characterpreview 2012-09-13 14:22:17 +02:00
Marc Zinnschlag
835c530e06 Merge branch 'ingredients' 2012-09-13 13:31:46 +02:00
Marc Zinnschlag
5706caa141 Issue #356: added ingredient eating sound effect 2012-09-13 13:30:57 +02:00
Marc Zinnschlag
fe68a252d5 Issue #356: Implemented ingredient eating 2012-09-13 13:02:26 +02:00
Marc Zinnschlag
2ccd7a480d Issue #356: added a missing return 2012-09-13 13:01:59 +02:00
scrawl
7ad80e306b fixed the disappearing 2012-09-13 12:33:09 +02:00
Marc Zinnschlag
9de7b3bf90 Issue #356: Properly support ingredients effect in ActiveSpells (hopefully) 2012-09-13 11:30:59 +02:00
Marc Zinnschlag
0af0dc0d5d Issue #356: More CreatureStats cleanup 2012-09-13 11:13:05 +02:00
Marc Zinnschlag
2934987f78 Issue #356: Some CreatureStats cleanup 2012-09-13 10:52:34 +02:00
Marc Zinnschlag
9dcf8939e9 Issue #356: added function for fatigue term calculation 2012-09-13 10:45:32 +02:00
Marc Zinnschlag
fca3b67507 Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula) 2012-09-13 09:30:47 +02:00
scrawl
4f3eb3c34a character preview WIP 2012-09-13 00:54:32 +02:00
Jason Hooks
a1a7733730 Set scale implemented 2012-09-12 18:30:32 -04:00
scrawl
2f0b47fc38 test 2012-09-13 00:21:58 +02:00
scrawl
a96ed6ac61 splash screens on startup 2012-09-12 19:15:29 +02:00
scrawl
c3966a7c5a oops, I used a float texture for water reflection. this change should give a little performance boost. 2012-09-11 22:45:41 +02:00
Marc Zinnschlag
e9e30c0fce fixed a memory leak 2012-09-11 20:34:54 +02:00
scrawl
a8d9aa98b1 some fixes 2012-09-11 19:18:26 +02:00
scrawl
d5a08e31e7 scene does not disappear anymore during load 2012-09-11 17:36:20 +02:00
scrawl
369db182de actual progress bar, performance optimization 2012-09-11 16:53:49 +02:00
scrawl
2b339f6c0f loading screen 2012-09-11 16:37:54 +02:00
Jason Hooks
c5b25ef70b Very basic actor physics (no set scale/rotate functions) 2012-09-10 20:29:24 -04:00
scrawl
4977c33e4c fixed a stats window resizing problem that I introduced today 2012-09-10 21:58:19 +02:00
Marc Zinnschlag
6c03d7aec4 documentation fix 2012-09-10 21:12:35 +02:00
scrawl
9448ce5968 implemented "get<Control>Disabled" functions 2012-09-10 18:44:59 +02:00
scrawl
89ad2af1d9 key usage to open doors or containers 
to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara)
 2012-09-10 17:44:59 +02:00
scrawl
fdc2a7433c remove the wrong container open sound 2012-09-10 15:01:51 +02:00
scrawl
d581ac426e useless cout message 2012-09-10 14:10:56 +02:00
scrawl
996e6280d8 more spell buying window cleanup 2012-09-10 14:10:01 +02:00
scrawl
ba0acd4056 changed some text colors 2012-09-10 13:52:37 +02:00
scrawl
fde69d0c87 Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing 2012-09-10 13:40:34 +02:00
scrawl
bc6a1979b0 replaced everything with the new method 2012-09-10 13:39:22 +02:00
Marc Zinnschlag
61c8a627aa added a missing include 2012-09-10 13:19:15 +02:00
Marc Zinnschlag
273ac0a97f Merge branch 'spellbuying' 2012-09-10 13:16:02 +02:00
Marc Zinnschlag
f17756712a fixed spell list handling 2012-09-10 13:15:55 +02:00
Marc Zinnschlag
6c928e93d3 added missing initialisation of NPC/creature spell lists from ESX records 2012-09-10 13:04:00 +02:00
scrawl
b66c8099eb new system for dynamic sizing of buttons & text boxes 2012-09-10 11:20:27 +02:00
scrawl
35dd49f948 fixed some "using namespace" in headers 2012-09-10 09:10:50 +02:00
scrawl
56061474c4 another 3 unnecessary lines 2012-09-09 23:53:23 +02:00
scrawl
bb267dddf6 some stats window cleanup 2012-09-09 23:50:57 +02:00
scrawl
432c089434 fix the spell tooltips to show the spell target 2012-09-09 23:06:24 +02:00
Marc Zinnschlag
bcf3a81a6c and a tiny bit more of cleanup 2012-09-09 21:18:47 +02:00
Marc Zinnschlag
9c49ca1468 a bit more random cleanup 2012-09-09 21:08:57 +02:00
Marc Zinnschlag
06677a0fc8 fixed ID handling and some misc cleanup 2012-09-09 21:03:39 +02:00
Marc Zinnschlag
3fad1c0786 fixed a crash 2012-09-09 20:43:21 +02:00
Adam Hogan
08410b9062 Renamed SpellBuyingWindow, took some suggestions from scrawl 2012-09-09 14:10:07 -04:00
Adam Hogan
562df5388f Merge branch 'master' of git://github.com/zinnschlag/openmw 2012-09-09 08:38:56 -04:00
Adam Hogan
ebf80943a9 Added spell buying window 2012-09-08 18:17:03 -04:00
Lukasz Gromanowski
99c46093dd Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests 2012-09-08 22:18:25 +03:00
Jason Hooks
23777033fd Starting to implement new PhysicActor 2012-09-05 17:44:11 -04:00
Marc Zinnschlag
0879abb948 Merge branch 'actiontarget' 2012-09-04 20:56:40 +02:00
Marc Zinnschlag
da041f902f Issue #370: fixed item taking sound 2012-09-04 20:56:28 +02:00
Marc Zinnschlag
482874f99e Merge remote-tracking branch 'scrawl/cache' 2012-09-04 20:40:18 +02:00
Marc Zinnschlag
6813bafbfc added missing sound effect for chest opening; minor cleanup 2012-09-04 15:42:41 +02:00
Marc Zinnschlag
fb8aae243d Issue #370: replaced custom target handling in talk action with base class implementation 2012-09-04 15:38:21 +02:00
Marc Zinnschlag
8ed8dd649a Issue #370: replaced custom target handling in take action with base class implementation 2012-09-04 15:34:44 +02:00
Marc Zinnschlag
ea1c3fe1e4 Issue #370: replaced custom target handling in open action with base class implementation 2012-09-04 15:29:51 +02:00
Marc Zinnschlag
8c2b4f996c Issue #370: replaced custom target handling in equip action with base class implementation 2012-09-04 15:27:10 +02:00
Marc Zinnschlag
b51c42146f Issue #370: replaced custom target handling in read action with base class implementation 2012-09-04 15:24:55 +02:00
Marc Zinnschlag
3f181f9a9d Issue #370: Support for targets in containers 2012-09-04 15:21:56 +02:00
Marc Zinnschlag
cc55056adf Issue #370: replaced custom target handling in apply action with base class implementation 2012-09-04 15:18:59 +02:00
Marc Zinnschlag
733654d730 Issue #370: implemented target handling in action base class 2012-09-04 15:14:33 +02:00
Marc Zinnschlag
1cecab6e3d fixed RefData::getHandle 2012-09-04 15:08:59 +02:00
Marc Zinnschlag
ead04e1cc3 Issue #389: added AI sequence to CreatureStats; execute AI packages during the regular actor update 2012-09-04 13:32:35 +02:00
Marc Zinnschlag
345eec1135 Issue #389: added AI package base class and AI packages management class 2012-09-04 13:25:53 +02:00
Marc Zinnschlag
ef6f033dd1 Merge branch 'multidata' 2012-09-04 11:02:28 +02:00
Jason Hooks
2efceba1fc Tearing apart PhysicActor 2012-09-03 20:32:20 -04:00
gugus
d261263824 oups forgot vmformat 2012-09-02 21:09:07 +02:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
gugus
95c27723f7 fixed a bug (see commit reverted) 2012-09-02 18:12:13 +02:00
gugus
99885e8ca4 Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p" 
This reverts commit 165065d378.
 2012-09-02 18:04:36 +02:00
gugus
fa9f2b268b PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe 2012-09-02 17:57:03 +02:00
scrawl
950bf66334 throw an exception if default value for a setting is not found 2012-09-02 11:39:54 +02:00
Jason Hooks
0697c7f7f4 Finally merged in master 2012-09-01 17:28:12 -04:00
Marc Zinnschlag
e2bf4694cb Merge remote-tracking branch 'scrawl/master' 2012-08-31 09:22:32 +02:00
scrawl
760f05c454 the HUD can be toggled with F12 key; useful for screenshots 2012-08-30 20:47:39 +02:00
Marc Zinnschlag
bc34fab17f Merge remote-tracking branch 'greye/aidata' 2012-08-30 09:55:01 +02:00
greye
a90547bbbe code formatting 2012-08-29 21:35:06 +04:00
Marc Zinnschlag
81463fa23d Issue #372: fixed positions in SoundManager 2012-08-29 18:48:20 +02:00
scrawl
6ad08dfd33 added settings for crosshair & subtitles 2012-08-29 11:15:17 +02:00
Artem Kotsynyak
e9b2f4ee74 fix equipment visibility update 2012-08-28 22:59:44 +04:00
scrawl
1c5055c8ac fix a problem where hovering a marker would render it on top of the fog of war instead of below 2012-08-28 18:49:44 +02:00
scrawl
7eaf5e7f0f changed the markers to look more like morrowind's (hover effect) 2012-08-28 18:40:11 +02:00
scrawl
d9276ca09d don't make copy of CellRefList in World::getNorthVector 2012-08-28 18:23:59 +02:00
scrawl
3c39c47e2f don't make copies of CellRefList & LiveCellRef 2012-08-28 18:23:01 +02:00
scrawl
571d5095d4 removed a cout 2012-08-28 17:32:50 +02:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
Marc Zinnschlag
40d4dad15e Issue #378: Fix (record wasn't build fully) 2012-08-28 09:32:38 +02:00
Marc Zinnschlag
160b52162b Merge remote-tracking branch 'scrawl/quick_keys' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2012-08-28 09:06:40 +02:00
scrawl
321f7c3419 fix an infinite recursion regression on several dialogs. 2012-08-27 21:29:04 +02:00
scrawl
5c28a67203 broke something in the last commit. 2012-08-27 20:55:39 +02:00
scrawl
4f19b7fb9b fix leaks. 2012-08-27 20:52:32 +02:00
scrawl
bc36b0e2bd remove the restriction on the last quick key 2012-08-27 20:51:13 +02:00
scrawl
6161f81c24 last bits of the quick key menu. 2012-08-27 20:44:14 +02:00
Marc Zinnschlag
14b4263143 Merge remote-tracking branch 'scrawl/alttab' 2012-08-27 20:32:56 +02:00
scrawl
dc8f9bd923 workaround for alt tab view mode toggle 2012-08-27 19:25:30 +02:00
scrawl
9af0b48ad6 show/hide crosshair correctly 2012-08-27 19:18:55 +02:00
scrawl
a4c1d979d6 Merge branch 'master' into quick_keys 2012-08-27 18:14:41 +02:00
scrawl
c5e55d3cac fix screenshot function 2012-08-27 15:51:01 +02:00
greye
61923349e5 resolving conflicts 2012-08-27 14:52:54 +04:00
scrawl
5ebcaeb098 Merge branch 'next' into quick_keys 2012-08-27 11:04:23 +02:00
scrawl
b1a394552d mouse click sounds 2012-08-27 10:01:53 +02:00
Marc Zinnschlag
d0cebea580 some cleanup 2012-08-26 18:50:47 +02:00
Marc Zinnschlag
450656a890 Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next 2012-08-26 18:39:09 +02:00
Marc Zinnschlag
ef4910293b Merge remote-tracking branch 'corristo/osx_f_keys_fix' into next 2012-08-26 18:35:26 +02:00
Douglas Diniz
5cbb08fee1 Task 339 - Moving all sounds to actions 2012-08-26 11:47:45 -03:00
scrawl
c0f27bd5ef magic selection window 2012-08-26 11:37:33 +02:00
scrawl
fab4cfecb1 some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
Marc Zinnschlag
1fd4d84173 Merge remote-tracking branch 'mmd/windowswarnings' into next 2012-08-24 15:07:19 +02:00
gugus
165065d378 fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p 2012-08-21 19:54:42 +02:00
Nikolay Kasyanov
71a6ce2202 removed cout spam 2012-08-20 21:14:29 +04:00
Nikolay Kasyanov
5395721c26 more appropriate fix for #189 2012-08-20 21:05:02 +04:00
Douglas Diniz
82e7c04c0a Changing sounds to Action. 
Adding onActor to Action to choose between playSound and playSound3D.
 2012-08-19 20:11:50 -03:00
scrawl
f7d537cb28 very small correction 2012-08-19 22:15:31 +02:00
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
 2012-08-19 22:09:22 +02:00
Lukasz Gromanowski
34513cf16b Added support for code coverage checking and unittests. 
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-08-19 22:23:46 +03:00
greye
e6c3e0744e tvm update and fix 2012-08-19 10:37:51 +04:00
greye
5b2b378f25 tvm script instruction 2012-08-18 18:05:10 +04:00
Marc Zinnschlag
d1656b2f5d Merge remote-tracking branch 'greye/player_control' 
Conflicts:
	apps/openmw/mwrender/player.cpp
 2012-08-18 13:38:54 +02:00
gugus
cc01a5ceed Merge branch 'next' of https://github.com/zinnschlag/openmw.git into object_movement_creation 2012-08-18 10:51:12 +02:00
gugus
f2d080d091 bugfix 2012-08-18 10:50:58 +02:00
greye
b8e56d61d3 update camera code, add idle time 2012-08-18 01:31:57 +04:00
greye
3f3972eb3b no vanity in gui mode (thanks scrawl) 2012-08-17 23:44:28 +04:00
greye
d2b451eb7d entering vanity mode 2012-08-17 23:25:29 +04:00
greye
b6954a4e8d use the same height on non-1st person modes 2012-08-17 22:08:16 +04:00
scrawl
8817a9634c don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone) 2012-08-17 16:55:21 +02:00
Marc Zinnschlag
1da56e2832 removed some unused variables 2012-08-17 15:37:14 +02:00
greye
14f293882c still resolving 2012-08-17 16:42:42 +04:00
greye
83356d5505 resolving conflicts 2012-08-17 16:25:54 +04:00
greye
7303d595dd resolving conflicts 2012-08-17 15:36:51 +04:00
greye
4f10138a04 using real player sight angles on ray cast 2012-08-17 15:20:57 +04:00
greye
0e6e141fd4 camera control related script instructions 2012-08-17 15:20:57 +04:00
greye
60fb1e8df6 fix sky in preview mode movement 2012-08-17 15:19:44 +04:00
greye
6961830efb using real player eye direction when moving 2012-08-17 15:19:44 +04:00
greye
e8fc942bef reverse Z-axis rotation to make doors happy 2012-08-17 15:19:44 +04:00
greye
a453a7f035 camera adjustment, fix view mode on start 2012-08-17 15:19:44 +04:00
scrawl
34f796c38e removed the far clip distance hack which is not needed anymore 2012-08-17 15:19:44 +04:00
scrawl
b97b3d7b71 fix sky position when reflection is enabled, fix delay in sky reflection 2012-08-17 15:19:44 +04:00
greye
575244bd35 fix SkaManager issue 2012-08-17 15:19:44 +04:00
greye
783e81afc3 fix 1st/preview/1st change; 1st invisible model 2012-08-17 15:19:43 +04:00
greye
392e6efcb5 initial player rendering 2012-08-17 15:19:43 +04:00
greye
6f87c0c36d preview mode, advanced vanity support 2012-08-17 15:19:43 +04:00
greye
fe1a9ac3c5 poor camera with some fixes 2012-08-17 15:19:43 +04:00
greye
db94018865 far better camera movement 2012-08-17 15:19:43 +04:00
greye
a7aeda9a3b initial vanity mode support 2012-08-17 15:19:43 +04:00
greye
c46eeaa100 initial 3d-person camera support 2012-08-17 15:19:43 +04:00
Jason Hooks
63a40e9ba3 npc xy disabled 2012-08-16 15:41:42 -04:00
Marc Zinnschlag
e97d23e626 Issue #361: reset skill level in race selection stage 2012-08-16 15:42:37 +02:00
scrawl
132da92391 Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem 2012-08-16 13:20:53 +02:00
Marc Zinnschlag
b0506e2220 re-enabling support for multiple data directories 2012-08-16 12:59:28 +02:00
Jason Hooks
8762f4a47a boxrotation nif field; commented functions 2012-08-15 16:47:26 -04:00
Jason Hooks
7b8b4c366d Set angle now working for npcs and creatures 2012-08-14 20:29:48 -04:00
Jason Hooks
1f5bc229e0 Separate adjustRigidBody function 2012-08-14 18:04:58 -04:00
scrawl
f9efd543e4 use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1 2012-08-13 21:33:53 +02:00
Michael Mc Donnell
b373d0ec7b Correct struct to class in forward declarations 
Fixes http://bugs.openmw.org/issues/362
 2012-08-13 13:58:35 -04:00
scrawl
67577c6192 UI cursor & camera sensitivity sliders 2012-08-13 18:48:50 +02:00
scrawl
c7b8787c32 "reset to defaults" button, invert y axis button 2012-08-13 02:55:22 +02:00
scrawl
bc6e4feedc hotkey window first version 2012-08-13 01:26:15 +02:00
scrawl
c4fe2e4e2a Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem 2012-08-12 23:01:25 +02:00
scrawl
976ad7a301 key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw 2012-08-12 22:59:58 +02:00
scrawl
90f1d9c2f2 OSX suggestion by corristo 2012-08-12 21:25:13 +02:00
scrawl
97c45455fd fix WindowManager destruction 2012-08-12 21:21:23 +02:00
scrawl
86d6f190bf Input system rewrite 2012-08-12 20:45:02 +02:00
Marc Zinnschlag
c4bf6214db Merge remote branch 'scrawl/master' 2012-08-12 18:11:36 +02:00
Marc Zinnschlag
88e70cb5bd Merge branch 'decouple' 2012-08-12 18:11:17 +02:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
scrawl
b6f427bf5e fix OpenMW not exiting when the window is closed (alt f4 etc) 2012-08-12 17:20:46 +02:00
Marc Zinnschlag
35a64edf2a Issue #107: removed a template from the window manager 2012-08-12 16:07:04 +02:00
Marc Zinnschlag
484cce12a8 Issue #107: removed redundant getStore function from window manager 2012-08-12 14:36:46 +02:00
Marc Zinnschlag
f37d3cd3c9 Issue #107: added a few todo comments 2012-08-12 14:09:55 +02:00
Marc Zinnschlag
4ca3cb81d4 Issue #107: some include clean up 2012-08-12 14:07:48 +02:00
Marc Zinnschlag
e0ba7cf952 Issue #107: Fixing up the window manager interface 2012-08-12 13:46:14 +02:00
Marc Zinnschlag
020fde70b8 Issue #107: moving function implementations from hpp to cpp file 2012-08-12 11:10:17 +02:00
Marc Zinnschlag
dbac3d2e5f Issue #107: fixing WindowManager::removeDialog 2012-08-12 10:52:29 +02:00
Marc Zinnschlag
a3b27ae756 Issue #107: Moved ClassPoint from window manager to character creation 2012-08-12 10:50:03 +02:00
Jason Hooks
e7329d5f8b Creatures now have a properly positioned box shape 2012-08-12 00:36:49 -04:00
gugus
fb91f76a2b fixed a crash 2012-08-11 22:08:04 +02:00
gugus
0c8045d606 allow exterior cell for positioncell. Crash! 2012-08-11 19:16:00 +02:00
gugus
0bc48cc5ea little fix (thanks greye!) 2012-08-11 18:07:20 +02:00
gugus
379fbccf8c Merge branch 'move_rotate_fix' of https://github.com/greye/openmw.git into object_movement_creation 2012-08-11 17:53:40 +02:00
Marc Zinnschlag
0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 2012-08-11 17:53:39 +02:00
Marc Zinnschlag
b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
scrawl
dcf1e66456 fix main menu placement after resolution changes 2012-08-11 17:26:01 +02:00
greye
f7f8ac0a73 fix move/rotateObject code 2012-08-11 18:28:37 +04:00
scrawl
2ebf4721d1 small main menu fix 2012-08-11 15:15:09 +02:00
Marc Zinnschlag
380defa52f Merge remote branch 'greye/cross_cell-borders' 2012-08-11 15:08:17 +02:00
greye
47f7a5e988 fix double pos/rot adjustment 2012-08-11 17:01:55 +04:00
Marc Zinnschlag
bc16dc81b9 Merge remote branch 'greye/cross_cell-borders' 2012-08-11 14:44:39 +02:00
gugus
eaf6a8df94 some correction 2012-08-11 14:06:58 +02:00
greye
355ca649c2 camera flip control rewritten 2012-08-11 14:54:33 +04:00
gugus
5d1c01a58e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-08-11 12:28:03 +02:00
Marc Zinnschlag
766e782aae Merge remote branch 'greye/cross_cell-borders' 2012-08-11 12:05:10 +02:00
Marc Zinnschlag
f3edea77b2 MSCV compatibility fix 2012-08-11 12:03:22 +02:00
Marc Zinnschlag
b53b27533a fixes some include guards 2012-08-11 12:02:51 +02:00
Marc Zinnschlag
6eb9f15b6d fixed time stamp operator 2012-08-11 11:38:26 +02:00
greye
45306e4bc3 fixed rotation adjustment 2012-08-11 13:23:54 +04:00
greye
5018db3332 removed some redundant code, added some comments 2012-08-11 12:13:16 +04:00
gugus
54221aab89 Merge branch 'cross_cell-borders' of https://github.com/greye/openmw.git into object_movement_creation 2012-08-11 09:53:06 +02:00
gugus
7fa1dc93d7 2nd try: position/ PositionCell 2012-08-11 09:52:49 +02:00
greye
0042020385 should fix 'north direction' bug 
not even compiled
 2012-08-10 21:24:07 +04:00
greye
bed6545e45 still fix assertion fail 2012-08-10 21:06:09 +04:00
greye
56c9c4dbd9 remove some redundant code 2012-08-10 21:03:46 +04:00
scrawl
11fadf4a07 forgot something 2012-08-10 16:25:27 +02:00
scrawl
44ff31b50a removed world exit methods 2012-08-10 16:21:53 +02:00
scrawl
f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 2012-08-10 15:15:48 +02:00
Jason Hooks
38c2c5d480 Creatures now use object physics 2012-08-09 18:09:11 -04:00
gugus
b664b174f0 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation 
Conflicts:
	apps/openmw/mwscript/transformationextensions.cpp
 2012-08-09 23:50:44 +02:00
gugus
cb5b69104d PositionCell 2012-08-09 23:45:06 +02:00
Jason Hooks
083e3537b4 post merge 2012-08-09 17:21:59 -04:00
greye
38b06aee6c resolving conflicts 2012-08-09 21:49:00 +04:00
Marc Zinnschlag
aca08eb4c2 Merge branch 'decouple' into player_control 
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.hpp
 2012-08-09 16:12:10 +02:00
greye
b5bc7bc424 SoundManager dependency on camera pos/dir 2012-08-09 17:01:03 +04:00
Marc Zinnschlag
6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 2012-08-09 14:33:21 +02:00
Marc Zinnschlag
d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 2012-08-09 12:56:03 +02:00
Marc Zinnschlag
a84145a087 Issue #107: minor corrections 2012-08-09 12:05:47 +02:00
greye
181d45661f fix rotation angles 2012-08-09 13:43:52 +04:00
greye
6b996d8c34 fix disabled camera on start 2012-08-09 13:29:13 +04:00
greye
df60f4bf92 stub for soundmanager, adjust rotation mode 2012-08-09 13:27:32 +04:00
Marc Zinnschlag
923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 2012-08-09 10:35:53 +02:00
Marc Zinnschlag
e6ede480c7 Issue #107: fixed up some interfaces 2012-08-09 09:41:17 +02:00
greye
378fcc2460 fix DisablePlayerControl logic 2012-08-09 11:10:18 +04:00
greye
1511eb3549 implemented enable/disable player looking switch 2012-08-09 10:55:49 +04:00
greye
a2d87d5f5b added camera flip control, fixed input rotation axis 2012-08-09 10:24:18 +04:00
greye
ec9cf4d3c6 rotateObject() added, input system rewritten 2012-08-09 00:15:52 +04:00
Marc Zinnschlag
28ecfb4290 Issue #107: ScriptManager is accessed only through the interface class from now on 2012-08-08 15:18:55 +02:00
Marc Zinnschlag
9b567e4ba6 Issue #107: Removed a redundant function in world interface; added a comment 2012-08-08 14:54:35 +02:00
greye
b6f7f21bcf fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added 2012-08-08 14:51:33 +04:00
greye
79b7487c87 fix using deleted objects 2012-08-07 22:21:46 +04:00
greye
d32a61b928 fix object moving 2012-08-06 18:20:48 +04:00
greye
ee97a204f2 fix npc animation key update 2012-08-06 15:26:37 +04:00
gugus
8a485e213b first try of the Position script instruction. Still missing: check if overlapp with an object. 2012-08-05 16:44:56 +02:00
gugus
d850a3ee49 some correction 2012-08-05 16:21:53 +02:00
Marc Zinnschlag
f5ee5a5414 Merge remote branch 'edmondo/master' 2012-08-05 00:03:16 +02:00
Marc Zinnschlag
1db7978361 silenced a warning 2012-08-04 22:03:14 +02:00
Marc Zinnschlag
0c5f886683 Merge remote branch 'greye/player_control' 2012-08-04 21:55:13 +02:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04:00
greye
16ad97610d add support for some scripting player control switches 2012-08-04 11:54:42 +04:00
Marc Zinnschlag
994e33e3d2 fixed object rotation code 2012-08-04 09:34:49 +02:00
Marc Zinnschlag
e4dc01832b fixing object rotation script instructions (wrong argument type and missing error handling) 2012-08-04 09:18:20 +02:00
Edmondo Tommasina
11d0761528 terrainmaterial.cpp: fix std::runtime_error compile error 2012-08-03 22:42:28 +02:00
gugus
b2ce1dfd1a getStartingPos 2012-08-03 18:20:51 +02:00
gugus
7d6ad6ad94 setPos and getPos Script instructions. Cell-crossing is not tested yet. 2012-08-03 18:14:05 +02:00
greye
ff62770657 World::isUnderwater(), World::isSwimming() 2012-08-03 14:42:09 +04:00
Marc Zinnschlag
c251fbdf23 Merge branch 'master' into HEAD 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	libs/openengine/ogre/renderer.cpp
 2012-08-02 14:57:35 +02:00
gugus
e9aac4512b Build fix for Windows 
Fixes a number of places where uint was used and not defined. This commit
was originally authored by gus. It rebased by Michael Mc Donnell to take
recent commit fixes into account.
 2012-08-01 11:47:36 -04:00
gugus
ebd8b064f6 getStartingAngle script instruction 2012-08-01 12:21:42 +02:00
scrawl
15a16aeba1 Fixed DirectX HLSL shaders and re-enabled them in the gui 2012-08-01 04:11:16 +02:00
greye
f2a2e5f57d remove MWWorld::Player::setPos() 2012-07-31 19:30:24 +04:00
greye
0e3f70413e a very little comments 2012-07-31 16:52:21 +04:00
greye
288b63350c fixed objects update, local script handling 2012-07-31 11:46:57 +04:00
greye
37990b5133 fix player update 2012-07-30 23:54:26 +04:00
greye
d6150b7482 high-level implementation, unstable 2012-07-30 23:28:14 +04:00
gugus
d37d0b1947 build fix for windows 2012-07-30 19:45:40 +02:00
Marc Zinnschlag
db10baafe1 Merge branch 'scriptconsole' 2012-07-30 12:43:48 +02:00
Marc Zinnschlag
2ccecd839b improved the help text for --script-run; updated readme.txt 2012-07-30 12:43:23 +02:00
Marc Zinnschlag
fd6c155118 Issue #352: added --script-run switch 2012-07-30 12:37:46 +02:00
Marc Zinnschlag
23f8595b87 Issue #352: refactored script execution in console 2012-07-30 11:57:19 +02:00
Marc Zinnschlag
90de02b901 Issue #350: console only script instructions 2012-07-30 11:43:28 +02:00
Marc Zinnschlag
0da3f2cb59 Issue #314: Playing drink sound when using a potion 2012-07-27 12:27:22 +02:00
Marc Zinnschlag
8b08928dae Issue #351: Added sound playing to Action 2012-07-27 12:19:25 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
scrawl
7cf2fc4009 Merge branch 'master' into shadersystem 2012-07-26 23:11:16 +02:00
scrawl
6077965d27 fix the directx startup issue on windows 2012-07-26 23:09:46 +02:00
Marc Zinnschlag
7725190f89 removed some redundant code 2012-07-26 19:09:45 +02:00
greye
aa5f63ffcc disabled items placing handling 2012-07-26 19:06:48 +04:00
greye
26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 2012-07-26 16:14:11 +04:00
greye
b734460dc9 Merge branch 'master' of https://github.com/zinnschlag/openmw 2012-07-26 16:02:58 +04:00
scrawl
06bd2cd919 Merge branch 'master' into shadersystem 2012-07-25 23:54:22 +02:00
greye
cd04911f3c dropping on the ground 2012-07-25 20:31:39 +04:00
greye
49b1d5e127 fix object placing 2012-07-25 20:31:39 +04:00
greye
e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 2012-07-25 20:31:39 +04:00
greye
bcc47cd5fb local scripts, move placing to World::placeObject(Ptr, CellStore, Position) 2012-07-25 20:31:39 +04:00
greye
d5fe378a66 Revert "local script registration" 
This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.
 2012-07-25 20:31:39 +04:00
greye
aff05b9d36 local script registration 2012-07-25 20:31:39 +04:00
greye
e1c7d1f529 fixed item sinking 2012-07-25 20:31:39 +04:00
greye
6a3a728a56 Class::getModel implementation 2012-07-25 20:31:39 +04:00
greye
87050e48c8 physics getObjectHeight(), MWWorld::Class::getModel() definition 2012-07-25 20:31:39 +04:00
greye
71253c64ab moving part 2, adding position parameter, stable 2012-07-25 20:31:39 +04:00
greye
61cb012ee7 moving Scene::insertObject to CellStore::insertObject, part 1 2012-07-25 20:31:39 +04:00
Chris Robinson
9f0c1eeb7b Support playgroup mode 0 2012-07-24 14:54:12 -07:00
Chris Robinson
13ab2baef0 Use a struct to hold the current animation times and remaining loop count 2012-07-24 14:42:01 -07:00
Chris Robinson
fd1e3f6ec5 Add support for playgroup mode 2 2012-07-24 14:14:32 -07:00
Chris Robinson
20121f3b0a Remove some unused stuff 2012-07-24 13:56:28 -07:00
Chris Robinson
9a7a629d0f Add support for playing animation groups 2012-07-24 13:51:48 -07:00
Chris Robinson
f953d7f8c0 Store text keys from base NIF animations 2012-07-23 17:27:35 -07:00
Chris Robinson
36be1536d9 Return text keys from NIFs when creating entities 2012-07-23 17:20:47 -07:00
scrawl
8c8228a15c fix terrain num lights setting 2012-07-24 00:08:53 +02:00
Chris Robinson
44975854e5 Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2012-07-23 13:46:05 -07:00
Chris Robinson
f67983bbee Don't assume one sub-entity for the night sky entities 2012-07-23 13:37:05 -07:00
Marc Zinnschlag
2d080ce4ef compile fix 2012-07-23 21:47:53 +02:00
Marc Zinnschlag
483a6d8605 Merge remote branch 'scrawl/shadersystem' 2012-07-23 21:46:06 +02:00
scrawl
02a52c0ff1 fixed some more settings bugs 2012-07-23 21:39:22 +02:00
scrawl
3ebc6fd590 fixed a settings window bug 2012-07-23 20:50:56 +02:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
scrawl
ab35bfa32c fixed a sky issue 2012-07-23 18:19:34 +02:00
scrawl
cfa0519721 Merge branch 'master' into nif-cleanup 2012-07-23 15:37:08 +02:00
scrawl
1fef086088 Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" 
This reverts commit 546b640022, reversing
changes made to fcaa8aae06.
 2012-07-23 15:36:12 +02:00
scrawl
f8d6a36196 Merge branch 'master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/sky.cpp
	apps/openmw/mwrender/sky.hpp
	components/nifogre/ogre_nif_loader.cpp
	components/nifogre/ogre_nif_loader.hpp
 2012-07-23 15:35:31 +02:00
Marc Zinnschlag
a24e7c9de2 Merge remote branch 'scrawl/shadersystem' 2012-07-23 15:25:11 +02:00
scrawl
2eca27bba9 fix horizon color of the sky reflection 2012-07-23 14:21:40 +02:00
Marc Zinnschlag
2c5d3d8df9 Merge remote branch 'scrawl/shadersystem' into shadersystem 
Attention: We have submodules again. Don't forget to update!

Conflicts:
	components/files/configurationmanager.cpp
 2012-07-23 14:12:21 +02:00
scrawl
1dbfd60305 Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup 2012-07-23 13:48:12 +02:00
scrawl
afe7c41729 removed some unused code 2012-07-23 13:47:51 +02:00
greye
32b1350b63 CreatureStats class 2012-07-22 18:29:54 +04:00
Chris Robinson
77446a0d58 Fix skipAnim, only skip one animation update 2012-07-21 17:39:57 -07:00
Chris Robinson
e81fc42daa Remove the beast-race special cases from updateParts 
The special handling should happen at a much lower level, and prevent the
objects from being equipped in the first place.
 2012-07-21 17:12:41 -07:00
Chris Robinson
c5b9098517 Remove an unused field from EntityList 2012-07-21 17:09:16 -07:00