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

2633 commits

Author SHA1 Message Date
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