cc9cii
|
1ab5948f19
|
merge upstream changes
|
11 years ago |
Marc Zinnschlag
|
b0ae5b8ab7
|
Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29
|
11 years ago |
cc9cii
|
fcfc8fcccb
|
Revert "Allow MinGW64 compilation in Windows/msys"
This reverts commit c3f350e3fb .
Conflicts:
libs/platform/string.h
|
11 years ago |
cc9cii
|
ac606a865c
|
Back out unnecessary change.
|
11 years ago |
cc9cii
|
c241405d91
|
Fix Windows save & load.
|
11 years ago |
cc9cii
|
c3f350e3fb
|
Allow MinGW64 compilation in Windows/msys
|
11 years ago |
Nikolay Kasyanov
|
59508e914f
|
Fixed OpenCS build on OS X
|
11 years ago |
Marek Kochanowicz
|
e348c6baa9
|
accept drops from filters table. Cool. ☺
|
11 years ago |
Marek Kochanowicz
|
e2dce53543
|
additional check on droping to prevent exception
|
11 years ago |
Marek Kochanowicz
|
fcf17805a0
|
Installing basic event filter
|
11 years ago |
Marc Zinnschlag
|
7693f712bc
|
started making CellStore into a proper class; encapsulated mCell member
|
11 years ago |
Marek Kochanowicz
|
55e9083570
|
refactorisation
|
11 years ago |
Marek Kochanowicz
|
1c35a85adf
|
fixed bugs, added extra display_type
|
11 years ago |
Marek Kochanowicz
|
7dff34ebf1
|
Features implemented. Time to debug.
|
11 years ago |
Marek Kochanowicz
|
3ad6df1f92
|
try with the passing action
|
11 years ago |
Marek Kochanowicz
|
38a86b5015
|
We can handle droping multiple records
|
11 years ago |
Marek Kochanowicz
|
b788ab8b4c
|
correcting
|
11 years ago |
Marek Kochanowicz
|
4fe21dc38f
|
Const correctness
|
11 years ago |
Marc Zinnschlag
|
736644de05
|
Revert "#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()"
This reverts commit 51fb9f65ea .
|
11 years ago |
Marek Kochanowicz
|
eb3cbaa4e1
|
Create filter on droping record.
|
11 years ago |
Marek Kochanowicz
|
c7b3e139aa
|
Propagate signal to the edit widget
|
11 years ago |
pvdk
|
755c99df3c
|
Some minor fixes
|
11 years ago |
pvdk
|
6916c0bc94
|
Wizard now writes valid Morrowind.ini files
|
11 years ago |
pvdk
|
e8170adde5
|
Some minor changes, implemented suggestions
|
11 years ago |
pvdk
|
ceb66d0790
|
Also install the separate Sounds directory for Tribunal
|
11 years ago |
pvdk
|
5024f1bf77
|
Added a warning when trying to install tribunal after bloodmoon
|
11 years ago |
pvdk
|
2ccf4d6112
|
Post-merge cleanups, using confignmanager for XDG paths now, thanks scrawl!
|
11 years ago |
pvdk
|
c54217d008
|
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
|
11 years ago |
Marek Kochanowicz
|
fca7701359
|
Column titles retrived and passed to the filterbox.
|
11 years ago |
pvdk
|
b43325119a
|
Some changes to the version retrieval: ignore shallow clones
|
11 years ago |
Marek Kochanowicz
|
d7a1abb30b
|
emit signal with types (will be connected to the tablesubview)
|
11 years ago |
Marek Kochanowicz
|
dd95ed8e4c
|
Accept drops on the filterbox
|
11 years ago |
Marek Kochanowicz
|
569533eeae
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
|
11 years ago |
scrawl
|
d25b3ad9cb
|
Fix AiCombat for creatures with weapons
|
11 years ago |
scrawl
|
ebc67a82cf
|
Don't list unnamed quests in the quest book
|
11 years ago |
scrawl
|
1fba5d1bb9
|
Terrain: change world bounds from AABB to 4 floats
|
11 years ago |
scrawl
|
bc376e6649
|
Closes #888: Treat "Bip 01" as animation root if existing
|
11 years ago |
scrawl
|
439018e706
|
Get rid of useless return values
|
11 years ago |
scrawl
|
90f6cda4cc
|
Moved includes to appropriate place
|
11 years ago |
Marek Kochanowicz
|
e9664d80bd
|
make convert enumns public static
|
11 years ago |
Marc Zinnschlag
|
550e5eb686
|
Merge remote-tracking branch 'corristo/osx-music-fix'
|
11 years ago |
Marc Zinnschlag
|
ea16f79d77
|
Merge remote-tracking branch 'gus/AIFix2'
|
11 years ago |
gus
|
84959eea28
|
woops, thanks scrawl
|
11 years ago |
gus
|
6e1425321b
|
remove cout spam
|
11 years ago |
gus
|
e5b19cf3c6
|
clean up
|
11 years ago |
Marc Zinnschlag
|
02c6c65705
|
Merge remote-tracking branch 'sirherrbatka/DragDrop'
|
11 years ago |
Marek Kochanowicz
|
2bb9e47507
|
Improvements.
|
11 years ago |
Nikolay Kasyanov
|
51fb9f65ea
|
#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()
|
11 years ago |
Nikolay Kasyanov
|
5e8cb2e466
|
Another attempt to fix #1041. This time I'm sending real data from decoder
once after playback started.
|
11 years ago |
Marek Kochanowicz
|
e1a0f60041
|
allow _foo ids without qoute
|
11 years ago |
Marek Kochanowicz
|
b83817e05e
|
May only include alphanumeric characters and underscores and may not start with a number.
|
11 years ago |
Marek Kochanowicz
|
3cc23a9cb3
|
very basic, but safe putting down " "
|
11 years ago |
Nikolay Kasyanov
|
4e28fd85a3
|
Fixed build on OS X
|
11 years ago |
Marc Zinnschlag
|
c18c3e51ee
|
handle IDs that don't exist anymore after loading
|
11 years ago |
Marc Zinnschlag
|
9788bbcab9
|
partially store creature state in saved game files (only attributes and dynamics for now)
|
11 years ago |
Marc Zinnschlag
|
b0532e0c85
|
store NPC state in saved game files
|
11 years ago |
Marc Zinnschlag
|
9f721fd144
|
store list of known topics in saved game files
|
11 years ago |
Marc Zinnschlag
|
6ac64bbe15
|
Merge branch 'script'
Conflicts:
readme.txt
|
11 years ago |
Marek Kochanowicz
|
17af865a9f
|
checking for the source of the drop, reject those from other files for now
|
11 years ago |
Marc Zinnschlag
|
9cdfca6c26
|
Merge remote-tracking branch 'potatoesmaster/disable-crash'
|
11 years ago |
Marek Kochanowicz
|
cbe1fe2f95
|
removed misplaced bracket
|
11 years ago |
Marek Kochanowicz
|
45d9364195
|
Put the id in the quote.
|
11 years ago |
Marek Kochanowicz
|
ec8c8a9d88
|
-journalinfo +topic
|
11 years ago |
Marek Kochanowicz
|
41606a67e4
|
implemented whitelist of allowed types in the scripts
|
11 years ago |
Marek Kochanowicz
|
930b77e60a
|
allow drag and drop into the script edit window.
|
11 years ago |
Marc Zinnschlag
|
01a7918124
|
Merge remote-tracking branch 'potatoesmaster/selected-spell'
|
11 years ago |
Marek Kochanowicz
|
97fe5465bf
|
created new files
|
11 years ago |
Emanuel Guevel
|
3d8ca02479
|
Fix breaking of enchanted items casting
|
11 years ago |
Marc Zinnschlag
|
0afa61eed5
|
fixed referenceable-loading in case of more than one content file
|
11 years ago |
Marc Zinnschlag
|
2007a3e902
|
improved script check error messages
|
11 years ago |
Marek Kochanowicz
|
56be62b956
|
small reformatting
|
11 years ago |
Marek Kochanowicz
|
4ee90c24e5
|
more readable code.
|
11 years ago |
Marc Zinnschlag
|
4e04131957
|
fixing case broke sorting in script context
|
11 years ago |
Marc Zinnschlag
|
2130ec39d6
|
disable warnings by default in script verifier
|
11 years ago |
Marek Kochanowicz
|
b1f63947e8
|
Checking if the drop comes from same document.
|
11 years ago |
Marek Kochanowicz
|
d6820b977e
|
store const ref to the document in the table.
|
11 years ago |
Marek Kochanowicz
|
f3dc45f1ec
|
long line split.
|
11 years ago |
Marek Kochanowicz
|
37d262b147
|
Splited very long line.
|
11 years ago |
Marc Zinnschlag
|
7b8802588e
|
Merge remote-tracking branch 'sirherrbatka/DragDrop'
|
11 years ago |
Marek Kochanowicz
|
aafde926d3
|
Documentation, corrections.
|
11 years ago |
Marc Zinnschlag
|
e17af4231a
|
added script verifier
|
11 years ago |
Marc Zinnschlag
|
0ff744c2ff
|
fixed CSMWorld::ScriptContext::isJournalId
|
11 years ago |
gus
|
a315d5cc2b
|
aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp
|
11 years ago |
Marek Kochanowicz
|
ae418f2538
|
nicer formatting
|
11 years ago |
Marc Zinnschlag
|
0a8ffbfb1d
|
added missing implementation for CSMWorld::ScriptContext::getMemberType
|
11 years ago |
Marc Zinnschlag
|
910d62e4b8
|
added missing implementation for CSMWorld::ScriptContext::getGlobalType
|
11 years ago |
Marc Zinnschlag
|
451e1f413b
|
instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly
|
11 years ago |
Emanuel Guevel
|
7c981587fc
|
When searching object by id, search in active cells before searching in the player's inventory
|
11 years ago |
Marc Zinnschlag
|
053b3dc371
|
Merge branch 'openmw-28'
Conflicts:
CMakeLists.txt
|
11 years ago |
Emanuel Guevel
|
e597328b6b
|
Make enable/disable a no-op for items in containers
|
11 years ago |
Marek Kochanowicz
|
40cc108e54
|
drag and drop works.
|
11 years ago |
Marek Kochanowicz
|
1bcc6d6918
|
using new icon.
|
11 years ago |
Marek Kochanowicz
|
2afe3f3e57
|
Introduced multitype icon.
|
11 years ago |
Marek Kochanowicz
|
6662560cbc
|
new displays for referencable table columns
|
11 years ago |
Marc Zinnschlag
|
d6e212a02b
|
Merge branch 'master' into script
|
11 years ago |
Marc Zinnschlag
|
e9238b456d
|
use case-insensitive sorting in columns
|
11 years ago |
Marek Kochanowicz
|
09d3c7a446
|
Attempt to match types. Does not work at the moment.
|
11 years ago |
gus
|
7c6e27e4f9
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
Conflicts:
apps/openmw/mwmechanics/aitravel.cpp
|
11 years ago |
Marek Kochanowicz
|
71b2fc1c70
|
Introduced method to access display type.
|
11 years ago |
Marc Zinnschlag
|
9c52820754
|
Merge remote-tracking branch 'scrawl/master'
|
11 years ago |
Marek Kochanowicz
|
5f3f867a10
|
Implemented convertEnums function
|
11 years ago |
scrawl
|
c6fb0f2d9b
|
Removed terrain component's dependency on ESM
|
11 years ago |
Marc Zinnschlag
|
dde4fbd818
|
allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away
|
11 years ago |
Marc Zinnschlag
|
b3412b7eec
|
another case fix (remote member access again)
|
11 years ago |
Marc Zinnschlag
|
dc433a3c09
|
fixed case handling problem for local variable access
|
11 years ago |
Marc Zinnschlag
|
388735046f
|
fixed broken remote member variable access
|
11 years ago |
Marek Kochanowicz
|
c142089bfe
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
|
11 years ago |
Marek Kochanowicz
|
c00834a8de
|
added some iostream garbage.
|
11 years ago |
Marek Kochanowicz
|
8dfdd87a07
|
Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop
Conflicts:
apps/opencs/view/world/table.cpp
|
11 years ago |
Marek Kochanowicz
|
62c9c77ddf
|
Compiles now.
|
11 years ago |
gus
|
6cf561f713
|
get index to where we are dropping
|
11 years ago |
gus
|
2e33ab3a13
|
droping somewhat works
|
11 years ago |
Marek Kochanowicz
|
e1a39b8388
|
Replaced some display_string with specific type. Damn, i wish this is correct ;-)
|
11 years ago |
Marek Kochanowicz
|
fc135fbfee
|
Added new Display types
|
11 years ago |
Emanuel Guevel
|
8824af30b4
|
Allow to display message box outside of dialogue window
|
11 years ago |
Marc Zinnschlag
|
ffd1783690
|
Merge remote-tracking branch 'mrcheko/master'
|
11 years ago |
Marc Zinnschlag
|
e44a7268fc
|
Merge remote-tracking branch 'potatoesmaster/selected-spell'
|
11 years ago |
Emanuel Guevel
|
a3eea4f6b6
|
Do not allow spellcasting stance without spell selected
|
11 years ago |
Emanuel Guevel
|
70d35da116
|
Unset selected spell when removed
|
11 years ago |
Emanuel Guevel
|
6a4820c0f7
|
Show a message when the player attempts to cast a disabled spell
|
11 years ago |
Marc Zinnschlag
|
9de2922d22
|
fixed case problem in remote member variable access
|
11 years ago |
Marek Kochanowicz
|
53e2e8415d
|
replaced start with exec
|
11 years ago |
gus
|
df46218acc
|
try droping
|
11 years ago |
Marc Zinnschlag
|
3b990795c4
|
added access to remote access of local variables of global scripts
|
11 years ago |
gus
|
b5006c5dbd
|
compile fix
|
11 years ago |
mrcheko
|
a6be72673c
|
improves animation-controlled velocity check
|
11 years ago |
scrawl
|
8f949c6ae2
|
Fix lockpicks
|
11 years ago |
scrawl
|
6ce499f0e6
|
Fixes #848: Use hardcoded animation velocity for first person movement
|
11 years ago |
scrawl
|
ff11d85a62
|
Fix wrong assertion
|
11 years ago |
gus
|
632834ce10
|
WIP
|
11 years ago |
scrawl
|
4a26909172
|
Fixes #1159: Don't allow quick keys menu in chargen
|
11 years ago |
Marek Kochanowicz
|
3b8f04c0f3
|
Allow multi-item drag.
|
11 years ago |
Marek Kochanowicz
|
f01b02c42d
|
Changed format.
|
11 years ago |
Marek Kochanowicz
|
76b729ac9b
|
Removed getUniversalid interface.
|
11 years ago |
scrawl
|
677fc84223
|
Refactor actors update
|
11 years ago |
scrawl
|
0cc1cd8f7e
|
Fix message box formatting bug
|
11 years ago |
scrawl
|
7907181c0c
|
Fix uninitialized member
|
11 years ago |
scrawl
|
ffe19e7a52
|
Feature #50: Handle attach & release of projectiles
|
11 years ago |
scrawl
|
8b8fb931a0
|
Feature #50: Don't allow ranged weapon attack when ammunition is empty
|
11 years ago |
scrawl
|
a07eaa0c0d
|
Feature #50: Allow body pitch in third person for ranged weapon aiming
|
11 years ago |
scrawl
|
5ee105c812
|
Fix typo
|
11 years ago |
scrawl
|
7cf22391a5
|
Feature #50: Handle weapon controllers (i.e. bowstring animations, etc)
|
11 years ago |
scrawl
|
e1e7a492e2
|
Fix movement speed formula for flying creatures
|
11 years ago |
scrawl
|
f608ceeffc
|
Fixes #1158 (Armor rating label issues)
|
11 years ago |
scrawl
|
8aed4fcfa4
|
Correction for marksman weapon inventory preview
|
11 years ago |
scrawl
|
5b076aa570
|
Revert "Bug #1074: Inventory paperdoll obscures armour rating"
This reverts commit b017a3be3e .
|
11 years ago |
scrawl
|
df78357e05
|
Handle knockout separately (Closes #1151)
|
11 years ago |
Marek Kochanowicz
|
04287cb87a
|
Provide method to return whole data vector from tablemimedata.
|
11 years ago |
Marek Kochanowicz
|
8b799683c1
|
Display QPixMap with dragged object.
|
11 years ago |
Marek Kochanowicz
|
3439940a8e
|
Tablemimedata able to handle vector of objects and return icon.
|
11 years ago |