teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
16788 commits 34 branches 0 tags 66 MiB
Commit graph

12668 commits

Author SHA1 Message Date
Aesylwinn
1cce085fa2 Remove unused headers. 2016-07-29 16:35:43 -04:00
Koncord
5e072b9d3c Update position after changing cell 2016-07-30 04:12:47 +08:00
Aesylwinn
2f97d6cffb Move tool tip processing to ShortcutManager, 
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
 2016-07-29 16:02:46 -04:00
Aesylwinn
d7a83d80a2 Change some key binding defaults. 2016-07-29 15:00:58 -04:00
Aesylwinn
3475b83e90 Clean up modifier/shortcut class and handle focus out event, 
Improve shortcut labels,
Adjust menu titles and remove menu navigation (can conflict with
shortcuts)
 2016-07-29 15:00:35 -04:00
Koncord
7107136808 New API 
SetExterior(pid, x, y)
GetExteriorX(pid)
GetExteriorY(pid)

also "SetCell" will now move to the named external cells (e.g. SetCell(pid, "Balmora"))
 2016-07-30 01:33:28 +08:00
Koncord
0549a7a01d Fixed type cast 2016-07-28 20:09:12 +08:00
Aesylwinn
96a3c278fd Added shortcuts for loading a cell relative to the camera, 
Removed Ctl+V binding for "Verify" because that is associated
with paste.
 2016-07-27 21:40:53 -04:00
Aesylwinn
65201badf6 Add custom page for key bindings. 2016-07-27 19:15:24 -04:00
LohikaarmeHav
f142f9bf86 wtf 2016-07-27 21:37:52 +03:00
Aesylwinn
b685c0ce6c Add ability to clear shortcut/modifier setting with right click. 2016-07-27 14:07:53 -04:00
Aesylwinn
12db6d2114 Add modifier setting. 2016-07-27 13:53:33 -04:00
Marc Zinnschlag
63fd1e8df7 Merge remote-tracking branch 'origin/master' 2016-07-27 15:49:11 +02:00
Koncord
23a37fc7fc Ignore LuaBridge warnings 
Remove TINYXML_LIBRARIES
 2016-07-27 17:53:26 +08:00
Koncord
d3414148fc Simplify LangLua::Call 2016-07-27 17:51:23 +08:00
Aesylwinn
b204758be1 More shortcuts. 2016-07-27 01:53:21 -04:00
Aesylwinn
3f7f75cc9d Exclude keys not compatible with qt 4 2016-07-27 00:44:34 -04:00
Aesylwinn
3edc77a32b Remove QShortcut usage, 
Add a lot of shortcuts,
Remove debug messages
 2016-07-27 00:24:16 -04:00
Koncord
5a6c1750d9 Fixed some build warnings and IsTimerElapsed function 2016-07-27 10:35:27 +08:00
Aesylwinn
08af82e1bd Switched to an interactive method for key input, 
Redid text representation for shortcuts
 2016-07-26 21:22:31 -04:00
AnyOldName3
20f73f4a32 Relocate escape-related code to new files escape.hpp and escape.cpp. 2016-07-27 00:58:31 +01:00
Stanislav Zhukov
075b600b3a Fix for Windows 2016-07-27 06:55:21 +08:00
Aesylwinn
05888e7925 Updated more tool tips to show shortcut configs. 2016-07-25 22:43:37 -04:00
Aesylwinn
8c5fddf150 Fix pathgrid selection mode not being removed from toolbar. 2016-07-25 20:49:28 -04:00
Aesylwinn
051aec2729 Added methods to keep text mentioning shortcuts up to date, 
fixed potential issue with widget relationship tracking,
hopefully got rid of signed/unsigned errors (Qt4/5 issue)
 2016-07-25 20:49:09 -04:00
Stanislav Zhukov
4316d4d1bf Merge pull request #21 from TES3MP/tes3mp-gui 
Tes3mp gui
 2016-07-25 16:16:32 -05:00
Aesylwinn
f251c3867d Redesigned shortcut handler to be capable of dealing with child and 
parent widgets. This should be the final design change. Also, some
various bug fixes.
 2016-07-23 21:23:02 -04:00
Koncord
86dccbed4b Fix CMake 2016-07-24 02:30:07 +08:00
David Cernat
f4342f0bde Stop requiring amx folder for non-Pawn builds. Use correct Windows identifiers for preprocessor directives in server code. 2016-07-23 20:06:14 +03:00
Koncord
1e3eff91ac Merged branch tes3mp-gui into tes3mp-gui 2016-07-23 22:08:01 +08:00
Koncord
9ab77cb123 New API functions: MessageBox, CustomMessageBox, InputDialog 
New Callback: OnGUIAction
 2016-07-23 22:02:06 +08:00
