1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:23:51 +00:00
Commit graph

16795 commits

Author SHA1 Message Date
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
eac1e80911 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-07-23 20:07:08 +03: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
scrawl
5a9b1b6a01 Merge pull request #1005 from MiroslavR/cellref-fixes
Various reference handling fixes
2016-07-23 15:43:35 +02:00
Stanislav Zhukov
917fa63f5c Fixed security issue 2016-07-23 17:14:54 +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
AnyOldName3
7243583963 Change a switch to a series of if/else if/.../else, hopefully resolving compilation issues on OSX and Linux. 2016-07-21 01:36:14 +01:00
AnyOldName3
2b829f7f7b Move some stuff to a header, removing the need for a dodgy hack. 2016-07-21 01:07:25 +01:00
AnyOldName3
becc053555 Trick the software into building by using what I assume is a really dirty hack. 2016-07-21 00:16:00 +01:00
AnyOldName3
519fbab864 Remove useless print 2016-07-20 23:18:09 +01:00
AnyOldName3
32f0ded8f6 Fix bug in unescape filter, but still manage not to fix build issue. 2016-07-20 23:15:44 +01: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
423919abb5 Make it not build again (but theoretically enable the desired functionality). 2016-07-20 15:19:34 +01:00
AnyOldName3
59639e3988 Make it build again (but remove the new functionality). 2016-07-20 15:16:53 +01:00
AnyOldName3
d9d5a6561b Adjust the code so that it should (maybe) work, changing the compilation error to a less straighforward one. 2016-07-20 14:50:34 +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
Stanislav Zhukov
a54e76cfd2 Update TES3MPTeam.md 2016-07-20 15:06:20 +08:00
Stanislav Zhukov
78b1511b5e Update TES3MPTeam.md 2016-07-20 14:46:04 +08:00
Stanislav Zhukov
61623222e1 Update TES3MPTeam.md 2016-07-20 14:44:55 +08: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
4ac5174d89 updated credits file 2016-07-19 16:29:26 +02:00
Marc Zinnschlag
c17e1ca24a Merge remote-tracking branch 'anyoldname3/ignore-hash-test' 2016-07-19 16:19:28 +02:00
Stanislav Zhukov
7b4a5fdcc2 Merge pull request #1 from Aesylwinn/MergeTES3MP
Merge tes3 mp
2016-07-19 00:13:52 -05: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
scrawl
9e3ed45320 Merge pull request #1003 from MiroslavR/camera-distance
Fix camera distance not getting reset to max value (Fixes #3473)
2016-07-17 20:24:49 +02:00
MiroslavR
19a8800d4d Fix camera distance not getting reset to max value (Fixes #3473) 2016-07-17 19:52:12 +02:00
Koncord
45fab50bd8 Merged branch master into master 2016-07-17 17:59:57 +08:00
Koncord
6f07d590d4 Fix SetPos and SetAngle functions
Fix types for SetPos and SetAngle
2016-07-17 17:59:46 +08:00
scrawl
2ed813d5f3 Merge pull request #1002 from MiroslavR/nitextureeffect-crash
Fix assertion failure with NiTextureEffect missing source texture
2016-07-16 19:26:09 +02:00
MiroslavR
721fa28c1e Fix assertion failure with NiTextureEffect missing source texture 2016-07-16 18:59:18 +02:00
David Cernat
f6d72ca5c1 Merge pull request #3 from testman42/patch-1
Use English translation for changelog
2016-07-16 15:19:55 +03:00