Imbris
|
9aece17286
|
fix rebase error
Former-commit-id: 9d3866f860c80468c5087d8f8dbffd7c8a8441f9
|
2019-03-20 01:24:28 -04:00 |
|
Imbris
|
e54a1ba369
|
add ToggleButton widg, make hud return event vec, simplify some widgets
Former-commit-id: aa3fe6de4944f912cb44fa6ecebe928cc849c52c
|
2019-03-20 01:24:27 -04:00 |
|
Imbris
|
f837492284
|
add chat box, minimap buttons, ui windows, etc
Former-commit-id: 09d3e20b917a9ac9ef6333ee9bb913d01a7fb52c
|
2019-03-20 01:24:27 -04:00 |
|
Imbris
|
16ed207437
|
add main menu and more hud elements
Former-commit-id: 29557c100e2b82597ced04df09f41c4f132ffc5e
|
2019-03-20 01:24:25 -04:00 |
|
Imbris
|
3d5c11855a
|
add ui scaling
Former-commit-id: 7c6c3c8fc7d16c4a2cd0e5eff36248d6009652d2
|
2019-03-20 01:24:23 -04:00 |
|
Imberflur
|
e35e2fffc1
|
add support for drawing portions of images in the ui
Former-commit-id: 98a939fcdde6ed202c884cdaae56326e3f90d61d
|
2019-03-20 01:24:23 -04:00 |
|
Imberflur
|
a20517684a
|
remove variable aliasing in test_hud
Former-commit-id: d84d517197643650e8f6dce18e27e67ffd06163d
|
2019-03-20 01:24:23 -04:00 |
|
Imberflur
|
1cce7e1096
|
use new ui images for bag, fix flickering of bag
Former-commit-id: ac93916d648ad14cca142ac68e39dcc940bfe5f7
|
2019-03-20 01:24:22 -04:00 |
|
Imberflur
|
71da6e6588
|
rewrite/address/remove some ui TODOs and comments
Former-commit-id: bbcbb0ee6e8d4049ad98a5cea6274ce9ef0027e0
|
2019-03-20 01:24:22 -04:00 |
|
Imberflur
|
1962320f7e
|
add ui text rendering
Former-commit-id: 5b9b809c660a2fdd178688bdaa63d16128debe08
|
2019-03-20 01:24:21 -04:00 |
|
Imberflur
|
e68fa6b579
|
separate implementation code from generic UI code
Former-commit-id: 9c77ca03c4d834188ef863645ab2c26f31763b6c
|
2019-03-20 01:24:21 -04:00 |
|
Imberflur
|
3f052cae1c
|
setup ui image rendering, started creating test ui with iteraction
Former-commit-id: 73235ad6b25ab160e9cde3ad2513d4dd32660161
|
2019-03-20 01:24:20 -04:00 |
|
Imberflur
|
d685706c9b
|
remove old ui files
Former-commit-id: 82979b9df64ffa120f385e625648e04113c6a917
|
2019-03-20 01:24:19 -04:00 |
|
Imberflur
|
628a91af00
|
move conrod ui rendering and setup into ui::Ui
Former-commit-id: 1dc43fb7d73671d0b798238fecfcbf8d07ffbfcb
|
2019-03-20 01:24:18 -04:00 |
|
Imberflur
|
1df2cf2804
|
starting testing of conrod based ui
Former-commit-id: d417d2372ed95ae82e8d3766c558fb3498056987
|
2019-03-20 01:24:18 -04:00 |
|
Joshua Barretto
|
a32d977b32
|
Merge branch 'master' into 'master'
Networked entities
See merge request veloren/fresh!12
Former-commit-id: 0aab14fdc18f0567c662589dda5d2cf518072431
|
2019-03-19 19:54:09 +00:00 |
|
Joshua Barretto
|
26906d8674
|
Minor changes
Former-commit-id: 39beb7858926cb62a1f2d0db5c74e71c804c5962
|
2019-03-19 19:53:35 +00:00 |
|
Joshua Barretto
|
3214164070
|
Working with upstream
Former-commit-id: 6543387e4df9a96a443c510c9e382ace3731d2f6
|
2019-03-19 14:12:42 +00:00 |
|
Joshua Barretto
|
c75625f179
|
Physics update adjustment
Former-commit-id: 10a8828b1ac496c7419672b88049fbda848d9d9d
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
e2f75c118e
|
Figure changes
Former-commit-id: c4cfb35c950f938cb8c7f8169518333db6364ad2
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
8a0adab381
|
Fixed ping timeout logic
Former-commit-id: 080ca9d4149ec0ecddd92c475d77e4fc92f6edaa
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
ffc4e6ebd4
|
Improved State API design
Former-commit-id: a32ab93409b1044fe2838f684d30ca2b963d4eb2
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
99bd0630b7
|
Added post refactor unit tests
Former-commit-id: 66ea368de32dc6dfe22fc752476b71856e0588a0
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
664f28a972
|
Patched in netcode refactor
Former-commit-id: 34a3b9a95129edad6dc8280d9a3cb41581d4d386
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
a8b0039898
|
Added networked entity updates, player entity allocation
Former-commit-id: b81d6e38a74f846d64c092d1422dc402f369100c
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
bb93f29522
|
Fixed client/server comms bug
Former-commit-id: fffc9cbf59784e7e2c9c2d9a60b8f2520b6f41fb
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
257042ec6f
|
Merge branch 'fix-duration-rust-nightly' into 'master'
fix duration rust nightly
See merge request veloren/fresh!13
Former-commit-id: 5a289fa8e867c2d6d4dd0338e9023f666a3efc2f
|
2019-03-19 00:52:29 +00:00 |
|
Tanner Donovan
|
d9f179b980
|
update Duration method calls
Former-commit-id: 4343e30583f74094a73365465a1d1ca912b693e6
|
2019-03-18 16:46:37 -07:00 |
|
Joshua Barretto
|
d7b87bd1a8
|
Merge branch 'master' into 'master'
client-server impl
See merge request veloren/fresh!10
Former-commit-id: 7389a98fec540371097b183503e47dbbdbf836df
|
2019-03-04 20:33:01 +00:00 |
|
Joshua Barretto
|
18870ce03a
|
Added voxygen submodule
Former-commit-id: f830900201159f1338d83b3a1d0fb9f2b8786f23
|
2019-03-04 20:31:38 +00:00 |
|
Joshua Barretto
|
2e613178a0
|
Component sync + UID system
Former-commit-id: 5ecddc0e1f9c1a15f99dd167b825178c972da062
|
2019-03-04 19:58:58 +00:00 |
|
Joshua Barretto
|
ef333877ae
|
Added Uid marker component
Former-commit-id: b0aae7a8e6dd075996f3bee6cc7be29763f6cdaa
|
2019-03-04 19:58:58 +00:00 |
|
Joshua Barretto
|
2fffe21bc7
|
Added client localhost connection
Former-commit-id: d4dec70ef3ecad8f40196b87b0f5c8b55c51c44a
|
2019-03-04 19:58:58 +00:00 |
|
Joshua Barretto
|
dbbcc1e80e
|
Added basic networked communications, chat communication
Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa
|
2019-03-04 19:58:58 +00:00 |
|
jshipsey
|
187b7939d7
|
adding test assets
Former-commit-id: e6cb2b75321c359ad6fdbf8e4ee1dc90c359f645
|
2019-03-04 19:58:58 +00:00 |
|
jshipsey
|
966fcc1709
|
quadruped testing
Former-commit-id: eb863aa33671032799b70833619ebb3d4d77c58a
|
2019-03-04 19:58:58 +00:00 |
|
Joshua Barretto
|
fd45ca5f6c
|
Merge branch 'asset-repos' into 'master'
Added voxygen assets submodule
See merge request veloren/fresh!11
Former-commit-id: 53f7da3c18b30dc98830000019e1a45fc625e25b
|
2019-03-04 19:58:18 +00:00 |
|
Joshua Barretto
|
8dbaa276b0
|
Added voxygen assets submodule
Former-commit-id: 289bfa10e8d90f12a6aa6db6c8933c6671d311a7
|
2019-03-04 19:56:58 +00:00 |
|
jshipsey
|
608423f09f
|
adding test assets
Former-commit-id: fc56d4d1bc9f9ea9b40dc42f600e164d11e2eb40
|
2019-03-02 18:05:21 -05:00 |
|
jshipsey
|
7e8781024b
|
quadruped testing
Former-commit-id: 50340b74d803ec84b6af43ae6d787d72bf2c2d57
|
2019-03-02 17:41:34 -05:00 |
|
Joshua Barretto
|
72e0cacfef
|
Merge branch 'physics' into 'master'
Player movement with basic physics ecs system
See merge request veloren/fresh!9
Former-commit-id: 87ca6d878c32b7fae9de9994ab2771129d76c747
|
2019-03-02 19:51:37 +00:00 |
|
Imbris
|
33b8922aa4
|
move/name velocity constant, rename move_vec, simplify cam rotate_by()
Former-commit-id: 0835a9e91bd0133922f5d4e9731b9f6b6b547a0b
|
2019-03-02 14:43:51 -05:00 |
|
Imberflur
|
6f5f80f749
|
add player movement with basic physics ecs system
Former-commit-id: f2e151971a42b25bfd1971311f5a06535a577007
|
2019-03-01 22:48:30 -05:00 |
|
Joshua Barretto
|
bbda3a9727
|
Merge branch 'master' into 'master'
Netcode usability improvements
See merge request veloren/fresh!8
Former-commit-id: 0a3ebdd8c7484c010cc2a4c891e798e5106008d1
|
2019-02-25 17:19:51 +00:00 |
|
Joshua Barretto
|
3f5782e993
|
Netcode usability improvements
Former-commit-id: a0e0d0b6fd503b4de9c60d2fcb02562def98c75e
|
2019-02-25 16:45:54 +00:00 |
|
Maciej Ćwięka
|
efb4273ad4
|
Merge branch 'net' into 'master'
Netcode
See merge request veloren/fresh!6
Former-commit-id: a17996824cd6373bb87b7ad65384ef9f0a30fa3c
|
2019-02-19 16:59:50 +00:00 |
|
Maciej Ćwięka
|
d011256542
|
Moved PostBox and PostOffice to separate files, finished implementing PostBox, started implementing PostOffice, fixups all over the place
Former-commit-id: 7a891b8937498b534ad611d7ede29de01ba88ea7
|
2019-02-19 16:59:50 +00:00 |
|
Maciej Ćwięka
|
993ee68037
|
Add LICENSE
Former-commit-id: cc446807e33cb3e5e28c0cdce6a851555840e46e
|
2019-02-04 18:08:21 +00:00 |
|
Yeedo
|
63c945b598
|
Updated mouse wheel zooming to use WindowEvent
Former-commit-id: fabe382516fd65eb76043b7d6ada87cf20f53590
|
2019-02-02 20:18:40 +00:00 |
|
Maciej Ćwięka
|
7be8337aac
|
Merge branch 'add-root-gitignore' into 'master'
Added previous .gitignore to root folder
See merge request veloren/fresh!5
Former-commit-id: 04d5aa18e8575305a987247883eeeb41ff750746
|
2019-02-01 22:51:52 +00:00 |
|