Stanislav Zhukov
fe50394f4d Fix movement desync 
I think this should fix all movements desyncs
 2016-07-22 23:40:34 +08:00
Aesylwinn
acdb636935 Qt4 protected signal workaround and signed/unsigned mismatch. 2016-07-22 02:41:00 -04:00
Aesylwinn
455d227f3c Changed shortcut design to allow a configurable second output. Also 
re-added shift for temporarily changing camera speed.
 2016-07-22 01:58:17 -04:00
MiroslavR
4a3529488b Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 2016-07-22 03:58:23 +02:00
MiroslavR
dafe184220 Fix moved references disappearing when modified by a plugin 2016-07-22 02:12:03 +02:00
MiroslavR
d790747389 Implement deletion of moved references (Bug #3471) 2016-07-22 01:59:02 +02:00
davidcernat
ab309180c2 Add useful debug info for cell changes 2016-07-21 23:07:37 +03:00
Aesylwinn
1b5273f2b7 Finally re-added rendering stats, refactored some functions 
to better fit new input structure, removed unneeded shortcut
declarations in headers, and changed the cell marker
interaction to use primary/secondary select instead of
shift + primary/secondary edit.
 2016-07-20 15:00:00 -04:00
AnyOldName3
59639e3988 Make it build again (but remove the new functionality). 2016-07-20 15:16:53 +01:00
Aesylwinn
faa84e0a35 - Further extended usage of new shortcut class 
- Refactored camera classes to take advantage of Qt's reference counting
- Removed some of the old implementation
 2016-07-20 08:25:11 -04:00
Aesylwinn
d8fa3fd1de Added orbit "center on selection" shortcut. 2016-07-20 08:25:11 -04:00
Aesylwinn
e8626e588a Changes in shortcut design. 
- Handle input in centralized class for potential conflict resolution.
- Remove wrapper class for QShortcut; it should be unnecessary.
- Added customizable shortcut usage to orbit camera mode.
 2016-07-20 08:25:11 -04:00
Aesylwinn
3fa4fdb839 Remove use of c++11 feature and add some missing headers. 2016-07-20 08:25:11 -04:00
Aesylwinn
40297701d0 Base key config/shortcut implementation 2016-07-20 08:25:11 -04:00
AnyOldName3
95d2c7ea5c Attempt to unescape characters when constructing file paths, introducing compilation errors. 2016-07-20 02:48:57 +01:00
davidcernat
3c8543bfaf Make player references cross exterior cells only when called by server 
Previously, clientside representations of players were able to move to a new exterior cell once during their movement tick and then again when sending a cell change packet to the server. Besides causing crashes in CellRef because of a messy cell-changing record, this also led to major desyncs.

Clientside representations of players can now only change their cells when a server-sent cell change packet specifically allows it.
 2016-07-20 03:26:25 +03:00
David Cernat
360eec30a0 Merge pull request #2 from OpenMW/master 
Add recent OpenMW commits by AnyOldName3
 2016-07-20 02:58:57 +03:00
Marc Zinnschlag
c17e1ca24a Merge remote-tracking branch 'anyoldname3/ignore-hash-test' 2016-07-19 16:19:28 +02:00
Aesylwinn
3483b54df5 Build fix. 2016-07-18 00:05:27 -04:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
 2016-07-17 23:50:52 -04:00
davidcernat
7bf08e5e5a Fix transition between exterior cells for non-local players 
Make the local player send a packet whenever moving from one exterior cell to another, don't require objects to have RefNums to be moved correctly between exterior cells, and increase the packet priority for cell changes.
 2016-07-17 22:03:20 +03:00
MiroslavR
19a8800d4d Fix camera distance not getting reset to max value (Fixes #3473) 2016-07-17 19:52:12 +02:00
Koncord
6f07d590d4 Fix SetPos and SetAngle functions 
Fix types for SetPos and SetAngle
 2016-07-17 17:59:46 +08:00
Stanislav Zhukov
645a21af21 Added new script functions for lua compatibility 
GetPosX, GetPosY, GetPosZ
GetAngleX, GetAngleY, GetAngleZ
 2016-07-16 16:19:35 +08:00
Stanislav Zhukov
ce92f30022 Fix maximum incoming connections 2016-07-13 04:24:42 +08:00
Stanislav Zhukov
b09e4a0218 Fix chat 'y' 
Now you can close chat only if pressed 'Enter'.
 2016-07-13 03:21:30 +08:00
AnyOldName3
f1b5ad5804 Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings. 2016-07-12 17:09:57 +01:00
Koncord
299c4c904e Resurrect function 2016-07-12 23:26:53 +08:00
GrimKriegor
ace719507c Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1 
https://github.com/TES3MP/TES3MP/issues/1
 2016-07-12 01:42:05 +01:00
AnyOldName3
e6f78ae5b7 Switch indentation to spaces to remain consistent with the rest of the project 2016-07-12 01:06:57 +01:00
AnyOldName3
1a0642f1db Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing 2016-07-11 22:33:15 +01:00
AnyOldName3
195dd27780 Resolve obvious runtime error revealing more subtle one 2016-07-11 22:05:38 +01:00
AnyOldName3
fbe6dc9704 Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++ 2016-07-11 21:33:36 +01:00
Allofich
c57d177f1c Trim unneeded code 2016-07-12 04:17:08 +09:00
AnyOldName3
2a9b12bb3f Fix an issue preventing compilation, revealing another that doesn't make much sense. 2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776 Remove a compilation error and set up framework to remove the others 2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 2016-07-11 01:16:32 +01:00
scrawl
2329812988 Merge pull request #995 from Allofich/traps 
Trap and lock fixes
 2016-07-10 17:19:36 +02:00
scrawl
67d3571fac Fix activation distance in third person mode 2016-07-10 17:10:19 +02:00
Allofich
599e6708ec Allow using keys to open trapped objects of lock level 0 2016-07-10 23:08:11 +09:00
Allofich
cabe038a97 Make lockpick and probe sounds 3d positional 2016-07-10 22:08:42 +09:00
Allofich
249918612d Play trap disarm sound when key used on trapped object 2016-07-10 22:06:35 +09:00
Allofich
d4e656ceaf Play trap activation sound on trapped object, not actor 2016-07-10 21:39:53 +09:00
MiroslavR
b0fcad4cb8 Don't stack effects for scrolls of the same type (Fixes #3466) 2016-07-10 03:49:09 +02:00
MiroslavR
75a66ced20 Fix actors lacking turning animations while in first person mode 2016-07-10 01:48:54 +02:00
MiroslavR
dc0bc5b68c Implement Face instruction (Feature #1424) 2016-07-09 02:16:47 +02:00
scrawl
6f376bd499 Merge pull request #983 from Allofich/telekinesis 
Don't allow telekinesis on actors or teleport doors
 2016-07-08 23:47:43 +02:00
Allofich
7a0f9a7989 Clean up, remove unnecessary code changes 2016-07-09 02:24:08 +09:00
Allofich
53ceefa46a Allow some telekinesis on teleport doors 2016-07-09 01:08:00 +09:00
Allofich
4e54338ce0 Implement and use getDistanceToFacedObject() 2016-07-08 23:28:49 +09:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08:00
scrawl
e362e3e6a5 Fix cppcheck warnings 2016-07-07 23:50:48 +08:00
Poncho
5b3ac5ff27 Use correct direction multipliers during awareness check 2016-07-07 23:50:48 +08:00
scrawl
0720a19fc0 Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
scrawl
994ad3e004 Reject conditions testing agaist Choice when not currently in a choice (Fixes #3117) 2016-07-07 23:50:48 +08:00
scrawl
cd8c84dc6c Fix typo in SameRace dialogue function (function was inverted, Fixes #3116) 2016-07-07 23:50:48 +08:00
scrawl
5d4063d8c7 LocalScripts: initialize mIter 2016-07-07 23:50:47 +08:00
Koncord
1e29409dd5 Add OpenMW-mp target 2016-07-07 23:50:38 +08:00
Allofich
0e5c3f781f Only allow trap distance check to apply to player 2016-07-07 22:10:38 +09:00
Allofich
7de3afaa7d Cleanups 2016-07-07 21:57:00 +09:00
Allofich
cb621939fd Streamline trap code 2016-07-07 21:56:54 +09:00
Allofich
35a23c3b49 Implement and use new method allowTelekinesis() 2016-07-07 21:54:31 +09:00
Allofich
8014f37879 Avoid duplicate code 2016-07-07 21:54:30 +09:00
Allofich
538209b0a2 Change variable to mRatio and initialize it 2016-07-07 21:54:29 +09:00
Allofich
e25e698978 Fix telekinesis check for activators 2016-07-07 21:54:29 +09:00
MiroslavR
80f2ae0ca7 Apply magic effects while waiting/sleeping 2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4 Player's death now interrupts waiting/sleeping 2016-07-06 00:15:25 +02:00
MiroslavR
d4e29e3e0c Clear projectiles on non-incremental time advances 2016-07-06 00:11:58 +02:00
Allofich
c1236f4113 Simplified code 2016-07-04 20:25:25 +09:00