Commit Graph

14 Commits

Author SHA1 Message Date
nvsickle 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-12 11:55:51 -07:00
nvsickle cdca18ca25 Use a smart viewport context pointer in AtomFont to avoid a crash 2021-05-11 18:26:05 -07:00
nvsickle 7ff5c0e105 Add multiline spacing and GetTextSize to Atom Font 2021-05-11 12:18:04 -07:00
bosnichd 440c40e490 Remove (almost) all references to pRenderer (#651)
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
2021-05-10 10:05:15 -06:00
mbalfour 066a1eddf5 Moved null check before setting the status to "initializing". Otherwise, if the first call to InitFont() is with a null render scene, the status will get stuck in initializing forever and fonts will never render. This does NOT fix the text being drawn in the wrong location, that's a separate bug. 2021-05-06 13:42:52 -05:00
rgba16f d115c89043 Fixes for using the DebugDisplayRequestBus in game mode 2021-05-03 11:48:48 -05:00
nvsickle 33b485767f Address reviewer feedback, make FFont initialization state an atomic state machine 2021-04-20 11:49:59 -07:00
nvsickle dee0f84704 Clarified lazy initialization and added some thread sanity logic after discussion with @rgba16f 2021-04-19 17:00:36 -07:00
nvsickle 8fc69113c9 Get the default viewport context on demand in FFont, as it may change 2021-04-19 15:08:06 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00